--- gvpe/src/connection.C	2007/11/10 05:14:22	1.60
+++ gvpe/src/connection.C	2007/12/04 15:01:12	1.64
@@ -84,7 +84,8 @@
   EVP_MD_CTX_cleanup (&ctx);
 }
 
-struct rsa_entry {
+struct rsa_entry
+{
   tstamp expire;
   rsaid id;
   rsachallenge chg;
@@ -98,7 +99,7 @@
   {
     for (iterator i = begin (); i != end (); ++i)
       {
-        if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ())
+        if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
           {
             memcpy (&chg, &i->chg, sizeof chg);
 
@@ -120,7 +121,7 @@
     RAND_bytes ((unsigned char *)&id,  sizeof id);
     RAND_bytes ((unsigned char *)&chg, sizeof chg);
 
-    e.expire = ev::ev_now () + RSA_TTL;
+    e.expire = ev_now () + RSA_TTL;
     e.id = id;
     memcpy (&e.chg, &chg, sizeof chg);
 
@@ -145,7 +146,7 @@
   else
     {
       for (iterator i = begin (); i != end (); )
-        if (i->expire <= ev::ev_now ())
+        if (i->expire <= ev_now ())
           i = erase (i);
         else
           ++i;
@@ -193,7 +194,8 @@
     delete queue[i];
 }
 
-struct net_rateinfo {
+struct net_rateinfo
+{
   u32    host;
   double pcnt, diff;
   tstamp last;
@@ -222,7 +224,7 @@
   for (i = begin (); i != end (); )
     if (i->host == host)
       break;
-    else if (i->last < ev::ev_now () - NRL_EXPIRE)
+    else if (i->last < ev_now () - NRL_EXPIRE)
       i = erase (i);
     else
       i++;
@@ -234,7 +236,7 @@
       ri.host = host;
       ri.pcnt = 1.;
       ri.diff = NRL_MAXDIF;
-      ri.last = ev::ev_now ();
+      ri.last = ev_now ();
 
       push_front (ri);
 
@@ -246,9 +248,9 @@
       erase (i);
 
       ri.pcnt = ri.pcnt * NRL_ALPHA;
-      ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last);
+      ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
 
-      ri.last = ev::ev_now ();
+      ri.last = ev_now ();
 
       double dif = ri.diff / ri.pcnt;
 
@@ -586,6 +588,8 @@
 void
 connection::connection_established ()
 {
+  slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
+
   if (ictx && octx)
     {
       connectmode = conf->connectmode;
@@ -762,12 +766,15 @@
 
       if (si.prot && !si.host)
         {
+          slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
           /*TODO*/ /* start the timer so we don't recurse endlessly */
           w.start (1);
           vpn->send_connect_request (conf->id);
         }
       else
         {
+          slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
+
           const sockinfo &dsi = forward_si (si);
 
           slow = slow || (dsi.prot & PROT_SLOW);
@@ -801,8 +808,12 @@
             conf->nodename, (const char *)si);
 
       if (::conf.script_node_down)
-        if (!run_script (run_script_cb (this, &connection::script_node_down), false))
-          slog (L_WARN, _("node-down command execution failed, continuing."));
+        {
+          run_script_cb cb;
+          callback_set (cb, this, connection, script_node_down);
+          if (!run_script (cb, false))
+            slog (L_WARN, _("node-down command execution failed, continuing."));
+        }
     }
 
   delete ictx; ictx = 0;
@@ -885,11 +896,14 @@
 void
 connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
 {
-  last_activity = ev::ev_now ();
+  last_activity = ev_now ();
 
   slog (L_NOISE, "<<%d received packet type %d from %d to %d", 
         conf->id, pkt->typ (), pkt->src (), pkt->dst ());
 
+  if (connectmode == conf_node::C_DISABLED)
+    return;
+
   switch (pkt->typ ())
     {
       case vpn_packet::PT_PING:
@@ -1033,8 +1047,12 @@
                                 p->prot_major, p->prot_minor);
 
                           if (::conf.script_node_up)
-                            if (!run_script (run_script_cb (this, &connection::script_node_up), false))
-                              slog (L_WARN, _("node-up command execution failed, continuing."));
+                            {
+                              run_script_cb cb;
+                              callback_set (cb, this, connection, script_node_up);
+                              if (!run_script (cb, false))
+                                slog (L_WARN, _("node-up command execution failed, continuing."));
+                            }
 
                           break;
                         }
@@ -1162,12 +1180,12 @@
 
 void connection::keepalive_cb (ev::timer &w, int revents)
 {
-  if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
+  if (ev_now () >= last_activity + ::conf.keepalive + 30)
     {
       reset_connection ();
       establish_connection ();
     }
-  else if (ev::ev_now () < last_activity + ::conf.keepalive)
+  else if (ev_now () < 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)
@@ -1175,7 +1193,7 @@
       send_ping (si);
       w.start (5);
     }
-  else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
+  else if (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 - ev::now ());