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

Changed -a / -s options handling for 'anonymous' after last commit

Browse Source
This commit is contained in:
z3apa3a 2016-12-19 03:19:17 +03:00
parent 6696b35d74
commit 1ab549036c
5 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/common.c
View File

@ -73,7 +73,8 @@ struct extparam conf = {
#else #else
0, 0,
#endif #endif
0, -1, 0, 0, 0, 0, 0, 500, 0, 0, 0, 0, 0, 0, -1, 0, 0, 0, 0,
0, 500, 0, 0, 0, 0,
6, 600, 6, 600,
1048576, 1048576,
NULL, NULL, NULL, NULL,

1
src/conf.c
View File

@ -1642,7 +1642,6 @@ void freeconf(struct extparam *confp){
#endif #endif
*SAFAMILY(&confp->intsa) = AF_INET; *SAFAMILY(&confp->intsa) = AF_INET;
*SAFAMILY(&confp->extsa) = AF_INET; *SAFAMILY(&confp->extsa) = AF_INET;
confp->singlepacket = 0;
confp->maxchild = 100; confp->maxchild = 100;
resolvfunc = NULL; resolvfunc = NULL;
numservers = 0; numservers = 0;

2
src/proxy.c
View File

@ -240,7 +240,7 @@ void * proxychild(struct clientparam* param) {
if(!(buf = myalloc(BUFSIZE))) {RETURN(21);} if(!(buf = myalloc(BUFSIZE))) {RETURN(21);}
bufsize = BUFSIZE; bufsize = BUFSIZE;
anonymous = param->srv->singlepacket; anonymous = param->srv->anonymous;
for(;;){ for(;;){
memset(buf, 0, bufsize); memset(buf, 0, bufsize);
inbuf = 0; inbuf = 0;

4
src/proxymain.c
View File

@ -304,8 +304,10 @@ int MODULEMAINFUNC (int argc, char** argv){
case 'S': case 'S':
srv.stacksize = atoi(argv[i]+2); srv.stacksize = atoi(argv[i]+2);
break; break;
case 's':
case 'a': case 'a':
srv.anonymous = 1 + atoi(argv[i]+2);
break;
case 's':
if(isudp) if(isudp)
srv.singlepacket = 1 + atoi(argv[i]+2); srv.singlepacket = 1 + atoi(argv[i]+2);
else else

6
src/structures.h
View File

@ -388,6 +388,7 @@ struct srvparam {
int family; int family;
int stacksize; int stacksize;
int noforce; int noforce;
int anonymous;
#ifdef WITHSPLICE #ifdef WITHSPLICE
int usesplice; int usesplice;
#endif #endif
@ -513,8 +514,9 @@ struct extparam {
struct bandlim * bandlimiter, *bandlimiterout; struct bandlim * bandlimiter, *bandlimiterout;
struct trafcount * trafcounter; struct trafcount * trafcounter;
struct srvparam *services; struct srvparam *services;
int stacksize, threadinit, counterd, haveerror, rotate, paused, archiverc, int stacksize,
demon, maxchild, singlepacket, needreload, timetoexit, version, noforce; threadinit, counterd, haveerror, rotate, paused, archiverc,
demon, maxchild, needreload, timetoexit, version, noforce;
int authcachetype, authcachetime; int authcachetype, authcachetime;
int filtermaxsize; int filtermaxsize;
unsigned char *logname, **archiver; unsigned char *logname, **archiver;