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.7 by pcg, Sat Apr 5 17:54:22 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. / 90.; // allow bursts 205# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 20.; // 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
208# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
205 209
206 bool can (const sockinfo &si) { return can((u32)si.host); } 210 bool can (const sockinfo &si) { return can((u32)si.host); }
207 bool can (u32 host); 211 bool can (u32 host);
208}; 212};
209 213
210net_rate_limiter auth_rate_limiter, reset_rate_limiter; 214net_rate_limiter auth_rate_limiter, reset_rate_limiter;
211 215
… …
214 iterator i; 218 iterator i;
215 219
216 for (i = begin (); i != end (); ) 220 for (i = begin (); i != end (); )
217 if (i->host == host) 221 if (i->host == host)
218 break; 222 break;
219 else if (i->last < NOW - EXPIRE) 223 else if (i->last < NOW - NRL_EXPIRE)
220 i = erase (i); 224 i = erase (i);
221 else 225 else
222 i++; 226 i++;
223 227
224 if (i == end ()) 228 if (i == end ())
225 { 229 {
226 net_rateinfo ri; 230 net_rateinfo ri;
227 231
228 ri.host = host; 232 ri.host = host;
229 ri.pcnt = 1.; 233 ri.pcnt = 1.;
230 ri.diff = CUTOFF * (1. / (1. - ALPHA)); 234 ri.diff = NRL_MAXDIF;
231 ri.last = NOW; 235 ri.last = NOW;
232 236
233 push_front (ri); 237 push_front (ri);
234 238
235 return true; 239 return true;
… …
237 else 241 else
238 { 242 {
239 net_rateinfo ri (*i); 243 net_rateinfo ri (*i);
240 erase (i); 244 erase (i);
241 245
242 ri.pcnt = ri.pcnt * ALPHA; 246 ri.pcnt = ri.pcnt * NRL_ALPHA;
243 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 247 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
244 248
245 ri.last = NOW; 249 ri.last = NOW;
246 250
251 double dif = ri.diff / ri.pcnt;
252
247 bool send = ri.diff / ri.pcnt > CUTOFF; 253 bool send = dif > NRL_CUTOFF;
248 254
255 if (dif > NRL_MAXDIF)
256 {
257 ri.pcnt = 1.;
258 ri.diff = NRL_MAXDIF;
259 }
249 if (send) 260 else if (send)
250 ri.pcnt++; 261 ri.pcnt++;
251 262
252 push_front (ri); 263 push_front (ri);
253 264
254 return send; 265 return send;
… …
299} 310}
300 311
301#define MAXVPNDATA (MAX_MTU - 6 - 6) 312#define MAXVPNDATA (MAX_MTU - 6 - 6)
302#define DATAHDR (sizeof (u32) + RAND_SIZE) 313#define DATAHDR (sizeof (u32) + RAND_SIZE)
303 314
304struct vpndata_packet:vpn_packet 315struct vpndata_packet : vpn_packet
305 { 316 {
306 u8 data[MAXVPNDATA + DATAHDR]; // seqno 317 u8 data[MAXVPNDATA + DATAHDR]; // seqno
307 318
308 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);
309 tap_packet *unpack (connection *conn, u32 &seqno); 320 tap_packet *unpack (connection *conn, u32 &seqno);
… …
322 int outl = 0, outl2; 333 int outl = 0, outl2;
323 ptype type = PT_DATA_UNCOMPRESSED; 334 ptype type = PT_DATA_UNCOMPRESSED;
324 335
325#if ENABLE_COMPRESSION 336#if ENABLE_COMPRESSION
326 u8 cdata[MAX_MTU]; 337 u8 cdata[MAX_MTU];
327 u32 cl;
328 338
339 if (conn->features & ENABLE_COMPRESSION)
340 {
329 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 341 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
342
330 if (cl) 343 if (cl)
331 { 344 {
332 type = PT_DATA_COMPRESSED; 345 type = PT_DATA_COMPRESSED;
333 d = cdata; 346 d = cdata;
334 l = cl + 2; 347 l = cl + 2;
335 348
336 d[0] = cl >> 8; 349 d[0] = cl >> 8;
337 d[1] = cl; 350 d[1] = cl;
351 }
338 } 352 }
339#endif 353#endif
340 354
341 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 355 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
342 356
343 struct { 357 struct {
344#if RAND_SIZE 358#if RAND_SIZE
345 u8 rnd[RAND_SIZE]; 359 u8 rnd[RAND_SIZE];
346#endif 360#endif
… …
350 datahdr.seqno = ntohl (seqno); 364 datahdr.seqno = ntohl (seqno);
351#if RAND_SIZE 365#if RAND_SIZE
352 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 366 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
353#endif 367#endif
354 368
355 EVP_EncryptUpdate (cctx, 369 require (EVP_EncryptUpdate (cctx,
356 (unsigned char *) data + outl, &outl2, 370 (unsigned char *) data + outl, &outl2,
357 (unsigned char *) &datahdr, DATAHDR); 371 (unsigned char *) &datahdr, DATAHDR));
358 outl += outl2; 372 outl += outl2;
359 373
360 EVP_EncryptUpdate (cctx, 374 require (EVP_EncryptUpdate (cctx,
361 (unsigned char *) data + outl, &outl2, 375 (unsigned char *) data + outl, &outl2,
362 (unsigned char *) d, l); 376 (unsigned char *) d, l));
363 outl += outl2; 377 outl += outl2;
364 378
365 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 379 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
366 outl += outl2; 380 outl += outl2;
367 381
368 len = outl + data_hdr_size (); 382 len = outl + data_hdr_size ();
369 383
370 set_hdr (type, dst); 384 set_hdr (type, dst);
… …
379 int outl = 0, outl2; 393 int outl = 0, outl2;
380 tap_packet *p = new tap_packet; 394 tap_packet *p = new tap_packet;
381 u8 *d; 395 u8 *d;
382 u32 l = len - data_hdr_size (); 396 u32 l = len - data_hdr_size ();
383 397
384 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 398 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
385 399
386#if ENABLE_COMPRESSION 400#if ENABLE_COMPRESSION
387 u8 cdata[MAX_MTU]; 401 u8 cdata[MAX_MTU];
388 402
389 if (type == PT_DATA_COMPRESSED) 403 if (type == PT_DATA_COMPRESSED)
… …
391 else 405 else
392#endif 406#endif
393 d = &(*p)[6 + 6 - DATAHDR]; 407 d = &(*p)[6 + 6 - DATAHDR];
394 408
395 /* 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 */
396 EVP_DecryptUpdate (cctx, 410 require (EVP_DecryptUpdate (cctx,
397 d, &outl2, 411 d, &outl2,
398 (unsigned char *)&data, len - data_hdr_size ()); 412 (unsigned char *)&data, len - data_hdr_size ()));
399 outl += outl2; 413 outl += outl2;
400 414
401 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 415 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
402 outl += outl2; 416 outl += outl2;
403 417
404 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 418 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
405 419
406 id2mac (dst () ? dst() : THISNODE->id, p->dst); 420 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
435{ 449{
436 // actually, hmaclen cannot be checked because the hmac 450 // actually, hmaclen cannot be checked because the hmac
437 // field comes before this data, so peers with other 451 // field comes before this data, so peers with other
438 // hmacs simply will not work. 452 // hmacs simply will not work.
439 u8 prot_major, prot_minor, randsize, hmaclen; 453 u8 prot_major, prot_minor, randsize, hmaclen;
440 u8 flags, challengelen, pad2, pad3; 454 u8 flags, challengelen, features, pad3;
441 u32 cipher_nid, digest_nid, hmac_nid; 455 u32 cipher_nid, digest_nid, hmac_nid;
442
443 const u8 curflags () const
444 {
445 return 0x80
446 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
447 }
448 456
449 void setup (ptype type, int dst); 457 void setup (ptype type, int dst);
450 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 }
451}; 471};
452 472
453void config_packet::setup (ptype type, int dst) 473void config_packet::setup (ptype type, int dst)
454{ 474{
455 prot_major = PROTOCOL_MAJOR; 475 prot_major = PROTOCOL_MAJOR;
456 prot_minor = PROTOCOL_MINOR; 476 prot_minor = PROTOCOL_MINOR;
457 randsize = RAND_SIZE; 477 randsize = RAND_SIZE;
458 hmaclen = HMACLENGTH; 478 hmaclen = HMACLENGTH;
459 flags = curflags (); 479 flags = 0;
460 challengelen = sizeof (rsachallenge); 480 challengelen = sizeof (rsachallenge);
481 features = get_features ();
461 482
462 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 483 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
463 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 484 digest_nid = htonl (EVP_MD_type (RSA_HASH));
464 hmac_nid = htonl (EVP_MD_type (DIGEST)); 485 hmac_nid = htonl (EVP_MD_type (DIGEST));
465 486
… …
467 set_hdr (type, dst); 488 set_hdr (type, dst);
468} 489}
469 490
470bool config_packet::chk_config () const 491bool config_packet::chk_config () const
471{ 492{
472 return prot_major == PROTOCOL_MAJOR 493 if (prot_major != PROTOCOL_MAJOR)
473 && randsize == RAND_SIZE 494 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474 && hmaclen == HMACLENGTH 495 else if (randsize != RAND_SIZE)
475 && 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);
476 && challengelen == sizeof (rsachallenge) 499 else if (challengelen != sizeof (rsachallenge))
500 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477 && 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));
478 && 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));
479 && 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;
480} 511}
481 512
482struct auth_req_packet : config_packet 513struct auth_req_packet : config_packet
483{ 514{
484 char magic[8]; 515 char magic[8];
485 u8 initiate; // false if this is just an automatic reply 516 u8 initiate; // false if this is just an automatic reply
486 u8 protocols; // supported protocols (will get patches on forward) 517 u8 protocols; // supported protocols (will be patched on forward)
487 u8 pad2, pad3; 518 u8 pad2, pad3;
488 rsaid id; 519 rsaid id;
489 rsaencrdata encr; 520 rsaencrdata encr;
490 521
491 auth_req_packet (int dst, bool initiate_, u8 protocols_) 522 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
546}; 577};
547 578
548///////////////////////////////////////////////////////////////////////////// 579/////////////////////////////////////////////////////////////////////////////
549 580
550void 581void
582connection::connection_established ()
583{
584 if (ictx && octx)
585 {
586 connectmode = conf->connectmode;
587
588 // make sure rekeying timeouts are slightly asymmetric
589 rekey.start (NOW + ::conf.rekey
590 + (conf->id > THISNODE->id ? 10 : 0));
591 keepalive.start (NOW + ::conf.keepalive);
592
593 // send queued packets
594 if (ictx && octx)
595 {
596 while (tap_packet *p = (tap_packet *)data_queue.get ())
597 {
598 send_data_packet (p);
599 delete p;
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 }
608 }
609 else
610 {
611 retry_cnt = 0;
612 establish_connection.start (NOW + 5);
613 keepalive.stop ();
614 rekey.stop ();
615 }
616}
617
618void
551connection::reset_dstaddr () 619connection::reset_si ()
552{ 620{
553 protocol = best_protocol (THISNODE->protocols & conf->protocols); 621 protocol = best_protocol (THISNODE->protocols & conf->protocols);
554 622
555 // mask out protocols we cannot establish 623 // mask out protocols we cannot establish
556 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 624 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
557 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
558 627
559 si.set (conf, protocol); 628 si.set (conf, protocol);
560} 629}
561 630
631// ensure sockinfo is valid, forward if necessary
632const sockinfo &
633connection::forward_si (const sockinfo &si) const
634{
635 if (!si.valid ())
636 {
637 connection *r = vpn->find_router ();
638
639 if (r)
640 {
641 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
642 conf->nodename, r->conf->nodename, (const char *)r->si);
643 return r->si;
644 }
645 else
646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
647 conf->nodename);
648 }
649
650 return si;
651}
652
653void
654connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
655{
656 if (!vpn->send_vpn_packet (pkt, si, tos))
657 reset_connection ();
658}
659
562void 660void
563connection::send_ping (const sockinfo &si, u8 pong) 661connection::send_ping (const sockinfo &si, u8 pong)
564{ 662{
565 ping_packet *pkt = new ping_packet; 663 ping_packet *pkt = new ping_packet;
566 664
567 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 665 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
568 vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 666 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
569 667
570 delete pkt; 668 delete pkt;
571} 669}
572 670
573void 671void
… …
576 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) 674 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
577 { 675 {
578 config_packet *pkt = new config_packet; 676 config_packet *pkt = new config_packet;
579 677
580 pkt->setup (vpn_packet::PT_RESET, conf->id); 678 pkt->setup (vpn_packet::PT_RESET, conf->id);
581 vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); 679 send_vpn_packet (pkt, si, IPTOS_MINCOST);
582 680
583 delete pkt; 681 delete pkt;
584 } 682 }
585} 683}
586 684
… …
588connection::send_auth_request (const sockinfo &si, bool initiate) 686connection::send_auth_request (const sockinfo &si, bool initiate)
589{ 687{
590 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);
591 689
592 rsachallenge chg; 690 rsachallenge chg;
593
594 rsa_cache.gen (pkt->id, chg); 691 rsa_cache.gen (pkt->id, chg);
595 692 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
596 if (0 > RSA_public_encrypt (sizeof chg,
597 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
598 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
599 fatal ("RSA_public_encrypt error");
600 693
601 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);
602 695
603 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 696 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
604 697
605 delete pkt; 698 delete pkt;
606} 699}
607 700
608void 701void
… …
616 709
617 pkt->hmac_set (octx); 710 pkt->hmac_set (octx);
618 711
619 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 712 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
620 713
621 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 714 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
622 715
623 delete pkt; 716 delete pkt;
624} 717}
625 718
626void 719void
… …
630 conf->id, rid, (const char *)rsi); 723 conf->id, rid, (const char *)rsi);
631 724
632 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 725 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
633 726
634 r->hmac_set (octx); 727 r->hmac_set (octx);
635 vpn->send_vpn_packet (r, si); 728 send_vpn_packet (r, si);
636 729
637 delete r; 730 delete r;
638} 731}
639 732
640void 733void
641connection::establish_connection_cb (time_watcher &w) 734connection::establish_connection_cb (time_watcher &w)
642{ 735{
643 if (ictx || conf == THISNODE 736 if (!ictx
737 && conf != THISNODE
644 || connectmode == conf_node::C_NEVER 738 && connectmode != conf_node::C_NEVER
645 || connectmode == conf_node::C_DISABLED) 739 && connectmode != conf_node::C_DISABLED
646 w.at = TSTAMP_CANCEL; 740 && NOW > w.at)
647 else if (w.at <= NOW)
648 { 741 {
649 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
650 743
651 if (retry_int < 3600 * 8) 744 double retry_int = double (retry_cnt & 3
745 ? (retry_cnt & 3) + 1
746 : 1 << (retry_cnt >> 2));
747
748 reset_si ();
749
750 bool slow = si.prot & PROT_SLOW;
751
752 if (si.prot && !si.host)
753 vpn->send_connect_request (conf->id);
754 else
755 {
756 const sockinfo &dsi = forward_si (si);
757
758 slow = slow || (dsi.prot & PROT_SLOW);
759
760 if (dsi.valid () && auth_rate_limiter.can (dsi))
761 {
762 if (retry_cnt < 4)
763 send_auth_request (dsi, true);
764 else
765 send_ping (dsi, 0);
766 }
767 }
768
769 retry_int *= slow ? 8. : 0.7;
770
771 if (retry_int < conf->max_retry)
652 retry_cnt++; 772 retry_cnt++;
653
654 w.at = NOW + retry_int;
655
656 if (conf->hostname)
657 {
658 reset_dstaddr ();
659
660 if (si.valid () && auth_rate_limiter.can (si))
661 {
662 if (retry_cnt < 4)
663 send_auth_request (si, true);
664 else
665 send_ping (si, 0);
666 }
667 }
668 else 773 else
669 vpn->connect_request (conf->id); 774 retry_int = conf->max_retry;
775
776 w.start (NOW + retry_int);
670 } 777 }
671} 778}
672 779
673void 780void
674connection::reset_connection () 781connection::reset_connection ()
… …
677 { 784 {
678 slog (L_INFO, _("%s(%s): connection lost"), 785 slog (L_INFO, _("%s(%s): connection lost"),
679 conf->nodename, (const char *)si); 786 conf->nodename, (const char *)si);
680 787
681 if (::conf.script_node_down) 788 if (::conf.script_node_down)
682 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."));
683 } 791 }
684 792
685 delete ictx; ictx = 0; 793 delete ictx; ictx = 0;
686 delete octx; octx = 0; 794 delete octx; octx = 0;
795#if ENABLE_DNS
796 dnsv4_reset_connection ();
797#endif
687 798
688 si.host= 0; 799 si.host = 0;
689 800
690 last_activity = 0; 801 last_activity = 0;
691 retry_cnt = 0; 802 retry_cnt = 0;
692 803
693 rekey.reset (); 804 rekey.stop ();
694 keepalive.reset (); 805 keepalive.stop ();
695 establish_connection.reset (); 806 establish_connection.stop ();
696} 807}
697 808
698void 809void
699connection::shutdown () 810connection::shutdown ()
700{ 811{
… …
705} 816}
706 817
707void 818void
708connection::rekey_cb (time_watcher &w) 819connection::rekey_cb (time_watcher &w)
709{ 820{
710 w.at = TSTAMP_CANCEL;
711
712 reset_connection (); 821 reset_connection ();
713 establish_connection (); 822 establish_connection ();
714} 823}
715 824
716void 825void
717connection::send_data_packet (tap_packet *pkt, bool broadcast) 826connection::send_data_packet (tap_packet *pkt)
718{ 827{
719 vpndata_packet *p = new vpndata_packet; 828 vpndata_packet *p = new vpndata_packet;
720 int tos = 0; 829 int tos = 0;
721 830
722 if (conf->inherit_tos 831 // I am not hilarious about peeking into packets, but so be it.
723 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 832 if (conf->inherit_tos && pkt->is_ipv4 ())
724 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
725 tos = (*pkt)[15] & IPTOS_TOS_MASK; 833 tos = (*pkt)[15] & IPTOS_TOS_MASK;
726 834
727 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
728 vpn->send_vpn_packet (p, si, tos); 836 send_vpn_packet (p, si, tos);
729 837
730 delete p; 838 delete p;
731 839
732 if (oseqno > MAX_SEQNO) 840 if (oseqno > MAX_SEQNO)
733 rekey (); 841 rekey ();
734} 842}
735 843
736void 844void
737connection::inject_data_packet (tap_packet *pkt, bool broadcast) 845connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
738{ 846{
739 if (ictx && octx) 847 if (ictx && octx)
740 send_data_packet (pkt, broadcast); 848 send_data_packet (pkt);
741 else 849 else
742 { 850 {
743 if (!broadcast)//DDDD 851 if (!broadcast)
744 queue.put (new tap_packet (*pkt)); 852 data_queue.put (new tap_packet (*pkt));
853
854 establish_connection ();
855 }
856}
857
858void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
859{
860 if (ictx && octx)
861 send_vpn_packet (pkt, si, tos);
862 else
863 {
864 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
745 865
746 establish_connection (); 866 establish_connection ();
747 } 867 }
748} 868}
749 869
… …
808 if (p->initiate) 928 if (p->initiate)
809 send_auth_request (rsi, false); 929 send_auth_request (rsi, false);
810 930
811 rsachallenge k; 931 rsachallenge k;
812 932
813 if (0 > RSA_private_decrypt (sizeof (p->encr), 933 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
814 (unsigned char *)&p->encr, (unsigned char *)&k, 934 {
815 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
816 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?"),
817 conf->nodename, (const char *)rsi); 936 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
937 break;
938 }
818 else 939 else
819 { 940 {
820 retry_cnt = 0;
821 establish_connection.start (NOW + 8); //? ;)
822 keepalive.reset ();
823 rekey.reset ();
824
825 delete ictx;
826 ictx = 0;
827
828 delete octx; 941 delete octx;
829 942
830 octx = new crypto_ctx (k, 1); 943 octx = new crypto_ctx (k, 1);
831 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 944 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
832 945
833 conf->protocols = p->protocols; 946 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features ();
948
834 send_auth_response (rsi, p->id, k); 949 send_auth_response (rsi, p->id, k);
950
951 connection_established ();
835 952
836 break; 953 break;
837 } 954 }
838 } 955 }
956 else
957 slog (L_WARN, _("%s(%s): protocol mismatch"),
958 conf->nodename, (const char *)rsi);
839 959
840 send_reset (rsi); 960 send_reset (rsi);
841 } 961 }
842 962
843 break; 963 break;
… …
856 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 976 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
857 977
858 rsachallenge chg; 978 rsachallenge chg;
859 979
860 if (!rsa_cache.find (p->id, chg)) 980 if (!rsa_cache.find (p->id, chg))
981 {
861 slog (L_ERR, _("%s(%s): unrequested auth response"), 982 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
862 conf->nodename, (const char *)rsi); 983 conf->nodename, (const char *)rsi);
984 break;
985 }
863 else 986 else
864 { 987 {
865 crypto_ctx *cctx = new crypto_ctx (chg, 0); 988 crypto_ctx *cctx = new crypto_ctx (chg, 0);
866 989
867 if (!p->hmac_chk (cctx)) 990 if (!p->hmac_chk (cctx))
991 {
868 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"
869 "could be an attack, or just corruption or an synchronization error"), 993 "could be an attack, or just corruption or a synchronization error"),
870 conf->nodename, (const char *)rsi); 994 conf->nodename, (const char *)rsi);
995 break;
996 }
871 else 997 else
872 { 998 {
873 rsaresponse h; 999 rsaresponse h;
874 1000
875 rsa_hash (p->id, chg, h); 1001 rsa_hash (p->id, chg, h);
… …
883 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1009 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
884 1010
885 si = rsi; 1011 si = rsi;
886 protocol = rsi.prot; 1012 protocol = rsi.prot;
887 1013
888 rekey.start (NOW + ::conf.rekey); 1014 connection_established ();
889 keepalive.start (NOW + ::conf.keepalive);
890
891 // send queued packets
892 while (tap_packet *p = queue.get ())
893 {
894 send_data_packet (p);
895 delete p;
896 }
897
898 connectmode = conf->connectmode;
899 1015
900 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
901 conf->nodename, (const char *)rsi, 1017 conf->nodename, (const char *)rsi,
902 p->prot_major, p->prot_minor); 1018 p->prot_major, p->prot_minor);
903 1019
904 if (::conf.script_node_up) 1020 if (::conf.script_node_up)
905 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."));
906 1023
907 break; 1024 break;
908 } 1025 }
909 else 1026 else
910 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"),
… …
929 1046
930 if (ictx && octx) 1047 if (ictx && octx)
931 { 1048 {
932 vpndata_packet *p = (vpndata_packet *)pkt; 1049 vpndata_packet *p = (vpndata_packet *)pkt;
933 1050
934 if (rsi == si) 1051 if (!p->hmac_chk (ictx))
1052 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1053 "could be an attack, or just corruption or a synchronization error"),
1054 conf->nodename, (const char *)rsi);
1055 else
935 { 1056 {
936 if (!p->hmac_chk (ictx))
937 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
938 "could be an attack, or just corruption or an synchronization error"),
939 conf->nodename, (const char *)rsi);
940 else 1057 u32 seqno;
1058 tap_packet *d = p->unpack (this, seqno);
1059
1060 if (iseqno.recv_ok (seqno))
941 { 1061 {
942 u32 seqno; 1062 vpn->tap->send (d);
943 tap_packet *d = p->unpack (this, seqno);
944 1063
945 if (iseqno.recv_ok (seqno)) 1064 if (si != rsi)
946 { 1065 {
947 vpn->tap->send (d); 1066 // fast re-sync on source address changes, useful especially for tcp/ip
948
949 if (p->dst () == 0) // re-broadcast
950 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
951 {
952 connection *c = *i;
953
954 if (c->conf != THISNODE && c->conf != conf)
955 c->inject_data_packet (d);
956 }
957
958 delete d;
959
960 break; 1067 si = rsi;
1068
1069 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1070 conf->nodename, (const char *)si, (const char *)rsi);
961 } 1071 }
962 } 1072 }
1073
1074 delete d;
1075 break;
963 } 1076 }
964 else
965 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
966 } 1077 }
967 1078
968 send_reset (rsi); 1079 send_reset (rsi);
969 break; 1080 break;
970 1081
971 case vpn_packet::PT_CONNECT_REQ: 1082 case vpn_packet::PT_CONNECT_REQ:
972 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1083 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
973 { 1084 {
974 connect_req_packet *p = (connect_req_packet *) pkt; 1085 connect_req_packet *p = (connect_req_packet *) pkt;
975 1086
976 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 ())
977 connection *c = vpn->conns[p->id - 1];
978 conf->protocols = p->protocols;
979
980 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
981 conf->id, p->id, c->ictx && c->octx);
982
983 if (c->ictx && c->octx)
984 { 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 {
985 // send connect_info packets to both sides, in case one is 1097 // send connect_info packets to both sides, in case one is
986 // behind a nat firewall (or both ;) 1098 // behind a nat firewall (or both ;)
987 c->send_connect_info (conf->id, si, conf->protocols); 1099 c->send_connect_info (conf->id, si, conf->protocols);
988 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 ();
989 } 1104 }
1105 else
1106 slog (L_WARN,
1107 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1108 p->id);
990 } 1109 }
991 1110
992 break; 1111 break;
993 1112
994 case vpn_packet::PT_CONNECT_INFO: 1113 case vpn_packet::PT_CONNECT_INFO:
995 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1114 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
996 { 1115 {
997 connect_info_packet *p = (connect_info_packet *) pkt; 1116 connect_info_packet *p = (connect_info_packet *)pkt;
998 1117
999 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 ())
1000 1119 {
1001 connection *c = vpn->conns[p->id - 1]; 1120 connection *c = vpn->conns[p->id - 1];
1002 1121
1003 c->conf->protocols = p->protocols; 1122 c->conf->protocols = p->protocols;
1004 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));
1005 p->si.upgrade_protocol (protocol, c->conf); 1124 p->si.upgrade_protocol (protocol, c->conf);
1006 1125
1007 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1126 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1008 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);
1009 //slog (L_ERR, "%d PROTOCL(C%x,T%x,0S%x,S%x,P%x,SP%x)",
1010 // p->id, c->conf->protocols, THISNODE->protocols, p->si.supported_protocols(0), p->si.supported_protocols (c->conf),
1011 // protocol, p->si.prot);
1012 1128
1129 const sockinfo &dsi = forward_si (p->si);
1130
1131 if (dsi.valid ())
1013 c->send_auth_request (p->si, 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);
1014 } 1138 }
1015 1139
1016 break; 1140 break;
1017 1141
1018 default: 1142 default:
… …
1027 { 1151 {
1028 reset_connection (); 1152 reset_connection ();
1029 establish_connection (); 1153 establish_connection ();
1030 } 1154 }
1031 else if (NOW < last_activity + ::conf.keepalive) 1155 else if (NOW < last_activity + ::conf.keepalive)
1032 w.at = last_activity + ::conf.keepalive; 1156 w.start (last_activity + ::conf.keepalive);
1033 else if (conf->connectmode != conf_node::C_ONDEMAND 1157 else if (conf->connectmode != conf_node::C_ONDEMAND
1034 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1158 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1035 { 1159 {
1036 send_ping (si); 1160 send_ping (si);
1037 w.at = NOW + 5; 1161 w.start (NOW + 5);
1038 } 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);
1039 else 1167 else
1040 reset_connection (); 1168 reset_connection ();
1041} 1169}
1042 1170
1043void connection::connect_request (int id) 1171void connection::send_connect_request (int id)
1044{ 1172{
1045 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1173 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1046 1174
1047 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1175 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1048 p->hmac_set (octx); 1176 p->hmac_set (octx);
1049 vpn->send_vpn_packet (p, si); 1177 send_vpn_packet (p, si);
1050 1178
1051 delete p; 1179 delete p;
1052} 1180}
1053 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
1054void connection::script_node () 1192void connection::script_init_connect_env ()
1055{ 1193{
1056 vpn->script_if_up (); 1194 vpn->script_init_env ();
1057 1195
1058 char *env; 1196 char *env;
1059 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1197 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1060 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1061 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1062 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1063} 1201}
1064 1202
1065const char *connection::script_node_up () 1203const char *connection::script_node_up ()
1066{ 1204{
1067 script_node (); 1205 script_init_connect_env ();
1068 1206
1069 putenv ("STATE=up"); 1207 putenv ("STATE=up");
1070 1208
1209 char *filename;
1210 asprintf (&filename,
1211 "%s/%s",
1212 confbase,
1071 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;
1072} 1216}
1073 1217
1074const char *connection::script_node_down () 1218const char *connection::script_node_down ()
1075{ 1219{
1076 script_node (); 1220 script_init_connect_env ();
1077 1221
1078 putenv ("STATE=down"); 1222 putenv ("STATE=down");
1079 1223
1080 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1224 char *filename;
1081} 1225 asprintf (&filename,
1226 "%s/%s",
1227 confbase,
1228 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1082 1229
1230 return filename;
1231}
1232
1083connection::connection(struct vpn *vpn_) 1233connection::connection (struct vpn *vpn, conf_node *conf)
1084: vpn(vpn_) 1234: vpn(vpn), conf(conf)
1085, rekey (this, &connection::rekey_cb) 1235, rekey (this, &connection::rekey_cb)
1086, keepalive (this, &connection::keepalive_cb) 1236, keepalive (this, &connection::keepalive_cb)
1087, establish_connection (this, &connection::establish_connection_cb) 1237, establish_connection (this, &connection::establish_connection_cb)
1238#if ENABLE_DNS
1239, dns (0)
1240#endif
1088{ 1241{
1089 octx = ictx = 0; 1242 octx = ictx = 0;
1090 retry_cnt = 0; 1243 retry_cnt = 0;
1091 1244
1245 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4;
1247
1092 connectmode = conf_node::C_ALWAYS; // initial setting 1248 connectmode = conf_node::C_ALWAYS; // initial setting
1093 reset_connection (); 1249 reset_connection ();
1094} 1250}
1095 1251
1096connection::~connection () 1252connection::~connection ()

Diff Legend

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