mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
IPv6 server side code
+ IPv6 server side support !!! Auth need to be fixed
This commit is contained in:
1 parent
ccf606fd9e
commit
a30d5d51a5
15 files changed
+141
-122
No files matched your search
+20
-18
@@ -28,7 +28,11 @@ void * sockschild(struct clientparam* param) {
|
||||
struct pollfd fds[3];
|
||||
int ver=0;
|
||||
int havepass = 0;
|
||||
#ifndef NOIPV6
|
||||
struct sockaddr_in6 sin;
|
||||
#else
|
||||
struct sockaddr_in sin;
|
||||
#endif
|
||||
int len;
|
||||
|
||||
|
||||
@@ -171,20 +175,18 @@ fprintf(stderr, "%s:%hu binded to communicate with server\n",
|
||||
fflush(stderr);
|
||||
#endif
|
||||
}
|
||||
sasize = sizeof(struct sockaddr_in);
|
||||
sasize = sizeof(param->sins);
|
||||
so._getsockname(param->remsock, (struct sockaddr *)¶m->sins, &sasize);
|
||||
if(command == 3) {
|
||||
param->ctrlsock = param->clisock;
|
||||
param->clisock = so._socket(AF_INET, SOCK_DGRAM, IPPROTO_UDP);
|
||||
param->clisock = so._socket(SASOCK(¶m->sincr), SOCK_DGRAM, IPPROTO_UDP);
|
||||
if(param->clisock == INVALID_SOCKET) {RETURN(11);}
|
||||
sin.sin_family = AF_INET;
|
||||
sin.sin_addr.s_addr = ((struct sockaddr_in *)¶m->srv->intsa)->sin_addr.s_addr;
|
||||
sin.sin_port = htons(0);
|
||||
if(so._bind(param->clisock,(struct sockaddr *)&sin,sizeof(struct sockaddr_in))) {RETURN (12);}
|
||||
memcpy(&sin, ¶m->sincl, sizeof(&sin));
|
||||
*SAPORT(&sin) = htons(0);
|
||||
if(so._bind(param->clisock,(struct sockaddr *)&sin,sizeof(sin))) {RETURN (12);}
|
||||
#if SOCKSTRACE > 0
|
||||
fprintf(stderr, "%s:%hu binded to communicate with client\n",
|
||||
inet_ntoa(sin.sin_addr),
|
||||
ntohs(sin.sin_port)
|
||||
fprintf(stderr, "%hu binded to communicate with client\n",
|
||||
ntohs(*SAPORT(&sin))
|
||||
);
|
||||
fflush(stderr);
|
||||
#endif
|
||||
@@ -195,7 +197,7 @@ fflush(stderr);
|
||||
CLEANRET:
|
||||
|
||||
if(param->clisock != INVALID_SOCKET){
|
||||
sasize = sizeof(struct sockaddr_in);
|
||||
sasize = sizeof(sin);
|
||||
if(command != 3) so._getsockname(param->remsock, (struct sockaddr *)&sin, &sasize);
|
||||
else so._getsockname(param->clisock, (struct sockaddr *)&sin, &sasize);
|
||||
#if SOCKSTRACE > 0
|
||||
@@ -212,15 +214,15 @@ fflush(stderr);
|
||||
buf[1] = param->res%10;
|
||||
buf[2] = 0;
|
||||
buf[3] = 1;
|
||||
memcpy(buf+4, &sin.sin_addr.s_addr, 4);
|
||||
memcpy(buf+8, &sin.sin_port, 2);
|
||||
memcpy(buf+4, SAADDR(&sin), 4);
|
||||
memcpy(buf+8, SAPORT(&sin), 2);
|
||||
socksend((command == 3)?param->ctrlsock:param->clisock, buf, 10, conf.timeouts[STRING_S]);
|
||||
}
|
||||
else{
|
||||
buf[0] = 0;
|
||||
buf[1] = 90 + (param->res%10);
|
||||
memcpy(buf+2, &sin.sin_port, 2);
|
||||
memcpy(buf+4, &sin.sin_addr.s_addr, 4);
|
||||
memcpy(buf+2, SAPORT(&sin), 2);
|
||||
memcpy(buf+4, SAADDR(&sin), 4);
|
||||
socksend(param->clisock, buf, 8, conf.timeouts[STRING_S]);
|
||||
}
|
||||
|
||||
@@ -300,12 +302,12 @@ fflush(stderr);
|
||||
break;
|
||||
}
|
||||
if (fds[1].revents) {
|
||||
sasize = sizeof(struct sockaddr_in);
|
||||
sasize = sizeof(sin);
|
||||
if((len = so._recvfrom(param->clisock, buf, 65535, 0, (struct sockaddr *)&sin, &sasize)) <= 10) {
|
||||
param->res = 464;
|
||||
break;
|
||||
}
|
||||
if(sin.sin_addr.s_addr != param->sinc.sin_addr.s_addr){
|
||||
if(SAADDRLEN(&sin) != SAADDRLEN(¶m->sincr) || memcmp(SAADDR(&sin), SAADDR(¶m->sincr), SAADDRLEN(&sin))){
|
||||
param->res = 465;
|
||||
break;
|
||||
}
|
||||
@@ -335,7 +337,7 @@ fflush(stderr);
|
||||
|
||||
sasize = sizeof(param->sins);
|
||||
if(len > (int)i){
|
||||
if(socksendto(param->remsock, ¶m->sins, buf+i, len - i, conf.timeouts[SINGLEBYTE_L]*1000) <= 0){
|
||||
if(socksendto(param->remsock, (struct sockaddr *)¶m->sins, buf+i, len - i, conf.timeouts[SINGLEBYTE_L]*1000) <= 0){
|
||||
param->res = 467;
|
||||
break;
|
||||
}
|
||||
@@ -371,7 +373,7 @@ fflush(stderr);
|
||||
memcpy(buf+4, &tsin.sin_addr.s_addr, 4);
|
||||
memcpy(buf+8, &tsin.sin_port, 2);
|
||||
sasize = sizeof(param->sins);
|
||||
if(socksendto(param->clisock, &sin, buf, len + 10, conf.timeouts[SINGLEBYTE_L]*1000) <=0){
|
||||
if(socksendto(param->clisock, (struct sockaddr *)&sin, buf, len + 10, conf.timeouts[SINGLEBYTE_L]*1000) <=0){
|
||||
param->res = 469;
|
||||
break;
|
||||
}
|
||||
|
||||
Reference in new issue
Block a user