--- gvpe/src/vpn.C	2003/04/05 02:32:40	1.5
+++ gvpe/src/vpn.C	2003/04/07 01:28:56	1.8
@@ -73,26 +73,20 @@
 int
 vpn::setup ()
 {
-  udpv4_fd = -1;
+  ipv4_fd = -1;
 
-  if (THISNODE->protocols & PROT_UDPv4)
+  if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
     {
-      udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
+      ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
 
-      if (udpv4_fd < 0)
+      if (ipv4_fd < 0)
         return -1;
 
-      // standard daemon practise...
-      {
-        int oval = 1;
-        setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
-      }
-
-      sockinfo si (THISNODE, PROT_UDPv4);
+      sockinfo si (THISNODE, PROT_IPv4);
 
-      if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
+      if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
         {
-          slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
+          slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
           exit (1);
         }
 
@@ -102,26 +96,33 @@
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
 #endif
 
-      udpv4_ev_watcher.start (udpv4_fd, POLLIN);
+      ipv4_ev_watcher.start (ipv4_fd, POLLIN);
     }
 
-  ipv4_fd = -1;
-  if (THISNODE->protocols & PROT_IPv4)
+  udpv4_fd = -1;
+
+  if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
     {
-      ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
+      udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
 
-      if (ipv4_fd < 0)
+      if (udpv4_fd < 0)
         return -1;
 
-      sockinfo si (THISNODE, PROT_IPv4);
+      // standard daemon practise...
+      {
+        int oval = 1;
+        setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
+      }
 
-      if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
+      sockinfo si (THISNODE, PROT_UDPv4);
+
+      if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
         {
-          slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
+          slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
           exit (1);
         }
 
@@ -131,15 +132,17 @@
       // fragment for me sometimes.
       {
         int oval = IP_PMTUDISC_DONT;
-        setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
+        setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
       }
 #endif
 
-      ipv4_ev_watcher.start (ipv4_fd, POLLIN);
+      udpv4_ev_watcher.start (udpv4_fd, POLLIN);
     }
 
+  tcpv4_fd = -1;
+
 #if ENABLE_TCP
-  if (THISNODE->protocols & PROT_TCPv4)
+  if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
     {
       tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
 
@@ -187,43 +190,44 @@
 }
 
 // send a vpn packet out to other hosts
-void
+bool
 vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
   switch (si.prot)
     {
       case PROT_IPv4:
-        send_ipv4_packet (pkt, si, tos);
-        break;
+        return send_ipv4_packet (pkt, si, tos);
 
       case PROT_UDPv4:
-        send_udpv4_packet (pkt, si, tos);
-        break;
+        return send_udpv4_packet (pkt, si, tos);
 
 #if ENABLE_TCP
       case PROT_TCPv4:
-        send_tcpv4_packet (pkt, si, tos);
-        break;
+        return send_tcpv4_packet (pkt, si, tos);
 #endif
 
       default:
         slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
-        abort ();
+        return false;
     }
 }
 
-void
+bool
 vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
   setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
   sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
+
+  return true;
 }
 
-void
+bool
 vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
 {
   setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
   sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
+
+  return true;
 }
 
 void
@@ -240,6 +244,9 @@
       || 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];
@@ -248,12 +255,16 @@
         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 ;)
-        slog (L_WARN,
-              _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"),
-              dst, conns[dst - 1]->conf->nodename,
-              (const char *)rsi,
-              THISNODE->id, THISNODE->nodename);
+        {
+          if (THISNODE->routerprio)
+            // the tos setting gets lost here. who cares.
+            conns[dst - 1]->inject_vpn_packet (pkt);
+          else
+            slog (L_WARN,
+                  _("%s(%s): forwarding request (=> %s), but we are no router"),
+                  c->conf->nodename, (const char *)rsi,
+                  conns[dst - 1]->conf->nodename);
+        }
       else
         c->recv_vpn_packet (pkt, rsi);
     }
@@ -491,17 +502,17 @@
   return router;
 }
 
-void vpn::connect_request (int id)
+void vpn::send_connect_request (int id)
 {
   connection *c = find_router ();
 
   if (c)
-    c->connect_request (id);
-  //else // does not work, because all others must connect to the same router
-  //  // no router found, aggressively connect to all routers
-  //  for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
-  //    if ((*i)->conf->routerprio)
-  //      (*i)->establish_connection ();
+    c->send_connect_request (id);
+  else
+    // no router found, aggressively connect to all routers
+    for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
+      if ((*i)->conf->routerprio)
+        (*i)->establish_connection ();
 }
 
 void