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

Diff Legend

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