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

Comparing gvpe/src/connection.C (file contents):
Revision 1.7 by pcg, Sat Apr 5 17:54:22 2003 UTC vs.
Revision 1.8 by pcg, Sun Apr 6 04:17:36 2003 UTC

 };
 /////////////////////////////////////////////////////////////////////////////
 void
-connection::reset_dstaddr ()
+connection::reset_si ()
 {
   protocol = best_protocol (THISNODE->protocols & conf->protocols);
   // mask out protocols we cannot establish
   if (!conf->udp_port) protocol &= ~PROT_UDPv4;
   if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
   si.set (conf, protocol);
+}
+// ensure sockinfo is valid, forward if necessary
+const sockinfo &
+connection::forward_si (const sockinfo &si) const
+{
+  if (!si.valid ())
+    {
+      connection *r = vpn->find_router ();
+      if (r)
+        {
+          slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),
+                conf->nodename, r->conf->nodename);
+          return r->si;
+        }
+      else
+        slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
+              conf->nodename);
+    }
+  return si;
 }
 void
 connection::send_ping (const sockinfo &si, u8 pong)
 {
                               conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
     fatal ("RSA_public_encrypt error");
   slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
-  vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
+  vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
   delete pkt;
 }
 void
       if (retry_int < 3600 * 8)
         retry_cnt++;
       w.at = NOW + retry_int;
-      if (conf->hostname)
+      reset_si ();
+      if (si.prot && !si.host)
+        vpn->connect_request (conf->id);
+      else
         {
-          reset_dstaddr ();
+          const sockinfo &dsi = forward_si (si);
-          if (si.valid () && auth_rate_limiter.can (si))
+          if (dsi.valid () && auth_rate_limiter.can (dsi))
-           {
+            {
-            if (retry_cnt < 4)
+              if (retry_cnt < 4)
-              send_auth_request (si, true);
+                send_auth_request (dsi, true);
-            else
+              else
-              send_ping (si, 0);
+                send_ping (dsi, 0);
-           }
+            }
         }
-      else
-        vpn->connect_request (conf->id);
     }
 }
 void
 connection::reset_connection ()
       if (!broadcast)//DDDD
         queue.put (new tap_packet (*pkt));
       establish_connection ();
     }
+}
+void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
+{
+  if (ictx && octx)
+    vpn->send_vpn_packet (pkt, si, tos);
+  else
+    establish_connection ();
 }
 void
 connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
 {
             protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
             p->si.upgrade_protocol (protocol, c->conf);
             slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
                            conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
-            //slog (L_ERR, "%d PROTOCL(C%x,T%x,0S%x,S%x,P%x,SP%x)",
-            //      p->id, c->conf->protocols, THISNODE->protocols, p->si.supported_protocols(0), p->si.supported_protocols (c->conf),
-            //      protocol, p->si.prot);
+            const sockinfo &dsi = forward_si (p->si);
+            if (dsi.valid ())
-            c->send_auth_request (p->si, true);
+              c->send_auth_request (dsi, true);
           }
         break;
       default:

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.7 by pcg, Sat Apr 5 17:54:22 2003 UTC vs. Revision 1.8 by pcg, Sun Apr 6 04:17:36 2003 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.7 by pcg, Sat Apr 5 17:54:22 2003 UTC vs.
Revision 1.8 by pcg, Sun Apr 6 04:17:36 2003 UTC