bcollet/socat
1
0
Fork 0
mirror of https://repo.or.cz/socat.git synced 2025-07-15 15:43:24 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

struct cmsghdr.cmsg is system dependend; more print format corrections

Browse source
This commit is contained in:
Gerhard Rieger 2014-03-09 22:08:19 +01:00
parent 93cfe88290
commit 80c7fa0bca
18 changed files with 141 additions and 66 deletions

5
xio-socks.c
View file

@ -236,7 +236,6 @@ int _xioopen_socks4_prepare(const char *targetport, struct opt *opts, char **soc
}
}
}
/*strncpy(sockhead->userid, userid, *headlen-SIZEOF_STRUCT_SOCKS4);*/
sockhead->userid[0] = '\0'; strncat(sockhead->userid, userid, *headlen-SIZEOF_STRUCT_SOCKS4-1);
*headlen = SIZEOF_STRUCT_SOCKS4+strlen(userid)+1;
return STAT_OK;
@ -365,7 +364,7 @@ int _xioopen_socks4_connect(struct single *xfd,
char msgbuff[3*SIZEOF_STRUCT_SOCKS4];
* xiohexdump((const unsigned char *)replyhead+bytes, result, msgbuff)
= '\0';
Debug2("received socks4 reply data (offset %u): %s", bytes, msgbuff);
Debug2("received socks4 reply data (offset "F_Zd"): %s", bytes, msgbuff);
}
#endif /* WITH_MSGLEVEL <= E_DEBUG */
bytes += result;
@ -373,7 +372,7 @@ int _xioopen_socks4_connect(struct single *xfd,
Debug1("received all "F_Zd" bytes", bytes);
break;
}
Debug2("received "F_Zd" bytes, waiting for "F_Zu" more bytes",
Debug2("received %d bytes, waiting for "F_Zu" more bytes",
result, SIZEOF_STRUCT_SOCKS4-bytes);
}
if (result <= 0) { /* we had a problem while reading socks answer */