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.38 by pcg, Sun Jul 25 18:11:40 2004 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cassert>
23
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
30
31#include "gettext.h"
32 42
33#include "conf.h" 43#include "conf.h"
34#include "slog.h" 44#include "slog.h"
35#include "device.h" 45#include "device.h"
36#include "vpn.h" 46#include "vpn.h"
… …
40 50
41#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
42# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
43#endif 53#endif
44 54
45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
46 57
47#define ULTRA_FAST 1 58#define ULTRA_FAST 1
48#define HLOG 15 59#define HLOG 15
49#include "lzf/lzf.h" 60#include "lzf/lzf.h"
50#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
52 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
53struct crypto_ctx 108struct crypto_ctx
54{ 109{
55 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 111 HMAC_CTX hctx;
57 112
… …
77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
78{ 133{
79 EVP_MD_CTX ctx; 134 EVP_MD_CTX ctx;
80 135
81 EVP_MD_CTX_init (&ctx); 136 EVP_MD_CTX_init (&ctx);
82 require (EVP_DigestInit (&ctx, RSA_HASH)); 137 require (EVP_DigestInit (&ctx, RSA_HASH));
83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg)); 138 require (EVP_DigestUpdate (&ctx, &chg, sizeof chg));
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate (&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
87} 142}
88 143
89struct rsa_entry { 144struct rsa_entry
145{
90 tstamp expire; 146 tstamp expire;
91 rsaid id; 147 rsaid id;
92 rsachallenge chg; 148 rsachallenge chg;
93}; 149};
94 150
95struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
96{ 152{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 154
99 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
100 { 156 {
101 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
102 { 158 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 160 {
105 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
106 162
107 erase (i); 163 erase (i);
108 return true; 164 return true;
109 } 165 }
110 } 166 }
111 167
112 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
114 170
115 return false; 171 return false;
116 } 172 }
117 173
118 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
119 { 175 {
120 rsa_entry e; 176 rsa_entry e;
121 177
122 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 180
125 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 182 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
128 184
129 push_back (e); 185 push_back (e);
130 186
131 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
133 } 189 }
134 190
135 rsa_cache () 191 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 192 {
137 { } 193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
138 196
139} rsa_cache; 197} rsa_cache;
140 198
141void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 201{
143 if (!empty ()) 202 if (empty ())
203 w.stop ();
204 else
144 { 205 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 207 if (i->expire <= ev_now ())
149 i = erase (i); 208 i = erase (i);
150 else 209 else
151 ++i; 210 ++i;
152 } 211 }
153} 212}
154 213
155////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
156 215
157void pkt_queue::put (net_packet *p) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
217: max_ttl (max_ttl), max_queue (max_queue)
158{ 218{
159 if (queue[i]) 219 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 220
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 221 i = 0;
187 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 225}
189 226
190pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
191{ 228{
192 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
193 delete queue[i]; 232 delete [] queue;
194} 233}
195 234
235void
236pkt_queue::expire_cb (ev::timer &w, int revents)
237{
238 ev_tstamp expire = ev_now () - max_ttl;
239
240 for (;;)
241 {
242 if (empty ())
243 break;
244
245 double diff = queue[j].tstamp - expire;
246
247 if (diff >= 0.)
248 {
249 w.start (diff > 0.5 ? diff : 0.5);
250 break;
251 }
252
253 delete get ();
254 }
255}
256
257void
258pkt_queue::put (net_packet *p)
259{
260 ev_tstamp now = ev_now ();
261
262 // start expiry timer
263 if (empty ())
264 expire.start (max_ttl);
265
266 int ni = i + 1 == max_queue ? 0 : i + 1;
267
268 if (ni == j)
269 delete get ();
270
271 queue[i].pkt = p;
272 queue[i].tstamp = now;
273
274 i = ni;
275}
276
277net_packet *
278pkt_queue::get ()
279{
280 if (empty ())
281 return 0;
282
283 net_packet *p = queue[j].pkt;
284 queue[j].pkt = 0;
285
286 j = j + 1 == max_queue ? 0 : j + 1;
287
288 return p;
289}
290
196struct net_rateinfo { 291struct net_rateinfo
292{
197 u32 host; 293 u32 host;
198 double pcnt, diff; 294 double pcnt, diff;
199 tstamp last; 295 tstamp last;
200}; 296};
201 297
… …
211 307
212 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 309 bool can (u32 host);
214}; 310};
215 311
216net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
217 313
314bool
218bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
219{ 316{
220 iterator i; 317 iterator i;
221 318
222 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
223 if (i->host == host) 320 if (i->host == host)
224 break; 321 break;
225 else if (i->last < NOW - NRL_EXPIRE) 322 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 323 i = erase (i);
227 else 324 else
228 i++; 325 i++;
229 326
230 if (i == end ()) 327 if (i == end ())
… …
232 net_rateinfo ri; 329 net_rateinfo ri;
233 330
234 ri.host = host; 331 ri.host = host;
235 ri.pcnt = 1.; 332 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 333 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 334 ri.last = ev_now ();
238 335
239 push_front (ri); 336 push_front (ri);
240 337
241 return true; 338 return true;
242 } 339 }
… …
244 { 341 {
245 net_rateinfo ri (*i); 342 net_rateinfo ri (*i);
246 erase (i); 343 erase (i);
247 344
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 345 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 347
251 ri.last = NOW; 348 ri.last = ev_now ();
252 349
253 double dif = ri.diff / ri.pcnt; 350 double dif = ri.diff / ri.pcnt;
254 351
255 bool send = dif > NRL_CUTOFF; 352 bool send = dif > NRL_CUTOFF;
256 353
… …
270 367
271///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
272 369
273unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
274 371
372void
275void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
276{ 374{
277 unsigned int xlen; 375 unsigned int xlen;
278 376
279 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
280 378
… …
298 hmac_gen (ctx); 396 hmac_gen (ctx);
299 397
300 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
301} 399}
302 400
401void
303void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
304{ 403{
305 type = type_; 404 type = type_;
306 405
307 int src = THISNODE->id; 406 int src = THISNODE->id;
308 407
… …
313 412
314#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
315#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
316 415
317struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
318 { 425 {
319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
320
321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
322 tap_packet *unpack (connection *conn, u32 &seqno);
323private:
324
325 const u32 data_hdr_size () const
326 {
327 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
328 }
329 }; 427 }
428};
330 429
331void 430void
332vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
333{ 432{
334 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
336 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
337 436
338#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
340 439
341 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
342 { 441 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 443
345 if (cl) 444 if (cl)
346 { 445 {
… …
466 f |= FEATURE_COMPRESSION; 565 f |= FEATURE_COMPRESSION;
467#endif 566#endif
468#if ENABLE_ROHC 567#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 568 f |= FEATURE_ROHC;
470#endif 569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
471 return f; 573 return f;
472 } 574 }
473}; 575};
474 576
577void
475void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
476{ 579{
477 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 584 flags = 0;
482 challengelen = sizeof (rsachallenge); 585 challengelen = sizeof (rsachallenge);
483 features = get_features (); 586 features = get_features ();
484 587
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
… …
488 591
489 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
490 set_hdr (type, dst); 593 set_hdr (type, dst);
491} 594}
492 595
596bool
493bool config_packet::chk_config () const 597config_packet::chk_config () const
494{ 598{
495 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
497 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH) 603 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 604 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge)) 605 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 606 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 608 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
526 rsaencrdata encr; 626 rsaencrdata encr;
527 627
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
529 { 629 {
530 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
531 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
532 initiate = !!initiate_; 632 initiate = !!initiate_;
533 protocols = protocols_; 633 protocols = protocols_;
534 634
535 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
536 } 636 }
… …
585///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
586 686
587void 687void
588connection::connection_established () 688connection::connection_established ()
589{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
590 if (ictx && octx) 692 if (ictx && octx)
591 { 693 {
592 connectmode = conf->connectmode;
593
594 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 696 rekey.start (rekey_interval, rekey_interval);
697
597 keepalive.start (NOW + ::conf.keepalive); 698 keepalive.start (::conf.keepalive);
598 699
599 // send queued packets 700 // send queued packets
600 if (ictx && octx) 701 if (ictx && octx)
601 { 702 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 703 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 704 {
604 send_data_packet (p); 705 if (p->len) send_data_packet (p);
605 delete p; 706 delete p;
606 } 707 }
607 708
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 709 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 710 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 711 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 712 delete p;
612 } 713 }
613 } 714 }
715
716 vpn->connection_established (this);
614 } 717 }
615 else 718 else
616 { 719 {
617 retry_cnt = 0; 720 retry_cnt = 0;
618 establish_connection.start (NOW + 5); 721 establish_connection.start (5);
619 keepalive.stop (); 722 keepalive.stop ();
620 rekey.stop (); 723 rekey.stop ();
621 } 724 }
622} 725}
623 726
624void 727void
625connection::reset_si () 728connection::reset_si ()
626{ 729{
730 if (vpn->can_direct (THISNODE, conf))
627 protocol = best_protocol (THISNODE->protocols & conf->protocols); 731 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
628 732 else
629 // mask out protocols we cannot establish 733 {
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 734 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 735 protocol = 0;
736 }
632 737
633 si.set (conf, protocol); 738 si.set (conf, protocol);
739
740 is_direct = si.valid ();
634} 741}
635 742
636// ensure sockinfo is valid, forward if necessary 743// ensure sockinfo is valid, forward if necessary
637const sockinfo & 744const sockinfo &
638connection::forward_si (const sockinfo &si) const 745connection::forward_si (const sockinfo &si) const
639{ 746{
640 if (!si.valid ()) 747 if (!si.valid ())
641 { 748 {
642 connection *r = vpn->find_router (); 749 connection *r = vpn->find_router_for (this);
643 750
644 if (r) 751 if (r)
645 { 752 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 753 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
647 conf->nodename, r->conf->nodename); 754 conf->nodename, r->conf->nodename);
648 return r->si; 755 return r->si;
649 } 756 }
650 else 757 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 758 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
652 conf->nodename); 759 conf->nodename);
653 } 760 }
654 761
655 return si; 762 return si;
656} 763}
… …
666connection::send_ping (const sockinfo &si, u8 pong) 773connection::send_ping (const sockinfo &si, u8 pong)
667{ 774{
668 ping_packet *pkt = new ping_packet; 775 ping_packet *pkt = new ping_packet;
669 776
670 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
671 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 781 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
672 782
673 delete pkt; 783 delete pkt;
674} 784}
675 785
… …
694 804
695 rsachallenge chg; 805 rsachallenge chg;
696 rsa_cache.gen (pkt->id, chg); 806 rsa_cache.gen (pkt->id, chg);
697 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 807 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
698 808
699 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);
700 810
701 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
702 812
703 delete pkt; 813 delete pkt;
704} 814}
… …
712 822
713 rsa_hash (id, chg, pkt->response); 823 rsa_hash (id, chg, pkt->response);
714 824
715 pkt->hmac_set (octx); 825 pkt->hmac_set (octx);
716 826
717 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);
718 828
719 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
720 830
721 delete pkt; 831 delete pkt;
722} 832}
723 833
724void 834void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 835connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 836{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 837 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
728 conf->id, rid, (const char *)rsi); 838 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
839 conf->protocols);
729 840
730 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);
731 842
732 r->hmac_set (octx); 843 r->hmac_set (octx);
733 send_vpn_packet (r, si); 844 send_vpn_packet (r, si);
734 845
735 delete r; 846 delete r;
736} 847}
737 848
738void 849inline void
739connection::establish_connection_cb (time_watcher &w) 850connection::establish_connection_cb (ev::timer &w, int revents)
740{ 851{
741 if (!ictx 852 if (!(ictx && octx)
742 && conf != THISNODE 853 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 854 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 855 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 856 && !w.is_active ())
746 { 857 {
747 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
748 859 // and stop trying. should probably be handled by a per-connection expire handler.
749 if (retry_int < conf->max_retry) 860 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
861 {
862 reset_connection ();
750 retry_cnt++; 863 return;
751 else 864 }
752 retry_int = conf->max_retry;
753 865
754 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));
755 871
756 reset_si (); 872 reset_si ();
757 873
758 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);
759 vpn->send_connect_request (conf->id); 880 vpn->send_connect_request (this);
881 }
760 else 882 else
761 { 883 {
884 if (si.valid ())
885 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
886 conf->nodename, (const char *)si);
887
762 const sockinfo &dsi = forward_si (si); 888 const sockinfo &dsi = forward_si (si);
889
890 slow = slow || (dsi.prot & PROT_SLOW);
763 891
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 892 if (dsi.valid () && auth_rate_limiter.can (dsi))
765 { 893 {
766 if (retry_cnt < 4) 894 if (retry_cnt < 4)
767 send_auth_request (dsi, true); 895 send_auth_request (dsi, true);
768 else 896 else
769 send_ping (dsi, 0); 897 send_ping (dsi, 0);
770 } 898 }
771 } 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);
772 } 909 }
773} 910}
774 911
775void 912void
776connection::reset_connection () 913connection::reset_connection ()
… …
779 { 916 {
780 slog (L_INFO, _("%s(%s): connection lost"), 917 slog (L_INFO, _("%s(%s): connection lost"),
781 conf->nodename, (const char *)si); 918 conf->nodename, (const char *)si);
782 919
783 if (::conf.script_node_down) 920 if (::conf.script_node_down)
784 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 }
785 } 926 }
786 927
787 delete ictx; ictx = 0; 928 delete ictx; ictx = 0;
788 delete octx; octx = 0; 929 delete octx; octx = 0;
789 930
790 si.host = 0; 931 si.host = 0;
791 932
792 last_activity = 0; 933 last_activity = 0.;
934 //last_si_change = 0.;
793 retry_cnt = 0; 935 retry_cnt = 0;
794 936
795 rekey.stop (); 937 rekey.stop ();
796 keepalive.stop (); 938 keepalive.stop ();
797 establish_connection.stop (); 939 establish_connection.stop ();
… …
804 send_reset (si); 946 send_reset (si);
805 947
806 reset_connection (); 948 reset_connection ();
807} 949}
808 950
809void 951// poor-man's rekeying
810connection::rekey_cb (time_watcher &w) 952inline void
953connection::rekey_cb (ev::timer &w, int revents)
811{ 954{
812 reset_connection (); 955 reset_connection ();
813 establish_connection (); 956 establish_connection ();
814} 957}
815 958
… …
831 if (oseqno > MAX_SEQNO) 974 if (oseqno > MAX_SEQNO)
832 rekey (); 975 rekey ();
833} 976}
834 977
835void 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
836connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 989connection::inject_data_packet (tap_packet *pkt)
837{ 990{
838 if (ictx && octx) 991 if (ictx && octx)
839 send_data_packet (pkt); 992 send_data_packet (pkt);
840 else 993 else
841 { 994 {
842 if (!broadcast)//DDDD
843 data_queue.put (new tap_packet (*pkt)); 995 data_queue.put (new tap_packet (*pkt));
844 996 post_inject_queue ();
845 establish_connection ();
846 } 997 }
847} 998}
848 999
1000void
849void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1001connection::inject_vpn_packet (vpn_packet *pkt, int tos)
850{ 1002{
851 if (ictx && octx) 1003 if (ictx && octx)
852 send_vpn_packet (pkt, si, tos); 1004 send_vpn_packet (pkt, si, tos);
853 else 1005 else
854 { 1006 {
855 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1007 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
856 1008 post_inject_queue ();
857 establish_connection ();
858 } 1009 }
859} 1010}
860 1011
861void 1012void
862connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1013connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
863{ 1014{
864 last_activity = NOW; 1015 last_activity = ev_now ();
865 1016
866 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.",
867 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;
868 1022
869 switch (pkt->typ ()) 1023 switch (pkt->typ ())
870 { 1024 {
871 case vpn_packet::PT_PING: 1025 case vpn_packet::PT_PING:
1026 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1027
872 // we send pings instead of auth packets after some retries, 1028 // we send pings instead of auth packets after some retries,
873 // so reset the retry counter and establish a connection 1029 // so reset the retry counter and establish a connection
874 // when we receive a ping. 1030 // when we receive a ping.
875 if (!ictx) 1031 if (!ictx)
876 { 1032 {
877 if (auth_rate_limiter.can (rsi)) 1033 if (auth_rate_limiter.can (rsi))
878 send_auth_request (rsi, true); 1034 send_auth_request (rsi, true);
879 } 1035 }
880 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.
881 send_ping (rsi, 1); // pong 1039 send_ping (rsi, 1); // pong
882 1040
883 break; 1041 break;
884 1042
885 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 ();
886 break; 1049 break;
887 1050
888 case vpn_packet::PT_RESET: 1051 case vpn_packet::PT_RESET:
889 { 1052 {
890 reset_connection (); 1053 reset_connection ();
891 1054
892 config_packet *p = (config_packet *) pkt; 1055 config_packet *p = (config_packet *) pkt;
893 1056
894 if (!p->chk_config ()) 1057 if (!p->chk_config ())
895 { 1058 {
896 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1059 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
897 conf->nodename, (const char *)rsi); 1060 conf->nodename, (const char *)rsi);
898 connectmode = conf_node::C_DISABLED; 1061 connectmode = conf_node::C_DISABLED;
899 } 1062 }
900 else if (connectmode == conf_node::C_ALWAYS) 1063 else if (connectmode == conf_node::C_ALWAYS)
901 establish_connection (); 1064 establish_connection ();
… …
903 break; 1066 break;
904 1067
905 case vpn_packet::PT_AUTH_REQ: 1068 case vpn_packet::PT_AUTH_REQ:
906 if (auth_rate_limiter.can (rsi)) 1069 if (auth_rate_limiter.can (rsi))
907 { 1070 {
908 auth_req_packet *p = (auth_req_packet *) pkt; 1071 auth_req_packet *p = (auth_req_packet *)pkt;
909 1072
910 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);
911 1076
912 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)))
913 { 1079 {
914 if (p->prot_minor != PROTOCOL_MINOR) 1080 if (p->prot_minor != PROTOCOL_MINOR)
915 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."),
916 conf->nodename, (const char *)rsi, 1082 conf->nodename, (const char *)rsi,
917 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1083 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
932 delete octx; 1098 delete octx;
933 1099
934 octx = new crypto_ctx (k, 1); 1100 octx = new crypto_ctx (k, 1);
935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1101 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
936 1102
937 // compatibility code, remove when no longer required
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939
940 conf->protocols = p->protocols; 1103 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features (); 1104 features = p->features & config_packet::get_features ();
942 1105
943 send_auth_response (rsi, p->id, k); 1106 send_auth_response (rsi, p->id, k);
944 1107
… …
946 1109
947 break; 1110 break;
948 } 1111 }
949 } 1112 }
950 else 1113 else
951 slog (L_WARN, _("%s(%s): protocol mismatch"), 1114 slog (L_WARN, _("%s(%s): protocol mismatch."),
952 conf->nodename, (const char *)rsi); 1115 conf->nodename, (const char *)rsi);
953 1116
954 send_reset (rsi); 1117 send_reset (rsi);
955 } 1118 }
956 1119
957 break; 1120 break;
958 1121
959 case vpn_packet::PT_AUTH_RES: 1122 case vpn_packet::PT_AUTH_RES:
960 { 1123 {
961 auth_res_packet *p = (auth_res_packet *) pkt; 1124 auth_res_packet *p = (auth_res_packet *)pkt;
962 1125
963 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1126 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
964 1127
965 if (p->chk_config ()) 1128 if (p->chk_config ())
966 { 1129 {
967 if (p->prot_minor != PROTOCOL_MINOR) 1130 if (p->prot_minor != PROTOCOL_MINOR)
968 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."),
… …
971 1134
972 rsachallenge chg; 1135 rsachallenge chg;
973 1136
974 if (!rsa_cache.find (p->id, chg)) 1137 if (!rsa_cache.find (p->id, chg))
975 { 1138 {
976 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1139 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
977 conf->nodename, (const char *)rsi); 1140 conf->nodename, (const char *)rsi);
978 break; 1141 break;
979 } 1142 }
980 else 1143 else
981 { 1144 {
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1145 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 1146
984 if (!p->hmac_chk (cctx)) 1147 if (!p->hmac_chk (cctx))
985 { 1148 {
986 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"
987 "could be an attack, or just corruption or a synchronization error"), 1150 "could be an attack, or just corruption or a synchronization error."),
988 conf->nodename, (const char *)rsi); 1151 conf->nodename, (const char *)rsi);
989 break; 1152 break;
990 } 1153 }
991 else 1154 else
992 { 1155 {
… …
1003 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
1004 1167
1005 si = rsi; 1168 si = rsi;
1006 protocol = rsi.prot; 1169 protocol = rsi.prot;
1007 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
1008 connection_established (); 1176 connection_established ();
1009 1177
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor);
1013
1014 if (::conf.script_node_up) 1178 if (::conf.script_node_up)
1015 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 }
1016 1184
1017 break; 1185 break;
1018 } 1186 }
1019 else 1187 else
1020 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."),
1021 conf->nodename, (const char *)rsi); 1189 conf->nodename, (const char *)rsi);
1022 } 1190 }
1023 1191
1024 delete cctx; 1192 delete cctx;
1025 } 1193 }
… …
1041 { 1209 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1210 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1211
1044 if (!p->hmac_chk (ictx)) 1212 if (!p->hmac_chk (ictx))
1045 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"
1046 "could be an attack, or just corruption or a synchronization error"), 1214 "could be an attack, or just corruption or a synchronization error."),
1047 conf->nodename, (const char *)rsi); 1215 conf->nodename, (const char *)rsi);
1048 else 1216 else
1049 { 1217 {
1050 u32 seqno; 1218 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1219 tap_packet *d = p->unpack (this, seqno);
1220 int seqclass = iseqno.seqno_classify (seqno);
1052 1221
1053 if (iseqno.recv_ok (seqno)) 1222 if (seqclass == 0) // ok
1054 { 1223 {
1055 vpn->tap->send (d); 1224 vpn->tap->send (d);
1056 1225
1057 if (si != rsi) 1226 if (si != rsi)
1058 { 1227 {
1059 // 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.)
1060 si = rsi; 1230 // {
1061
1062 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1231 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1063 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);
1064 } 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);
1065 } 1260 }
1066 1261
1067 delete d; 1262 delete d;
1068 break; 1263 break;
1069 } 1264 }
… …
1073 break; 1268 break;
1074 1269
1075 case vpn_packet::PT_CONNECT_REQ: 1270 case vpn_packet::PT_CONNECT_REQ:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1271 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1272 {
1078 connect_req_packet *p = (connect_req_packet *) pkt; 1273 connect_req_packet *p = (connect_req_packet *)pkt;
1079 1274
1080 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 ())
1081 connection *c = vpn->conns[p->id - 1];
1082 conf->protocols = p->protocols;
1083
1084 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1085 conf->id, p->id, c->ictx && c->octx);
1086
1087 if (c->ictx && c->octx)
1088 { 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 {
1089 // send connect_info packets to both sides, in case one is 1287 // send connect_info packets to both sides, in case one is
1090 // behind a nat firewall (or both ;) 1288 // behind a nat firewall (or both ;)
1091 c->send_connect_info (conf->id, si, conf->protocols); 1289 c->send_connect_info (conf->id, si, conf->protocols);
1092 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 ();
1093 } 1294 }
1094 else 1295 else
1095 c->establish_connection (); 1296 slog (L_WARN,
1297 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1298 p->id);
1096 } 1299 }
1097 1300
1098 break; 1301 break;
1099 1302
1100 case vpn_packet::PT_CONNECT_INFO: 1303 case vpn_packet::PT_CONNECT_INFO:
1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1304 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1102 { 1305 {
1103 connect_info_packet *p = (connect_info_packet *) pkt; 1306 connect_info_packet *p = (connect_info_packet *)pkt;
1104 1307
1105 assert (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 ())
1106 1309 {
1107 connection *c = vpn->conns[p->id - 1]; 1310 connection *c = vpn->conns[p->id - 1];
1108 1311
1109 c->conf->protocols = p->protocols; 1312 c->conf->protocols = p->protocols;
1110 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));
1111 p->si.upgrade_protocol (protocol, c->conf); 1314 p->si.upgrade_protocol (protocol, c->conf);
1112 1315
1113 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]",
1114 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);
1115 1324
1116 const sockinfo &dsi = forward_si (p->si); 1325 const sockinfo &dsi = forward_si (p->si);
1117 1326
1118 if (dsi.valid ()) 1327 if (dsi.valid ())
1119 c->send_auth_request (dsi, true); 1328 c->send_auth_request (dsi, true);
1329 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);
1333 }
1334 else
1335 slog (L_WARN,
1336 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1337 p->id);
1120 } 1338 }
1121 1339
1122 break; 1340 break;
1123 1341
1124 default: 1342 default:
1125 send_reset (rsi); 1343 send_reset (rsi);
1126 break; 1344 break;
1127 } 1345 }
1128} 1346}
1129 1347
1130void connection::keepalive_cb (time_watcher &w) 1348inline void
1349connection::keepalive_cb (ev::timer &w, int revents)
1131{ 1350{
1132 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)
1133 { 1356 {
1134 reset_connection (); 1357 reset_connection ();
1135 establish_connection (); 1358 establish_connection ();
1136 } 1359 }
1137 else if (NOW < last_activity + ::conf.keepalive)
1138 w.start (last_activity + ::conf.keepalive);
1139 else if (conf->connectmode != conf_node::C_ONDEMAND 1360 else if (conf->connectmode != conf_node::C_ONDEMAND
1140 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1361 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1141 { 1362 {
1363 w.start (3);
1142 send_ping (si); 1364 send_ping (si);
1143 w.start (NOW + 5);
1144 } 1365 }
1145 else if (NOW < last_activity + ::conf.keepalive + 10) 1366 else if (when >= -10)
1146 // hold ondemand connections implicitly a few seconds longer 1367 // hold ondemand connections implicitly a few seconds longer
1147 // should delete octx, though, or something like that ;) 1368 // should delete octx, though, or something like that ;)
1148 w.start (last_activity + ::conf.keepalive + 10); 1369 w.start (when + 10);
1149 else 1370 else
1150 reset_connection (); 1371 reset_connection ();
1151} 1372}
1152 1373
1374void
1153void connection::send_connect_request (int id) 1375connection::send_connect_request (int id)
1154{ 1376{
1155 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);
1156 1378
1157 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);
1158 p->hmac_set (octx); 1382 p->hmac_set (octx);
1159 send_vpn_packet (p, si); 1383 send_vpn_packet (p, si);
1160 1384
1161 delete p; 1385 delete p;
1162} 1386}
1163 1387
1164void connection::script_node () 1388void
1389connection::script_init_env (const char *ext)
1165{ 1390{
1166 vpn->script_if_up ();
1167
1168 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;
1169 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);
1170 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1407 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1171 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1408 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1172 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1409 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1173} 1410}
1174 1411
1412inline const char *
1175const char *connection::script_node_up () 1413connection::script_node_up ()
1176{ 1414{
1177 script_node (); 1415 script_init_connect_env ();
1178 1416
1179 putenv ("STATE=up"); 1417 putenv ((char *)"STATE=up");
1180 1418
1419 char *filename;
1420 asprintf (&filename,
1421 "%s/%s",
1422 confbase,
1181 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1423 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1182}
1183 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 *
1184const char *connection::script_node_down () 1445connection::script_node_down ()
1185{ 1446{
1186 script_node (); 1447 script_init_connect_env ();
1187 1448
1188 putenv ("STATE=down"); 1449 putenv ((char *)"STATE=down");
1189 1450
1190 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1451 char *filename;
1191} 1452 asprintf (&filename,
1453 "%s/%s",
1454 confbase,
1455 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1192 1456
1457 return filename;
1458}
1459
1193connection::connection(struct vpn *vpn_) 1460connection::connection (struct vpn *vpn, conf_node *conf)
1194: vpn(vpn_) 1461: vpn(vpn), conf(conf),
1195, rekey (this, &connection::rekey_cb) 1462#if ENABLE_DNS
1196, keepalive (this, &connection::keepalive_cb) 1463 dns (0),
1464#endif
1465 data_queue(conf->max_ttl, conf->max_queue + 1),
1466 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1467{
1468 rekey .set<connection, &connection::rekey_cb > (this);
1469 keepalive .set<connection, &connection::keepalive_cb > (this);
1197, establish_connection (this, &connection::establish_connection_cb) 1470 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1198{ 1471
1472 last_establish_attempt = 0.;
1199 octx = ictx = 0; 1473 octx = ictx = 0;
1200 retry_cnt = 0;
1201 1474
1202 connectmode = conf_node::C_ALWAYS; // initial setting 1475 connectmode = conf->connectmode;
1476
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
1203 reset_connection (); 1481 reset_connection ();
1204} 1482}
1205 1483
1206connection::~connection () 1484connection::~connection ()
1207{ 1485{
1208 shutdown (); 1486 shutdown ();
1209} 1487}
1210 1488
1489void
1211void connection_init () 1490connection_init ()
1212{ 1491{
1213 auth_rate_limiter.clear (); 1492 auth_rate_limiter.clear ();
1214 reset_rate_limiter.clear (); 1493 reset_rate_limiter.clear ();
1215} 1494}
1216 1495

Diff Legend

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