--- gvpe/src/connection.C 2005/03/12 18:10:40 1.49 +++ gvpe/src/connection.C 2007/12/06 00:35:29 1.66 @@ -16,13 +16,11 @@ 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 - #include #include @@ -30,8 +28,6 @@ #include #include -#include "gettext.h" - #include "conf.h" #include "slog.h" #include "device.h" @@ -88,7 +84,8 @@ EVP_MD_CTX_cleanup (&ctx); } -struct rsa_entry { +struct rsa_entry +{ tstamp expire; rsaid id; rsachallenge chg; @@ -96,58 +93,60 @@ struct rsa_cache : list { - void cleaner_cb (time_watcher &w); time_watcher cleaner; + inline 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) - { - memcpy (&chg, &i->chg, sizeof chg); + { + for (iterator i = begin (); i != end (); ++i) + { + if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) + { + memcpy (&chg, &i->chg, sizeof chg); - erase (i); - return true; - } - } + erase (i); + return true; + } + } - if (cleaner.at < NOW) - cleaner.start (NOW + RSA_TTL); + if (!cleaner.is_active ()) + cleaner.again (); - 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 *)&chg, sizeof chg); + RAND_bytes ((unsigned char *)&id, sizeof id); + RAND_bytes ((unsigned char *)&chg, sizeof chg); - e.expire = NOW + RSA_TTL; - e.id = id; - memcpy (&e.chg, &chg, sizeof chg); + e.expire = ev_now () + RSA_TTL; + e.id = id; + memcpy (&e.chg, &chg, sizeof chg); - push_back (e); + push_back (e); - if (cleaner.at < NOW) - cleaner.start (NOW + RSA_TTL); - } + if (!cleaner.is_active ()) + cleaner.again (); + } rsa_cache () - : cleaner (this, &rsa_cache::cleaner_cb) - { } + { + cleaner.set (this); + 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_now ()) i = erase (i); else ++i; @@ -195,7 +194,8 @@ delete queue[i]; } -struct net_rateinfo { +struct net_rateinfo +{ u32 host; double pcnt, diff; tstamp last; @@ -224,7 +224,7 @@ for (i = begin (); i != end (); ) if (i->host == host) break; - else if (i->last < NOW - NRL_EXPIRE) + else if (i->last < ev_now () - NRL_EXPIRE) i = erase (i); else i++; @@ -236,7 +236,7 @@ ri.host = host; ri.pcnt = 1.; ri.diff = NRL_MAXDIF; - ri.last = NOW; + ri.last = ev_now (); push_front (ri); @@ -248,9 +248,9 @@ erase (i); ri.pcnt = ri.pcnt * NRL_ALPHA; - ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); + ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last); - ri.last = NOW; + ri.last = ev_now (); double dif = ri.diff / ri.pcnt; @@ -470,6 +470,9 @@ #if ENABLE_ROHC f |= FEATURE_ROHC; #endif +#if ENABLE_BRIDGING + f |= FEATURE_BRIDGING; +#endif return f; } }; @@ -585,14 +588,16 @@ 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; // make sure rekeying timeouts are slightly asymmetric - rekey.start (NOW + ::conf.rekey - + (conf->id > THISNODE->id ? 10 : 0)); - keepalive.start (NOW + ::conf.keepalive); + ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); + rekey.start (rekey_interval, rekey_interval); + keepalive.start (::conf.keepalive); // send queued packets if (ictx && octx) @@ -613,7 +618,7 @@ else { retry_cnt = 0; - establish_connection.start (NOW + 5); + establish_connection.start (5); keepalive.stop (); rekey.stop (); } @@ -629,6 +634,14 @@ 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); } @@ -723,7 +736,7 @@ 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); @@ -734,29 +747,34 @@ delete r; } -void -connection::establish_connection_cb (time_watcher &w) +inline void +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 - - double retry_int = double (retry_cnt & 3 - ? (retry_cnt & 3) + 1 - : 1 << (retry_cnt >> 2)); + ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 + ? (retry_cnt & 3) + 1 + : 1 << (retry_cnt >> 2)); reset_si (); bool slow = si.prot & PROT_SLOW; if (si.prot && !si.host) - vpn->send_connect_request (conf->id); + { + 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); @@ -777,7 +795,7 @@ else retry_int = conf->max_retry; - w.start (NOW + retry_int); + w.start (retry_int); } } @@ -790,7 +808,12 @@ conf->nodename, (const char *)si); if (::conf.script_node_down) - run_script (run_script_cb (this, &connection::script_node_down), false); + { + run_script_cb cb; + cb.set (this); + if (!run_script (cb, false)) + slog (L_WARN, _("node-down command execution failed, continuing.")); + } } delete ictx; ictx = 0; @@ -818,8 +841,8 @@ reset_connection (); } -void -connection::rekey_cb (time_watcher &w) +inline void +connection::rekey_cb (ev::timer &w, int revents) { reset_connection (); establish_connection (); @@ -851,7 +874,7 @@ send_data_packet (pkt); else { - if (!broadcast)//DDDD + if (!broadcast) data_queue.put (new tap_packet (*pkt)); establish_connection (); @@ -873,11 +896,14 @@ void connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) { - last_activity = 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: @@ -1021,7 +1047,12 @@ p->prot_major, p->prot_minor); if (::conf.script_node_up) - run_script (run_script_cb (this, &connection::script_node_up), false); + { + run_script_cb cb; + cb.set (this); + if (!run_script (cb, false)) + slog (L_WARN, _("node-up command execution failed, continuing.")); + } break; } @@ -1065,7 +1096,7 @@ 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"), @@ -1086,22 +1117,28 @@ { 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 - connection *c = vpn->conns[p->id - 1]; - conf->protocols = p->protocols; + 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); + 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 - // behind a nat firewall (or both ;) - c->send_connect_info (conf->id, si, conf->protocols); - send_connect_info (c->conf->id, c->si, c->conf->protocols); + if (c->ictx && c->octx) + { + // send connect_info packets to both sides, in case one is + // behind a nat firewall (or both ;) + c->send_connect_info (conf->id, si, 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; @@ -1111,7 +1148,7 @@ { 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]; @@ -1127,6 +1164,10 @@ 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; @@ -1137,25 +1178,26 @@ } } -void connection::keepalive_cb (time_watcher &w) +inline void +connection::keepalive_cb (ev::timer &w, int revents) { - if (NOW >= last_activity + ::conf.keepalive + 30) + if (ev_now () >= last_activity + ::conf.keepalive + 30) { reset_connection (); establish_connection (); } - else if (NOW < last_activity + ::conf.keepalive) - w.start (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) { send_ping (si); - w.start (NOW + 5); + w.start (5); } - else if (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); + w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); else reset_connection (); } @@ -1171,9 +1213,19 @@ delete p; } -void connection::script_node () +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_init_connect_env () { - vpn->script_if_up (); + vpn->script_init_env (); char *env; asprintf (&env, "DESTID=%d", conf->id); putenv (env); @@ -1182,33 +1234,48 @@ asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); } -const char *connection::script_node_up () +inline const char * +connection::script_node_up () { - script_node (); + script_init_connect_env (); - putenv ("STATE=up"); + putenv ((char *)"STATE=up"); - return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; + char *filename; + asprintf (&filename, + "%s/%s", + confbase, + ::conf.script_node_up ? ::conf.script_node_up : "node-up"); + + return filename; } -const char *connection::script_node_down () +inline const char * +connection::script_node_down () { - script_node (); + script_init_connect_env (); + + putenv ((char *)"STATE=down"); - putenv ("STATE=down"); + char *filename; + asprintf (&filename, + "%s/%s", + confbase, + ::conf.script_node_down ? ::conf.script_node_down : "node-down"); - return ::conf.script_node_up ? ::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) -, keepalive (this, &connection::keepalive_cb) -, establish_connection (this, &connection::establish_connection_cb) #if ENABLE_DNS , dns (0) #endif { + rekey .set (this); + keepalive .set (this); + establish_connection.set (this); + octx = ictx = 0; retry_cnt = 0;