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

Diff Legend

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