I2P_Developers/libsam3
3
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Merge pull request #12 from i2p/remember-c

Browse Source 
do the checkIsSilent better
This commit is contained in:
idk
2020-11-24 17:15:18 +00:00
committed by GitHub
parent 0aebf5a20a ca20286c6b
commit 4bcaa17adb
2 changed files with 6 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
src/libsam3/libsam3.c
View File

@ -949,11 +949,9 @@ Sam3Connection *sam3StreamConnect(Sam3Session *ses, const char *destkey) {
strcpyerr(ses, "IO_ERROR_SK");
goto error;
}
char silent[] = "false";
checkIsSilent(ses, silent);
if (sam3tcpPrintf(conn->fd,
"STREAM CONNECT ID=%s DESTINATION=%s SILENT=%s\n",
ses->channel, destkey, silent) < 0) {
ses->channel, destkey, checkIsSilent(ses)) < 0) {
strcpyerr(ses, "IO_ERROR");
goto error;
}
@ -1056,11 +1054,11 @@ Sam3Connection *sam3StreamAccept(Sam3Session *ses) {
return NULL;
}
void checkIsSilent(Sam3Session *ses, char *str) {
const char *checkIsSilent(Sam3Session *ses) {
if (ses->silent == true) {
str = "true ";
return "true";
} else {
str = "false";
return "false";
}
}
@ -1084,11 +1082,9 @@ int sam3StreamForward(Sam3Session *ses, const char *hostname, int port) {
strcpyerr(ses, "IO_ERROR_SK");
goto error;
}
char silent[] = "false";
checkIsSilent(ses, silent);
if (sam3tcpPrintf(ses->fwd_fd,
"STREAM FORWARD ID=%s PORT=%d HOST=%s SILENT=%s\n",
ses->channel, port, hostname, silent) < 0) {
ses->channel, port, hostname, checkIsSilent(ses)) < 0) {
strcpyerr(ses, "IO_ERROR_PF");
goto error;
}

2
src/libsam3/libsam3.h
View File

@ -205,7 +205,7 @@ extern int sam3CloseSession(Sam3Session *ses);
* characters for use with sam3tcpPrintf() checkIsSilent
*/
void checkIsSilent(Sam3Session *ses, char *str);
const char *checkIsSilent(Sam3Session *ses);
/*
* Check to make sure that the destination in use is of a valid length, returns