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

Comparing gvpe/src/connection.C (file contents):
Revision 1.76 by pcg, Sun Aug 10 15:16:55 2008 UTC vs.
Revision 1.89 by root, Thu Dec 2 08:15:09 2010 UTC

 /*
     connection.C -- manage a single connection
-    Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
+    Copyright (C) 2003-2008,2010 Marc Lehmann <gvpe@schmorp.de>
     This file is part of GVPE.
     GVPE is free software; you can redistribute it and/or modify it
     under the terms of the GNU General Public License as published by the
 #if !HAVE_RAND_PSEUDO_BYTES
 # define  RAND_pseudo_bytes RAND_bytes
 #endif
-#define MAGIC "vped\xbd\xc6\xdb\x82"	// 8 bytes of magic
+#define MAGIC_OLD "vped\xbd\xc6\xdb\x82"	// 8 bytes of magic (still used in the protocol)
+#define MAGIC     "gvpe\xbd\xc6\xdb\x82"	// 8 bytes of magic (understood but not generated)
 #define ULTRA_FAST 1
 #define HLOG 15
 #include "lzf/lzf.h"
 #include "lzf/lzf_c.c"
   ptype type = PT_DATA_UNCOMPRESSED;
 #if ENABLE_COMPRESSION
   u8 cdata[MAX_MTU];
-  if (conn->features & ENABLE_COMPRESSION)
+  if (conn->features & FEATURE_COMPRESSION)
     {
       u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
       if (cl)
         {
   rsaencrdata encr;
   auth_req_packet (int dst, bool initiate_, u8 protocols_)
   {
     config_packet::setup (PT_AUTH_REQ, dst);
-    strncpy (magic, MAGIC, 8);
+    strncpy (magic, MAGIC_OLD, 8);
     initiate = !!initiate_;
     protocols = protocols_;
     len = sizeof (*this) - sizeof (net_packet);
   }
 /////////////////////////////////////////////////////////////////////////////
 void
 connection::connection_established ()
 {
-  slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
+  slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
   if (ictx && octx)
     {
       // make sure rekeying timeouts are slightly asymmetric
       ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
 {
   ping_packet *pkt = new ping_packet;
   pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
-  slog (L_TRACE, ">>%d %s [%s]", conf->id, pong ? "PT_PONG" : "PT_PING", (const char *)si);
+  slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
   send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
   delete pkt;
 }
   rsachallenge chg;
   rsa_cache.gen (pkt->id, chg);
   rsa_encrypt (conf->rsa_key, chg, pkt->encr);
-  slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
+  slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
   send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
   delete pkt;
 }
   rsa_hash (id, chg, pkt->response);
   pkt->hmac_set (octx);
-  slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
+  slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
   send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
   delete pkt;
 }
 void
 connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
 {
-  slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
+  slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
-                 conf->id, rid, (const char *)rsi);
+                 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
   connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
   r->hmac_set (octx);
   send_vpn_packet (r, si);
 void
 connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
 {
   last_activity = ev_now ();
-  slog (L_NOISE, "<<%d received packet type %d from %d to %d.",
+  slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
-        conf->id, pkt->typ (), pkt->src (), pkt->dst ());
+        conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
   if (connectmode == conf_node::C_DISABLED)
     return;
   switch (pkt->typ ())
     {
       case vpn_packet::PT_PING:
+        slog (L_TRACE, "%s >> PT_PING", conf->nodename);
         // we send pings instead of auth packets after some retries,
         // so reset the retry counter and establish a connection
         // when we receive a ping.
         if (!ictx)
           {
             if (auth_rate_limiter.can (rsi))
               send_auth_request (rsi, true);
           }
         else
-          // we would love to change thre socket address here, but ping's aren't
+          // we would love to change the socket address here, but ping's aren't
           // authenticated, so we best ignore it.
           send_ping (rsi, 1); // pong
         break;
       case vpn_packet::PT_PONG:
+        slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
+        // a PONG might mean that the other side doesn't really know
+        // about our desire for communication.
+        establish_connection ();
         break;
       case vpn_packet::PT_RESET:
         {
           reset_connection ();
       case vpn_packet::PT_AUTH_REQ:
         if (auth_rate_limiter.can (rsi))
           {
             auth_req_packet *p = (auth_req_packet *) pkt;
-            slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate);
+            slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
-            if (p->chk_config () && !strncmp (p->magic, MAGIC, 8))
+            if (p->chk_config ()
+                && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
               {
                 if (p->prot_minor != PROTOCOL_MINOR)
                   slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
                         conf->nodename, (const char *)rsi,
                         PROTOCOL_MINOR, conf->nodename, p->prot_minor);
         break;
       case vpn_packet::PT_AUTH_RES:
         {
-          auth_res_packet *p = (auth_res_packet *) pkt;
+          auth_res_packet *p = (auth_res_packet *)pkt;
-          slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id);
+          slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
           if (p->chk_config ())
             {
               if (p->prot_minor != PROTOCOL_MINOR)
                 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
                           si = rsi;
                           protocol = rsi.prot;
                           slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
                                 conf->nodename, (const char *)rsi,
-                                is_direct ? "direct" : "routed",
+                                is_direct ? "direct" : "forwarded",
                                 p->prot_major, p->prot_minor);
                           connection_established ();
                           if (::conf.script_node_up)
                     if (si != rsi)
                       {
                         // fast re-sync on source address changes, useful especially for tcp/ip
                         //if (last_si_change < ev_now () + 5.)
                         //  {
+                            slog (L_INFO, _("%s(%s): changing socket address to %s."),
+                                  conf->nodename, (const char *)si, (const char *)rsi);
                             si = rsi;
-                            slog (L_INFO, _("%s(%s): socket address changed to %s."),
+                            if (::conf.script_node_change)
-                                  conf->nodename, (const char *)si, (const char *)rsi);
+                              {
+                                run_script_cb *cb = new run_script_cb;
+                                cb->set<connection, &connection::script_node_change> (this);
+                                run_script_queued (cb, _("node-change command execution failed, continuing."));
+                              }
                         //  }
                         //else
                         //  slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
                         //        conf->nodename, (const char *)si, (const char *)rsi);
                       }
         break;
       case vpn_packet::PT_CONNECT_REQ:
         if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
           {
-            connect_req_packet *p = (connect_req_packet *) pkt;
+            connect_req_packet *p = (connect_req_packet *)pkt;
             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]",
+                slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
-                               conf->id, p->id, c->ictx && c->octx);
+                               conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
                 if (c->ictx && c->octx)
                   {
                     // send connect_info packets to both sides, in case one is
                     // behind a nat firewall (or both ;)
                 c->conf->protocols = p->protocols;
                 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)",
+                slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
+                               conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
-                               conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
+                               (const char *)p->si, !c->ictx && !c->octx);
                 const sockinfo &dsi = forward_si (p->si);
                 if (dsi.valid ())
                   c->send_auth_request (dsi, true);
 }
 inline void
 connection::keepalive_cb (ev::timer &w, int revents)
 {
-  if (ev_now () >= last_activity + ::conf.keepalive + 30)
+  if (ev_now () >= last_activity + ::conf.keepalive + 15)
     {
       reset_connection ();
       establish_connection ();
     }
   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)
     {
       send_ping (si);
-      w.start (5);
+      w.start (3);
     }
   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 ());
 void connection::send_connect_request (int id)
 {
   connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
-  slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
+  slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
+                 conf->nodename, vpn->conns[id - 1]->conf->nodename);
   p->hmac_set (octx);
   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, "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);
+            conf->id & 0xff);                              putenv (env);
 }
 void connection::script_init_connect_env ()
 {
   vpn->script_init_env ();
   char *env;
-  asprintf (&env, "DESTID=%d",   conf->id); putenv (env);
+  asprintf (&env, "DESTID=%d",   conf->id);         putenv (env);
+  asprintf (&env, "DESTSI=%s",   (const char *)si); putenv (env);
-  asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
+  asprintf (&env, "DESTNODE=%s", conf->nodename);   putenv (env);
-  asprintf (&env, "DESTIP=%s",   si.ntoa ()); putenv (env);
+  asprintf (&env, "DESTIP=%s",   si.ntoa ());       putenv (env);
-  asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
+  asprintf (&env, "DESTPORT=%d", ntohs (si.port));  putenv (env);
 }
 inline const char *
 connection::script_node_up ()
 {
   char *filename;
   asprintf (&filename,
             "%s/%s",
             confbase,
             ::conf.script_node_up ? ::conf.script_node_up : "node-up");
+  return filename;
+}
+inline const char *
+connection::script_node_change ()
+{
+  script_init_connect_env ();
+  putenv ((char *)"STATE=change");
+  char *filename;
+  asprintf (&filename,
+            "%s/%s",
+            confbase,
+            ::conf.script_node_change ? ::conf.script_node_change : "node-change");
   return filename;
 }
 inline const char *

Diff Legend

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

Comparing gvpe/src/connection.C (file contents): Revision 1.76 by pcg, Sun Aug 10 15:16:55 2008 UTC vs. Revision 1.89 by root, Thu Dec 2 08:15:09 2010 UTC

Diff Legend

Comparing gvpe/src/connection.C (file contents):
Revision 1.76 by pcg, Sun Aug 10 15:16:55 2008 UTC vs.
Revision 1.89 by root, Thu Dec 2 08:15:09 2010 UTC