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

Comparing gvpe/src/vpn.C (file contents):
Revision 1.5 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.6 by pcg, Sun Apr 6 04:17:36 2003 UTC

   if (src == 0 || src > conns.size ()
       || dst > conns.size ()
       || pkt->typ () >= vpn_packet::PT_MAX)
     slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
           (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
+  else if (dst > conns.size ())
+    slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
+          (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
   else
     {
       connection *c = conns[src - 1];
       if (dst == 0 && !THISNODE->routerprio)
         slog (L_WARN, _("%s(%s): received broadcast, but we are no router"),
               c->conf->nodename, (const char *)rsi);
       else if (dst != 0 && dst != THISNODE->id)
-        // FORWARDING NEEDED ;)
+        {
+          if (THISNODE->routerprio)
+            // the tos setting gets lost here. who cares.
+            conns[dst - 1]->inject_vpn_packet (pkt);
+          else
-        slog (L_WARN,
+            slog (L_WARN,
-              _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),
+                  _("%s(%s): forwarding request (=> %s), but we are no router"),
+                  c->conf->nodename, (const char *)rsi,
-              dst, conns[dst - 1]->conf->nodename,
+                  conns[dst - 1]->conf->nodename);
-              (const char *)rsi,
+        }
-              THISNODE->id, THISNODE->nodename);
       else
         c->recv_vpn_packet (pkt, rsi);
     }
 }

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