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.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.93 by root, Tue Feb 15 13:31:23 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines