--- gvpe/src/connection.C 2003/04/02 03:06:22 1.1 +++ gvpe/src/connection.C 2003/04/05 17:54:22 1.7 @@ -24,12 +24,17 @@ #include +#include +#include +#include +#include + #include "gettext.h" #include "conf.h" #include "slog.h" #include "device.h" -#include "protocol.h" +#include "vpn.h" #include "connection.h" #if !HAVE_RAND_PSEUDO_BYTES @@ -82,7 +87,7 @@ struct rsa_cache : list { - void cleaner_cb (tstamp &ts); time_watcher cleaner; + void cleaner_cb (time_watcher &w); time_watcher cleaner; bool find (const rsaid &id, rsachallenge &chg) { @@ -126,13 +131,13 @@ } rsa_cache; -void rsa_cache::cleaner_cb (tstamp &ts) +void rsa_cache::cleaner_cb (time_watcher &w) { if (empty ()) - ts = TSTAMP_CANCEL; + w.at = TSTAMP_CANCEL; else { - ts = NOW + RSA_TTL; + w.at = NOW + RSA_TTL; for (iterator i = begin (); i != end (); ) if (i->expire <= NOW) @@ -282,9 +287,9 @@ return !memcmp (hmac, hmac_digest, HMACLENGTH); } -void vpn_packet::set_hdr (ptype type, unsigned int dst) +void vpn_packet::set_hdr (ptype type_, unsigned int dst) { - this->type = type; + type = type_; int src = THISNODE->id; @@ -545,7 +550,13 @@ void connection::reset_dstaddr () { - si.set (conf); + protocol = best_protocol (THISNODE->protocols & conf->protocols); + + // mask out protocols we cannot establish + if (!conf->udp_port) protocol &= ~PROT_UDPv4; + if (!conf->tcp_port) protocol &= ~PROT_TCPv4; + + si.set (conf, protocol); } void @@ -554,7 +565,7 @@ ping_packet *pkt = new ping_packet; pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); - send_vpn_packet (pkt, si, IPTOS_LOWDELAY); + vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); delete pkt; } @@ -567,7 +578,7 @@ config_packet *pkt = new config_packet; pkt->setup (vpn_packet::PT_RESET, conf->id); - send_vpn_packet (pkt, si, IPTOS_MINCOST); + vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); delete pkt; } @@ -578,8 +589,6 @@ { auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); - protocol = best_protocol (THISNODE->protocols & conf->protocols); - rsachallenge chg; rsa_cache.gen (pkt->id, chg); @@ -591,7 +600,7 @@ slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); - send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly + vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly delete pkt; } @@ -609,7 +618,7 @@ slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); - send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly + vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly delete pkt; } @@ -623,31 +632,32 @@ connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); r->hmac_set (octx); - send_vpn_packet (r, si); + vpn->send_vpn_packet (r, si); delete r; } void -connection::establish_connection_cb (tstamp &ts) +connection::establish_connection_cb (time_watcher &w) { if (ictx || conf == THISNODE || connectmode == conf_node::C_NEVER || connectmode == conf_node::C_DISABLED) - ts = TSTAMP_CANCEL; - else if (ts <= NOW) + w.at = TSTAMP_CANCEL; + else if (w.at <= NOW) { double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; if (retry_int < 3600 * 8) retry_cnt++; - ts = NOW + retry_int; + w.at = NOW + retry_int; if (conf->hostname) { reset_dstaddr (); - if (si.host && auth_rate_limiter.can (si)) + + if (si.valid () && auth_rate_limiter.can (si)) { if (retry_cnt < 4) send_auth_request (si, true); @@ -695,9 +705,9 @@ } void -connection::rekey_cb (tstamp &ts) +connection::rekey_cb (time_watcher &w) { - ts = TSTAMP_CANCEL; + w.at = TSTAMP_CANCEL; reset_connection (); establish_connection (); @@ -715,7 +725,7 @@ tos = (*pkt)[15] & IPTOS_TOS_MASK; p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs - send_vpn_packet (p, si, tos); + vpn->send_vpn_packet (p, si, tos); delete p; @@ -747,265 +757,271 @@ switch (pkt->typ ()) { - case vpn_packet::PT_PING: - // 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) + case vpn_packet::PT_PING: + // 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 + send_ping (rsi, 1); // pong + + break; + + case vpn_packet::PT_PONG: + break; + + case vpn_packet::PT_RESET: { - if (auth_rate_limiter.can (rsi)) - send_auth_request (rsi, true); + reset_connection (); + + config_packet *p = (config_packet *) pkt; + + if (!p->chk_config ()) + { + slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), + conf->nodename, (const char *)rsi); + connectmode = conf_node::C_DISABLED; + } + else if (connectmode == conf_node::C_ALWAYS) + establish_connection (); } - else - send_ping (rsi, 1); // pong + break; - break; + case vpn_packet::PT_AUTH_REQ: + if (auth_rate_limiter.can (rsi)) + { + auth_req_packet *p = (auth_req_packet *) pkt; - case vpn_packet::PT_PONG: - break; + slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); - case vpn_packet::PT_RESET: - { - reset_connection (); + if (p->chk_config () && !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); + + if (p->initiate) + send_auth_request (rsi, false); + + rsachallenge k; + + if (0 > RSA_private_decrypt (sizeof (p->encr), + (unsigned char *)&p->encr, (unsigned char *)&k, + ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) + slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), + conf->nodename, (const char *)rsi); + else + { + retry_cnt = 0; + establish_connection.start (NOW + 8); //? ;) + keepalive.reset (); + rekey.reset (); - config_packet *p = (config_packet *) pkt; + delete ictx; + ictx = 0; - if (!p->chk_config ()) - { - slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), - conf->nodename, (const char *)rsi); - connectmode = conf_node::C_DISABLED; + delete octx; + + octx = new crypto_ctx (k, 1); + oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; + + conf->protocols = p->protocols; + send_auth_response (rsi, p->id, k); + + break; + } + } + + send_reset (rsi); } - else if (connectmode == conf_node::C_ALWAYS) - establish_connection (); - } - break; - case vpn_packet::PT_AUTH_REQ: - if (auth_rate_limiter.can (rsi)) + break; + + case vpn_packet::PT_AUTH_RES: { - auth_req_packet *p = (auth_req_packet *) pkt; + auth_res_packet *p = (auth_res_packet *) pkt; - slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); + slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); - if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) + 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."), conf->nodename, (const char *)rsi, PROTOCOL_MINOR, conf->nodename, p->prot_minor); - if (p->initiate) - send_auth_request (rsi, false); - - rsachallenge k; + rsachallenge chg; - if (0 > RSA_private_decrypt (sizeof (p->encr), - (unsigned char *)&p->encr, (unsigned char *)&k, - ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING)) - slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), + if (!rsa_cache.find (p->id, chg)) + slog (L_ERR, _("%s(%s): unrequested auth response"), conf->nodename, (const char *)rsi); else { - retry_cnt = 0; - establish_connection.set (NOW + 8); //? ;) - keepalive.reset (); - rekey.reset (); + crypto_ctx *cctx = new crypto_ctx (chg, 0); + + if (!p->hmac_chk (cctx)) + slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" + "could be an attack, or just corruption or an synchronization error"), + conf->nodename, (const char *)rsi); + else + { + rsaresponse h; + + rsa_hash (p->id, chg, h); + + if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h)) + { + prot_minor = p->prot_minor; + + delete ictx; ictx = cctx; - delete ictx; - ictx = 0; + iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid - delete octx; + si = rsi; + protocol = rsi.prot; - octx = new crypto_ctx (k, 1); - oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; + rekey.start (NOW + ::conf.rekey); + keepalive.start (NOW + ::conf.keepalive); - conf->protocols = p->protocols; - send_auth_response (rsi, p->id, k); + // send queued packets + while (tap_packet *p = queue.get ()) + { + send_data_packet (p); + delete p; + } - break; + connectmode = conf->connectmode; + + 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); + + break; + } + else + slog (L_ERR, _("%s(%s): sent and received challenge do not match"), + conf->nodename, (const char *)rsi); + } + + delete cctx; } } - - send_reset (rsi); } - break; + send_reset (rsi); + break; - case vpn_packet::PT_AUTH_RES: - { - auth_res_packet *p = (auth_res_packet *) pkt; + case vpn_packet::PT_DATA_COMPRESSED: +#if !ENABLE_COMPRESSION + send_reset (rsi); + break; +#endif - slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); + case vpn_packet::PT_DATA_UNCOMPRESSED: - if (p->chk_config ()) + if (ictx && octx) { - 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); - - rsachallenge chg; + vpndata_packet *p = (vpndata_packet *)pkt; - if (!rsa_cache.find (p->id, chg)) - slog (L_ERR, _("%s(%s): unrequested auth response"), - conf->nodename, (const char *)rsi); - else + if (rsi == si) { - crypto_ctx *cctx = new crypto_ctx (chg, 0); - - if (!p->hmac_chk (cctx)) - slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" + if (!p->hmac_chk (ictx)) + slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" "could be an attack, or just corruption or an synchronization error"), conf->nodename, (const char *)rsi); else { - rsaresponse h; + u32 seqno; + tap_packet *d = p->unpack (this, seqno); - rsa_hash (p->id, chg, h); - - if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h)) + if (iseqno.recv_ok (seqno)) { - prot_minor = p->prot_minor; - - delete ictx; ictx = cctx; - - iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid - - si = rsi; - - rekey.set (NOW + ::conf.rekey); - keepalive.set (NOW + ::conf.keepalive); - - // send queued packets - while (tap_packet *p = queue.get ()) - { - send_data_packet (p); - delete p; - } - - connectmode = conf->connectmode; + vpn->tap->send (d); - slog (L_INFO, _("%s(%s): %s connection established, protocol version %d.%d"), - conf->nodename, (const char *)rsi, - strprotocol (protocol), - p->prot_major, p->prot_minor); + if (p->dst () == 0) // re-broadcast + for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) + { + connection *c = *i; + + if (c->conf != THISNODE && c->conf != conf) + c->inject_data_packet (d); + } - if (::conf.script_node_up) - run_script (run_script_cb (this, &connection::script_node_up), false); + delete d; break; } - else - slog (L_ERR, _("%s(%s): sent and received challenge do not match"), - conf->nodename, (const char *)rsi); } - - delete cctx; } + else + slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi); } - } - - send_reset (rsi); - break; - - case vpn_packet::PT_DATA_COMPRESSED: -#if !ENABLE_COMPRESSION - send_reset (rsi); - break; -#endif - - case vpn_packet::PT_DATA_UNCOMPRESSED: - - if (ictx && octx) - { - vpndata_packet *p = (vpndata_packet *)pkt; - - if (rsi == si) - { - if (!p->hmac_chk (ictx)) - slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" - "could be an attack, or just corruption or an synchronization error"), - conf->nodename, (const char *)rsi); - else - { - u32 seqno; - tap_packet *d = p->unpack (this, seqno); - - if (iseqno.recv_ok (seqno)) - { - vpn->tap->send (d); - - if (p->dst () == 0) // re-broadcast - for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i) - { - connection *c = *i; - - if (c->conf != THISNODE && c->conf != conf) - c->inject_data_packet (d); - } - delete d; + send_reset (rsi); + break; - break; - } - } - } - else - slog (L_ERR, _("received data packet from unknown source %s"), (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; - send_reset (rsi); - break; + 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; - case vpn_packet::PT_CONNECT_REQ: - if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) - { - connect_req_packet *p = (connect_req_packet *) pkt; + slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", + conf->id, p->id, c->ictx && c->octx); - assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything - conf->protocols = p->protocols; - connection *c = vpn->conns[p->id - 1]; - - slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", - 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); - } - } + break; - break; + case vpn_packet::PT_CONNECT_INFO: + if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) + { + connect_info_packet *p = (connect_info_packet *) pkt; - case vpn_packet::PT_CONNECT_INFO: - if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) - { - connect_info_packet *p = (connect_info_packet *) pkt; + assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything - assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything - conf->protocols = p->protocols; - connection *c = vpn->conns[p->id - 1]; + connection *c = vpn->conns[p->id - 1]; - slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", - conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); + 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); - c->send_auth_request (p->si, true); - } + slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", + conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); + //slog (L_ERR, "%d PROTOCL(C%x,T%x,0S%x,S%x,P%x,SP%x)", + // p->id, c->conf->protocols, THISNODE->protocols, p->si.supported_protocols(0), p->si.supported_protocols (c->conf), + // protocol, p->si.prot); - break; + c->send_auth_request (p->si, true); + } - default: - send_reset (rsi); - break; + break; + default: + send_reset (rsi); + break; } } -void connection::keepalive_cb (tstamp &ts) +void connection::keepalive_cb (time_watcher &w) { if (NOW >= last_activity + ::conf.keepalive + 30) { @@ -1013,12 +1029,12 @@ establish_connection (); } else if (NOW < last_activity + ::conf.keepalive) - ts = last_activity + ::conf.keepalive; + w.at = last_activity + ::conf.keepalive; else if (conf->connectmode != conf_node::C_ONDEMAND || THISNODE->connectmode != conf_node::C_ONDEMAND) { send_ping (si); - ts = NOW + 5; + w.at = NOW + 5; } else reset_connection (); @@ -1030,14 +1046,14 @@ slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); p->hmac_set (octx); - send_vpn_packet (p, si); + vpn->send_vpn_packet (p, si); delete p; } void connection::script_node () { - vpn->script_if_up (0); + vpn->script_if_up (); char *env; asprintf (&env, "DESTID=%d", conf->id); putenv (env); @@ -1046,7 +1062,7 @@ asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); } -const char *connection::script_node_up (int) +const char *connection::script_node_up () { script_node (); @@ -1055,7 +1071,7 @@ return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; } -const char *connection::script_node_down (int) +const char *connection::script_node_down () { script_node (); @@ -1064,16 +1080,6 @@ return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; } -// send a vpn packet out to other hosts -void -connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) -{ - if (protocol & PROT_IPv4) - vpn->send_ipv4_packet (pkt, si, tos); - else - vpn->send_udpv4_packet (pkt, si, tos); -} - connection::connection(struct vpn *vpn_) : vpn(vpn_) , rekey (this, &connection::rekey_cb)