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.23 by pcg, Wed Oct 22 00:42:53 2003 UTC vs.
Revision 1.62 by pcg, Sat Dec 1 23:35:31 2007 UTC

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

Diff Legend

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