IPv6 bugfixes

This commit is contained in:
z3APA3A 2014-11-03 21:25:06 +03:00
parent db5c4b1255
commit f70e4adf47
6 changed files with 7 additions and 6 deletions

View File

@ -268,6 +268,7 @@ int handleredirect(struct clientparam * param, struct ace * acentry){
} }
else if(!cur->redirport && cur->redirip) { else if(!cur->redirport && cur->redirip) {
unsigned short port = *SAPORT(&param->sinsl); unsigned short port = *SAPORT(&param->sinsl);
memset(&param->sinsl, 0, sizeof(param->sinsl));
*SAFAMILY(&param->sinsl) = AF_INET; *SAFAMILY(&param->sinsl) = AF_INET;
*(unsigned long *)SAADDR(&param->sinsl) = cur->redirip; *(unsigned long *)SAADDR(&param->sinsl) = cur->redirip;
*SAPORT(&param->sinsl) = port; *SAPORT(&param->sinsl) = port;

View File

@ -599,7 +599,7 @@ void logsyslog(struct clientparam * param, const unsigned char *s) {
int doconnect(struct clientparam * param){ int doconnect(struct clientparam * param){
SASIZETYPE size = sizeof(param->sinsr); SASIZETYPE size = sizeof(param->sinsr);
if (*SAFAMILY(&param->sincr) == *SAFAMILY(&param->req) && !memcmp(SAADDR(&param->sincr), SAADDR(&param->req), SASIZE(&param->req)) && if (*SAFAMILY(&param->sincr) == *SAFAMILY(&param->req) && !memcmp(SAADDR(&param->sincr), SAADDR(&param->req), SAADDRLEN(&param->req)) &&
*SAPORT(&param->sincr) == *SAPORT(&param->req)) return 519; *SAPORT(&param->sincr) == *SAPORT(&param->req)) return 519;
if (param->operation == ADMIN || param->operation == DNSRESOLVE || param->operation == BIND || param->operation == UDPASSOC) if (param->operation == ADMIN || param->operation == DNSRESOLVE || param->operation == BIND || param->operation == UDPASSOC)

View File

@ -132,8 +132,8 @@ char * proxy_stringtable[] = {
NULL NULL
}; };
#define BUFSIZE 4096 #define BUFSIZE 8192
#define LINESIZE 2048 #define LINESIZE 4096
static void logurl(struct clientparam * param, char * buf, char * req, int ftp){ static void logurl(struct clientparam * param, char * buf, char * req, int ftp){
char *sb; char *sb;

View File

@ -42,7 +42,7 @@
#define NOCOUNTOUT 8 #define NOCOUNTOUT 8
#define UDPBUFSIZE 16384 #define UDPBUFSIZE 16384
#define TCPBUFSIZE 4096 #define TCPBUFSIZE 8192
#ifdef _WIN32 #ifdef _WIN32

View File

@ -292,7 +292,7 @@ void * smtppchild(struct clientparam* param) {
CLEANRET: CLEANRET:
if(param->hostname&&param->extusername) { if(param->hostname&&param->extusername) {
sprintf((char *)buf, "%.64s@%.128s%c%hu", param->extusername, param->hostname, (ntohs(*SAPORT(&param->sinsr))==25)?0:':', *SAPORT(&param->sinsr)); sprintf((char *)buf, "%.64s@%.128s%c%hu", param->extusername, param->hostname, *SAPORT(&param->sinsr)==25?0:':',ntohs(*SAPORT(&param->sinsr)));
(*param->srv->logfunc)(param, buf); (*param->srv->logfunc)(param, buf);
} }
else (*param->srv->logfunc)(param, NULL); else (*param->srv->logfunc)(param, NULL);

View File

@ -1,2 +1,2 @@
#define VERSION "3proxy-0.8b-devel" #define VERSION "3proxy-0.8b-devel"
#define BUILDDATE "141021055913" #define BUILDDATE "141103212413"