[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.18 by pcg, Thu Oct 16 02:28:36 2003 UTC

   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)
 {
   unsigned int src = pkt->src ();
   unsigned int dst = pkt->dst ();
       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.18 by pcg, Thu Oct 16 02:28:36 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.18 by pcg, Thu Oct 16 02:28:36 2003 UTC