--- gvpe/src/sockinfo.C	2004/04/02 14:42:45	1.12
+++ gvpe/src/sockinfo.C	2005/03/01 06:27:20	1.13
@@ -27,7 +27,7 @@
 #include "slog.h"
 
 // all ipv4-based protocols
-#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4)
+#define PROTv4 (PROT_UDPv4 | PROT_TCPv4 | PROT_ICMPv4 | PROT_IPv4 | PROT_DNSv4)
 
 void sockinfo::set (const sockaddr_in *sa, u8 prot_)
 {
@@ -61,12 +61,13 @@
 void
 sockinfo::set (const conf_node *conf, u8 prot_)
 {
- set (conf->hostname,
-        prot_ == PROT_UDPv4 ? conf->udp_port
-      : prot_ == PROT_TCPv4 ? conf->tcp_port
-      : prot_ == PROT_DNSv4 ? conf->dns_port
-      : 0,
-      prot_);
+  set (prot_ == PROT_DNSv4 ? ::conf.dns_forw_host
+                           : conf->hostname,
+       prot_ == PROT_UDPv4   ? conf->udp_port
+       : prot_ == PROT_TCPv4 ? conf->tcp_port
+       : prot_ == PROT_DNSv4 ? conf->dns_port
+       : 0,
+       prot_);
 }
 
 const sockaddr *
@@ -124,7 +125,8 @@
 
   if (conf
       && prot & PROTv4
-      && conf->protocols & PROT_DNSv4)
+      && conf->protocols & PROT_DNSv4
+      && conf->dns_port)
     protocols |= PROT_DNSv4;
 
   return protocols;
@@ -165,6 +167,15 @@
           port = htons (conf->tcp_port);
           return true;
         }
+
+      if (conf
+          && prot_ & PROT_DNSv4
+          && conf->protocols & PROT_DNSv4
+          && conf->dns_port)
+        {
+          set (::conf.dns_forw_host, ::conf.dns_forw_port, prot_);
+          return true;
+        }
     }
 
   return false;