--- gvpe/src/connection.C 2004/03/21 13:16:36 1.33 +++ gvpe/src/connection.C 2005/03/02 05:49:31 1.41 @@ -204,10 +204,10 @@ // but low on resources. struct net_rate_limiter : list { - static const double ALPHA = 1. - 1. / 600.; // allow bursts - static const double CUTOFF = 10.; // one event every CUTOFF seconds - static const double EXPIRE = CUTOFF * 30.; // expire entries after this time - static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value +# define NRL_ALPHA (1. - 1. / 600.) // allow bursts +# define NRL_CUTOFF 10. // one event every CUTOFF seconds +# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time +# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value bool can (const sockinfo &si) { return can((u32)si.host); } bool can (u32 host); @@ -222,7 +222,7 @@ for (i = begin (); i != end (); ) if (i->host == host) break; - else if (i->last < NOW - EXPIRE) + else if (i->last < NOW - NRL_EXPIRE) i = erase (i); else i++; @@ -233,7 +233,7 @@ ri.host = host; ri.pcnt = 1.; - ri.diff = MAXDIF; + ri.diff = NRL_MAXDIF; ri.last = NOW; push_front (ri); @@ -245,19 +245,19 @@ net_rateinfo ri (*i); erase (i); - ri.pcnt = ri.pcnt * ALPHA; - ri.diff = ri.diff * ALPHA + (NOW - ri.last); + ri.pcnt = ri.pcnt * NRL_ALPHA; + ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); ri.last = NOW; double dif = ri.diff / ri.pcnt; - bool send = dif > CUTOFF; + bool send = dif > NRL_CUTOFF; - if (dif > MAXDIF) + if (dif > NRL_MAXDIF) { ri.pcnt = 1.; - ri.diff = MAXDIF; + ri.diff = NRL_MAXDIF; } else if (send) ri.pcnt++; @@ -591,7 +591,9 @@ { connectmode = conf->connectmode; - rekey.start (NOW + ::conf.rekey); + // make sure rekeying timeouts are slightly asymmetric + rekey.start (NOW + ::conf.rekey + + (conf->id > THISNODE->id ? 10 : 0)); keepalive.start (NOW + ::conf.keepalive); // send queued packets @@ -627,6 +629,7 @@ // mask out protocols we cannot establish if (!conf->udp_port) protocol &= ~PROT_UDPv4; if (!conf->tcp_port) protocol &= ~PROT_TCPv4; + if (!conf->dns_port) protocol &= ~PROT_DNSv4; si.set (conf, protocol); } @@ -656,7 +659,33 @@ void connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) { - if (!vpn->send_vpn_packet (pkt, si, tos)) + bool ok; + + switch (si.prot) + { + case PROT_IPv4: + ok = vpn->send_ipv4_packet (pkt, si, tos); break; + case PROT_UDPv4: + ok = vpn->send_udpv4_packet (pkt, si, tos); break; +#if ENABLE_TCP + case PROT_TCPv4: + ok = vpn->send_tcpv4_packet (pkt, si, tos); break; +#endif +#if ENABLE_ICMP + case PROT_ICMPv4: + ok = vpn->send_icmpv4_packet (pkt, si, tos); break; +#endif +#if ENABLE_DNS + case PROT_DNSv4: + ok = send_dnsv4_packet (pkt, si, tos); break; +#endif + + default: + slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); + ok = false; + } + + if (!ok) reset_connection (); } @@ -744,8 +773,10 @@ { double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; - if (retry_int < 3600 * 8) + if (retry_int < conf->max_retry) retry_cnt++; + else + retry_int = conf->max_retry; w.start (NOW + retry_int); @@ -783,7 +814,7 @@ delete ictx; ictx = 0; delete octx; octx = 0; - si.host= 0; + si.host = 0; last_activity = 0; retry_cnt = 0; @@ -1096,23 +1127,24 @@ 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 + connect_info_packet *p = (connect_info_packet *)pkt; - connection *c = vpn->conns[p->id - 1]; + if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything + { + connection *c = vpn->conns[p->id - 1]; - 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->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)", - conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); + slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", + conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); - const sockinfo &dsi = forward_si (p->si); + const sockinfo &dsi = forward_si (p->si); - if (dsi.valid ()) - c->send_auth_request (dsi, true); + if (dsi.valid ()) + c->send_auth_request (dsi, true); + } } break; @@ -1186,15 +1218,23 @@ return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; } -connection::connection(struct vpn *vpn_) -: vpn(vpn_) +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 +, dnsv4_tw (this, &connection::dnsv4_cb) +, dns_rcvdq (0), dns_snddq (0) +, dns_rcvseq (0), dns_sndseq (0) +#endif { octx = ictx = 0; retry_cnt = 0; + if (!conf->protocols) // make sure some protocol is enabled + conf->protocols = PROT_UDPv4; + connectmode = conf_node::C_ALWAYS; // initial setting reset_connection (); }