ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

Comparing gvpe/src/connection.C (file contents):
Revision 1.60 by pcg, Sat Nov 10 05:14:22 2007 UTC vs.
Revision 1.92 by root, Thu Feb 10 03:59:51 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
38 50
39#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
40# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
41#endif 53#endif
42 54
43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
44 57
45#define ULTRA_FAST 1 58#define ULTRA_FAST 1
46#define HLOG 15 59#define HLOG 15
47#include "lzf/lzf.h" 60#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
63
64//////////////////////////////////////////////////////////////////////////////
65
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev;
68
69namespace
70{
71 void // c++ requires external linkage here, apparently :(
72 rs_child_cb (ev::child &w, int revents)
73 {
74 w.stop ();
75
76 if (rs_queue.empty ())
77 return;
78
79 pid_t pid = run_script (*rs_queue.front ().first, false);
80 if (pid)
81 {
82 w.set (pid);
83 w.start ();
84 }
85 else
86 slog (L_WARN, rs_queue.front ().second);
87
88 delete rs_queue.front ().first;
89 rs_queue.pop ();
90 }
91};
92
93// despite the fancy name, this is quite a hack
94static void
95run_script_queued (run_script_cb *cb, const char *warnmsg)
96{
97 rs_queue.push (std::make_pair (cb, warnmsg));
98
99 if (!rs_child_ev.is_active ())
100 {
101 rs_child_ev.set<rs_child_cb> ();
102 rs_child_ev ();
103 }
104}
105
106//////////////////////////////////////////////////////////////////////////////
50 107
51struct crypto_ctx 108struct crypto_ctx
52{ 109{
53 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 111 HMAC_CTX hctx;
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
85} 142}
86 143
87struct rsa_entry { 144struct rsa_entry
145{
88 tstamp expire; 146 tstamp expire;
89 rsaid id; 147 rsaid id;
90 rsachallenge chg; 148 rsachallenge chg;
91}; 149};
92 150
93struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
94{ 152{
95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 154
97 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
98 { 156 {
99 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
100 { 158 {
101 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev::ev_now ()) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
102 { 160 {
103 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
104 162
105 erase (i); 163 erase (i);
106 return true; 164 return true;
118 rsa_entry e; 176 rsa_entry e;
119 177
120 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
121 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
122 180
123 e.expire = ev::ev_now () + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
124 e.id = id; 182 e.id = id;
125 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
126 184
127 push_back (e); 185 push_back (e);
128 186
129 if (!cleaner.is_active ()) 187 if (!cleaner.is_active ())
130 cleaner.again (); 188 cleaner.again ();
131 } 189 }
132 190
133 rsa_cache () 191 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { 192 {
193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
136 cleaner.set (RSA_TTL, RSA_TTL); 194 cleaner.set (RSA_TTL, RSA_TTL);
137 } 195 }
138 196
139} rsa_cache; 197} rsa_cache;
140 198
199void
141void rsa_cache::cleaner_cb (ev::timer &w, int revents) 200rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 201{
143 if (empty ()) 202 if (empty ())
144 w.stop (); 203 w.stop ();
145 else 204 else
146 { 205 {
147 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
148 if (i->expire <= ev::ev_now ()) 207 if (i->expire <= ev_now ())
149 i = erase (i); 208 i = erase (i);
150 else 209 else
151 ++i; 210 ++i;
152 } 211 }
153} 212}
154 213
155////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
156 215
157void pkt_queue::put (net_packet *p) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
217: max_ttl (max_ttl), max_queue (max_queue)
158{ 218{
159 if (queue[i]) 219 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 220
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 221 i = 0;
187 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 225}
189 226
190pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
191{ 228{
192 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
193 delete queue[i]; 232 delete [] queue;
194} 233}
195 234
235void
236pkt_queue::expire_cb (ev::timer &w, int revents)
237{
238 ev_tstamp expire = ev_now () - max_ttl;
239
240 for (;;)
241 {
242 if (empty ())
243 break;
244
245 double diff = queue[j].tstamp - expire;
246
247 if (diff >= 0.)
248 {
249 w.start (diff > 0.5 ? diff : 0.5);
250 break;
251 }
252
253 delete get ();
254 }
255}
256
257void
258pkt_queue::put (net_packet *p)
259{
260 ev_tstamp now = ev_now ();
261
262 // start expiry timer
263 if (empty ())
264 expire.start (max_ttl);
265
266 int ni = i + 1 == max_queue ? 0 : i + 1;
267
268 if (ni == j)
269 delete get ();
270
271 queue[i].pkt = p;
272 queue[i].tstamp = now;
273
274 i = ni;
275}
276
277net_packet *
278pkt_queue::get ()
279{
280 if (empty ())
281 return 0;
282
283 net_packet *p = queue[j].pkt;
284 queue[j].pkt = 0;
285
286 j = j + 1 == max_queue ? 0 : j + 1;
287
288 return p;
289}
290
196struct net_rateinfo { 291struct net_rateinfo
292{
197 u32 host; 293 u32 host;
198 double pcnt, diff; 294 double pcnt, diff;
199 tstamp last; 295 tstamp last;
200}; 296};
201 297
211 307
212 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 309 bool can (u32 host);
214}; 310};
215 311
216net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
217 313
314bool
218bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
219{ 316{
220 iterator i; 317 iterator i;
221 318
222 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
223 if (i->host == host) 320 if (i->host == host)
224 break; 321 break;
225 else if (i->last < ev::ev_now () - NRL_EXPIRE) 322 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 323 i = erase (i);
227 else 324 else
228 i++; 325 i++;
229 326
230 if (i == end ()) 327 if (i == end ())
232 net_rateinfo ri; 329 net_rateinfo ri;
233 330
234 ri.host = host; 331 ri.host = host;
235 ri.pcnt = 1.; 332 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 333 ri.diff = NRL_MAXDIF;
237 ri.last = ev::ev_now (); 334 ri.last = ev_now ();
238 335
239 push_front (ri); 336 push_front (ri);
240 337
241 return true; 338 return true;
242 } 339 }
244 { 341 {
245 net_rateinfo ri (*i); 342 net_rateinfo ri (*i);
246 erase (i); 343 erase (i);
247 344
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 345 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (ev::ev_now () - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 347
251 ri.last = ev::ev_now (); 348 ri.last = ev_now ();
252 349
253 double dif = ri.diff / ri.pcnt; 350 double dif = ri.diff / ri.pcnt;
254 351
255 bool send = dif > NRL_CUTOFF; 352 bool send = dif > NRL_CUTOFF;
256 353
270 367
271///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
272 369
273unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
274 371
372void
275void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
276{ 374{
277 unsigned int xlen; 375 unsigned int xlen;
278 376
279 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
280 378
298 hmac_gen (ctx); 396 hmac_gen (ctx);
299 397
300 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
301} 399}
302 400
401void
303void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
304{ 403{
305 type = type_; 404 type = type_;
306 405
307 int src = THISNODE->id; 406 int src = THISNODE->id;
308 407
313 412
314#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
315#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
316 415
317struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
318 { 425 {
319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
320
321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
322 tap_packet *unpack (connection *conn, u32 &seqno);
323private:
324
325 const u32 data_hdr_size () const
326 {
327 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
328 }
329 }; 427 }
428};
330 429
331void 430void
332vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
333{ 432{
334 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
336 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
337 436
338#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
340 439
341 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
342 { 441 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 443
345 if (cl) 444 if (cl)
346 { 445 {
473#endif 572#endif
474 return f; 573 return f;
475 } 574 }
476}; 575};
477 576
577void
478void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
479{ 579{
480 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
491 591
492 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
493 set_hdr (type, dst); 593 set_hdr (type, dst);
494} 594}
495 595
596bool
496bool config_packet::chk_config () const 597config_packet::chk_config () const
497{ 598{
498 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
499 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
500 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
501 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
525 rsaencrdata encr; 626 rsaencrdata encr;
526 627
527 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
528 { 629 {
529 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
530 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
531 initiate = !!initiate_; 632 initiate = !!initiate_;
532 protocols = protocols_; 633 protocols = protocols_;
533 634
534 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
535 } 636 }
584///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
585 686
586void 687void
587connection::connection_established () 688connection::connection_established ()
588{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
589 if (ictx && octx) 692 if (ictx && octx)
590 { 693 {
591 connectmode = conf->connectmode;
592
593 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
595 rekey.start (rekey_interval, rekey_interval); 696 rekey.start (rekey_interval, rekey_interval);
596 keepalive.start (::conf.keepalive); 697 keepalive.start (::conf.keepalive);
597 698
598 // send queued packets 699 // send queued packets
599 if (ictx && octx) 700 if (ictx && octx)
600 { 701 {
601 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
602 { 703 {
603 send_data_packet (p); 704 if (p->len) send_data_packet (p);
604 delete p; 705 delete p;
605 } 706 }
606 707
607 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
608 { 709 {
609 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
610 delete p; 711 delete p;
611 } 712 }
612 } 713 }
714
715 vpn->connection_established (this);
613 } 716 }
614 else 717 else
615 { 718 {
616 retry_cnt = 0; 719 retry_cnt = 0;
617 establish_connection.start (5); 720 establish_connection.start (5);
621} 724}
622 725
623void 726void
624connection::reset_si () 727connection::reset_si ()
625{ 728{
729 if (vpn->can_direct (THISNODE, conf))
626 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
627 731 else
628 // mask out protocols we cannot establish
629 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
630 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
631 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
632
633 if (protocol
634 && (!conf->can_direct (THISNODE)
635 || !THISNODE->can_direct (conf)))
636 { 732 {
637 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
638 protocol = 0; 734 protocol = 0;
639 } 735 }
640 736
641 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
642} 740}
643 741
644// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
645const sockinfo & 743const sockinfo &
646connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
647{ 745{
648 if (!si.valid ()) 746 if (!si.valid ())
649 { 747 {
650 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
651 749
652 if (r) 750 if (r)
653 { 751 {
654 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
655 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
656 return r->si; 754 return r->si;
657 } 755 }
658 else 756 else
659 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
660 conf->nodename); 758 conf->nodename);
661 } 759 }
662 760
663 return si; 761 return si;
664} 762}
674connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
675{ 773{
676 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
677 775
678 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
679 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
680 781
681 delete pkt; 782 delete pkt;
682} 783}
683 784
702 803
703 rsachallenge chg; 804 rsachallenge chg;
704 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
705 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
706 807
707 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
708 809
709 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
710 811
711 delete pkt; 812 delete pkt;
712} 813}
720 821
721 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
722 823
723 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
724 825
725 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
726 827
727 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
728 829
729 delete pkt; 830 delete pkt;
730} 831}
731 832
732void 833void
733connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
734{ 835{
735 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
736 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
737 838
738 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 839 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
739 840
740 r->hmac_set (octx); 841 r->hmac_set (octx);
741 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
742 843
743 delete r; 844 delete r;
744} 845}
745 846
746void 847inline void
747connection::establish_connection_cb (ev::timer &w, int revents) 848connection::establish_connection_cb (ev::timer &w, int revents)
748{ 849{
749 if (!ictx 850 if (!(ictx && octx)
750 && conf != THISNODE 851 && conf != THISNODE
751 && connectmode != conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
752 && connectmode != conf_node::C_DISABLED 853 && connectmode != conf_node::C_DISABLED
753 && !w.is_active ()) 854 && !w.is_active ())
754 { 855 {
856 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
857 // and stop trying. should probably be handled by a per-connection expire handler.
858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
861 return;
862 }
863
864 last_establish_attempt = ev_now ();
865
755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 866 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1 867 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2)); 868 : 1 << (retry_cnt >> 2));
758 869
759 reset_si (); 870 reset_si ();
760 871
761 bool slow = si.prot & PROT_SLOW; 872 bool slow = si.prot & PROT_SLOW;
762 873
763 if (si.prot && !si.host) 874 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
764 { 875 {
765 /*TODO*/ /* start the timer so we don't recurse endlessly */ 876 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1); 877 w.start (1);
767 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
768 } 879 }
769 else 880 else
770 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
771 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
772 887
773 slow = slow || (dsi.prot & PROT_SLOW); 888 slow = slow || (dsi.prot & PROT_SLOW);
774 889
775 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
779 else 894 else
780 send_ping (dsi, 0); 895 send_ping (dsi, 0);
781 } 896 }
782 } 897 }
783 898
784 retry_int *= slow ? 8. : 0.7; 899 retry_int *= slow ? 8. : 0.9;
785 900
786 if (retry_int < conf->max_retry) 901 if (retry_int < conf->max_retry)
787 retry_cnt++; 902 retry_cnt++;
788 else 903 else
789 retry_int = conf->max_retry; 904 retry_int = conf->max_retry;
799 { 914 {
800 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
801 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
802 917
803 if (::conf.script_node_down) 918 if (::conf.script_node_down)
804 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 919 {
920 run_script_cb *cb = new run_script_cb;
921 cb->set<connection, &connection::script_node_down> (this);
805 slog (L_WARN, _("node-down command execution failed, continuing.")); 922 run_script_queued (cb, _("node-down command execution failed, continuing."));
923 }
806 } 924 }
807 925
808 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
809 delete octx; octx = 0; 927 delete octx; octx = 0;
810#if ENABLE_DNS 928#if ENABLE_DNS
811 dnsv4_reset_connection (); 929 dnsv4_reset_connection ();
812#endif 930#endif
813 931
814 si.host = 0; 932 si.host = 0;
815 933
816 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
817 retry_cnt = 0; 936 retry_cnt = 0;
818 937
819 rekey.stop (); 938 rekey.stop ();
820 keepalive.stop (); 939 keepalive.stop ();
821 establish_connection.stop (); 940 establish_connection.stop ();
828 send_reset (si); 947 send_reset (si);
829 948
830 reset_connection (); 949 reset_connection ();
831} 950}
832 951
833void 952// poor-man's rekeying
953inline void
834connection::rekey_cb (ev::timer &w, int revents) 954connection::rekey_cb (ev::timer &w, int revents)
835{ 955{
836 reset_connection (); 956 reset_connection ();
837 establish_connection (); 957 establish_connection ();
838} 958}
855 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
856 rekey (); 976 rekey ();
857} 977}
858 978
859void 979void
980connection::post_inject_queue ()
981{
982 // force a connection every now and when when packets are sent (max 1/s)
983 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
984 establish_connection.stop ();
985
986 establish_connection ();
987}
988
989void
860connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
861{ 991{
862 if (ictx && octx) 992 if (ictx && octx)
863 send_data_packet (pkt); 993 send_data_packet (pkt);
864 else 994 else
865 { 995 {
866 if (!broadcast)
867 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
868 997 post_inject_queue ();
869 establish_connection ();
870 } 998 }
871} 999}
872 1000
1001void
873void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
874{ 1003{
875 if (ictx && octx) 1004 if (ictx && octx)
876 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
877 else 1006 else
878 { 1007 {
879 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
880 1009 post_inject_queue ();
881 establish_connection ();
882 } 1010 }
883} 1011}
884 1012
885void 1013void
886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
887{ 1015{
888 last_activity = ev::ev_now (); 1016 last_activity = ev_now ();
889 1017
890 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1018 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
891 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1019 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1020
1021 if (connectmode == conf_node::C_DISABLED)
1022 return;
892 1023
893 switch (pkt->typ ()) 1024 switch (pkt->typ ())
894 { 1025 {
895 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
896 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
897 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
898 // when we receive a ping. 1031 // when we receive a ping.
899 if (!ictx) 1032 if (!ictx)
900 { 1033 {
901 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
902 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
903 } 1036 }
904 else 1037 else
1038 // we would love to change the socket address here, but ping's aren't
1039 // authenticated, so we best ignore it.
905 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
906 1041
907 break; 1042 break;
908 1043
909 case vpn_packet::PT_PONG: 1044 case vpn_packet::PT_PONG:
1045 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1046
1047 // a PONG might mean that the other side doesn't really know
1048 // about our desire for communication.
1049 establish_connection ();
910 break; 1050 break;
911 1051
912 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
913 { 1053 {
914 reset_connection (); 1054 reset_connection ();
915 1055
916 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
917 1057
918 if (!p->chk_config ()) 1058 if (!p->chk_config ())
919 { 1059 {
920 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
921 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
922 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
923 } 1063 }
924 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
925 establish_connection (); 1065 establish_connection ();
929 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
930 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
931 { 1071 {
932 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
933 1073
934 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1074 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
935 1075
936 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1076 if (p->chk_config ()
1077 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
937 { 1078 {
938 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
939 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
940 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
941 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
967 1108
968 break; 1109 break;
969 } 1110 }
970 } 1111 }
971 else 1112 else
972 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
973 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
974 1115
975 send_reset (rsi); 1116 send_reset (rsi);
976 } 1117 }
977 1118
978 break; 1119 break;
979 1120
980 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
981 { 1122 {
982 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
983 1124
984 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
985 1126
986 if (p->chk_config ()) 1127 if (p->chk_config ())
987 { 1128 {
988 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
989 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
992 1133
993 rsachallenge chg; 1134 rsachallenge chg;
994 1135
995 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
996 { 1137 {
997 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
998 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
999 break; 1140 break;
1000 } 1141 }
1001 else 1142 else
1002 { 1143 {
1003 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1004 1145
1005 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
1006 { 1147 {
1007 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1148 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1008 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
1009 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
1010 break; 1151 break;
1011 } 1152 }
1012 else 1153 else
1013 { 1154 {
1024 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1025 1166
1026 si = rsi; 1167 si = rsi;
1027 protocol = rsi.prot; 1168 protocol = rsi.prot;
1028 1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
1029 connection_established (); 1175 connection_established ();
1030 1176
1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1032 conf->nodename, (const char *)rsi,
1033 p->prot_major, p->prot_minor);
1034
1035 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1036 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1037 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1038 1183
1039 break; 1184 break;
1040 } 1185 }
1041 else 1186 else
1042 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1043 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1044 } 1189 }
1045 1190
1046 delete cctx; 1191 delete cctx;
1047 } 1192 }
1063 { 1208 {
1064 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1065 1210
1066 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1067 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1212 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1068 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1069 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1070 else 1215 else
1071 { 1216 {
1072 u32 seqno; 1217 u32 seqno;
1073 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1074 1220
1075 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1076 { 1222 {
1077 vpn->tap->send (d); 1223 vpn->tap->send (d);
1078 1224
1079 if (si != rsi) 1225 if (si != rsi)
1080 { 1226 {
1081 // fast re-sync on source address changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1082 si = rsi; 1229 // {
1083
1084 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1085 conf->nodename, (const char *)si, (const char *)rsi); 1231 conf->nodename, (const char *)si, (const char *)rsi);
1232
1233 si = rsi;
1234
1235 if (::conf.script_node_change)
1236 {
1237 run_script_cb *cb = new run_script_cb;
1238 cb->set<connection, &connection::script_node_change> (this);
1239 run_script_queued (cb, _("node-change command execution failed, continuing."));
1240 }
1241
1242 // }
1243 //else
1244 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1245 // conf->nodename, (const char *)si, (const char *)rsi);
1086 } 1246 }
1247 }
1248 else if (seqclass == 1) // far history
1249 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1250 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1251 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1252 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 3) // reset
1255 {
1256 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1257 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1258 send_reset (rsi);
1087 } 1259 }
1088 1260
1089 delete d; 1261 delete d;
1090 break; 1262 break;
1091 } 1263 }
1095 break; 1267 break;
1096 1268
1097 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1098 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1099 { 1271 {
1100 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1101 1273
1102 if (p->id > 0 && p->id <= vpn->conns.size ()) 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1103 { 1275 {
1104 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1105 conf->protocols = p->protocols; 1277 conf->protocols = p->protocols;
1106 1278
1107 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1108 conf->id, p->id, c->ictx && c->octx); 1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1109 1281
1110 if (c->ictx && c->octx) 1282 if (c->ictx && c->octx)
1111 { 1283 {
1112 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1113 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1136 1308
1137 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1138 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1310 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1139 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1140 1312
1141 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1313 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1314 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1142 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1143 1316
1144 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1145 1318
1146 if (dsi.valid ()) 1319 if (dsi.valid ())
1147 c->send_auth_request (dsi, true); 1320 c->send_auth_request (dsi, true);
1158 send_reset (rsi); 1331 send_reset (rsi);
1159 break; 1332 break;
1160 } 1333 }
1161} 1334}
1162 1335
1336inline void
1163void connection::keepalive_cb (ev::timer &w, int revents) 1337connection::keepalive_cb (ev::timer &w, int revents)
1164{ 1338{
1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1166 { 1340 {
1167 reset_connection (); 1341 reset_connection ();
1168 establish_connection (); 1342 establish_connection ();
1169 } 1343 }
1170 else if (ev::ev_now () < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1171 w.start (last_activity + ::conf.keepalive - ev::now ()); 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1172 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1173 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1174 { 1348 {
1175 send_ping (si); 1349 send_ping (si);
1176 w.start (5); 1350 w.start (3);
1177 } 1351 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1182 else 1356 else
1183 reset_connection (); 1357 reset_connection ();
1184} 1358}
1185 1359
1360void
1186void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1187{ 1362{
1188 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1363 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1189 1364
1190 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1365 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1366 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1191 p->hmac_set (octx); 1367 p->hmac_set (octx);
1192 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1193 1369
1194 delete p; 1370 delete p;
1195} 1371}
1196 1372
1373void
1197void connection::script_init_env (const char *ext) 1374connection::script_init_env (const char *ext)
1198{ 1375{
1199 char *env; 1376 char *env;
1200 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1377 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1201 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1378 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1202 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1379 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1203 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1380 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1204 conf->id & 0xff); putenv (env); 1381 conf->id & 0xff); putenv (env);
1205} 1382}
1206 1383
1384void
1207void connection::script_init_connect_env () 1385connection::script_init_connect_env ()
1208{ 1386{
1209 vpn->script_init_env (); 1387 vpn->script_init_env ();
1210 1388
1211 char *env; 1389 char *env;
1212 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1390 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1391 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1216} 1395}
1217 1396
1397inline const char *
1218const char *connection::script_node_up () 1398connection::script_node_up ()
1219{ 1399{
1220 script_init_connect_env (); 1400 script_init_connect_env ();
1221 1401
1222 putenv ((char *)"STATE=up"); 1402 putenv ((char *)"STATE=up");
1223 1403
1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229 1409
1230 return filename; 1410 return filename;
1231} 1411}
1232 1412
1413inline const char *
1414connection::script_node_change ()
1415{
1416 script_init_connect_env ();
1417
1418 putenv ((char *)"STATE=change");
1419
1420 char *filename;
1421 asprintf (&filename,
1422 "%s/%s",
1423 confbase,
1424 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1425
1426 return filename;
1427}
1428
1429inline const char *
1233const char *connection::script_node_down () 1430connection::script_node_down ()
1234{ 1431{
1235 script_init_connect_env (); 1432 script_init_connect_env ();
1236 1433
1237 putenv ((char *)"STATE=down"); 1434 putenv ((char *)"STATE=down");
1238 1435
1244 1441
1245 return filename; 1442 return filename;
1246} 1443}
1247 1444
1248connection::connection (struct vpn *vpn, conf_node *conf) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1249: vpn(vpn), conf(conf) 1446: vpn(vpn), conf(conf),
1250, rekey (this, &connection::rekey_cb)
1251, keepalive (this, &connection::keepalive_cb)
1252, establish_connection (this, &connection::establish_connection_cb)
1253#if ENABLE_DNS 1447#if ENABLE_DNS
1254, dns (0) 1448 dns (0),
1255#endif 1449#endif
1450 data_queue(conf->max_ttl, conf->max_queue + 1),
1451 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1256{ 1452{
1453 rekey .set<connection, &connection::rekey_cb > (this);
1454 keepalive .set<connection, &connection::keepalive_cb > (this);
1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1456
1457 last_establish_attempt = 0.;
1257 octx = ictx = 0; 1458 octx = ictx = 0;
1258 retry_cnt = 0;
1259 1459
1260 if (!conf->protocols) // make sure some protocol is enabled 1460 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4; 1461 conf->protocols = PROT_UDPv4;
1262 1462
1263 connectmode = conf_node::C_ALWAYS; // initial setting 1463 connectmode = conf->connectmode;
1464
1465 // queue a dummy packet to force an initial connection attempt
1466 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1467 vpn_queue.put (new net_packet);
1468
1264 reset_connection (); 1469 reset_connection ();
1265} 1470}
1266 1471
1267connection::~connection () 1472connection::~connection ()
1268{ 1473{
1269 shutdown (); 1474 shutdown ();
1270} 1475}
1271 1476
1477void
1272void connection_init () 1478connection_init ()
1273{ 1479{
1274 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1275 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1276} 1482}
1277 1483

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines