mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
SOCKSv5 parent udp support (initial, untested)
This commit is contained in:
1 parent
8107f03062
commit
314503d8df
6 files changed
+270
-116
No files matched your search
+1
-106
@@ -13,7 +13,6 @@
|
||||
unsigned char * commands[] = {(unsigned char *)"UNKNOWN", (unsigned char *)"CONNECT", (unsigned char *)"BIND", (unsigned char *)"UDPMAP"};
|
||||
|
||||
#define BUFSIZE 1024
|
||||
#define LARGEBUFSIZE 67000
|
||||
|
||||
#if SOCKSTRACE > 0
|
||||
char tracebuf[256];
|
||||
@@ -407,111 +406,7 @@ fflush(stderr);
|
||||
break;
|
||||
case 3:
|
||||
param->sinsr = param->req;
|
||||
myfree(buf);
|
||||
if(!(buf = myalloc(LARGEBUFSIZE))) {RETURN(21);}
|
||||
sin = param->sincr;
|
||||
|
||||
for(;;){
|
||||
fds[0].fd = param->remsock;
|
||||
fds[1].fd = param->clisock;
|
||||
fds[2].fd = param->ctrlsock;
|
||||
fds[2].events = fds[1].events = fds[0].events = POLLIN;
|
||||
|
||||
res = param->srv->so._poll(param->sostate, fds, 3, conf.timeouts[CONNECTION_L]*1000);
|
||||
if(res <= 0) {
|
||||
param->res = 463;
|
||||
break;
|
||||
}
|
||||
if (fds[2].revents) {
|
||||
param->res = 0;
|
||||
break;
|
||||
}
|
||||
if (fds[1].revents) {
|
||||
sasize = sizeof(sin);
|
||||
if((len = param->srv->so._recvfrom(param->sostate, param->clisock, (char *)buf, 65535, 0, (struct sockaddr *)&sin, &sasize)) <= 10) {
|
||||
param->res = 464;
|
||||
break;
|
||||
}
|
||||
if(SAADDRLEN(&sin) != SAADDRLEN(¶m->sincr) || memcmp(SAADDR(&sin), SAADDR(¶m->sincr), SAADDRLEN(&sin))){
|
||||
param->res = 465;
|
||||
break;
|
||||
}
|
||||
if(buf[0] || buf[1] || buf[2]) {
|
||||
param->res = 466;
|
||||
break;
|
||||
}
|
||||
size = 4;
|
||||
switch(buf[3]) {
|
||||
case 4:
|
||||
size = 16;
|
||||
case 1:
|
||||
i = 4+size;
|
||||
*SAFAMILY(¶m->sinsr) = (size == 4)?AF_INET:AF_INET6;
|
||||
memcpy(SAADDR(¶m->sinsr), buf+4, size);
|
||||
break;
|
||||
case 3:
|
||||
size = buf[4];
|
||||
for (i=4; size; i++, size--){
|
||||
buf[i] = buf[i+1];
|
||||
}
|
||||
buf[i++] = 0;
|
||||
if(!getip46(param->srv->family, buf+4, (struct sockaddr *) ¶m->sinsr)) RETURN(100);
|
||||
break;
|
||||
default:
|
||||
RETURN(997);
|
||||
}
|
||||
|
||||
memcpy(SAPORT(¶m->sinsr), buf+i, 2);
|
||||
i+=2;
|
||||
|
||||
sasize = sizeof(param->sinsr);
|
||||
if(len > (int)i){
|
||||
socksendto(param, param->remsock, (struct sockaddr *)¶m->sinsr, buf+i, len - i, conf.timeouts[SINGLEBYTE_L]*1000);
|
||||
param->statscli64+=(len - i);
|
||||
param->nwrites++;
|
||||
#if SOCKSTRACE > 1
|
||||
myinet_ntop(*SAFAMILY(¶m->sinsr), ¶m->sinsr, tracebuf, SASIZE(¶m->sinsr));
|
||||
|
||||
fprintf(stderr, "UDP packet relayed from client to %s:%hu size %d, header %d\n",
|
||||
tracebuf,
|
||||
ntohs(*SAPORT(¶m->sinsr)),
|
||||
(len - i),
|
||||
i
|
||||
);
|
||||
myinet_ntop(*SAFAMILY(&sin), &sin, tracebuf, SASIZE(&sin));
|
||||
fprintf(stderr, "client address is assumed to be %s:%hu\n",
|
||||
tracebuf,
|
||||
ntohs(*SAPORT(&sin))
|
||||
);
|
||||
fflush(stderr);
|
||||
#endif
|
||||
}
|
||||
|
||||
}
|
||||
if (fds[0].revents) {
|
||||
sasize = sizeof(param->sinsr);
|
||||
buf[0]=buf[1]=buf[2]=0;
|
||||
buf[3]=(*SAFAMILY(¶m->sinsl) == AF_INET)?1:4;
|
||||
if((len = param->srv->so._recvfrom(param->sostate, param->remsock, (char *)buf+6+SAADDRLEN(¶m->sinsl), 65535 - (6+SAADDRLEN(¶m->sinsl)), 0, (struct sockaddr *)¶m->sinsr, &sasize)) <= 0) {
|
||||
param->res = 468;
|
||||
break;
|
||||
}
|
||||
param->statssrv64+=len;
|
||||
param->nreads++;
|
||||
memcpy(buf+4, SAADDR(¶m->sinsr), SAADDRLEN(¶m->sinsr));
|
||||
memcpy(buf+4+SAADDRLEN(¶m->sinsr), SAPORT(¶m->sinsr), 2);
|
||||
sasize = sizeof(sin);
|
||||
socksendto(param, param->clisock, (struct sockaddr *)&sin, buf, len + 6 + SAADDRLEN(¶m->sinsr), conf.timeouts[SINGLEBYTE_L]*1000);
|
||||
#if SOCKSTRACE > 1
|
||||
fprintf(stderr, "UDP packet relayed to client from %hu size %d\n",
|
||||
ntohs(*SAPORT(¶m->sinsr)),
|
||||
len
|
||||
);
|
||||
fflush(stderr);
|
||||
#endif
|
||||
|
||||
}
|
||||
}
|
||||
param->res = udpsockmap(param, conf.timeouts[CONNECTION_L]);
|
||||
break;
|
||||
default:
|
||||
param->res = 417;
|
||||
|
||||
Reference in new issue
Block a user