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

Diff Legend

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