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

Comparing gvpe/src/connection.C (file contents):
Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC vs.
Revision 1.52 by pcg, Wed Mar 23 21:55:39 2005 UTC

 #include <openssl/rand.h>
 #include <openssl/evp.h>
 #include <openssl/rsa.h>
 #include <openssl/err.h>
-#include "gettext.h"
 #include "conf.h"
 #include "slog.h"
 #include "device.h"
 #include "vpn.h"
 #include "connection.h"
 struct rsa_cache : list<rsa_entry>
 {
   void cleaner_cb (time_watcher &w); time_watcher cleaner;
   bool find (const rsaid &id, rsachallenge &chg)
-    {
+  {
-      for (iterator i = begin (); i != end (); ++i)
+    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 > NOW)
-            {
+          {
-              memcpy (&chg, &i->chg, sizeof chg);
+            memcpy (&chg, &i->chg, sizeof chg);
-              erase (i);
+            erase (i);
-              return true;
+            return true;
-            }
+          }
-        }
+      }
-      if (cleaner.at < NOW)
+    if (cleaner.at < NOW)
-        cleaner.start (NOW + RSA_TTL);
+      cleaner.start (NOW + RSA_TTL);
-      return false;
+    return false;
-    }
+  }
   void gen (rsaid &id, rsachallenge &chg)
-    {
+  {
-      rsa_entry e;
+    rsa_entry e;
-      RAND_bytes ((unsigned char *)&id,  sizeof id);
+    RAND_bytes ((unsigned char *)&id,  sizeof id);
-      RAND_bytes ((unsigned char *)&chg, sizeof chg);
+    RAND_bytes ((unsigned char *)&chg, sizeof chg);
-      e.expire = NOW + RSA_TTL;
+    e.expire = NOW + RSA_TTL;
-      e.id = id;
+    e.id = id;
-      memcpy (&e.chg, &chg, sizeof chg);
+    memcpy (&e.chg, &chg, sizeof chg);
-      push_back (e);
+    push_back (e);
-      if (cleaner.at < NOW)
+    if (cleaner.at < NOW)
-        cleaner.start (NOW + RSA_TTL);
+      cleaner.start (NOW + RSA_TTL);
-    }
+  }
   rsa_cache ()
-    : cleaner (this, &rsa_cache::cleaner_cb)
+  : cleaner (this, &rsa_cache::cleaner_cb)
-    { }
+  { }
 } rsa_cache;
 void rsa_cache::cleaner_cb (time_watcher &w)
 {
 {
   prot_major = PROTOCOL_MAJOR;
   prot_minor = PROTOCOL_MINOR;
   randsize = RAND_SIZE;
   hmaclen = HMACLENGTH;
-  flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
+  flags = 0;
   challengelen = sizeof (rsachallenge);
   features = get_features ();
   cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
   digest_nid = htonl (EVP_MD_type (RSA_HASH));
     slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
   else if (randsize != RAND_SIZE)
     slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
   else if (hmaclen != HMACLENGTH)
     slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
-#if 0 // this implementation should handle all flag settings
-  else if (flags != curflags ())
-    slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
-#endif
   else if (challengelen != sizeof (rsachallenge))
     slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
   else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
     slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
   else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
       && conf != THISNODE
       && connectmode != conf_node::C_NEVER
       && connectmode != conf_node::C_DISABLED
       && NOW > w.at)
     {
-      double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
+      w.at = TSTAMP_MAX; // first disable this watcher in case of recursion
-      if (retry_int < conf->max_retry)
+      double retry_int = double (retry_cnt & 3
-        retry_cnt++;
+                                 ? (retry_cnt & 3) + 1
-      else
+                                 : 1 << (retry_cnt >> 2));
-        retry_int = conf->max_retry;
-      w.start (NOW + retry_int);
       reset_si ();
+      bool slow = si.prot & PROT_SLOW;
       if (si.prot && !si.host)
         vpn->send_connect_request (conf->id);
       else
         {
           const sockinfo &dsi = forward_si (si);
+          slow = slow || (dsi.prot & PROT_SLOW);
           if (dsi.valid () && auth_rate_limiter.can (dsi))
             {
               if (retry_cnt < 4)
                 send_auth_request (dsi, true);
               else
                 send_ping (dsi, 0);
             }
         }
+      retry_int *= slow ? 8. : 0.7;
+      if (retry_int < conf->max_retry)
+        retry_cnt++;
+      else
+        retry_int = conf->max_retry;
+      w.start (NOW + 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
                     delete octx;
                     octx   = new crypto_ctx (k, 1);
                     oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
-                    // compatibility code, remove when no longer required
-                    if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
                     conf->protocols = p->protocols;
                     features = p->features & config_packet::get_features ();
                     send_auth_response (rsi, p->id, k);
                           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"),
   send_vpn_packet (p, si);
   delete p;
 }
-void connection::script_node ()
+void connection::script_init_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_env ();
   putenv ("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");
 }
 const char *connection::script_node_down ()
 {
-  script_node ();
+  script_init_env ();
   putenv ("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");
 }
 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.46 by pcg, Sat Mar 5 19:13:15 2005 UTC vs. Revision 1.52 by pcg, Wed Mar 23 21:55:39 2005 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.46 by pcg, Sat Mar 5 19:13:15 2005 UTC vs.
Revision 1.52 by pcg, Wed Mar 23 21:55:39 2005 UTC