--- gvpe/src/sockinfo.C	2003/10/16 02:41:21	1.10
+++ gvpe/src/sockinfo.C	2005/03/07 01:31:26	1.17
@@ -1,8 +1,10 @@
 /*
     sockinfo.C -- socket address management
-    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003 Marc Lehmann <gvpe@schmorp.de>
     
-    This program is free software; you can redistribute it and/or modify
+    This file is part of GVPE.
+
+    GVPE is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
     the Free Software Foundation; either version 2 of the License, or
     (at your option) any later version.
@@ -13,13 +15,12 @@
     GNU General Public License for more details.
  
     You should have received a copy of the GNU General Public License
-    along with this program; if not, write to the Free Software
+    along with gvpe; if not, write to the Free Software
     Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 */
 
 #include "config.h"
 
-#include <arpa/inet.h>
 #include <netdb.h>
 
 #include "gettext.h"
@@ -28,7 +29,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_)
 {
@@ -62,11 +63,17 @@
 void
 sockinfo::set (const conf_node *conf, u8 prot_)
 {
- set (conf->hostname,
-        prot_ == PROT_UDPv4 ? conf->udp_port
-      : prot_ == PROT_TCPv4 ? conf->tcp_port
-      : 0,
-      prot_);
+  if (prot_ == PROT_DNSv4)
+    {
+      host = 0x01010101; port = htons (conf->id); prot = prot_;
+    }
+  else
+    set (conf->hostname,
+         prot_ == PROT_UDPv4   ? conf->udp_port
+         : prot_ == PROT_TCPv4 ? conf->tcp_port
+         : prot_ == PROT_DNSv4 ? conf->dns_port
+         : 0,
+         prot_);
 }
 
 const sockaddr *
@@ -122,6 +129,12 @@
       && conf->tcp_port)
     protocols |= PROT_TCPv4;
 
+  if (conf
+      && prot & PROTv4
+      && conf->protocols & PROT_DNSv4
+      && conf->dns_port)
+    protocols |= PROT_DNSv4;
+
   return protocols;
 }