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.18 by pcg, Sat Oct 4 13:20:07 2003 UTC vs.
Revision 1.63 by pcg, Sun Dec 2 00:45:41 2007 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 10 (at your option) any later version.
8 11
9 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,
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12 GNU General Public License for more details. 15 GNU General Public License for more details.
13 16
14 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
15 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
17*/ 20*/
18 21
19#include "config.h" 22#include "config.h"
20
21extern "C" {
22# include "lzf/lzf.h"
23}
24 23
25#include <list> 24#include <list>
26 25
27#include <openssl/rand.h> 26#include <openssl/rand.h>
28#include <openssl/evp.h> 27#include <openssl/evp.h>
29#include <openssl/rsa.h> 28#include <openssl/rsa.h>
30#include <openssl/err.h> 29#include <openssl/err.h>
31
32#include "gettext.h"
33 30
34#include "conf.h" 31#include "conf.h"
35#include "slog.h" 32#include "slog.h"
36#include "device.h" 33#include "device.h"
37#include "vpn.h" 34#include "vpn.h"
38#include "connection.h" 35#include "connection.h"
39 36
37#include "netcompat.h"
38
40#if !HAVE_RAND_PSEUDO_BYTES 39#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 40# define RAND_pseudo_bytes RAND_bytes
42#endif 41#endif
43 42
44#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
45 44
45#define ULTRA_FAST 1
46#define HLOG 15
47#include "lzf/lzf.h"
48#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c"
50
46struct crypto_ctx 51struct crypto_ctx
47{ 52{
48 EVP_CIPHER_CTX cctx; 53 EVP_CIPHER_CTX cctx;
49 HMAC_CTX hctx; 54 HMAC_CTX hctx;
50 55
… …
53}; 58};
54 59
55crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56{ 61{
57 EVP_CIPHER_CTX_init (&cctx); 62 EVP_CIPHER_CTX_init (&cctx);
58 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 63 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59 HMAC_CTX_init (&hctx); 64 HMAC_CTX_init (&hctx);
60 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 65 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61} 66}
62 67
63crypto_ctx::~crypto_ctx () 68crypto_ctx::~crypto_ctx ()
64{ 69{
65 EVP_CIPHER_CTX_cleanup (&cctx); 70 require (EVP_CIPHER_CTX_cleanup (&cctx));
66 HMAC_CTX_cleanup (&hctx); 71 HMAC_CTX_cleanup (&hctx);
67} 72}
68 73
69static void 74static void
70rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71{ 76{
72 EVP_MD_CTX ctx; 77 EVP_MD_CTX ctx;
73 78
74 EVP_MD_CTX_init (&ctx); 79 EVP_MD_CTX_init (&ctx);
75 EVP_DigestInit (&ctx, RSA_HASH); 80 require (EVP_DigestInit (&ctx, RSA_HASH));
76 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77 EVP_DigestUpdate(&ctx, &id, sizeof id); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
80} 85}
81 86
82struct rsa_entry { 87struct rsa_entry
88{
83 tstamp expire; 89 tstamp expire;
84 rsaid id; 90 rsaid id;
85 rsachallenge chg; 91 rsachallenge chg;
86}; 92};
87 93
88struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
89{ 95{
90 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
91 97
92 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
93 { 99 {
94 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
95 { 101 {
96 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
97 { 103 {
98 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
99 105
100 erase (i); 106 erase (i);
101 return true; 107 return true;
102 } 108 }
103 } 109 }
104 110
105 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
106 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
107 113
108 return false; 114 return false;
109 } 115 }
110 116
111 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
112 { 118 {
113 rsa_entry e; 119 rsa_entry e;
114 120
115 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
116 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
117 123
118 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
119 e.id = id; 125 e.id = id;
120 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
121 127
122 push_back (e); 128 push_back (e);
123 129
124 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
125 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
126 } 132 }
127 133
128 rsa_cache () 134 rsa_cache ()
129 : cleaner (this, &rsa_cache::cleaner_cb) 135 : cleaner (this, &rsa_cache::cleaner_cb)
130 { } 136 {
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
131 139
132} rsa_cache; 140} rsa_cache;
133 141
134void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
135{ 143{
136 if (empty ()) 144 if (empty ())
137 w.at = TSTAMP_CANCEL; 145 w.stop ();
138 else 146 else
139 { 147 {
140 w.at = NOW + RSA_TTL;
141
142 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
144 i = erase (i); 150 i = erase (i);
145 else 151 else
146 ++i; 152 ++i;
147 } 153 }
148} 154}
… …
186{ 192{
187 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
188 delete queue[i]; 194 delete queue[i];
189} 195}
190 196
191struct net_rateinfo { 197struct net_rateinfo
198{
192 u32 host; 199 u32 host;
193 double pcnt, diff; 200 double pcnt, diff;
194 tstamp last; 201 tstamp last;
195}; 202};
196 203
197// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
198// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
199// but low on resources. 206// but low on resources.
200struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
201{ 208{
202 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
205 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
206 213
207 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 215 bool can (u32 host);
209}; 216};
210 217
… …
215 iterator i; 222 iterator i;
216 223
217 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
218 if (i->host == host) 225 if (i->host == host)
219 break; 226 break;
220 else if (i->last < NOW - EXPIRE) 227 else if (i->last < ev_now () - NRL_EXPIRE)
221 i = erase (i); 228 i = erase (i);
222 else 229 else
223 i++; 230 i++;
224 231
225 if (i == end ()) 232 if (i == end ())
226 { 233 {
227 net_rateinfo ri; 234 net_rateinfo ri;
228 235
229 ri.host = host; 236 ri.host = host;
230 ri.pcnt = 1.; 237 ri.pcnt = 1.;
231 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
232 ri.last = NOW; 239 ri.last = ev_now ();
233 240
234 push_front (ri); 241 push_front (ri);
235 242
236 return true; 243 return true;
237 } 244 }
238 else 245 else
239 { 246 {
240 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
241 erase (i); 248 erase (i);
242 249
243 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
244 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
245 252
246 ri.last = NOW; 253 ri.last = ev_now ();
247 254
248 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
249 256
250 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
251 258
252 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
253 { 260 {
254 ri.pcnt = 1.; 261 ri.pcnt = 1.;
255 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
256 } 263 }
257 else if (send) 264 else if (send)
258 ri.pcnt++; 265 ri.pcnt++;
259 266
260 push_front (ri); 267 push_front (ri);
… …
307} 314}
308 315
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 318
312struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
313 { 320 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 322
316 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
317 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
330 int outl = 0, outl2; 337 int outl = 0, outl2;
331 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
332 339
333#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
334 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
335 u32 cl;
336 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
337 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
338 if (cl) 347 if (cl)
339 { 348 {
340 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
341 d = cdata; 350 d = cdata;
342 l = cl + 2; 351 l = cl + 2;
343 352
344 d[0] = cl >> 8; 353 d[0] = cl >> 8;
345 d[1] = cl; 354 d[1] = cl;
355 }
346 } 356 }
347#endif 357#endif
348 358
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 360
351 struct { 361 struct {
352#if RAND_SIZE 362#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
354#endif 364#endif
… …
358 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 369#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 371#endif
362 372
363 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 376 outl += outl2;
367 377
368 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 380 (unsigned char *) d, l));
371 outl += outl2; 381 outl += outl2;
372 382
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 384 outl += outl2;
375 385
376 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
377 387
378 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 397 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
389 u8 *d; 399 u8 *d;
390 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
391 401
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 403
394#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
396 406
397 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
399 else 409 else
400#endif 410#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
402 412
403 /* this overwrites part of the src mac, but we fix that later */ 413 /* this overwrites part of the src mac, but we fix that later */
404 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 415 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 417 outl += outl2;
408 418
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 420 outl += outl2;
411 421
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 423
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
443{ 453{
444 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
445 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
446 // hmacs simply will not work. 456 // hmacs simply will not work.
447 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
448 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
449 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
450
451 const u8 curflags () const
452 {
453 return 0x80
454 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
455 }
456 460
457 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
458 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
475#endif
476 return f;
477 }
459}; 478};
460 479
461void config_packet::setup (ptype type, int dst) 480void config_packet::setup (ptype type, int dst)
462{ 481{
463 prot_major = PROTOCOL_MAJOR; 482 prot_major = PROTOCOL_MAJOR;
464 prot_minor = PROTOCOL_MINOR; 483 prot_minor = PROTOCOL_MINOR;
465 randsize = RAND_SIZE; 484 randsize = RAND_SIZE;
466 hmaclen = HMACLENGTH; 485 hmaclen = HMACLENGTH;
467 flags = curflags (); 486 flags = 0;
468 challengelen = sizeof (rsachallenge); 487 challengelen = sizeof (rsachallenge);
488 features = get_features ();
469 489
470 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
472 hmac_nid = htonl (EVP_MD_type (DIGEST)); 492 hmac_nid = htonl (EVP_MD_type (DIGEST));
473 493
… …
476} 496}
477 497
478bool config_packet::chk_config () const 498bool config_packet::chk_config () const
479{ 499{
480 if (prot_major != PROTOCOL_MAJOR) 500 if (prot_major != PROTOCOL_MAJOR)
481 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 501 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 else if (randsize != RAND_SIZE) 502 else if (randsize != RAND_SIZE)
483 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 503 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
484 else if (hmaclen != HMACLENGTH) 504 else if (hmaclen != HMACLENGTH)
485 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 505 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
486 else if (flags != curflags ())
487 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
488 else if (challengelen != sizeof (rsachallenge)) 506 else if (challengelen != sizeof (rsachallenge))
489 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 507 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
490 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 508 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
491 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 509 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
492 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
493 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 511 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
494 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 512 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
495 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 513 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
496 else 514 else
497 return true; 515 return true;
498 516
499 return false; 517 return false;
500} 518}
501 519
502struct auth_req_packet : config_packet 520struct auth_req_packet : config_packet
503{ 521{
504 char magic[8]; 522 char magic[8];
505 u8 initiate; // false if this is just an automatic reply 523 u8 initiate; // false if this is just an automatic reply
506 u8 protocols; // supported protocols (will get patches on forward) 524 u8 protocols; // supported protocols (will be patched on forward)
507 u8 pad2, pad3; 525 u8 pad2, pad3;
508 rsaid id; 526 rsaid id;
509 rsaencrdata encr; 527 rsaencrdata encr;
510 528
511 auth_req_packet (int dst, bool initiate_, u8 protocols_) 529 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
568///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
569 587
570void 588void
571connection::connection_established () 589connection::connection_established ()
572{ 590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
573 if (ictx && octx) 593 if (ictx && octx)
574 { 594 {
575 connectmode = conf->connectmode; 595 connectmode = conf->connectmode;
576 596
577 rekey.start (NOW + ::conf.rekey); 597 // make sure rekeying timeouts are slightly asymmetric
598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
599 rekey.start (rekey_interval, rekey_interval);
578 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
579 601
580 // send queued packets 602 // send queued packets
581 if (ictx && octx) 603 if (ictx && octx)
582 { 604 {
583 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
594 } 616 }
595 } 617 }
596 else 618 else
597 { 619 {
598 retry_cnt = 0; 620 retry_cnt = 0;
599 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
600 keepalive.reset (); 622 keepalive.stop ();
601 rekey.reset (); 623 rekey.stop ();
602 } 624 }
603} 625}
604 626
605void 627void
606connection::reset_si () 628connection::reset_si ()
… …
608 protocol = best_protocol (THISNODE->protocols & conf->protocols); 630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
609 631
610 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
611 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
612 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
642 protocol = 0;
643 }
613 644
614 si.set (conf, protocol); 645 si.set (conf, protocol);
615} 646}
616 647
617// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
… …
622 { 653 {
623 connection *r = vpn->find_router (); 654 connection *r = vpn->find_router ();
624 655
625 if (r) 656 if (r)
626 { 657 {
627 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
628 conf->nodename, r->conf->nodename); 659 conf->nodename, r->conf->nodename, (const char *)r->si);
629 return r->si; 660 return r->si;
630 } 661 }
631 else 662 else
632 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
633 conf->nodename); 664 conf->nodename);
… …
672connection::send_auth_request (const sockinfo &si, bool initiate) 703connection::send_auth_request (const sockinfo &si, bool initiate)
673{ 704{
674 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 705 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
675 706
676 rsachallenge chg; 707 rsachallenge chg;
677
678 rsa_cache.gen (pkt->id, chg); 708 rsa_cache.gen (pkt->id, chg);
679 709 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
680 if (0 > RSA_public_encrypt (sizeof chg,
681 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
682 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
683 fatal ("RSA_public_encrypt error");
684 710
685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 711 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
686 712
687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 713 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
688 714
… …
708} 734}
709 735
710void 736void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 738{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
714 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
715 741
716 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
717 743
718 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
720 746
721 delete r; 747 delete r;
722} 748}
723 749
724void 750void
725connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
726{ 752{
727 if (ictx || conf == THISNODE 753 if (!ictx
754 && conf != THISNODE
728 || connectmode == conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
729 || connectmode == conf_node::C_DISABLED) 756 && connectmode != conf_node::C_DISABLED
730 w.at = TSTAMP_CANCEL; 757 && !w.is_active ())
731 else if (w.at <= NOW)
732 { 758 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
734 760 ? (retry_cnt & 3) + 1
735 if (retry_int < 3600 * 8) 761 : 1 << (retry_cnt >> 2));
736 retry_cnt++;
737
738 w.at = NOW + retry_int;
739 762
740 reset_si (); 763 reset_si ();
741 764
765 bool slow = si.prot & PROT_SLOW;
766
742 if (si.prot && !si.host) 767 if (si.prot && !si.host)
768 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1);
743 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
744 else 774 else
745 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
746 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
747 781
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 783 {
750 if (retry_cnt < 4) 784 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
752 else 786 else
753 send_ping (dsi, 0); 787 send_ping (dsi, 0);
754 } 788 }
755 } 789 }
790
791 retry_int *= slow ? 8. : 0.7;
792
793 if (retry_int < conf->max_retry)
794 retry_cnt++;
795 else
796 retry_int = conf->max_retry;
797
798 w.start (retry_int);
756 } 799 }
757} 800}
758 801
759void 802void
760connection::reset_connection () 803connection::reset_connection ()
… …
763 { 806 {
764 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
766 809
767 if (::conf.script_node_down) 810 if (::conf.script_node_down)
768 run_script (run_script_cb (this, &connection::script_node_down), false); 811 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
812 slog (L_WARN, _("node-down command execution failed, continuing."));
769 } 813 }
770 814
771 delete ictx; ictx = 0; 815 delete ictx; ictx = 0;
772 delete octx; octx = 0; 816 delete octx; octx = 0;
817#if ENABLE_DNS
818 dnsv4_reset_connection ();
819#endif
773 820
774 si.host= 0; 821 si.host = 0;
775 822
776 last_activity = 0; 823 last_activity = 0;
777 retry_cnt = 0; 824 retry_cnt = 0;
778 825
779 rekey.reset (); 826 rekey.stop ();
780 keepalive.reset (); 827 keepalive.stop ();
781 establish_connection.reset (); 828 establish_connection.stop ();
782} 829}
783 830
784void 831void
785connection::shutdown () 832connection::shutdown ()
786{ 833{
… …
789 836
790 reset_connection (); 837 reset_connection ();
791} 838}
792 839
793void 840void
794connection::rekey_cb (time_watcher &w) 841connection::rekey_cb (ev::timer &w, int revents)
795{ 842{
796 w.at = TSTAMP_CANCEL;
797
798 reset_connection (); 843 reset_connection ();
799 establish_connection (); 844 establish_connection ();
800} 845}
801 846
802void 847void
803connection::send_data_packet (tap_packet *pkt, bool broadcast) 848connection::send_data_packet (tap_packet *pkt)
804{ 849{
805 vpndata_packet *p = new vpndata_packet; 850 vpndata_packet *p = new vpndata_packet;
806 int tos = 0; 851 int tos = 0;
807 852
808 // I am not hilarious about peeking into packets, but so be it. 853 // I am not hilarious about peeking into packets, but so be it.
809 if (conf->inherit_tos 854 if (conf->inherit_tos && pkt->is_ipv4 ())
810 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
811 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
812 tos = (*pkt)[15] & IPTOS_TOS_MASK; 855 tos = (*pkt)[15] & IPTOS_TOS_MASK;
813 856
814 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 857 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815 send_vpn_packet (p, si, tos); 858 send_vpn_packet (p, si, tos);
816 859
817 delete p; 860 delete p;
818 861
819 if (oseqno > MAX_SEQNO) 862 if (oseqno > MAX_SEQNO)
820 rekey (); 863 rekey ();
821} 864}
822 865
823void 866void
824connection::inject_data_packet (tap_packet *pkt, bool broadcast) 867connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
825{ 868{
826 if (ictx && octx) 869 if (ictx && octx)
827 send_data_packet (pkt, broadcast); 870 send_data_packet (pkt);
828 else 871 else
829 { 872 {
830 if (!broadcast)//DDDD 873 if (!broadcast)
831 data_queue.put (new tap_packet (*pkt)); 874 data_queue.put (new tap_packet (*pkt));
832 875
833 establish_connection (); 876 establish_connection ();
834 } 877 }
835} 878}
… …
838{ 881{
839 if (ictx && octx) 882 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos); 883 send_vpn_packet (pkt, si, tos);
841 else 884 else
842 { 885 {
843 vpn_queue.put (new vpn_packet (*pkt)); 886 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
844 887
845 establish_connection (); 888 establish_connection ();
846 } 889 }
847} 890}
848 891
849void 892void
850connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 893connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
851{ 894{
852 last_activity = NOW; 895 last_activity = ev_now ();
853 896
854 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 897 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
855 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 898 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
899
900 if (connectmode == conf_node::C_DISABLED)
901 return;
856 902
857 switch (pkt->typ ()) 903 switch (pkt->typ ())
858 { 904 {
859 case vpn_packet::PT_PING: 905 case vpn_packet::PT_PING:
860 // we send pings instead of auth packets after some retries, 906 // we send pings instead of auth packets after some retries,
… …
907 if (p->initiate) 953 if (p->initiate)
908 send_auth_request (rsi, false); 954 send_auth_request (rsi, false);
909 955
910 rsachallenge k; 956 rsachallenge k;
911 957
912 if (0 > RSA_private_decrypt (sizeof (p->encr), 958 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913 (unsigned char *)&p->encr, (unsigned char *)&k, 959 {
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 960 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 961 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
962 break;
963 }
917 else 964 else
918 { 965 {
919 delete octx; 966 delete octx;
920 967
921 octx = new crypto_ctx (k, 1); 968 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 969 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 970
924 conf->protocols = p->protocols; 971 conf->protocols = p->protocols;
972 features = p->features & config_packet::get_features ();
925 973
926 send_auth_response (rsi, p->id, k); 974 send_auth_response (rsi, p->id, k);
927 975
928 connection_established (); 976 connection_established ();
929 977
… …
965 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1013 crypto_ctx *cctx = new crypto_ctx (chg, 0);
966 1014
967 if (!p->hmac_chk (cctx)) 1015 if (!p->hmac_chk (cctx))
968 { 1016 {
969 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1017 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
970 "could be an attack, or just corruption or an synchronization error"), 1018 "could be an attack, or just corruption or a synchronization error"),
971 conf->nodename, (const char *)rsi); 1019 conf->nodename, (const char *)rsi);
972 break; 1020 break;
973 } 1021 }
974 else 1022 else
975 { 1023 {
… …
993 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1041 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
994 conf->nodename, (const char *)rsi, 1042 conf->nodename, (const char *)rsi,
995 p->prot_major, p->prot_minor); 1043 p->prot_major, p->prot_minor);
996 1044
997 if (::conf.script_node_up) 1045 if (::conf.script_node_up)
998 run_script (run_script_cb (this, &connection::script_node_up), false); 1046 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1047 slog (L_WARN, _("node-up command execution failed, continuing."));
999 1048
1000 break; 1049 break;
1001 } 1050 }
1002 else 1051 else
1003 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1052 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1024 { 1073 {
1025 vpndata_packet *p = (vpndata_packet *)pkt; 1074 vpndata_packet *p = (vpndata_packet *)pkt;
1026 1075
1027 if (!p->hmac_chk (ictx)) 1076 if (!p->hmac_chk (ictx))
1028 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1077 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1029 "could be an attack, or just corruption or an synchronization error"), 1078 "could be an attack, or just corruption or a synchronization error"),
1030 conf->nodename, (const char *)rsi); 1079 conf->nodename, (const char *)rsi);
1031 else 1080 else
1032 { 1081 {
1033 u32 seqno; 1082 u32 seqno;
1034 tap_packet *d = p->unpack (this, seqno); 1083 tap_packet *d = p->unpack (this, seqno);
1035 1084
1036 if (iseqno.recv_ok (seqno)) 1085 if (iseqno.recv_ok (seqno))
1037 { 1086 {
1038 vpn->tap->send (d); 1087 vpn->tap->send (d);
1039 1088
1040 if (p->dst () == 0) // re-broadcast
1041 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1042 {
1043 connection *c = *i;
1044
1045 if (c->conf != THISNODE && c->conf != conf)
1046 c->inject_data_packet (d);
1047 }
1048
1049 if (si != rsi) 1089 if (si != rsi)
1050 { 1090 {
1051 // fast re-sync on connection changes, useful especially for tcp/ip 1091 // fast re-sync on source address changes, useful especially for tcp/ip
1052 si = rsi; 1092 si = rsi;
1053 1093
1054 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1094 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1055 conf->nodename, (const char *)si, (const char *)rsi); 1095 conf->nodename, (const char *)si, (const char *)rsi);
1056 } 1096 }
1057
1058 delete d;
1059
1060 break;
1061 } 1097 }
1098
1099 delete d;
1100 break;
1062 } 1101 }
1063 } 1102 }
1064 1103
1065 send_reset (rsi); 1104 send_reset (rsi);
1066 break; 1105 break;
… …
1068 case vpn_packet::PT_CONNECT_REQ: 1107 case vpn_packet::PT_CONNECT_REQ:
1069 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1070 { 1109 {
1071 connect_req_packet *p = (connect_req_packet *) pkt; 1110 connect_req_packet *p = (connect_req_packet *) pkt;
1072 1111
1073 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ())
1074 connection *c = vpn->conns[p->id - 1];
1075 conf->protocols = p->protocols;
1076
1077 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1078 conf->id, p->id, c->ictx && c->octx);
1079
1080 if (c->ictx && c->octx)
1081 { 1113 {
1114 connection *c = vpn->conns[p->id - 1];
1115 conf->protocols = p->protocols;
1116
1117 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1118 conf->id, p->id, c->ictx && c->octx);
1119
1120 if (c->ictx && c->octx)
1121 {
1082 // send connect_info packets to both sides, in case one is 1122 // send connect_info packets to both sides, in case one is
1083 // behind a nat firewall (or both ;) 1123 // behind a nat firewall (or both ;)
1084 c->send_connect_info (conf->id, si, conf->protocols); 1124 c->send_connect_info (conf->id, si, conf->protocols);
1085 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1125 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1126 }
1127 else
1128 c->establish_connection ();
1086 } 1129 }
1087 else 1130 else
1088 c->establish_connection (); 1131 slog (L_WARN,
1132 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1133 p->id);
1089 } 1134 }
1090 1135
1091 break; 1136 break;
1092 1137
1093 case vpn_packet::PT_CONNECT_INFO: 1138 case vpn_packet::PT_CONNECT_INFO:
1094 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1139 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1095 { 1140 {
1096 connect_info_packet *p = (connect_info_packet *) pkt; 1141 connect_info_packet *p = (connect_info_packet *)pkt;
1097 1142
1098 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1143 if (p->id > 0 && p->id <= vpn->conns.size ())
1099 1144 {
1100 connection *c = vpn->conns[p->id - 1]; 1145 connection *c = vpn->conns[p->id - 1];
1101 1146
1102 c->conf->protocols = p->protocols; 1147 c->conf->protocols = p->protocols;
1103 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1148 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1104 p->si.upgrade_protocol (protocol, c->conf); 1149 p->si.upgrade_protocol (protocol, c->conf);
1105 1150
1106 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1151 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1107 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1152 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1108 1153
1109 const sockinfo &dsi = forward_si (p->si); 1154 const sockinfo &dsi = forward_si (p->si);
1110 1155
1111 if (dsi.valid ()) 1156 if (dsi.valid ())
1112 c->send_auth_request (dsi, true); 1157 c->send_auth_request (dsi, true);
1158 }
1159 else
1160 slog (L_WARN,
1161 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1162 p->id);
1113 } 1163 }
1114 1164
1115 break; 1165 break;
1116 1166
1117 default: 1167 default:
1118 send_reset (rsi); 1168 send_reset (rsi);
1119 break; 1169 break;
1120 } 1170 }
1121} 1171}
1122 1172
1123void connection::keepalive_cb (time_watcher &w) 1173void connection::keepalive_cb (ev::timer &w, int revents)
1124{ 1174{
1125 if (NOW >= last_activity + ::conf.keepalive + 30) 1175 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1126 { 1176 {
1127 reset_connection (); 1177 reset_connection ();
1128 establish_connection (); 1178 establish_connection ();
1129 } 1179 }
1130 else if (NOW < last_activity + ::conf.keepalive) 1180 else if (ev_now () < last_activity + ::conf.keepalive)
1131 w.at = last_activity + ::conf.keepalive; 1181 w.start (last_activity + ::conf.keepalive - ev::now ());
1132 else if (conf->connectmode != conf_node::C_ONDEMAND 1182 else if (conf->connectmode != conf_node::C_ONDEMAND
1133 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1183 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1134 { 1184 {
1135 send_ping (si); 1185 send_ping (si);
1136 w.at = NOW + 5; 1186 w.start (5);
1137 } 1187 }
1138 else if (NOW < last_activity + ::conf.keepalive + 10) 1188 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1139 // hold ondemand connections implicitly a few seconds longer 1189 // hold ondemand connections implicitly a few seconds longer
1140 // should delete octx, though, or something like that ;) 1190 // should delete octx, though, or something like that ;)
1141 w.at = last_activity + ::conf.keepalive + 10; 1191 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1142 else 1192 else
1143 reset_connection (); 1193 reset_connection ();
1144} 1194}
1145 1195
1146void connection::send_connect_request (int id) 1196void connection::send_connect_request (int id)
… …
1152 send_vpn_packet (p, si); 1202 send_vpn_packet (p, si);
1153 1203
1154 delete p; 1204 delete p;
1155} 1205}
1156 1206
1207void connection::script_init_env (const char *ext)
1208{
1209 char *env;
1210 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1211 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1212 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1213 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1214 conf->id & 0xff); putenv (env);
1215}
1216
1157void connection::script_node () 1217void connection::script_init_connect_env ()
1158{ 1218{
1159 vpn->script_if_up (); 1219 vpn->script_init_env ();
1160 1220
1161 char *env; 1221 char *env;
1162 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1222 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1163 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1223 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1164 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1224 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1165 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1225 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1166} 1226}
1167 1227
1168const char *connection::script_node_up () 1228const char *connection::script_node_up ()
1169{ 1229{
1170 script_node (); 1230 script_init_connect_env ();
1171 1231
1172 putenv ("STATE=up"); 1232 putenv ((char *)"STATE=up");
1173 1233
1234 char *filename;
1235 asprintf (&filename,
1236 "%s/%s",
1237 confbase,
1174 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1238 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1239
1240 return filename;
1175} 1241}
1176 1242
1177const char *connection::script_node_down () 1243const char *connection::script_node_down ()
1178{ 1244{
1179 script_node (); 1245 script_init_connect_env ();
1180 1246
1181 putenv ("STATE=down"); 1247 putenv ((char *)"STATE=down");
1182 1248
1183 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1249 char *filename;
1184} 1250 asprintf (&filename,
1251 "%s/%s",
1252 confbase,
1253 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1185 1254
1255 return filename;
1256}
1257
1186connection::connection(struct vpn *vpn_) 1258connection::connection (struct vpn *vpn, conf_node *conf)
1187: vpn(vpn_) 1259: vpn(vpn), conf(conf)
1188, rekey (this, &connection::rekey_cb) 1260, rekey (this, &connection::rekey_cb)
1189, keepalive (this, &connection::keepalive_cb) 1261, keepalive (this, &connection::keepalive_cb)
1190, establish_connection (this, &connection::establish_connection_cb) 1262, establish_connection (this, &connection::establish_connection_cb)
1263#if ENABLE_DNS
1264, dns (0)
1265#endif
1191{ 1266{
1192 octx = ictx = 0; 1267 octx = ictx = 0;
1193 retry_cnt = 0; 1268 retry_cnt = 0;
1194 1269
1270 if (!conf->protocols) // make sure some protocol is enabled
1271 conf->protocols = PROT_UDPv4;
1272
1195 connectmode = conf_node::C_ALWAYS; // initial setting 1273 connectmode = conf_node::C_ALWAYS; // initial setting
1196 reset_connection (); 1274 reset_connection ();
1197} 1275}
1198 1276
1199connection::~connection () 1277connection::~connection ()

Diff Legend

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