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

Comparing gvpe/src/connection.C (file contents):
Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.12 by pcg, Sun Apr 13 16:53:36 2003 UTC

     }
 }
 //////////////////////////////////////////////////////////////////////////////
-void pkt_queue::put (tap_packet *p)
+void pkt_queue::put (net_packet *p)
 {
   if (queue[i])
     {
       delete queue[i];
       j = (j + 1) % QUEUEDEPTH;
   queue[i] = p;
   i = (i + 1) % QUEUEDEPTH;
 }
-tap_packet *pkt_queue::get ()
+net_packet *pkt_queue::get ()
 {
-  tap_packet *p = queue[j];
+  net_packet *p = queue[j];
   if (p)
     {
       queue[j] = 0;
       j = (j + 1) % QUEUEDEPTH;
       rekey.start (NOW + ::conf.rekey);
       keepalive.start (NOW + ::conf.keepalive);
       // send queued packets
       if (ictx && octx)
+        {
-        while (tap_packet *p = queue.get ())
+          while (tap_packet *p = (tap_packet *)data_queue.get ())
-          {
+            {
-            send_data_packet (p);
+              send_data_packet (p);
-            delete p;
+              delete p;
-          }
+            }
+          while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
+            {
+              send_vpn_packet (p, si, IPTOS_RELIABILITY);
+              delete p;
+            }
+        }
     }
   else
     {
       retry_cnt = 0;
       establish_connection.start (NOW + 5);
 connection::send_data_packet (tap_packet *pkt, bool broadcast)
 {
   vpndata_packet *p = new vpndata_packet;
   int tos = 0;
+  // I am not hilarious about peeking into packets, but so be it.
   if (conf->inherit_tos
       && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
       && ((*pkt)[14] & 0xf0) == 0x40)             // IPv4
     tos = (*pkt)[15] & IPTOS_TOS_MASK;
   if (ictx && octx)
     send_data_packet (pkt, broadcast);
   else
     {
       if (!broadcast)//DDDD
-        queue.put (new tap_packet (*pkt));
+        data_queue.put (new tap_packet (*pkt));
       establish_connection ();
     }
 }
 void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
 {
   if (ictx && octx)
     send_vpn_packet (pkt, si, tos);
   else
+    {
+      vpn_queue.put (new vpn_packet (*pkt));
-    establish_connection ();
+      establish_connection ();
+    }
 }
 void
 connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
 {
            || THISNODE->connectmode != conf_node::C_ONDEMAND)
     {
       send_ping (si);
       w.at = NOW + 5;
     }
+  else if (NOW < last_activity + ::conf.keepalive + 10)
+    // hold ondemand connections implicitly a few seconds longer
+    // should delete octx, though, or something like that ;)
+    w.at = last_activity + ::conf.keepalive + 10;
   else
     reset_connection ();
 }
 void connection::send_connect_request (int id)

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs. Revision 1.12 by pcg, Sun Apr 13 16:53:36 2003 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.12 by pcg, Sun Apr 13 16:53:36 2003 UTC