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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC vs.
Revision 1.21 by pcg, Thu Oct 16 21:57:54 2003 UTC

 /*
     vpn.C -- handle the protocol, encryption, handshaking etc.
+    Copyright (C) 2003 Marc Lehmann <pcg@goof.com>
     This program 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.
 #include "connection.h"
 #include "util.h"
 #include "vpn.h"
+vpn network; // THE vpn (bad design...)
 /////////////////////////////////////////////////////////////////////////////
 const char *vpn::script_if_up ()
 {
   // the tunnel device mtu should be the physical mtu - overhead
   mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
   mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
   mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
   char *env;
-  asprintf (&env, "CONFBASE=%s", confbase);
+  asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
-  putenv (env);
-  asprintf (&env, "NODENAME=%s", THISNODE->nodename);
+  asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env);
-  putenv (env);
-  asprintf (&env, "NODEID=%d", THISNODE->id);
+  asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
-  putenv (env);
-  asprintf (&env, "IFNAME=%s", tap->interface ());
+  asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
-  putenv (env);
+  asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
+  asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
-  asprintf (&env, "MTU=%d", mtu);
+  asprintf (&env, "MTU=%d", mtu); putenv (env);
-  putenv (env);
   asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x",
             0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
             THISNODE->id & 0xff);
   putenv (env);
   setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
 #endif
   sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
   return true;
+}
+void
+vpn::inject_data_packet (tap_packet *pkt, int dst)
+{
+  if (dst)
+    {
+      // unicast
+      if (dst != THISNODE->id)
+        conns[dst - 1]->inject_data_packet (pkt);
+    }
+  else
+    {
+      // broadcast, this is ugly, but due to the security policy
+      // we have to connect to all hosts...
+      for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
+        if ((*c)->conf != THISNODE)
+          (*c)->inject_data_packet (pkt, true);
+  }
 }
 void
 vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
 {
       connection *c = conns[src - 1];
       if (dst == 0)
         slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
               c->conf->nodename, (const char *)rsi);
-      else if (dst != 0 && dst != THISNODE->id)
+      else if (dst != THISNODE->id)
         {
           if (THISNODE->routerprio)
             // the tos setting gets lost here. who cares.
             conns[dst - 1]->inject_vpn_packet (pkt);
           else
       /* process data */
       tap_packet *pkt;
       pkt = tap->recv ();
+      if (!pkt)
+        return;
+      if (pkt->len > 14)
+        {
-      int dst = mac2id (pkt->dst);
+          int dst = mac2id (pkt->dst);
-      int src = mac2id (pkt->src);
+          int src = mac2id (pkt->src);
-      if (src != THISNODE->id)
+          if (src != THISNODE->id)
-        {
-          slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
-          exit (1);
-        }
-      if (dst == THISNODE->id)
-        {
-          slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
-          exit (1);
-        }
-      if (dst > conns.size ())
-        slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
-      else
-        {
-          if (dst)
             {
-              // unicast
+              slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
-              if (dst != THISNODE->id)
+              exit (1);
-                conns[dst - 1]->inject_data_packet (pkt);
             }
+          if (dst == THISNODE->id)
+            {
+              slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
+              exit (1);
+            }
+          if (dst > conns.size ())
+            slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
           else
-            {
-              // broadcast, this is ugly, but due to the security policy
-              // we have to connect to all hosts...
-              for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
-                if ((*c)->conf != THISNODE)
-                  (*c)->inject_data_packet (pkt);
+            inject_data_packet (pkt, dst);
-            }
         }
       delete pkt;
     }
   else if (revents & (POLLHUP | POLLERR))

Diff Legend

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

Comparing gvpe/src/vpn.C (file contents): Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC vs. Revision 1.21 by pcg, Thu Oct 16 21:57:54 2003 UTC

Diff Legend

Comparing gvpe/src/vpn.C (file contents):
Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC vs.
Revision 1.21 by pcg, Thu Oct 16 21:57:54 2003 UTC