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.37 by pcg, Fri Jun 11 15:56:34 2004 UTC vs.
Revision 1.93 by root, Tue Feb 15 13:31:23 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cassert>
23
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>
30
31#include "gettext.h"
32 42
33#include "conf.h" 43#include "conf.h"
34#include "slog.h" 44#include "slog.h"
35#include "device.h" 45#include "device.h"
36#include "vpn.h" 46#include "vpn.h"
40 50
41#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
42# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
43#endif 53#endif
44 54
45#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)
46 57
47#define ULTRA_FAST 1 58#define ULTRA_FAST 1
48#define HLOG 15 59#define HLOG 15
49#include "lzf/lzf.h" 60#include "lzf/lzf.h"
50#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
51#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//////////////////////////////////////////////////////////////////////////////
52 107
53struct crypto_ctx 108struct crypto_ctx
54{ 109{
55 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 111 HMAC_CTX hctx;
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
87} 142}
88 143
89struct rsa_entry { 144struct rsa_entry
145{
90 tstamp expire; 146 tstamp expire;
91 rsaid id; 147 rsaid id;
92 rsachallenge chg; 148 rsachallenge chg;
93}; 149};
94 150
95struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
96{ 152{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 154
99 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
100 { 156 {
101 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
102 { 158 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 160 {
105 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
106 162
107 erase (i); 163 erase (i);
108 return true; 164 return true;
109 } 165 }
110 } 166 }
111 167
112 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
114 170
115 return false; 171 return false;
116 } 172 }
117 173
118 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
119 { 175 {
120 rsa_entry e; 176 rsa_entry e;
121 177
122 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 180
125 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 182 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
128 184
129 push_back (e); 185 push_back (e);
130 186
131 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
133 } 189 }
134 190
135 rsa_cache () 191 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 192 {
137 { } 193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
138 196
139} rsa_cache; 197} rsa_cache;
140 198
141void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 201{
143 if (!empty ()) 202 if (empty ())
203 w.stop ();
204 else
144 { 205 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
148 if (i->expire <= 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 < 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 = 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 + (NOW - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 347
251 ri.last = 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 {
466 f |= FEATURE_COMPRESSION; 565 f |= FEATURE_COMPRESSION;
467#endif 566#endif
468#if ENABLE_ROHC 567#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 568 f |= FEATURE_ROHC;
470#endif 569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
471 return f; 573 return f;
472 } 574 }
473}; 575};
474 576
577void
475void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
476{ 579{
477 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 584 flags = 0;
482 challengelen = sizeof (rsachallenge); 585 challengelen = sizeof (rsachallenge);
483 features = get_features (); 586 features = get_features ();
484 587
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
488 591
489 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
490 set_hdr (type, dst); 593 set_hdr (type, dst);
491} 594}
492 595
596bool
493bool config_packet::chk_config () const 597config_packet::chk_config () const
494{ 598{
495 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
496 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);
497 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
498 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);
499 else if (hmaclen != HMACLENGTH) 603 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 604 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 605 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 606 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 608 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
526 rsaencrdata encr; 626 rsaencrdata encr;
527 627
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
529 { 629 {
530 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
531 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
532 initiate = !!initiate_; 632 initiate = !!initiate_;
533 protocols = protocols_; 633 protocols = protocols_;
534 634
535 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
536 } 636 }
585///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
586 686
587void 687void
588connection::connection_established () 688connection::connection_established ()
589{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
590 if (ictx && octx) 692 if (ictx && octx)
591 { 693 {
592 connectmode = conf->connectmode;
593
594 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 696 rekey.start (rekey_interval, rekey_interval);
597 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
598 698
599 // send queued packets 699 // send queued packets
600 if (ictx && octx) 700 if (ictx && octx)
601 { 701 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 703 {
604 send_data_packet (p); 704 if (p->len) send_data_packet (p);
605 delete p; 705 delete p;
606 } 706 }
607 707
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 709 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 711 delete p;
612 } 712 }
613 } 713 }
714
715 vpn->connection_established (this);
614 } 716 }
615 else 717 else
616 { 718 {
617 retry_cnt = 0; 719 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
619 keepalive.stop (); 721 keepalive.stop ();
620 rekey.stop (); 722 rekey.stop ();
621 } 723 }
622} 724}
623 725
624void 726void
625connection::reset_si () 727connection::reset_si ()
626{ 728{
729 if (vpn->can_direct (THISNODE, conf))
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
628 731 else
629 // mask out protocols we cannot establish 732 {
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
735 }
632 736
633 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
634} 740}
635 741
636// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
637const sockinfo & 743const sockinfo &
638connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
639{ 745{
640 if (!si.valid ()) 746 if (!si.valid ())
641 { 747 {
642 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
643 749
644 if (r) 750 if (r)
645 { 751 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
647 conf->nodename, r->conf->nodename); 753 conf->nodename, r->conf->nodename);
648 return r->si; 754 return r->si;
649 } 755 }
650 else 756 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
652 conf->nodename); 758 conf->nodename);
653 } 759 }
654 760
655 return si; 761 return si;
656} 762}
666connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
667{ 773{
668 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
669 775
670 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
671 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
672 781
673 delete pkt; 782 delete pkt;
674} 783}
675 784
694 803
695 rsachallenge chg; 804 rsachallenge chg;
696 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
697 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
698 807
699 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);
700 809
701 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
702 811
703 delete pkt; 812 delete pkt;
704} 813}
712 821
713 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
714 823
715 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
716 825
717 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);
718 827
719 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
720 829
721 delete pkt; 830 delete pkt;
722} 831}
723 832
724void 833void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 835{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
728 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
838 conf->protocols);
729 839
730 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 840 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
731 841
732 r->hmac_set (octx); 842 r->hmac_set (octx);
733 send_vpn_packet (r, si); 843 send_vpn_packet (r, si);
734 844
735 delete r; 845 delete r;
736} 846}
737 847
738void 848inline void
739connection::establish_connection_cb (time_watcher &w) 849connection::establish_connection_cb (ev::timer &w, int revents)
740{ 850{
741 if (!ictx 851 if (!(ictx && octx)
742 && conf != THISNODE 852 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 853 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 854 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 855 && !w.is_active ())
746 { 856 {
747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 857 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
748 858 // and stop trying. should probably be handled by a per-connection expire handler.
749 if (retry_int < conf->max_retry) 859 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
860 {
861 reset_connection ();
750 retry_cnt++; 862 return;
751 else 863 }
752 retry_int = conf->max_retry;
753 864
754 w.start (NOW + retry_int); 865 last_establish_attempt = ev_now ();
866
867 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
868 ? (retry_cnt & 3) + 1
869 : 1 << (retry_cnt >> 2));
755 870
756 reset_si (); 871 reset_si ();
757 872
758 if (si.prot && !si.host) 873 bool slow = si.prot & PROT_SLOW;
874
875 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
876 {
877 /*TODO*/ /* start the timer so we don't recurse endlessly */
878 w.start (1);
759 vpn->send_connect_request (conf->id); 879 vpn->send_connect_request (this);
880 }
760 else 881 else
761 { 882 {
883 if (si.valid ())
884 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
885 conf->nodename, (const char *)si);
886
762 const sockinfo &dsi = forward_si (si); 887 const sockinfo &dsi = forward_si (si);
888
889 slow = slow || (dsi.prot & PROT_SLOW);
763 890
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 891 if (dsi.valid () && auth_rate_limiter.can (dsi))
765 { 892 {
766 if (retry_cnt < 4) 893 if (retry_cnt < 4)
767 send_auth_request (dsi, true); 894 send_auth_request (dsi, true);
768 else 895 else
769 send_ping (dsi, 0); 896 send_ping (dsi, 0);
770 } 897 }
771 } 898 }
899
900 retry_int *= slow ? 8. : 0.9;
901
902 if (retry_int < conf->max_retry)
903 retry_cnt++;
904 else
905 retry_int = conf->max_retry;
906
907 w.start (retry_int);
772 } 908 }
773} 909}
774 910
775void 911void
776connection::reset_connection () 912connection::reset_connection ()
779 { 915 {
780 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost"),
781 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si);
782 918
783 if (::conf.script_node_down) 919 if (::conf.script_node_down)
784 run_script (run_script_cb (this, &connection::script_node_down), false); 920 {
921 run_script_cb *cb = new run_script_cb;
922 cb->set<connection, &connection::script_node_down> (this);
923 run_script_queued (cb, _("node-down command execution failed, continuing."));
924 }
785 } 925 }
786 926
787 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
788 delete octx; octx = 0; 928 delete octx; octx = 0;
929#if ENABLE_DNS
930 dnsv4_reset_connection ();
931#endif
789 932
790 si.host= 0; 933 si.host = 0;
791 934
792 last_activity = 0; 935 last_activity = 0.;
936 //last_si_change = 0.;
793 retry_cnt = 0; 937 retry_cnt = 0;
794 938
795 rekey.stop (); 939 rekey.stop ();
796 keepalive.stop (); 940 keepalive.stop ();
797 establish_connection.stop (); 941 establish_connection.stop ();
804 send_reset (si); 948 send_reset (si);
805 949
806 reset_connection (); 950 reset_connection ();
807} 951}
808 952
809void 953// poor-man's rekeying
810connection::rekey_cb (time_watcher &w) 954inline void
955connection::rekey_cb (ev::timer &w, int revents)
811{ 956{
812 reset_connection (); 957 reset_connection ();
813 establish_connection (); 958 establish_connection ();
814} 959}
815 960
831 if (oseqno > MAX_SEQNO) 976 if (oseqno > MAX_SEQNO)
832 rekey (); 977 rekey ();
833} 978}
834 979
835void 980void
981connection::post_inject_queue ()
982{
983 // force a connection every now and when when packets are sent (max 1/s)
984 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
985 establish_connection.stop ();
986
987 establish_connection ();
988}
989
990void
836connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 991connection::inject_data_packet (tap_packet *pkt)
837{ 992{
838 if (ictx && octx) 993 if (ictx && octx)
839 send_data_packet (pkt); 994 send_data_packet (pkt);
840 else 995 else
841 { 996 {
842 if (!broadcast)//DDDD
843 data_queue.put (new tap_packet (*pkt)); 997 data_queue.put (new tap_packet (*pkt));
844 998 post_inject_queue ();
845 establish_connection ();
846 } 999 }
847} 1000}
848 1001
1002void
849void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1003connection::inject_vpn_packet (vpn_packet *pkt, int tos)
850{ 1004{
851 if (ictx && octx) 1005 if (ictx && octx)
852 send_vpn_packet (pkt, si, tos); 1006 send_vpn_packet (pkt, si, tos);
853 else 1007 else
854 { 1008 {
855 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1009 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
856 1010 post_inject_queue ();
857 establish_connection ();
858 } 1011 }
859} 1012}
860 1013
861void 1014void
862connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1015connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
863{ 1016{
864 last_activity = NOW; 1017 last_activity = ev_now ();
865 1018
866 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1019 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
867 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1020 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1021
1022 if (connectmode == conf_node::C_DISABLED)
1023 return;
868 1024
869 switch (pkt->typ ()) 1025 switch (pkt->typ ())
870 { 1026 {
871 case vpn_packet::PT_PING: 1027 case vpn_packet::PT_PING:
1028 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1029
872 // we send pings instead of auth packets after some retries, 1030 // we send pings instead of auth packets after some retries,
873 // so reset the retry counter and establish a connection 1031 // so reset the retry counter and establish a connection
874 // when we receive a ping. 1032 // when we receive a ping.
875 if (!ictx) 1033 if (!ictx)
876 { 1034 {
877 if (auth_rate_limiter.can (rsi)) 1035 if (auth_rate_limiter.can (rsi))
878 send_auth_request (rsi, true); 1036 send_auth_request (rsi, true);
879 } 1037 }
880 else 1038 else
1039 // we would love to change the socket address here, but ping's aren't
1040 // authenticated, so we best ignore it.
881 send_ping (rsi, 1); // pong 1041 send_ping (rsi, 1); // pong
882 1042
883 break; 1043 break;
884 1044
885 case vpn_packet::PT_PONG: 1045 case vpn_packet::PT_PONG:
1046 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1047
1048 // a PONG might mean that the other side doesn't really know
1049 // about our desire for communication.
1050 establish_connection ();
886 break; 1051 break;
887 1052
888 case vpn_packet::PT_RESET: 1053 case vpn_packet::PT_RESET:
889 { 1054 {
890 reset_connection (); 1055 reset_connection ();
891 1056
892 config_packet *p = (config_packet *) pkt; 1057 config_packet *p = (config_packet *) pkt;
893 1058
894 if (!p->chk_config ()) 1059 if (!p->chk_config ())
895 { 1060 {
896 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1061 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
897 conf->nodename, (const char *)rsi); 1062 conf->nodename, (const char *)rsi);
898 connectmode = conf_node::C_DISABLED; 1063 connectmode = conf_node::C_DISABLED;
899 } 1064 }
900 else if (connectmode == conf_node::C_ALWAYS) 1065 else if (connectmode == conf_node::C_ALWAYS)
901 establish_connection (); 1066 establish_connection ();
903 break; 1068 break;
904 1069
905 case vpn_packet::PT_AUTH_REQ: 1070 case vpn_packet::PT_AUTH_REQ:
906 if (auth_rate_limiter.can (rsi)) 1071 if (auth_rate_limiter.can (rsi))
907 { 1072 {
908 auth_req_packet *p = (auth_req_packet *) pkt; 1073 auth_req_packet *p = (auth_req_packet *)pkt;
909 1074
910 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1075 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1076 conf->nodename, p->initiate ? "initiate" : "reply",
1077 p->protocols, p->features);
911 1078
912 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1079 if (p->chk_config ()
1080 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
913 { 1081 {
914 if (p->prot_minor != PROTOCOL_MINOR) 1082 if (p->prot_minor != PROTOCOL_MINOR)
915 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1083 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
916 conf->nodename, (const char *)rsi, 1084 conf->nodename, (const char *)rsi,
917 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1085 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
932 delete octx; 1100 delete octx;
933 1101
934 octx = new crypto_ctx (k, 1); 1102 octx = new crypto_ctx (k, 1);
935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1103 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
936 1104
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
940 conf->protocols = p->protocols; 1105 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features (); 1106 features = p->features & config_packet::get_features ();
942 1107
943 send_auth_response (rsi, p->id, k); 1108 send_auth_response (rsi, p->id, k);
944 1109
946 1111
947 break; 1112 break;
948 } 1113 }
949 } 1114 }
950 else 1115 else
951 slog (L_WARN, _("%s(%s): protocol mismatch"), 1116 slog (L_WARN, _("%s(%s): protocol mismatch."),
952 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
953 1118
954 send_reset (rsi); 1119 send_reset (rsi);
955 } 1120 }
956 1121
957 break; 1122 break;
958 1123
959 case vpn_packet::PT_AUTH_RES: 1124 case vpn_packet::PT_AUTH_RES:
960 { 1125 {
961 auth_res_packet *p = (auth_res_packet *) pkt; 1126 auth_res_packet *p = (auth_res_packet *)pkt;
962 1127
963 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1128 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
964 1129
965 if (p->chk_config ()) 1130 if (p->chk_config ())
966 { 1131 {
967 if (p->prot_minor != PROTOCOL_MINOR) 1132 if (p->prot_minor != PROTOCOL_MINOR)
968 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1133 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
971 1136
972 rsachallenge chg; 1137 rsachallenge chg;
973 1138
974 if (!rsa_cache.find (p->id, chg)) 1139 if (!rsa_cache.find (p->id, chg))
975 { 1140 {
976 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1141 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
977 conf->nodename, (const char *)rsi); 1142 conf->nodename, (const char *)rsi);
978 break; 1143 break;
979 } 1144 }
980 else 1145 else
981 { 1146 {
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1147 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 1148
984 if (!p->hmac_chk (cctx)) 1149 if (!p->hmac_chk (cctx))
985 { 1150 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1151 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or a synchronization error"), 1152 "could be an attack, or just corruption or a synchronization error."),
988 conf->nodename, (const char *)rsi); 1153 conf->nodename, (const char *)rsi);
989 break; 1154 break;
990 } 1155 }
991 else 1156 else
992 { 1157 {
1003 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1168 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1004 1169
1005 si = rsi; 1170 si = rsi;
1006 protocol = rsi.prot; 1171 protocol = rsi.prot;
1007 1172
1173 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1174 conf->nodename, (const char *)rsi,
1175 is_direct ? "direct" : "forwarded",
1176 p->prot_major, p->prot_minor);
1177
1008 connection_established (); 1178 connection_established ();
1009 1179
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor);
1013
1014 if (::conf.script_node_up) 1180 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false); 1181 {
1182 run_script_cb *cb = new run_script_cb;
1183 cb->set<connection, &connection::script_node_up> (this);
1184 run_script_queued (cb, _("node-up command execution failed, continuing."));
1185 }
1016 1186
1017 break; 1187 break;
1018 } 1188 }
1019 else 1189 else
1020 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1190 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1021 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1022 } 1192 }
1023 1193
1024 delete cctx; 1194 delete cctx;
1025 } 1195 }
1041 { 1211 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1212 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1213
1044 if (!p->hmac_chk (ictx)) 1214 if (!p->hmac_chk (ictx))
1045 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1215 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1046 "could be an attack, or just corruption or a synchronization error"), 1216 "could be an attack, or just corruption or a synchronization error."),
1047 conf->nodename, (const char *)rsi); 1217 conf->nodename, (const char *)rsi);
1048 else 1218 else
1049 { 1219 {
1050 u32 seqno; 1220 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1221 tap_packet *d = p->unpack (this, seqno);
1222 int seqclass = iseqno.seqno_classify (seqno);
1052 1223
1053 if (iseqno.recv_ok (seqno)) 1224 if (seqclass == 0) // ok
1054 { 1225 {
1055 vpn->tap->send (d); 1226 vpn->tap->send (d);
1056 1227
1057 if (si != rsi) 1228 if (si != rsi)
1058 { 1229 {
1059 // fast re-sync on connection changes, useful especially for tcp/ip 1230 // fast re-sync on source address changes, useful especially for tcp/ip
1231 //if (last_si_change < ev_now () + 5.)
1060 si = rsi; 1232 // {
1061
1062 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1233 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1063 conf->nodename, (const char *)si, (const char *)rsi); 1234 conf->nodename, (const char *)si, (const char *)rsi);
1235
1236 si = rsi;
1237
1238 if (::conf.script_node_change)
1239 {
1240 run_script_cb *cb = new run_script_cb;
1241 cb->set<connection, &connection::script_node_change> (this);
1242 run_script_queued (cb, _("node-change command execution failed, continuing."));
1243 }
1244
1245 // }
1246 //else
1247 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1248 // conf->nodename, (const char *)si, (const char *)rsi);
1064 } 1249 }
1250 }
1251 else if (seqclass == 1) // far history
1252 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1255 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1256 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1257 else if (seqclass == 3) // reset
1258 {
1259 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1260 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1261 send_reset (rsi);
1065 } 1262 }
1066 1263
1067 delete d; 1264 delete d;
1068 break; 1265 break;
1069 } 1266 }
1073 break; 1270 break;
1074 1271
1075 case vpn_packet::PT_CONNECT_REQ: 1272 case vpn_packet::PT_CONNECT_REQ:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1273 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1274 {
1078 connect_req_packet *p = (connect_req_packet *) pkt; 1275 connect_req_packet *p = (connect_req_packet *)pkt;
1079 1276
1080 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1277 if (p->id > 0 && p->id <= vpn->conns.size ())
1081 connection *c = vpn->conns[p->id - 1];
1082 conf->protocols = p->protocols;
1083
1084 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1085 conf->id, p->id, c->ictx && c->octx);
1086
1087 if (c->ictx && c->octx)
1088 { 1278 {
1279 connection *c = vpn->conns[p->id - 1];
1280 conf->protocols = p->protocols;
1281
1282 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1283 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1284 p->protocols,
1285 c->ictx && c->octx);
1286
1287 if (c->ictx && c->octx)
1288 {
1089 // send connect_info packets to both sides, in case one is 1289 // send connect_info packets to both sides, in case one is
1090 // behind a nat firewall (or both ;) 1290 // behind a nat firewall (or both ;)
1091 c->send_connect_info (conf->id, si, conf->protocols); 1291 c->send_connect_info (conf->id, si, conf->protocols);
1092 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1292 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1293 }
1294 else
1295 c->establish_connection ();
1093 } 1296 }
1094 else 1297 else
1095 c->establish_connection (); 1298 slog (L_WARN,
1299 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1300 p->id);
1096 } 1301 }
1097 1302
1098 break; 1303 break;
1099 1304
1100 case vpn_packet::PT_CONNECT_INFO: 1305 case vpn_packet::PT_CONNECT_INFO:
1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1306 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1102 { 1307 {
1103 connect_info_packet *p = (connect_info_packet *) pkt; 1308 connect_info_packet *p = (connect_info_packet *)pkt;
1104 1309
1105 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1310 if (p->id > 0 && p->id <= vpn->conns.size ())
1106 1311 {
1107 connection *c = vpn->conns[p->id - 1]; 1312 connection *c = vpn->conns[p->id - 1];
1108 1313
1109 c->conf->protocols = p->protocols; 1314 c->conf->protocols = p->protocols;
1110 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1315 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1111 p->si.upgrade_protocol (protocol, c->conf); 1316 p->si.upgrade_protocol (protocol, c->conf);
1112 1317
1113 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1318 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1114 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1319 conf->nodename,
1320 vpn->conns[p->id - 1]->conf->nodename,
1321 (const char *)p->si,
1322 p->protocols,
1323 !c->ictx && !c->octx);
1115 1324
1116 const sockinfo &dsi = forward_si (p->si); 1325 const sockinfo &dsi = forward_si (p->si);
1117 1326
1118 if (dsi.valid ()) 1327 if (dsi.valid ())
1119 c->send_auth_request (dsi, true); 1328 c->send_auth_request (dsi, true);
1329 }
1330 else
1331 slog (L_WARN,
1332 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1333 p->id);
1120 } 1334 }
1121 1335
1122 break; 1336 break;
1123 1337
1124 default: 1338 default:
1125 send_reset (rsi); 1339 send_reset (rsi);
1126 break; 1340 break;
1127 } 1341 }
1128} 1342}
1129 1343
1130void connection::keepalive_cb (time_watcher &w) 1344inline void
1345connection::keepalive_cb (ev::timer &w, int revents)
1131{ 1346{
1132 if (NOW >= last_activity + ::conf.keepalive + 30) 1347 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1133 { 1348 {
1134 reset_connection (); 1349 reset_connection ();
1135 establish_connection (); 1350 establish_connection ();
1136 } 1351 }
1137 else if (NOW < last_activity + ::conf.keepalive) 1352 else if (ev_now () < last_activity + ::conf.keepalive)
1138 w.start (last_activity + ::conf.keepalive); 1353 w.start (last_activity + ::conf.keepalive - ev::now ());
1139 else if (conf->connectmode != conf_node::C_ONDEMAND 1354 else if (conf->connectmode != conf_node::C_ONDEMAND
1140 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1355 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1141 { 1356 {
1142 send_ping (si); 1357 send_ping (si);
1143 w.start (NOW + 5); 1358 w.start (3);
1144 } 1359 }
1145 else if (NOW < last_activity + ::conf.keepalive + 10) 1360 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1146 // hold ondemand connections implicitly a few seconds longer 1361 // hold ondemand connections implicitly a few seconds longer
1147 // should delete octx, though, or something like that ;) 1362 // should delete octx, though, or something like that ;)
1148 w.start (last_activity + ::conf.keepalive + 10); 1363 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1149 else 1364 else
1150 reset_connection (); 1365 reset_connection ();
1151} 1366}
1152 1367
1368void
1153void connection::send_connect_request (int id) 1369connection::send_connect_request (int id)
1154{ 1370{
1155 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1371 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1156 1372
1157 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1373 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1374 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1375 THISNODE->protocols);
1158 p->hmac_set (octx); 1376 p->hmac_set (octx);
1159 send_vpn_packet (p, si); 1377 send_vpn_packet (p, si);
1160 1378
1161 delete p; 1379 delete p;
1162} 1380}
1163 1381
1164void connection::script_node () 1382void
1383connection::script_init_env (const char *ext)
1165{ 1384{
1166 vpn->script_if_up ();
1167
1168 char *env; 1385 char *env;
1386 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1387 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1388 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1389 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1390 conf->id & 0xff); putenv (env);
1391}
1392
1393void
1394connection::script_init_connect_env ()
1395{
1396 vpn->script_init_env ();
1397
1398 char *env;
1169 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1399 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1400 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1170 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1401 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1171 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1402 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1172 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1403 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1173} 1404}
1174 1405
1406inline const char *
1175const char *connection::script_node_up () 1407connection::script_node_up ()
1176{ 1408{
1177 script_node (); 1409 script_init_connect_env ();
1178 1410
1179 putenv ("STATE=up"); 1411 putenv ((char *)"STATE=up");
1180 1412
1413 char *filename;
1414 asprintf (&filename,
1415 "%s/%s",
1416 confbase,
1181 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1417 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1182}
1183 1418
1419 return filename;
1420}
1421
1422inline const char *
1423connection::script_node_change ()
1424{
1425 script_init_connect_env ();
1426
1427 putenv ((char *)"STATE=change");
1428
1429 char *filename;
1430 asprintf (&filename,
1431 "%s/%s",
1432 confbase,
1433 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1434
1435 return filename;
1436}
1437
1438inline const char *
1184const char *connection::script_node_down () 1439connection::script_node_down ()
1185{ 1440{
1186 script_node (); 1441 script_init_connect_env ();
1187 1442
1188 putenv ("STATE=down"); 1443 putenv ((char *)"STATE=down");
1189 1444
1190 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1445 char *filename;
1191} 1446 asprintf (&filename,
1447 "%s/%s",
1448 confbase,
1449 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1192 1450
1451 return filename;
1452}
1453
1193connection::connection(struct vpn *vpn_) 1454connection::connection (struct vpn *vpn, conf_node *conf)
1194: vpn(vpn_) 1455: vpn(vpn), conf(conf),
1195, rekey (this, &connection::rekey_cb) 1456#if ENABLE_DNS
1196, keepalive (this, &connection::keepalive_cb) 1457 dns (0),
1458#endif
1459 data_queue(conf->max_ttl, conf->max_queue + 1),
1460 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1461{
1462 rekey .set<connection, &connection::rekey_cb > (this);
1463 keepalive .set<connection, &connection::keepalive_cb > (this);
1197, establish_connection (this, &connection::establish_connection_cb) 1464 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1198{ 1465
1466 last_establish_attempt = 0.;
1199 octx = ictx = 0; 1467 octx = ictx = 0;
1200 retry_cnt = 0;
1201 1468
1202 connectmode = conf_node::C_ALWAYS; // initial setting 1469 connectmode = conf->connectmode;
1470
1471 // queue a dummy packet to force an initial connection attempt
1472 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1473 vpn_queue.put (new net_packet);
1474
1203 reset_connection (); 1475 reset_connection ();
1204} 1476}
1205 1477
1206connection::~connection () 1478connection::~connection ()
1207{ 1479{
1208 shutdown (); 1480 shutdown ();
1209} 1481}
1210 1482
1483void
1211void connection_init () 1484connection_init ()
1212{ 1485{
1213 auth_rate_limiter.clear (); 1486 auth_rate_limiter.clear ();
1214 reset_rate_limiter.clear (); 1487 reset_rate_limiter.clear ();
1215} 1488}
1216 1489

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines