nscache6 command support + nsrecord with IPv6

nscache6 - new command for IPv6 addresses cache
nsrecord supports IPv6 addresses
dnsauth should work with IPv6 servers and clients
+ caching is now more accurate
This commit is contained in:
z3APA3A committed 2014-12-14 05:33:08 +03:00
1 parent 7fc43e3fbd
commit 5844e165b5
9 files changed
+168 -120

No files matched your search

+17 -3
View File
@@ -693,6 +693,7 @@ struct hostent * my_gethostbyname(char *name, char *buf, struct hostent *hp){
}
#endif
#ifdef NOIPV6
unsigned long getip(unsigned char *name){
unsigned long retval;
int i;
@@ -719,9 +720,9 @@ unsigned long getip(unsigned char *name){
}
}
if(resolvfunc){
if((retval = (*resolvfunc)(name))) return retval;
if((*resolvfunc)(AF_INET, name, &retval)) return retval;
if(conf.demanddialprog) system(conf.demanddialprog);
return (*resolvfunc)(name);
return (*resolvfunc)(AF_INET, name, &retval)?retval:0;
}
#if !defined(_WIN32) && !defined(GETHOSTBYNAME_R)
if(!ghbn_init){
@@ -744,6 +745,7 @@ unsigned long getip(unsigned char *name){
#endif
return retval;
}
#endif
unsigned long getip46(int family, unsigned char *name, struct sockaddr *sa){
#ifndef NOIPV6
@@ -753,9 +755,11 @@ unsigned long getip46(int family, unsigned char *name, struct sockaddr *sa){
if(!sa) return 0;
if(!family) {
#endif
family = AF_INET;
#else
((struct sockaddr_in *)sa)->sin_family = AF_INET;
return (((struct sockaddr_in *)sa)->sin_addr.s_addr = getip(name))? AF_INET:0;
#endif
#ifndef NOIPV6
}
for(i=0; name[i]; i++){
@@ -786,6 +790,16 @@ unsigned long getip46(int family, unsigned char *name, struct sockaddr *sa){
return inet_pton(AF_INET6, name, SAADDR(sa))?(family==4? 0:AF_INET6) : 0;
}
}
if(resolvfunc){
int f = (family == 6 || family == 64)?AF_INET6:AF_INET;
*SAFAMILY(sa) = f;
if(resolvfunc(f, name, SAADDR(sa))) return f;
if(family == 4 || family == 6) return 0;
f = (family == 46)? AF_INET6 : AF_INET;
*SAFAMILY(sa) = f;
if(resolvfunc(f, name, SAADDR(sa))) return f;
return 0;
}
memset(&hint, 0, sizeof(hint));
hint.ai_family = (family == 6 || family == 64)?AF_INET6:AF_INET;
if (getaddrinfo(name, NULL, &hint, &ai)) {