[ViewVC] Diff of: cvs/gvpe/src/vpn.C

Comparing gvpe/src/vpn.C (file contents):
Revision 1.22 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.31 by pcg, Sat Mar 5 19:13:16 2005 UTC

 /*
     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 file is part of GVPE.
-    This program is free software; you can redistribute it and/or modify
+    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.
     This program is distributed in the hope that it will be useful,
     but WITHOUT ANY WARRANTY; without even the implied warranty of
     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     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 <list>
+#include <cstdio>
+#include <cstring>
 #include <cstdlib>
-#include <cstring>
-#include <cstdio>
 #include <sys/types.h>
 #include <sys/socket.h>
 #include <sys/wait.h>
 #include <errno.h>
       sockinfo si (THISNODE, PROT_IPv4);
       if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
-          exit (1);
+          exit (EXIT_FAILURE);
         }
       ipv4_ev_watcher.start (ipv4_fd, EVENT_READ);
     }
       sockinfo si (THISNODE, PROT_UDPv4);
       if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
-          exit (1);
+          exit (EXIT_FAILURE);
         }
       udpv4_ev_watcher.start (udpv4_fd, EVENT_READ);
     }
       sockinfo si (THISNODE, PROT_ICMPv4);
       if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
-          exit (1);
+          exit (EXIT_FAILURE);
         }
       icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ);
     }
 #endif
       sockinfo si (THISNODE, PROT_TCPv4);
       if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
         {
           slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno));
-          exit (1);
+          exit (EXIT_FAILURE);
         }
       if (listen (tcpv4_fd, 5))
         {
           slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno));
-          exit (1);
+          exit (EXIT_FAILURE);
         }
       tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ);
+    }
+#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 (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
+      }
+      sockinfo si (THISNODE->dns_hostname,
+                   THISNODE->dns_hostname ? THISNODE->dns_port : 0,
+                   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
     {
       slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname);
-      exit (1);
+      exit (EXIT_FAILURE);
     }
   run_script (run_script_cb (this, &vpn::script_if_up), true);
   tap_ev_watcher.start (tap->fd, EVENT_READ);
   reconnect_all ();
   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)
 {
       else
         c->recv_vpn_packet (pkt, rsi);
     }
 }
+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
+#if ENABLE_DNS
+      case PROT_DNSv4:
+        return send_dnsv4_packet (pkt, si, tos);
+#endif
+      default:
+        slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
+    }
+  return false;
+}
 void
 vpn::ipv4_ev (io_watcher &w, short revents)
 {
   if (revents & EVENT_READ)
     {
       if (len > 0)
         {
           pkt->len = len;
-          // raw sockets deliver the ipv4, but don't expect it on sends
+          // raw sockets deliver the ipv4 header, but don't expect it on sends
-          // this is slow, but...
           pkt->skip_hdr (IP_OVERHEAD);
           recv_vpn_packet (pkt, si);
         }
       else
       delete pkt;
     }
   else
     {
       slog (L_ERR,
-              _("FATAL: unknown revents %08x in socket, terminating\n"),
+            _("FATAL: unknown revents %08x in socket, terminating\n"),
-              revents);
+            revents);
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 }
 #if ENABLE_ICMP
 void
   else
     {
       slog (L_ERR,
               _("FATAL: unknown revents %08x in socket, terminating\n"),
               revents);
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 }
 #endif
 void
   else
     {
       slog (L_ERR,
               _("FATAL: unknown revents %08x in socket, terminating\n"),
               revents);
-      exit (1);
+      exit (EXIT_FAILURE);
     }
 }
 void
 vpn::tap_ev (io_watcher &w, short revents)
           int dst = mac2id (pkt->dst);
           int src = mac2id (pkt->src);
           if (src != THISNODE->id)
             {
-              slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
+              slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
-              exit (1);
+              exit (EXIT_FAILURE);
             }
           if (dst == THISNODE->id)
             {
               slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
-              exit (1);
+              exit (EXIT_FAILURE);
             }
           if (dst > conns.size ())
             slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
           else
       if (events & EVENT_SHUTDOWN)
         {
           slog (L_INFO, _("preparing shutdown..."));
           shutdown_all ();
-          remove_pid (pidfilename);
+          remove_pid (conf.pidfilename);
           slog (L_INFO, _("terminating"));
-          exit (0);
+          exit (EXIT_SUCCESS);
         }
       if (events & EVENT_RECONNECT)
         {
           slog (L_INFO, _("forced reconnect"));
   connection_init ();
   for (configuration::node_vector::iterator i = conf.nodes.begin ();
        i != conf.nodes.end (); ++i)
     {
-      connection *conn = new connection (this);
+      connection *conn = new connection (this, *i);
-      conn->conf = *i;
       conns.push_back (conn);
       conn->establish_connection ();
     }
 }
 connection *vpn::find_router ()
 , tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
 #endif
 #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)
 {
 }
 vpn::~vpn ()

Diff Legend

-–
+Removed lines
-+
+Added lines
-<
+Changed lines
->
+Changed lines

Comparing gvpe/src/vpn.C (file contents): Revision 1.22 by pcg, Sat Jan 17 01:18:36 2004 UTC vs. Revision 1.31 by pcg, Sat Mar 5 19:13:16 2005 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.22 by pcg, Sat Jan 17 01:18:36 2004 UTC vs.
Revision 1.31 by pcg, Sat Mar 5 19:13:16 2005 UTC