|
@@ -503,7 +503,7 @@ int dobuf2(struct clientparam * param, unsigned char * buf, const unsigned char
|
|
|
i += myinet_ntop(*SAFAMILY(¶m->sinsl), SAADDR(¶m->sinsl), (char *)buf + i, 64);
|
|
i += myinet_ntop(*SAFAMILY(¶m->sinsl), SAADDR(¶m->sinsl), (char *)buf + i, 64);
|
|
|
break;
|
|
break;
|
|
|
case 'i':
|
|
case 'i':
|
|
|
- i += myinet_ntop(*SAFAMILY(¶m->sincl), SAADDR(¶m->sinsl), (char *)buf + i, 64);
|
|
|
|
|
|
|
+ i += myinet_ntop(*SAFAMILY(¶m->sincl), SAADDR(¶m->sincl), (char *)buf + i, 64);
|
|
|
break;
|
|
break;
|
|
|
case 'C':
|
|
case 'C':
|
|
|
i += myinet_ntop(*SAFAMILY(¶m->sincr), SAADDR(¶m->sincr), (char *)buf + i, 64);
|
|
i += myinet_ntop(*SAFAMILY(¶m->sincr), SAADDR(¶m->sincr), (char *)buf + i, 64);
|
|
@@ -638,7 +638,8 @@ void logsyslog(struct clientparam * param, const unsigned char *s) {
|
|
|
#endif
|
|
#endif
|
|
|
|
|
|
|
|
int doconnect(struct clientparam * param){
|
|
int doconnect(struct clientparam * param){
|
|
|
- SASIZETYPE size = sizeof(param->sinsr);
|
|
|
|
|
|
|
+ SASIZETYPE size;
|
|
|
|
|
+
|
|
|
|
|
|
|
|
if (*SAFAMILY(¶m->sincr) == *SAFAMILY(¶m->req) && !memcmp(SAADDR(¶m->sincr), SAADDR(¶m->req), SAADDRLEN(¶m->req)) &&
|
|
if (*SAFAMILY(¶m->sincr) == *SAFAMILY(¶m->req) && !memcmp(SAADDR(¶m->sincr), SAADDR(¶m->req), SAADDRLEN(¶m->req)) &&
|
|
|
*SAPORT(¶m->sincr) == *SAPORT(¶m->req)) return 519;
|
|
*SAPORT(¶m->sincr) == *SAPORT(¶m->req)) return 519;
|
|
@@ -646,6 +647,7 @@ int doconnect(struct clientparam * param){
|
|
|
if (param->operation == ADMIN || param->operation == DNSRESOLVE || param->operation == BIND || param->operation == UDPASSOC)
|
|
if (param->operation == ADMIN || param->operation == DNSRESOLVE || param->operation == BIND || param->operation == UDPASSOC)
|
|
|
return 0;
|
|
return 0;
|
|
|
if (param->remsock != INVALID_SOCKET){
|
|
if (param->remsock != INVALID_SOCKET){
|
|
|
|
|
+ size = sizeof(param->sinsr);
|
|
|
if(so._getpeername(param->remsock, (struct sockaddr *)¶m->sinsr, &size)==-1) {return (15);}
|
|
if(so._getpeername(param->remsock, (struct sockaddr *)¶m->sinsr, &size)==-1) {return (15);}
|
|
|
}
|
|
}
|
|
|
else {
|
|
else {
|