bughz/3proxy
1
0
Fork 0
mirror of https://github.com/3proxy/3proxy.git synced 2025-02-23 18:45:40 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

getip46() added

Browse Source 
int getip46(int family, unsigned char *name,  struct sockaddr_storage
*sa)
family: IPv4/IPv6 preference order 4, 6, 46, 64 or 0 for getip()
compatibility.
name - hostname,
sa - destination sockaddr (must be large enougth)
returns:
0 fo failed resolution
IP address for family = 0
AF_INET/AF_INET6 overwise.
This commit is contained in:
Vladimir Dubrovin 2014-05-06 02:56:35 +04:00
parent aad2559004
commit 6b99de69c4
2 changed files with 69 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

63
src/common.c
View File

@ -688,9 +688,8 @@ unsigned long getip(unsigned char *name){
if(name[i] <'0' || name[i] >'9') break; if(name[i] <'0' || name[i] >'9') break;
} }
if(!name[i] && ndots == 3){ if(!name[i] && ndots == 3){
unsigned long ip; if(scanaddr(name, &retval, NULL) == 4){
if(scanaddr(name, &ip, NULL) == 4){ return retval;
return ip;
} }
} }
if(resolvfunc){ if(resolvfunc){
@ -719,3 +718,61 @@ unsigned long getip(unsigned char *name){
#endif #endif
return retval; return retval;
} }
#ifdef NOIPV6
unsigned long getip46(int family, unsigned char *name, struct sockaddr_in *sa){
#else
unsigned long getip46(int family, unsigned char *name, struct sockaddr_storage *sa){
int ndots=0, ncols=0;
struct addrinfo *ai, *iter;
struct sockaddr *sa4, *sa6;
int i;
if(!sa) return 0;
if(!family) {
#endif
memset(sa, 0, sizeof(struct sockaddr_in));
((struct sockaddr_in *)sa)->sin_family = AF_INET;
return (((struct sockaddr_in *)sa)->sin_addr.s_addr = getip(name))? AF_INET:0;
#ifndef NOIPV6
}
for(i=0; name[i]; i++){
if(name[i] == '.'){
if(++ndots > 3) break;
continue;
}
else if(name[i] == ':'){
if(++ndots > 7) break;
continue;
}
if(name[i] <'0' || name[i] >'9') break;
}
if(!name[i]){
if(ndots == 3 && ncols == 0){
return inet_pton(AF_INET, name, sa)? AF_INET : 0;
}
if(ncols >= 2) {
return inet_pton(AF_INET6, name, sa)? AF_INET6 : 0;
}
}
if (getaddrinfo(name, NULL, NULL, &ai)) return 0;
for(iter = ai; iter; iter = iter->ai_next){
if(!sa4 && iter->ai_addr->sa_family == AF_INET) sa4 = iter->ai_addr;
if(!sa6 && iter->ai_addr->sa_family == AF_INET) sa6 = iter->ai_addr;
}
if(sa6 && ((family == 6) || (family == 64) || (family == 46 && !sa4))){
memcpy(sa, sa6, sizeof(struct sockaddr_in6));
freeaddrinfo(ai);
return AF_INET6;
}
else if(sa4 && family != 6){
memcpy(sa, sa4, sizeof(struct sockaddr_in));
freeaddrinfo(ai);
return AF_INET;
}
else {
freeaddrinfo(ai);
return 0;
}
#endif
}

9
src/proxy.h
View File

@ -47,6 +47,10 @@
#ifdef _WIN32 #ifdef _WIN32
#include <winsock2.h> #include <winsock2.h>
#ifndef NOIPV6
#include <Ws2tcpip.h>
#endif
#ifndef _WINCE #ifndef _WINCE
#include <io.h> #include <io.h>
#else #else
@ -188,6 +192,11 @@ int myinet_ntoa(struct in_addr in, char * buf);
extern unsigned long nservers[MAXNSERVERS]; extern unsigned long nservers[MAXNSERVERS];
extern unsigned long authnserver; extern unsigned long authnserver;
unsigned long getip(unsigned char *name); unsigned long getip(unsigned char *name);
#ifdef NOIPV6
unsigned long getip46(int family, unsigned char *name, struct sockaddr_in *sa){
#else
unsigned long getip46(int family, unsigned char *name, struct sockaddr_storage *sa){
#endif
unsigned long myresolver(unsigned char *); unsigned long myresolver(unsigned char *);
unsigned long fakeresolver (unsigned char *name); unsigned long fakeresolver (unsigned char *name);
int initdnshashtable(unsigned nhashsize); int initdnshashtable(unsigned nhashsize);