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

support IPv6 with NOSTDRESOLVE

Browse Source
This commit is contained in:
Vladimir Dubrovin 2026-05-27 17:03:17 +03:00
parent 7c08432a70
commit 905e3d3152
1 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/common.c
View File

@ -812,7 +812,9 @@ int afdetect(unsigned char *name){
uint32_t getip46(int family, unsigned char *name, struct sockaddr *sa){ uint32_t getip46(int family, unsigned char *name, struct sockaddr *sa){
#ifndef NOIPV6 #ifndef NOIPV6
int detect; int detect;
#ifndef NOSTDRESOLVE
struct addrinfo *ai, hint; struct addrinfo *ai, hint;
#endif
RESOLVFUNC tmpresolv; RESOLVFUNC tmpresolv;
if(!sa) return 0; if(!sa) return 0;
@ -832,7 +834,6 @@ uint32_t getip46(int family, unsigned char *name, struct sockaddr *sa){
return inet_pton(*SAFAMILY(sa), (char *)name, SAADDR(sa))>0? *SAFAMILY(sa) : 0; return inet_pton(*SAFAMILY(sa), (char *)name, SAADDR(sa))>0? *SAFAMILY(sa) : 0;
} }
if((tmpresolv = resolvfunc)){ if((tmpresolv = resolvfunc)){
int f = (family == 6 || family == 64)?AF_INET6:AF_INET; int f = (family == 6 || family == 64)?AF_INET6:AF_INET;
*SAFAMILY(sa) = f; *SAFAMILY(sa) = f;
@ -843,6 +844,7 @@ uint32_t getip46(int family, unsigned char *name, struct sockaddr *sa){
if(tmpresolv(f, name, SAADDR(sa))) return f; if(tmpresolv(f, name, SAADDR(sa))) return f;
return 0; return 0;
} }
#ifndef NOSTDRESOLVE
memset(&hint, 0, sizeof(hint)); memset(&hint, 0, sizeof(hint));
hint.ai_family = (family == 6 || family == 64)?AF_INET6:AF_INET; hint.ai_family = (family == 6 || family == 64)?AF_INET6:AF_INET;
if (getaddrinfo((char *)name, NULL, &hint, &ai)) { if (getaddrinfo((char *)name, NULL, &hint, &ai)) {
@ -861,6 +863,7 @@ uint32_t getip46(int family, unsigned char *name, struct sockaddr *sa){
} }
freeaddrinfo(ai); freeaddrinfo(ai);
} }
#endif
return 0; return 0;
#endif #endif
} }