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

Comparing gvpe/src/connection.C (file contents):
Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC

     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
     GNU General Public License for more details.
     You should have received a copy of the GNU General Public License
     along with gvpe; if not, write to the Free Software
-    Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+    Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 #include "config.h"
-#include <cassert>
 #include <list>
 #include <openssl/rand.h>
 #include <openssl/evp.h>
   rsachallenge chg;
 };
 struct rsa_cache : list<rsa_entry>
 {
-  void cleaner_cb (time_watcher &w); time_watcher cleaner;
+  void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
   bool find (const rsaid &id, rsachallenge &chg)
   {
     for (iterator i = begin (); i != end (); ++i)
       {
-        if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
+        if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ())
           {
             memcpy (&chg, &i->chg, sizeof chg);
             erase (i);
             return true;
           }
       }
-    if (cleaner.at < NOW)
+    if (!cleaner.is_active ())
-      cleaner.start (NOW + RSA_TTL);
+      cleaner.again ();
     return false;
   }
   void gen (rsaid &id, rsachallenge &chg)
     rsa_entry e;
     RAND_bytes ((unsigned char *)&id,  sizeof id);
     RAND_bytes ((unsigned char *)&chg, sizeof chg);
-    e.expire = NOW + RSA_TTL;
+    e.expire = ev::ev_now () + RSA_TTL;
     e.id = id;
     memcpy (&e.chg, &chg, sizeof chg);
     push_back (e);
-    if (cleaner.at < NOW)
+    if (!cleaner.is_active ())
-      cleaner.start (NOW + RSA_TTL);
+      cleaner.again ();
   }
   rsa_cache ()
   : cleaner (this, &rsa_cache::cleaner_cb)
-  { }
+  {
+    cleaner.set (RSA_TTL, RSA_TTL);
+  }
 } rsa_cache;
-void rsa_cache::cleaner_cb (time_watcher &w)
+void rsa_cache::cleaner_cb (ev::timer &w, int revents)
 {
-  if (!empty ())
+  if (empty ())
+    w.stop ();
+  else
     {
-      w.start (NOW + RSA_TTL);
       for (iterator i = begin (); i != end (); )
-        if (i->expire <= NOW)
+        if (i->expire <= ev::ev_now ())
           i = erase (i);
         else
           ++i;
     }
 }
   iterator i;
   for (i = begin (); i != end (); )
     if (i->host == host)
       break;
-    else if (i->last < NOW - NRL_EXPIRE)
+    else if (i->last < ev::ev_now () - NRL_EXPIRE)
       i = erase (i);
     else
       i++;
   if (i == end ())
       net_rateinfo ri;
       ri.host = host;
       ri.pcnt = 1.;
       ri.diff = NRL_MAXDIF;
-      ri.last = NOW;
+      ri.last = ev::ev_now ();
       push_front (ri);
       return true;
     }
     {
       net_rateinfo ri (*i);
       erase (i);
       ri.pcnt = ri.pcnt * NRL_ALPHA;
-      ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
+      ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last);
-      ri.last = NOW;
+      ri.last = ev::ev_now ();
       double dif = ri.diff / ri.pcnt;
       bool send = dif > NRL_CUTOFF;
 #if ENABLE_COMPRESSION
     f |= FEATURE_COMPRESSION;
 #endif
 #if ENABLE_ROHC
     f |= FEATURE_ROHC;
+#endif
+#if ENABLE_BRIDGING
+    f |= FEATURE_BRIDGING;
 #endif
     return f;
   }
 };
   if (ictx && octx)
     {
       connectmode = conf->connectmode;
       // make sure rekeying timeouts are slightly asymmetric
-      rekey.start (NOW + ::conf.rekey
+      ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
-                   + (conf->id > THISNODE->id ? 10 : 0));
+      rekey.start (rekey_interval, rekey_interval);
-      keepalive.start (NOW + ::conf.keepalive);
+      keepalive.start (::conf.keepalive);
       // send queued packets
       if (ictx && octx)
         {
           while (tap_packet *p = (tap_packet *)data_queue.get ())
         }
     }
   else
     {
       retry_cnt = 0;
-      establish_connection.start (NOW + 5);
+      establish_connection.start (5);
       keepalive.stop ();
       rekey.stop ();
     }
 }
   // mask out protocols we cannot establish
   if (!conf->udp_port) protocol &= ~PROT_UDPv4;
   if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
   if (!conf->dns_port) protocol &= ~PROT_DNSv4;
