mirror of
https://github.com/3proxy/3proxy.git
synced 2025-02-23 18:45:40 +08:00
IPv6 bugfixes
This commit is contained in:
parent
db5c4b1255
commit
f70e4adf47
@ -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(¶m->sinsl);
|
unsigned short port = *SAPORT(¶m->sinsl);
|
||||||
|
memset(¶m->sinsl, 0, sizeof(param->sinsl));
|
||||||
*SAFAMILY(¶m->sinsl) = AF_INET;
|
*SAFAMILY(¶m->sinsl) = AF_INET;
|
||||||
*(unsigned long *)SAADDR(¶m->sinsl) = cur->redirip;
|
*(unsigned long *)SAADDR(¶m->sinsl) = cur->redirip;
|
||||||
*SAPORT(¶m->sinsl) = port;
|
*SAPORT(¶m->sinsl) = port;
|
||||||
|
@ -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(¶m->sincr) == *SAFAMILY(¶m->req) && !memcmp(SAADDR(¶m->sincr), SAADDR(¶m->req), SASIZE(¶m->req)) &&
|
if (*SAFAMILY(¶m->sincr) == *SAFAMILY(¶m->req) && !memcmp(SAADDR(¶m->sincr), SAADDR(¶m->req), SAADDRLEN(¶m->req)) &&
|
||||||
*SAPORT(¶m->sincr) == *SAPORT(¶m->req)) return 519;
|
*SAPORT(¶m->sincr) == *SAPORT(¶m->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)
|
||||||
|
@ -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;
|
||||||
|
@ -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
|
||||||
|
@ -292,7 +292,7 @@ void * smtppchild(struct clientparam* param) {
|
|||||||
CLEANRET:
|
CLEANRET:
|
||||||
|
|
||||||
if(param->hostname&¶m->extusername) {
|
if(param->hostname&¶m->extusername) {
|
||||||
sprintf((char *)buf, "%.64s@%.128s%c%hu", param->extusername, param->hostname, (ntohs(*SAPORT(¶m->sinsr))==25)?0:':', *SAPORT(¶m->sinsr));
|
sprintf((char *)buf, "%.64s@%.128s%c%hu", param->extusername, param->hostname, *SAPORT(¶m->sinsr)==25?0:':',ntohs(*SAPORT(¶m->sinsr)));
|
||||||
(*param->srv->logfunc)(param, buf);
|
(*param->srv->logfunc)(param, buf);
|
||||||
}
|
}
|
||||||
else (*param->srv->logfunc)(param, NULL);
|
else (*param->srv->logfunc)(param, NULL);
|
||||||
|
@ -1,2 +1,2 @@
|
|||||||
#define VERSION "3proxy-0.8b-devel"
|
#define VERSION "3proxy-0.8b-devel"
|
||||||
#define BUILDDATE "141021055913"
|
#define BUILDDATE "141103212413"
|
||||||
|
Loading…
Reference in New Issue
Block a user