--- gvpe/src/vpn.C	2004/01/29 18:55:10	1.23
+++ gvpe/src/vpn.C	2005/03/04 04:52:38	1.29
@@ -1,8 +1,10 @@
 /*
     vpn.C -- handle the protocol, encryption, handshaking etc.
-    Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
+    Copyright (C) 2003-2005 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,7 +15,7 @@
     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
 */
 
@@ -225,6 +227,34 @@
     }
 #endif
 
+#if ENABLE_DNS
+  if (THISNODE->protocols & PROT_DNSv4)
+    {
+      dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
+
+      dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+
+      if (dnsv4_fd < 0)
+        return -1;
+
+      // standard daemon practise...
+      {
+        int oval = 1;
+        setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
+      }
+
+      sockinfo si (THISNODE, PROT_DNSv4);
+
+      if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
+        {
+          slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno));
+          exit (EXIT_FAILURE);
+        }
+
+      dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ);
+    }
+#endif
+
   tap = new tap_device ();
   if (!tap) //D this, of course, never catches
     {
@@ -241,34 +271,6 @@
   return 0;
 }
 
-// send a vpn packet out to other hosts
-bool
-vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
-{
-  switch (si.prot)
-    {
-      case PROT_IPv4:
-        return send_ipv4_packet (pkt, si, tos);
-
-      case PROT_UDPv4:
-        return send_udpv4_packet (pkt, si, tos);
-
-#if ENABLE_TCP
-      case PROT_TCPv4:
-        return send_tcpv4_packet (pkt, si, tos);
-#endif
-
-#if ENABLE_ICMP
-      case PROT_ICMPv4:
-        return send_icmpv4_packet (pkt, si, tos);
-#endif
-
-      default:
-        slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
-        return false;
-    }
-}
-
 bool
 vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
@@ -574,7 +576,7 @@
           slog (L_INFO, _("preparing shutdown..."));
 
           shutdown_all ();
-          remove_pid (pidfilename);
+          remove_pid (conf.pidfilename);
           slog (L_INFO, _("terminating"));
           exit (EXIT_SUCCESS);
         }
@@ -610,11 +612,8 @@
   for (configuration::node_vector::iterator i = conf.nodes.begin ();
        i != conf.nodes.end (); ++i)
     {
-      connection *conn = new connection (this);
-
-      conn->conf = *i;
+      connection *conn = new connection (this, *i);
       conns.push_back (conn);
-
       conn->establish_connection ();
     }
 }
@@ -687,6 +686,9 @@
 #if ENABLE_ICMP
 , icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
 #endif
+#if ENABLE_DNS
+, dnsv4_ev_watcher (this, &vpn::dnsv4_ev)
+#endif
 , tap_ev_watcher   (this, &vpn::tap_ev)
 {
 }