bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-24 02:55:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Use splice by default if no filteers set

Browse Source 
-s0 to disable splice
This commit is contained in:
z3APA3A 2018-04-22 20:03:04 +03:00
parent a4bc89dc8f
commit d2705df891
2 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/proxy.h
View File

@ -324,7 +324,7 @@ extern struct datatype datatypes[64];
extern struct commands commandhandlers[]; extern struct commands commandhandlers[];
#ifdef WITHSPLICE #ifdef WITHSPLICE
#define mapsocket(a,b) (a->srv->usesplice?splicemap(a,b):sockmap(a,b)) #define mapsocket(a,b) (a->srv->usesplice && !a->ndatfilterssrv && !a->ndatfilterscli && !a->npredatfilters?splicemap(a,b):sockmap(a,b))
#else #else
#define mapsocket(a,b) sockmap(a,b) #define mapsocket(a,b) sockmap(a,b)
#endif #endif

5
src/proxymain.c
View File

@ -395,7 +395,7 @@ int MODULEMAINFUNC (int argc, char** argv){
srv.singlepacket = 1 + atoi(argv[i]+2); srv.singlepacket = 1 + atoi(argv[i]+2);
#ifdef WITHSPLICE #ifdef WITHSPLICE
else else
srv.usesplice = 1 + atoi(argv[i]+2); if(*(argv[i]+2)) srv.usesplice = atoi(argv[i]+2);
#endif #endif
break; break;
case 'o': case 'o':
@ -850,6 +850,9 @@ void srvinit(struct srvparam * srv, struct clientparam *param){
param->srv = srv; param->srv = srv;
param->version = srv->version; param->version = srv->version;
param->paused = srv->paused; param->paused = srv->paused;
#ifdef WITHSPLICE
param->usesplice = 1;
#endif
param->remsock = param->clisock = param->ctrlsock = param->ctrlsocksrv = INVALID_SOCKET; param->remsock = param->clisock = param->ctrlsock = param->ctrlsocksrv = INVALID_SOCKET;
*SAFAMILY(&param->req) = *SAFAMILY(&param->sinsl) = *SAFAMILY(&param->sinsr) = *SAFAMILY(&param->sincr) = *SAFAMILY(&param->sincl) = AF_INET; *SAFAMILY(&param->req) = *SAFAMILY(&param->sinsl) = *SAFAMILY(&param->sinsr) = *SAFAMILY(&param->sincr) = *SAFAMILY(&param->sincl) = AF_INET;
pthread_mutex_init(&srv->counter_mutex, NULL); pthread_mutex_init(&srv->counter_mutex, NULL);