mirror/curl
2
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-01-18 14:04:30 +08:00
Code Issues Packages Projects Releases Wiki Activity

server/socksd: log atyp + address in a separate log

Browse Source 
To allow the test suite to verify that the right data arrived
This commit is contained in:
Daniel Stenberg 2022-01-03 13:32:05 +01:00
parent effd2bd7ba
commit 61cbb4b626
No known key found for this signature in database
GPG Key ID: 5CC908FDB71E12C2
1 changed files with 40 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/server/socksd.c
View File

@ -101,6 +101,10 @@
#define DEFAULT_LOGFILE "log/socksd.log" #define DEFAULT_LOGFILE "log/socksd.log"
#endif #endif
#ifndef DEFAULT_REQFILE
#define DEFAULT_REQFILE "log/socksd-request.log"
#endif
#ifndef DEFAULT_CONFIG #ifndef DEFAULT_CONFIG
#define DEFAULT_CONFIG "socksd.config" #define DEFAULT_CONFIG "socksd.config"
#endif #endif
@ -136,6 +140,7 @@ struct configurable {
static struct configurable config; static struct configurable config;
const char *serverlogfile = DEFAULT_LOGFILE; const char *serverlogfile = DEFAULT_LOGFILE;
const char *reqlogfile = DEFAULT_REQFILE;
static const char *configfile = DEFAULT_CONFIG; static const char *configfile = DEFAULT_CONFIG;
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
@ -515,6 +520,35 @@ static curl_socket_t sockit(curl_socket_t fd)
} }
logmsg("Received ATYP %d", type); logmsg("Received ATYP %d", type);
{
FILE *dump;
dump = fopen(reqlogfile, "ab");
if(dump) {
int i;
fprintf(dump, "atyp %u =>", type);
switch(type) {
case 1:
/* 4 bytes IPv4 address */
fprintf(dump, " %u.%u.%u.%u\n",
address[0], address[1], address[2], address[3]);
break;
case 3:
/* The first octet of the address field contains the number of octets
of name that follow */
fprintf(dump, " %.*s\n", len-1, &address[1]);
break;
case 4:
/* 16 bytes IPv6 address */
for(i = 0; i < 16; i++) {
fprintf(dump, " %02x", address[i]);
}
fprintf(dump, "\n");
break;
}
fclose(dump);
}
}
if(!config.port) { if(!config.port) {
unsigned char *portp = &buffer[SOCKS5_DSTADDR + len]; unsigned char *portp = &buffer[SOCKS5_DSTADDR + len];
s5port = (unsigned short)((portp[0]<<8) | (portp[1])); s5port = (unsigned short)((portp[0]<<8) | (portp[1]));
@ -931,6 +965,11 @@ int main(int argc, char *argv[])
if(argc>arg) if(argc>arg)
serverlogfile = argv[arg++]; serverlogfile = argv[arg++];
} }
else if(!strcmp("--reqfile", argv[arg])) {
arg++;
if(argc>arg)
reqlogfile = argv[arg++];
}
else if(!strcmp("--ipv6", argv[arg])) { else if(!strcmp("--ipv6", argv[arg])) {
#ifdef ENABLE_IPV6 #ifdef ENABLE_IPV6
ipv_inuse = "IPv6"; ipv_inuse = "IPv6";
@ -964,6 +1003,7 @@ int main(int argc, char *argv[])
" --logfile [file]\n" " --logfile [file]\n"
" --pidfile [file]\n" " --pidfile [file]\n"
" --portfile [file]\n" " --portfile [file]\n"
" --reqfile [file]\n"
" --ipv4\n" " --ipv4\n"
" --ipv6\n" " --ipv6\n"
" --bindonly\n" " --bindonly\n"