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.47 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.95 by root, Tue Mar 8 17:33:30 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,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);
599 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
600 698
601 // send queued packets 699 // send queued packets
602 if (ictx && octx) 700 if (ictx && octx)
603 { 701 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
605 { 703 {
606 send_data_packet (p); 704 if (p->len) send_data_packet (p);
607 delete p; 705 delete p;
608 } 706 }
609 707
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 { 709 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p; 711 delete p;
614 } 712 }
615 } 713 }
714
715 vpn->connection_established (this);
616 } 716 }
617 else 717 else
618 { 718 {
619 retry_cnt = 0; 719 retry_cnt = 0;
620 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
621 keepalive.stop (); 721 keepalive.stop ();
622 rekey.stop (); 722 rekey.stop ();
623 } 723 }
624} 724}
625 725
626void 726void
627connection::reset_si () 727connection::reset_si ()
628{ 728{
729 if (vpn->can_direct (THISNODE, conf))
629 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
630 731 else
631 // mask out protocols we cannot establish 732 {
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 735 }
635 736
636 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
637} 740}
638 741
639// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
640const sockinfo & 743const sockinfo &
641connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
642{ 745{
643 if (!si.valid ()) 746 if (!si.valid ())
644 { 747 {
645 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
646 749
647 if (r) 750 if (r)
648 { 751 {
649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
650 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
651 return r->si; 754 return r->si;
652 } 755 }
653 else 756 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
655 conf->nodename); 758 conf->nodename);
656 } 759 }
657 760
658 return si; 761 return si;
659} 762}
… …
669connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
670{ 773{
671 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
672 775
673 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
674 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
675 781
676 delete pkt; 782 delete pkt;
677} 783}
678 784
… …
697 803
698 rsachallenge chg; 804 rsachallenge chg;
699 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
700 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
701 807
702 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);
703 809
704 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
705 811
706 delete pkt; 812 delete pkt;
707} 813}
… …
715 821
716 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
717 823
718 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
719 825
720 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);
721 827
722 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
723 829
724 delete pkt; 830 delete pkt;
725} 831}
726 832
727void 833void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 835{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
731 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
838 conf->protocols);
732 839
733 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);
734 841
735 r->hmac_set (octx); 842 r->hmac_set (octx);
736 send_vpn_packet (r, si); 843 send_vpn_packet (r, si);
737 844
738 delete r; 845 delete r;
739} 846}
740 847
741void 848inline void
742connection::establish_connection_cb (time_watcher &w) 849connection::establish_connection_cb (ev::timer &w, int revents)
743{ 850{
744 if (!ictx 851 if (!(ictx && octx)
745 && conf != THISNODE 852 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 853 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 854 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 855 && !w.is_active ())
749 { 856 {
750 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 857 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
858 // and stop trying. should probably be handled by a per-connection expire handler.
859 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
860 {
861 reset_connection ();
862 return;
863 }
751 864
752 double retry_int = double (retry_cnt & 3 865 last_establish_attempt = ev_now ();
866
867 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
753 ? (retry_cnt & 3) + 1 868 ? (retry_cnt & 3) + 1
754 : 1 << (retry_cnt >> 2)); 869 : 1 << (retry_cnt >> 2));
755 870
756 reset_si (); 871 reset_si ();
757 872
758 bool slow = si.prot & PROT_SLOW; 873 bool slow = si.prot & PROT_SLOW;
759 874
760 if (si.prot && !si.host) 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);
761 vpn->send_connect_request (conf->id); 879 vpn->send_connect_request (this);
880 }
762 else 881 else
763 { 882 {
883 if (si.valid ())
884 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
885 conf->nodename, (const char *)si);
886
764 const sockinfo &dsi = forward_si (si); 887 const sockinfo &dsi = forward_si (si);
765 888
766 slow = slow || (dsi.prot & PROT_SLOW); 889 slow = slow || (dsi.prot & PROT_SLOW);
767 890
768 if (dsi.valid () && auth_rate_limiter.can (dsi)) 891 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
772 else 895 else
773 send_ping (dsi, 0); 896 send_ping (dsi, 0);
774 } 897 }
775 } 898 }
776 899
777 retry_int *= slow ? 3. : 0.7; 900 retry_int *= slow ? 8. : 0.9;
778 901
779 if (retry_int < conf->max_retry) 902 if (retry_int < conf->max_retry)
780 retry_cnt++; 903 retry_cnt++;
781 else 904 else
782 retry_int = conf->max_retry; 905 retry_int = conf->max_retry;
783 906
784 w.start (NOW + retry_int); 907 w.start (retry_int);
785 } 908 }
786} 909}
787 910
788void 911void
789connection::reset_connection () 912connection::reset_connection ()
… …
792 { 915 {
793 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost"),
794 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si);
795 918
796 if (::conf.script_node_down) 919 if (::conf.script_node_down)
797 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 }
798 } 925 }
799 926
800 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
801 delete octx; octx = 0; 928 delete octx; octx = 0;
802#if ENABLE_DNS
803 dnsv4_reset_connection ();
804#endif
805 929
806 si.host = 0; 930 si.host = 0;
807 931
808 last_activity = 0; 932 last_activity = 0.;
933 //last_si_change = 0.;
809 retry_cnt = 0; 934 retry_cnt = 0;
810 935
811 rekey.stop (); 936 rekey.stop ();
812 keepalive.stop (); 937 keepalive.stop ();
813 establish_connection.stop (); 938 establish_connection.stop ();
… …
820 send_reset (si); 945 send_reset (si);
821 946
822 reset_connection (); 947 reset_connection ();
823} 948}
824 949
825void 950// poor-man's rekeying
826connection::rekey_cb (time_watcher &w) 951inline void
952connection::rekey_cb (ev::timer &w, int revents)
827{ 953{
828 reset_connection (); 954 reset_connection ();
829 establish_connection (); 955 establish_connection ();
830} 956}
831 957
… …
847 if (oseqno > MAX_SEQNO) 973 if (oseqno > MAX_SEQNO)
848 rekey (); 974 rekey ();
849} 975}
850 976
851void 977void
978connection::post_inject_queue ()
979{
980 // force a connection every now and when when packets are sent (max 1/s)
981 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
982 establish_connection.stop ();
983
984 establish_connection ();
985}
986
987void
852connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 988connection::inject_data_packet (tap_packet *pkt)
853{ 989{
854 if (ictx && octx) 990 if (ictx && octx)
855 send_data_packet (pkt); 991 send_data_packet (pkt);
856 else 992 else
857 { 993 {
858 if (!broadcast)//DDDD
859 data_queue.put (new tap_packet (*pkt)); 994 data_queue.put (new tap_packet (*pkt));
860 995 post_inject_queue ();
861 establish_connection ();
862 } 996 }
863} 997}
864 998
999void
865void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1000connection::inject_vpn_packet (vpn_packet *pkt, int tos)
866{ 1001{
867 if (ictx && octx) 1002 if (ictx && octx)
868 send_vpn_packet (pkt, si, tos); 1003 send_vpn_packet (pkt, si, tos);
869 else 1004 else
870 { 1005 {
871 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1006 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
872 1007 post_inject_queue ();
873 establish_connection ();
874 } 1008 }
875} 1009}
876 1010
877void 1011void
878connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1012connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
879{ 1013{
880 last_activity = NOW; 1014 last_activity = ev_now ();
881 1015
882 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1016 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
883 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1017 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1018
1019 if (connectmode == conf_node::C_DISABLED)
1020 return;
884 1021
885 switch (pkt->typ ()) 1022 switch (pkt->typ ())
886 { 1023 {
887 case vpn_packet::PT_PING: 1024 case vpn_packet::PT_PING:
1025 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1026
888 // we send pings instead of auth packets after some retries, 1027 // we send pings instead of auth packets after some retries,
889 // so reset the retry counter and establish a connection 1028 // so reset the retry counter and establish a connection
890 // when we receive a ping. 1029 // when we receive a ping.
891 if (!ictx) 1030 if (!ictx)
892 { 1031 {
893 if (auth_rate_limiter.can (rsi)) 1032 if (auth_rate_limiter.can (rsi))
894 send_auth_request (rsi, true); 1033 send_auth_request (rsi, true);
895 } 1034 }
896 else 1035 else
1036 // we would love to change the socket address here, but ping's aren't
1037 // authenticated, so we best ignore it.
897 send_ping (rsi, 1); // pong 1038 send_ping (rsi, 1); // pong
898 1039
899 break; 1040 break;
900 1041
901 case vpn_packet::PT_PONG: 1042 case vpn_packet::PT_PONG:
1043 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1044
1045 // a PONG might mean that the other side doesn't really know
1046 // about our desire for communication.
1047 establish_connection ();
902 break; 1048 break;
903 1049
904 case vpn_packet::PT_RESET: 1050 case vpn_packet::PT_RESET:
905 { 1051 {
906 reset_connection (); 1052 reset_connection ();
907 1053
908 config_packet *p = (config_packet *) pkt; 1054 config_packet *p = (config_packet *) pkt;
909 1055
910 if (!p->chk_config ()) 1056 if (!p->chk_config ())
911 { 1057 {
912 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1058 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
913 conf->nodename, (const char *)rsi); 1059 conf->nodename, (const char *)rsi);
914 connectmode = conf_node::C_DISABLED; 1060 connectmode = conf_node::C_DISABLED;
915 } 1061 }
916 else if (connectmode == conf_node::C_ALWAYS) 1062 else if (connectmode == conf_node::C_ALWAYS)
917 establish_connection (); 1063 establish_connection ();
… …
919 break; 1065 break;
920 1066
921 case vpn_packet::PT_AUTH_REQ: 1067 case vpn_packet::PT_AUTH_REQ:
922 if (auth_rate_limiter.can (rsi)) 1068 if (auth_rate_limiter.can (rsi))
923 { 1069 {
924 auth_req_packet *p = (auth_req_packet *) pkt; 1070 auth_req_packet *p = (auth_req_packet *)pkt;
925 1071
926 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1072 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1073 conf->nodename, p->initiate ? "initiate" : "reply",
1074 p->protocols, p->features);
927 1075
928 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1076 if (p->chk_config ()
1077 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
929 { 1078 {
930 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
931 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
932 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
933 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
948 delete octx; 1097 delete octx;
949 1098
950 octx = new crypto_ctx (k, 1); 1099 octx = new crypto_ctx (k, 1);
951 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1100 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
952 1101
953 // compatibility code, remove when no longer required
954 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
955
956 conf->protocols = p->protocols; 1102 conf->protocols = p->protocols;
957 features = p->features & config_packet::get_features (); 1103 features = p->features & config_packet::get_features ();
958 1104
959 send_auth_response (rsi, p->id, k); 1105 send_auth_response (rsi, p->id, k);
960 1106
… …
962 1108
963 break; 1109 break;
964 } 1110 }
965 } 1111 }
966 else 1112 else
967 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
968 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
969 1115
970 send_reset (rsi); 1116 send_reset (rsi);
971 } 1117 }
972 1118
973 break; 1119 break;
974 1120
975 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
976 { 1122 {
977 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
978 1124
979 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
980 1126
981 if (p->chk_config ()) 1127 if (p->chk_config ())
982 { 1128 {
983 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
984 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
987 1133
988 rsachallenge chg; 1134 rsachallenge chg;
989 1135
990 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
991 { 1137 {
992 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
993 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
994 break; 1140 break;
995 } 1141 }
996 else 1142 else
997 { 1143 {
998 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
999 1145
1000 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
1001 { 1147 {
1002 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1148 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1003 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
1004 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
1005 break; 1151 break;
1006 } 1152 }
1007 else 1153 else
1008 { 1154 {
… …
1019 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1020 1166
1021 si = rsi; 1167 si = rsi;
1022 protocol = rsi.prot; 1168 protocol = rsi.prot;
1023 1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
1024 connection_established (); 1175 connection_established ();
1025 1176
1026 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1027 conf->nodename, (const char *)rsi,
1028 p->prot_major, p->prot_minor);
1029
1030 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1031 run_script (run_script_cb (this, &connection::script_node_up), false); 1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1032 1183
1033 break; 1184 break;
1034 } 1185 }
1035 else 1186 else
1036 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1037 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1038 } 1189 }
1039 1190
1040 delete cctx; 1191 delete cctx;
1041 } 1192 }
… …
1057 { 1208 {
1058 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1059 1210
1060 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1061 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1212 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1062 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1063 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1064 else 1215 else
1065 { 1216 {
1066 u32 seqno; 1217 u32 seqno;
1067 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1068 1220
1069 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1070 { 1222 {
1071 vpn->tap->send (d); 1223 vpn->tap->send (d);
1072 1224
1073 if (si != rsi) 1225 if (si != rsi)
1074 { 1226 {
1075 // fast re-sync on connection changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1076 si = rsi; 1229 // {
1077
1078 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1079 conf->nodename, (const char *)si, (const char *)rsi); 1231 conf->nodename, (const char *)si, (const char *)rsi);
1232
1233 si = rsi;
1234
1235 if (::conf.script_node_change)
1236 {
1237 run_script_cb *cb = new run_script_cb;
1238 cb->set<connection, &connection::script_node_change> (this);
1239 run_script_queued (cb, _("node-change command execution failed, continuing."));
1240 }
1241
1242 // }
1243 //else
1244 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1245 // conf->nodename, (const char *)si, (const char *)rsi);
1080 } 1246 }
1247 }
1248 else if (seqclass == 1) // far history
1249 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1250 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1251 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1252 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 3) // reset
1255 {
1256 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1257 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1258 send_reset (rsi);
1081 } 1259 }
1082 1260
1083 delete d; 1261 delete d;
1084 break; 1262 break;
1085 } 1263 }
… …
1089 break; 1267 break;
1090 1268
1091 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1092 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1093 { 1271 {
1094 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1095 1273
1096 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1097 connection *c = vpn->conns[p->id - 1];
1098 conf->protocols = p->protocols;
1099
1100 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1101 conf->id, p->id, c->ictx && c->octx);
1102
1103 if (c->ictx && c->octx)
1104 { 1275 {
1276 connection *c = vpn->conns[p->id - 1];
1277 conf->protocols = p->protocols;
1278
1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1281 p->protocols,
1282 c->ictx && c->octx);
1283
1284 if (c->ictx && c->octx)
1285 {
1105 // send connect_info packets to both sides, in case one is 1286 // send connect_info packets to both sides, in case one is
1106 // behind a nat firewall (or both ;) 1287 // behind a nat firewall (or both ;)
1107 c->send_connect_info (conf->id, si, conf->protocols); 1288 c->send_connect_info (conf->id, si, conf->protocols);
1108 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1289 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1290 }
1291 else
1292 c->establish_connection ();
1109 } 1293 }
1110 else 1294 else
1111 c->establish_connection (); 1295 slog (L_WARN,
1296 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1297 p->id);
1112 } 1298 }
1113 1299
1114 break; 1300 break;
1115 1301
1116 case vpn_packet::PT_CONNECT_INFO: 1302 case vpn_packet::PT_CONNECT_INFO:
1117 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1303 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1118 { 1304 {
1119 connect_info_packet *p = (connect_info_packet *)pkt; 1305 connect_info_packet *p = (connect_info_packet *)pkt;
1120 1306
1121 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1307 if (p->id > 0 && p->id <= vpn->conns.size ())
1122 { 1308 {
1123 connection *c = vpn->conns[p->id - 1]; 1309 connection *c = vpn->conns[p->id - 1];
1124 1310
1125 c->conf->protocols = p->protocols; 1311 c->conf->protocols = p->protocols;
1126 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1312 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1127 p->si.upgrade_protocol (protocol, c->conf); 1313 p->si.upgrade_protocol (protocol, c->conf);
1128 1314
1129 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1315 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1130 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1316 conf->nodename,
1317 vpn->conns[p->id - 1]->conf->nodename,
1318 (const char *)p->si,
1319 p->protocols,
1320 !c->ictx && !c->octx);
1131 1321
1132 const sockinfo &dsi = forward_si (p->si); 1322 const sockinfo &dsi = forward_si (p->si);
1133 1323
1134 if (dsi.valid ()) 1324 if (dsi.valid ())
1135 c->send_auth_request (dsi, true); 1325 c->send_auth_request (dsi, true);
1136 } 1326 }
1327 else
1328 slog (L_WARN,
1329 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1330 p->id);
1137 } 1331 }
1138 1332
1139 break; 1333 break;
1140 1334
1141 default: 1335 default:
1142 send_reset (rsi); 1336 send_reset (rsi);
1143 break; 1337 break;
1144 } 1338 }
1145} 1339}
1146 1340
1147void connection::keepalive_cb (time_watcher &w) 1341inline void
1342connection::keepalive_cb (ev::timer &w, int revents)
1148{ 1343{
1149 if (NOW >= last_activity + ::conf.keepalive + 30) 1344 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1150 { 1345 {
1151 reset_connection (); 1346 reset_connection ();
1152 establish_connection (); 1347 establish_connection ();
1153 } 1348 }
1154 else if (NOW < last_activity + ::conf.keepalive) 1349 else if (ev_now () < last_activity + ::conf.keepalive)
1155 w.start (last_activity + ::conf.keepalive); 1350 w.start (last_activity + ::conf.keepalive - ev::now ());
1156 else if (conf->connectmode != conf_node::C_ONDEMAND 1351 else if (conf->connectmode != conf_node::C_ONDEMAND
1157 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1352 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1158 { 1353 {
1159 send_ping (si); 1354 send_ping (si);
1160 w.start (NOW + 5); 1355 w.start (3);
1161 } 1356 }
1162 else if (NOW < last_activity + ::conf.keepalive + 10) 1357 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1163 // hold ondemand connections implicitly a few seconds longer 1358 // hold ondemand connections implicitly a few seconds longer
1164 // should delete octx, though, or something like that ;) 1359 // should delete octx, though, or something like that ;)
1165 w.start (last_activity + ::conf.keepalive + 10); 1360 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1166 else 1361 else
1167 reset_connection (); 1362 reset_connection ();
1168} 1363}
1169 1364
1365void
1170void connection::send_connect_request (int id) 1366connection::send_connect_request (int id)
1171{ 1367{
1172 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1368 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1173 1369
1174 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1370 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1371 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1372 THISNODE->protocols);
1175 p->hmac_set (octx); 1373 p->hmac_set (octx);
1176 send_vpn_packet (p, si); 1374 send_vpn_packet (p, si);
1177 1375
1178 delete p; 1376 delete p;
1179} 1377}
1180 1378
1181void connection::script_node () 1379void
1380connection::script_init_env (const char *ext)
1182{ 1381{
1183 vpn->script_if_up ();
1184
1185 char *env; 1382 char *env;
1383 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1384 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1385 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1386 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1387 conf->id & 0xff); putenv (env);
1388}
1389
1390void
1391connection::script_init_connect_env ()
1392{
1393 vpn->script_init_env ();
1394
1395 char *env;
1186 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1396 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1397 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1187 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1398 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1188 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1399 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1189 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1400 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1190} 1401}
1191 1402
1403inline const char *
1192const char *connection::script_node_up () 1404connection::script_node_up ()
1193{ 1405{
1194 script_node (); 1406 script_init_connect_env ();
1195 1407
1196 putenv ("STATE=up"); 1408 putenv ((char *)"STATE=up");
1197 1409
1410 char *filename;
1411 asprintf (&filename,
1412 "%s/%s",
1413 confbase,
1198 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1414 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1199}
1200 1415
1416 return filename;
1417}
1418
1419inline const char *
1420connection::script_node_change ()
1421{
1422 script_init_connect_env ();
1423
1424 putenv ((char *)"STATE=change");
1425
1426 char *filename;
1427 asprintf (&filename,
1428 "%s/%s",
1429 confbase,
1430 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1431
1432 return filename;
1433}
1434
1435inline const char *
1201const char *connection::script_node_down () 1436connection::script_node_down ()
1202{ 1437{
1203 script_node (); 1438 script_init_connect_env ();
1204 1439
1205 putenv ("STATE=down"); 1440 putenv ((char *)"STATE=down");
1206 1441
1207 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1442 char *filename;
1443 asprintf (&filename,
1444 "%s/%s",
1445 confbase,
1446 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1447
1448 return filename;
1208} 1449}
1209 1450
1210connection::connection (struct vpn *vpn, conf_node *conf) 1451connection::connection (struct vpn *vpn, conf_node *conf)
1211: vpn(vpn), conf(conf) 1452: vpn(vpn), conf(conf),
1212, rekey (this, &connection::rekey_cb)
1213, keepalive (this, &connection::keepalive_cb)
1214, establish_connection (this, &connection::establish_connection_cb)
1215#if ENABLE_DNS 1453#if ENABLE_DNS
1216, dns (0) 1454 dns (0),
1217#endif 1455#endif
1456 data_queue(conf->max_ttl, conf->max_queue + 1),
1457 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1218{ 1458{
1459 rekey .set<connection, &connection::rekey_cb > (this);
1460 keepalive .set<connection, &connection::keepalive_cb > (this);
1461 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1462
1463 last_establish_attempt = 0.;
1219 octx = ictx = 0; 1464 octx = ictx = 0;
1220 retry_cnt = 0;
1221 1465
1222 if (!conf->protocols) // make sure some protocol is enabled 1466 connectmode = conf->connectmode;
1223 conf->protocols = PROT_UDPv4;
1224 1467
1225 connectmode = conf_node::C_ALWAYS; // initial setting 1468 // queue a dummy packet to force an initial connection attempt
1469 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1470 vpn_queue.put (new net_packet);
1471
1226 reset_connection (); 1472 reset_connection ();
1227} 1473}
1228 1474
1229connection::~connection () 1475connection::~connection ()
1230{ 1476{
1231 shutdown (); 1477 shutdown ();
1232} 1478}
1233 1479
1480void
1234void connection_init () 1481connection_init ()
1235{ 1482{
1236 auth_rate_limiter.clear (); 1483 auth_rate_limiter.clear ();
1237 reset_rate_limiter.clear (); 1484 reset_rate_limiter.clear ();
1238} 1485}
1239 1486

Diff Legend

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