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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines