mirror of
https://github.com/3proxy/3proxy.git
synced 2026-11-22 23:59:41 +08:00
Fix: dnspr was broken since udppm rewrite. -F (fake resolve to redirect traffic) option added to dnspr
This commit is contained in:
1 parent
87fc8ae4ee
commit
c94766dff7
6 files changed
+173
-6
No files matched your search
+1
-1
@@ -264,7 +264,7 @@ static int h_proxy(int argc, unsigned char ** argv){
|
||||
childdef.port = 53;
|
||||
childdef.isudp = 1;
|
||||
childdef.service = S_DNSPR;
|
||||
childdef.helpmessage = " -s - simple DNS forwarding - do not use 3proxy resolver / name cache\n";
|
||||
childdef.helpmessage = " -s - simple DNS forwarding - do not use 3proxy resolver / name cache\n -Fip - fake: answer all A queries with this IP\n";
|
||||
#ifndef NOIPV6
|
||||
if(!resolvfunc || (resolvfunc == myresolver && !dns_table.poolsize) || resolvfunc == fakeresolver){
|
||||
fprintf(stderr, "[line %d] Warning: no nserver/nscache configured, dnspr will not work as expected\n", linenum);
|
||||
|
||||
+20
-3
@@ -25,6 +25,7 @@ void * dnsprchild(struct clientparam* param) {
|
||||
SASIZETYPE size;
|
||||
int res, i;
|
||||
int len;
|
||||
int semlocked = 1;
|
||||
unsigned type=0;
|
||||
uint32_t ttl;
|
||||
unsigned char addr[16];
|
||||
@@ -38,10 +39,13 @@ void * dnsprchild(struct clientparam* param) {
|
||||
RETURN (21);
|
||||
}
|
||||
buf = bbuf+2;
|
||||
size = sizeof(param->sincr);
|
||||
i = param->srv->so._recvfrom(param->sostate, param->srv->srvsock, (char *)buf, BUFSIZE, 0, (struct sockaddr *)¶m->sincr, &size);
|
||||
size = sizeof(param->sinsl);
|
||||
getsockname(param->srv->srvsock, (struct sockaddr *)¶m->sincl, &size);
|
||||
i = param->srv->udplen;
|
||||
if(i > BUFSIZE) i = BUFSIZE;
|
||||
memcpy(buf, param->srv->udpbuf, i);
|
||||
_3proxy_sem_unlock(udpinit);
|
||||
semlocked = 0;
|
||||
#ifdef _WIN32
|
||||
if((param->clisock=param->srv->so._socket(param->sostate, AF_INET, SOCK_DGRAM, IPPROTO_UDP)) == INVALID_SOCKET) {
|
||||
RETURN(818);
|
||||
@@ -82,7 +86,19 @@ void * dnsprchild(struct clientparam* param) {
|
||||
*s2 = (len - (int)(s2 - buf)) - 1;
|
||||
|
||||
type = ((unsigned)buf[len+1])*256 + (unsigned)buf[len+2];
|
||||
if((type==0x01 || type==0x1c) && !param->srv->s_option){
|
||||
if(type==0x01 && param->srv->fakeip){
|
||||
ip = 1;
|
||||
ttl = 3600;
|
||||
*(uint32_t *)addr = param->srv->fakeip;
|
||||
}
|
||||
#ifndef NOIPV6
|
||||
else if(type==0x1c && *(uint32_t *)param->srv->fakeip6){
|
||||
ip = 1;
|
||||
ttl = 3600;
|
||||
memcpy(addr, param->srv->fakeip6, 16);
|
||||
}
|
||||
#endif
|
||||
else if((type==0x01 || type==0x1c) && !param->srv->s_option){
|
||||
ip = udpresolve((type==0x1c)?AF_INET6:AF_INET, (unsigned char *)host, addr, &ttl, param, 0);
|
||||
}
|
||||
|
||||
@@ -191,6 +207,7 @@ void * dnsprchild(struct clientparam* param) {
|
||||
|
||||
CLEANRET:
|
||||
|
||||
if(semlocked) _3proxy_sem_unlock(udpinit);
|
||||
if(param->res!=813){
|
||||
sprintf((char *)buf, "%04x/%s/",
|
||||
(unsigned)type,
|
||||
|
||||
@@ -537,6 +537,18 @@ int MODULEMAINFUNC (int argc, char** argv){
|
||||
else if(!strncasecmp(argv[i]+2, "smtp", 4)) srv.srvstarttls = S_SMTPP;
|
||||
else error = 1;
|
||||
break;
|
||||
case 'F':
|
||||
{
|
||||
PROXYSOCKADDRTYPE fsa;
|
||||
memset(&fsa, 0, sizeof(fsa));
|
||||
if(!getip46(46, (unsigned char *)argv[i]+2, (struct sockaddr *)&fsa)) error = 1;
|
||||
else if(*SAFAMILY(&fsa) == AF_INET) srv.fakeip = *(uint32_t *)SAADDR(&fsa);
|
||||
#ifndef NOIPV6
|
||||
else if(*SAFAMILY(&fsa) == AF_INET6) memcpy(srv.fakeip6, SAADDR(&fsa), 16);
|
||||
#endif
|
||||
else error = 1;
|
||||
}
|
||||
break;
|
||||
case 'T':
|
||||
srv.transparent = 1;
|
||||
break;
|
||||
|
||||
@@ -539,6 +539,8 @@ struct srvparam {
|
||||
int haproxy;
|
||||
int nostarttls;
|
||||
PROXYSERVICE srvstarttls;
|
||||
uint32_t fakeip;
|
||||
unsigned char fakeip6[16];
|
||||
#ifdef WITHSPLICE
|
||||
int usesplice;
|
||||
#endif
|
||||
|
||||
Reference in new issue
Block a user