+  if (protocol
+      && (!conf->can_direct (THISNODE)
+          || !THISNODE->can_direct (conf)))
+    {
+      slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
+      protocol = 0;
+    }
   si.set (conf, protocol);
 }
 // ensure sockinfo is valid, forward if necessary
 }
 void
 connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
 {
-  slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",
+  slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
                  conf->id, rid, (const char *)rsi);
   connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
   r->hmac_set (octx);
   delete r;
 }
 void
-connection::establish_connection_cb (time_watcher &w)
+connection::establish_connection_cb (ev::timer &w, int revents)
 {
   if (!ictx
       && conf != THISNODE
       && connectmode != conf_node::C_NEVER
       && connectmode != conf_node::C_DISABLED
-      && NOW > w.at)
+      && !w.is_active ())
     {
-      w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
+      ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
-      double retry_int = double (retry_cnt & 3
-                                 ? (retry_cnt & 3) + 1
+                                         ? (retry_cnt & 3) + 1
-                                 : 1 << (retry_cnt >> 2));
+                                         : 1 << (retry_cnt >> 2));
       reset_si ();
       bool slow = si.prot & PROT_SLOW;
       if (si.prot && !si.host)
+        {
+          /*TODO*/ /* start the timer so we don't recurse endlessly */
+          w.start (1);
-        vpn->send_connect_request (conf->id);
+          vpn->send_connect_request (conf->id);
+        }
       else
         {
           const sockinfo &dsi = forward_si (si);
           slow = slow || (dsi.prot & PROT_SLOW);
       if (retry_int < conf->max_retry)
         retry_cnt++;
       else
         retry_int = conf->max_retry;
-      w.start (NOW + retry_int);
+      w.start (retry_int);
     }
 }
 void
 connection::reset_connection ()
     {
       slog (L_INFO, _("%s(%s): connection lost"),
             conf->nodename, (const char *)si);
       if (::conf.script_node_down)
-        run_script (run_script_cb (this, &connection::script_node_down), false);
+        if (!run_script (run_script_cb (this, &connection::script_node_down), false))
+          slog (L_WARN, _("node-down command execution failed, continuing."));
     }
   delete ictx; ictx = 0;
   delete octx; octx = 0;
 #if ENABLE_DNS
   reset_connection ();
 }
 void
-connection::rekey_cb (time_watcher &w)
+connection::rekey_cb (ev::timer &w, int revents)
 {
   reset_connection ();
   establish_connection ();
 }
 {
   if (ictx && octx)
     send_data_packet (pkt);
   else
     {
-      if (!broadcast)//DDDD
+      if (!broadcast)
         data_queue.put (new tap_packet (*pkt));
       establish_connection ();
     }
 }
 }
 void
 connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
 {
-  last_activity = NOW;
+  last_activity = ev::ev_now ();
   slog (L_NOISE, "<<%d received packet type %d from %d to %d",
         conf->id, pkt->typ (), pkt->src (), pkt->dst ());
   switch (pkt->typ ())
                           slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
                                 conf->nodename, (const char *)rsi,
                                 p->prot_major, p->prot_minor);
                           if (::conf.script_node_up)
-                            run_script (run_script_cb (this, &connection::script_node_up), false);
+                            if (!run_script (run_script_cb (this, &connection::script_node_up), false))
+                              slog (L_WARN, _("node-up command execution failed, continuing."));
                           break;
                         }
                       else
                         slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
                   {
                     vpn->tap->send (d);
                     if (si != rsi)
                       {
-                        // fast re-sync on connection changes, useful especially for tcp/ip
+                        // fast re-sync on source address changes, useful especially for tcp/ip
                         si = rsi;
                         slog (L_INFO, _("%s(%s): socket address changed to %s"),
                               conf->nodename, (const char *)si, (const char *)rsi);
                       }
       case vpn_packet::PT_CONNECT_REQ:
         if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
           {
             connect_req_packet *p = (connect_req_packet *) pkt;
-            assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
+            if (p->id > 0 && p->id <= vpn->conns.size ())
-            connection *c = vpn->conns[p->id - 1];
-            conf->protocols = p->protocols;
-            slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
-                           conf->id, p->id, c->ictx && c->octx);
-            if (c->ictx && c->octx)
               {
+                connection *c = vpn->conns[p->id - 1];
+                conf->protocols = p->protocols;
+                slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
+                               conf->id, p->id, c->ictx && c->octx);
+                if (c->ictx && c->octx)
+                  {
-                // send connect_info packets to both sides, in case one is
+                    // send connect_info packets to both sides, in case one is
-                // behind a nat firewall (or both ;)
+                    // behind a nat firewall (or both ;)
-                c->send_connect_info (conf->id, si, conf->protocols);
+                    c->send_connect_info (conf->id, si, conf->protocols);
-                send_connect_info (c->conf->id, c->si, c->conf->protocols);
+                    send_connect_info (c->conf->id, c->si, c->conf->protocols);
+                  }
+                else
+                  c->establish_connection ();
               }
             else
