bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2026-05-13 13:30:12 +08:00
Code Issues Actions 4 Packages Projects Releases Wiki Activity

Allocate udp buffer dynamically

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-05-06 22:44:29 +03:00
parent cbab76fe41
commit 0e13f57139
5 changed files with 21 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/conf.c
View File

@ -163,14 +163,14 @@ int start_proxy_thread(struct child * chp){
_3proxy_sem_lock(conf.threadinit); _3proxy_sem_lock(conf.threadinit);
#ifdef _WIN32 #ifdef _WIN32
#ifndef _WINCE #ifndef _WINCE
h = (HANDLE)_beginthreadex((LPSECURITY_ATTRIBUTES )NULL, 32768+conf.stacksize, (void *)startsrv, (void *) chp, (DWORD)0, &thread); h = (HANDLE)_beginthreadex((LPSECURITY_ATTRIBUTES )NULL, 16384+conf.stacksize, (void *)startsrv, (void *) chp, (DWORD)0, &thread);
#else #else
h = (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES )NULL, 32768+conf.stacksize, (void *)startsrv, (void *) chp, (DWORD)0, &thread); h = (HANDLE)CreateThread((LPSECURITY_ATTRIBUTES )NULL, 16384+conf.stacksize, (void *)startsrv, (void *) chp, (DWORD)0, &thread);
#endif #endif
if(h)CloseHandle(h); if(h)CloseHandle(h);
#else #else
pthread_attr_init(&pa); pthread_attr_init(&pa);
pthread_attr_setstacksize(&pa,PTHREAD_STACK_MIN + (65536+conf.stacksize)); pthread_attr_setstacksize(&pa,PTHREAD_STACK_MIN + (32768+conf.stacksize));
pthread_attr_setdetachstate(&pa,PTHREAD_CREATE_DETACHED); pthread_attr_setdetachstate(&pa,PTHREAD_CREATE_DETACHED);
pthread_create(&thread, &pa, startsrv, (void *)chp); pthread_create(&thread, &pa, startsrv, (void *)chp);
pthread_attr_destroy(&pa); pthread_attr_destroy(&pa);

16
src/proxymain.c
View File

@ -349,6 +349,14 @@ int MODULEMAINFUNC (int argc, char** argv){
#ifndef NOUDPMAIN #ifndef NOUDPMAIN
if(isudp) { if(isudp) {
if(!udp_table.ihashtable)inithashtable(&udp_table, 64, 256, 65536); if(!udp_table.ihashtable)inithashtable(&udp_table, 64, 256, 65536);
srv.udpbuf = malloc(UDPBUFSIZE);
srv.udpbuf2 = malloc(UDPBUFSIZE);
if(!srv.udpbuf || !srv.udpbuf2) {
#ifndef STDMAIN
haveerror = 2;
#endif
return 11;
}
} }
#endif #endif
srv.service = defparam.service = childdef.service; srv.service = defparam.service = childdef.service;
@ -995,8 +1003,8 @@ int MODULEMAINFUNC (int argc, char** argv){
if(hashresolv(&udp_table, &defparam, &toparam, NULL)) { if(hashresolv(&udp_table, &defparam, &toparam, NULL)) {
int i, len=0; int i, len=0;
if(toparam->udp_nhops - 1){ if(toparam->udp_nhops){
for(i=1; i < toparam->udp_nhops - 1; i++){ for(i=1; i < toparam->udp_nhops; i++){
len+=socks5_udp_build_hdr(srv.udpbuf2+len, &toparam->udp_relay[i-1]); len+=socks5_udp_build_hdr(srv.udpbuf2+len, &toparam->udp_relay[i-1]);
} }
len += socks5_udp_build_hdr(srv.udpbuf2+len, &toparam->req); len += socks5_udp_build_hdr(srv.udpbuf2+len, &toparam->req);
@ -1241,6 +1249,10 @@ void srvfree(struct srvparam * srv){
if(srv->onetns) free(srv->onetns); if(srv->onetns) free(srv->onetns);
#endif #endif
if(srv->so.freefunc) srv->so.freefunc(srv->so.state); if(srv->so.freefunc) srv->so.freefunc(srv->so.state);
#ifndef NOUDPMAIN
if(srv->udpbuf) free(srv->udpbuf);
if(srv->udpbuf2) free(srv->udpbuf2);
#endif
} }

6
src/structures.h
View File

@ -569,11 +569,9 @@ struct srvparam {
uint16_t targetport; uint16_t targetport;
unsigned char replace; unsigned char replace;
time_t time_start; time_t time_start;
#ifndef NOUDPMAIN unsigned char *udpbuf;
unsigned char udpbuf[UDPBUFSIZE]; unsigned char *udpbuf2;
unsigned char udpbuf2[UDPBUFSIZE];
int udplen; int udplen;
#endif
}; };
struct clientparam { struct clientparam {

1
src/udppm.c
View File

@ -75,7 +75,6 @@ void * udppmchild(struct clientparam* param) {
param->srvinbuf = 0; param->srvinbuf = 0;
param->nwrites++; param->nwrites++;
param->clisock = param->srv->srvsock; param->clisock = param->srv->srvsock;
param->udp_nhops++;
param->waitserver64 = 0x7fffffffffffffff; param->waitserver64 = 0x7fffffffffffffff;
param->res = udpsockmap(param, conf.timeouts[STRING_L]); param->res = udpsockmap(param, conf.timeouts[STRING_L]);
_3proxy_sem_lock(udpinit); _3proxy_sem_lock(udpinit);

2
src/udpsockmap.c
View File

@ -57,6 +57,8 @@ int udpsockmap(struct clientparam *param, int timeo)
int nhops = param->udp_nhops; int nhops = param->udp_nhops;
int clisock_idx = -1, ctrlsock_idx = -1, ctrlsocksrv_idx = -1; int clisock_idx = -1, ctrlsock_idx = -1, ctrlsocksrv_idx = -1;
int firstpacket = 1; int firstpacket = 1;
if(param->srv->service == S_UDPPM) nhops++;
if (param->srvbufsize < UDPBUFSIZE) { if (param->srvbufsize < UDPBUFSIZE) {
unsigned char *newbuf = realloc(param->srvbuf, UDPBUFSIZE); unsigned char *newbuf = realloc(param->srvbuf, UDPBUFSIZE);
if (!newbuf) return 21; if (!newbuf) return 21;