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

Diff Legend

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