-              c->establish_connection ();
+              slog (L_WARN,
+                    _("received authenticated connection request from unknown node #%d, config file mismatch?"),
+                    p->id);
           }
         break;
       case vpn_packet::PT_CONNECT_INFO:
         if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
           {
             connect_info_packet *p = (connect_info_packet *)pkt;
-            if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
+            if (p->id > 0 && p->id <= vpn->conns.size ())
               {
                 connection *c = vpn->conns[p->id - 1];
                 c->conf->protocols = p->protocols;
                 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
                 const sockinfo &dsi = forward_si (p->si);
                 if (dsi.valid ())
                   c->send_auth_request (dsi, true);
               }
+            else
+              slog (L_WARN,
+                    _("received authenticated connection request from unknown node #%d, config file mismatch?"),
+                    p->id);
           }
         break;
       default:
         send_reset (rsi);
         break;
     }
 }
-void connection::keepalive_cb (time_watcher &w)
+void connection::keepalive_cb (ev::timer &w, int revents)
 {
-  if (NOW >= last_activity + ::conf.keepalive + 30)
+  if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
     {
       reset_connection ();
       establish_connection ();
     }
-  else if (NOW < last_activity + ::conf.keepalive)
+  else if (ev::ev_now () < last_activity + ::conf.keepalive)
-    w.start (last_activity + ::conf.keepalive);
+    w.start (last_activity + ::conf.keepalive - ev::now ());
   else if (conf->connectmode != conf_node::C_ONDEMAND
            || THISNODE->connectmode != conf_node::C_ONDEMAND)
     {
       send_ping (si);
-      w.start (NOW + 5);
+      w.start (5);
     }
-  else if (NOW < last_activity + ::conf.keepalive + 10)
+  else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
     // hold ondemand connections implicitly a few seconds longer
     // should delete octx, though, or something like that ;)
-    w.start (last_activity + ::conf.keepalive + 10);
+    w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
   else
     reset_connection ();
 }
 void connection::send_connect_request (int id)
   send_vpn_packet (p, si);
   delete p;
 }
+void connection::script_init_env (const char *ext)
+{
+  char *env;
+  asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
+  asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
+  asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
+            0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
+            conf->id & 0xff); putenv (env);
+}
-void connection::script_node ()
+void connection::script_init_connect_env ()
 {
-  vpn->script_if_up ();
+  vpn->script_init_env ();
   char *env;
   asprintf (&env, "DESTID=%d",   conf->id); putenv (env);
   asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
   asprintf (&env, "DESTIP=%s",   si.ntoa ()); putenv (env);
   asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
 }
 const char *connection::script_node_up ()
 {
-  script_node ();
+  script_init_connect_env ();
-  putenv ("STATE=up");
+  putenv ((char *)"STATE=up");
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
-  return ::conf.script_node_up ? ::conf.script_node_up : "node-up";
+            ::conf.script_node_up ? ::conf.script_node_up : "node-up");
+  return filename;
 }
 const char *connection::script_node_down ()
 {
-  script_node ();
+  script_init_connect_env ();
-  putenv ("STATE=down");
+  putenv ((char *)"STATE=down");
-  return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
+            ::conf.script_node_down ? ::conf.script_node_down : "node-down");
+  return filename;
 }
 connection::connection (struct vpn *vpn, conf_node *conf)
 : vpn(vpn), conf(conf)
 , rekey (this, &connection::rekey_cb)

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC vs. Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.51 by pcg, Wed Mar 23 20:07:56 2005 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC