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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.51 by pcg, Wed Mar 23 20:07: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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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
40#include <sys/socket.h> 39#include "netcompat.h"
41#ifdef HAVE_NETINET_IN_H
42# include <netinet/in.h>
43#endif
44#include <arpa/inet.h>
45#include <net/if.h>
46#ifdef HAVE_NETINET_IN_SYSTM_H
47# include <netinet/in_systm.h>
48#endif
49#ifdef HAVE_NETINET_IP_H
50# include <netinet/ip.h>
51#endif
52
53#ifndef IPTOS_TOS_MASK
54# define IPTOS_TOS_MASK (IPTOS_LOWDELAY | IPTOS_THROUGHPUT | IPTOS_RELIABILITY | IPTOS_MINCOST)
55#endif
56 40
57#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
58# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
59#endif 43#endif
60 44
61#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
62 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
63struct crypto_ctx 53struct crypto_ctx
64{ 54{
65 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
66 HMAC_CTX hctx; 56 HMAC_CTX hctx;
67 57
… …
70}; 60};
71 61
72crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
73{ 63{
74 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
75 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));
76 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
77 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);
78} 68}
79 69
80crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
81{ 71{
82 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
83 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
84} 74}
85 75
86static void 76static void
87rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
88{ 78{
89 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
90 80
91 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
92 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
93 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
94 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
95 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
96 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
97} 87}
98 88
99struct rsa_entry { 89struct rsa_entry {
100 tstamp expire; 90 tstamp expire;
… …
105struct rsa_cache : list<rsa_entry> 95struct rsa_cache : list<rsa_entry>
106{ 96{
107 void cleaner_cb (time_watcher &w); time_watcher cleaner; 97 void cleaner_cb (time_watcher &w); time_watcher cleaner;
108 98
109 bool find (const rsaid &id, rsachallenge &chg) 99 bool find (const rsaid &id, rsachallenge &chg)
110 { 100 {
111 for (iterator i = begin (); i != end (); ++i) 101 for (iterator i = begin (); i != end (); ++i)
112 { 102 {
113 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
114 { 104 {
115 memcpy (&chg, &i->chg, sizeof chg); 105 memcpy (&chg, &i->chg, sizeof chg);
116 106
117 erase (i); 107 erase (i);
118 return true; 108 return true;
119 } 109 }
120 } 110 }
121 111
122 if (cleaner.at < NOW) 112 if (cleaner.at < NOW)
123 cleaner.start (NOW + RSA_TTL); 113 cleaner.start (NOW + RSA_TTL);
124 114
125 return false; 115 return false;
126 } 116 }
127 117
128 void gen (rsaid &id, rsachallenge &chg) 118 void gen (rsaid &id, rsachallenge &chg)
129 { 119 {
130 rsa_entry e; 120 rsa_entry e;
131 121
132 RAND_bytes ((unsigned char *)&id, sizeof id); 122 RAND_bytes ((unsigned char *)&id, sizeof id);
133 RAND_bytes ((unsigned char *)&chg, sizeof chg); 123 RAND_bytes ((unsigned char *)&chg, sizeof chg);
134 124
135 e.expire = NOW + RSA_TTL; 125 e.expire = NOW + RSA_TTL;
136 e.id = id; 126 e.id = id;
137 memcpy (&e.chg, &chg, sizeof chg); 127 memcpy (&e.chg, &chg, sizeof chg);
138 128
139 push_back (e); 129 push_back (e);
140 130
141 if (cleaner.at < NOW) 131 if (cleaner.at < NOW)
142 cleaner.start (NOW + RSA_TTL); 132 cleaner.start (NOW + RSA_TTL);
143 } 133 }
144 134
145 rsa_cache () 135 rsa_cache ()
146 : cleaner (this, &rsa_cache::cleaner_cb) 136 : cleaner (this, &rsa_cache::cleaner_cb)
147 { } 137 { }
148 138
149} rsa_cache; 139} rsa_cache;
150 140
151void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
152{ 142{
153 if (empty ()) 143 if (!empty ())
154 w.at = TSTAMP_CANCEL;
155 else
156 { 144 {
157 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
158 146
159 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
160 if (i->expire <= NOW) 148 if (i->expire <= NOW)
161 i = erase (i); 149 i = erase (i);
162 else 150 else
… …
214// 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.
215// this implementation ("splay list" ;) is inefficient, 203// this implementation ("splay list" ;) is inefficient,
216// but low on resources. 204// but low on resources.
217struct net_rate_limiter : list<net_rateinfo> 205struct net_rate_limiter : list<net_rateinfo>
218{ 206{
219 static const double ALPHA = 1. - 1. / 600.; // allow bursts 207# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
220 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
221 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
222 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 210# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
223 211
224 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
225 bool can (u32 host); 213 bool can (u32 host);
226}; 214};
227 215
… …
232 iterator i; 220 iterator i;
233 221
234 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
235 if (i->host == host) 223 if (i->host == host)
236 break; 224 break;
237 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
238 i = erase (i); 226 i = erase (i);
239 else 227 else
240 i++; 228 i++;
241 229
242 if (i == end ()) 230 if (i == end ())
243 { 231 {
244 net_rateinfo ri; 232 net_rateinfo ri;
245 233
246 ri.host = host; 234 ri.host = host;
247 ri.pcnt = 1.; 235 ri.pcnt = 1.;
248 ri.diff = MAXDIF; 236 ri.diff = NRL_MAXDIF;
249 ri.last = NOW; 237 ri.last = NOW;
250 238
251 push_front (ri); 239 push_front (ri);
252 240
253 return true; 241 return true;
… …
255 else 243 else
256 { 244 {
257 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
258 erase (i); 246 erase (i);
259 247
260 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
261 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
262 250
263 ri.last = NOW; 251 ri.last = NOW;
264 252
265 double dif = ri.diff / ri.pcnt; 253 double dif = ri.diff / ri.pcnt;
266 254
267 bool send = dif > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
268 256
269 if (dif > MAXDIF) 257 if (dif > NRL_MAXDIF)
270 { 258 {
271 ri.pcnt = 1.; 259 ri.pcnt = 1.;
272 ri.diff = MAXDIF; 260 ri.diff = NRL_MAXDIF;
273 } 261 }
274 else if (send) 262 else if (send)
275 ri.pcnt++; 263 ri.pcnt++;
276 264
277 push_front (ri); 265 push_front (ri);
… …
324} 312}
325 313
326#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
327#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
328 316
329struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
330 { 318 {
331 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
332 320
333 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);
334 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
347 int outl = 0, outl2; 335 int outl = 0, outl2;
348 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
349 337
350#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
351 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
352 u32 cl;
353 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
354 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
355 if (cl) 345 if (cl)
356 { 346 {
357 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
358 d = cdata; 348 d = cdata;
359 l = cl + 2; 349 l = cl + 2;
360 350
361 d[0] = cl >> 8; 351 d[0] = cl >> 8;
362 d[1] = cl; 352 d[1] = cl;
353 }
363 } 354 }
364#endif 355#endif
365 356
366 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
367 358
368 struct { 359 struct {
369#if RAND_SIZE 360#if RAND_SIZE
370 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
371#endif 362#endif
… …
375 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
376#if RAND_SIZE 367#if RAND_SIZE
377 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
378#endif 369#endif
379 370
380 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
381 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
382 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
383 outl += outl2; 374 outl += outl2;
384 375
385 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
386 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
387 (unsigned char *) d, l); 378 (unsigned char *) d, l));
388 outl += outl2; 379 outl += outl2;
389 380
390 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
391 outl += outl2; 382 outl += outl2;
392 383
393 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
394 385
395 set_hdr (type, dst); 386 set_hdr (type, dst);
… …
404 int outl = 0, outl2; 395 int outl = 0, outl2;
405 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
406 u8 *d; 397 u8 *d;
407 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
408 399
409 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
410 401
411#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
412 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
413 404
414 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
… …
416 else 407 else
417#endif 408#endif
418 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
419 410
420 /* 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 */
421 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
422 d, &outl2, 413 d, &outl2,
423 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
424 outl += outl2; 415 outl += outl2;
425 416
426 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
427 outl += outl2; 418 outl += outl2;
428 419
429 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
430 421
431 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
460{ 451{
461 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
462 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
463 // hmacs simply will not work. 454 // hmacs simply will not work.
464 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
465 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
466 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
467
468 const u8 curflags () const
469 {
470 return 0x80
471 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
472 }
473 458
474 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
475 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 }
476}; 473};
477 474
478void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
479{ 476{
480 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
484 flags = curflags (); 481 flags = 0;
485 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
486 484
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
489 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
490 488
… …
493} 491}
494 492
495bool config_packet::chk_config () const 493bool config_packet::chk_config () const
496{ 494{
497 if (prot_major != PROTOCOL_MAJOR) 495 if (prot_major != PROTOCOL_MAJOR)
498 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 497 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 499 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503 else if (flags != curflags ())
504 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
505 else if (challengelen != sizeof (rsachallenge)) 501 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 502 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 503 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 504 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 505 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 506 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 507 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 508 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else 509 else
514 return true; 510 return true;
515 511
516 return false; 512 return false;
517} 513}
518 514
519struct auth_req_packet : config_packet 515struct auth_req_packet : config_packet
520{ 516{
521 char magic[8]; 517 char magic[8];
522 u8 initiate; // false if this is just an automatic reply 518 u8 initiate; // false if this is just an automatic reply
523 u8 protocols; // supported protocols (will get patches on forward) 519 u8 protocols; // supported protocols (will be patched on forward)
524 u8 pad2, pad3; 520 u8 pad2, pad3;
525 rsaid id; 521 rsaid id;
526 rsaencrdata encr; 522 rsaencrdata encr;
527 523
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 524 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
589{ 585{
590 if (ictx && octx) 586 if (ictx && octx)
591 { 587 {
592 connectmode = conf->connectmode; 588 connectmode = conf->connectmode;
593 589
590 // make sure rekeying timeouts are slightly asymmetric
594 rekey.start (NOW + ::conf.rekey); 591 rekey.start (NOW + ::conf.rekey
592 + (conf->id > THISNODE->id ? 10 : 0));
595 keepalive.start (NOW + ::conf.keepalive); 593 keepalive.start (NOW + ::conf.keepalive);
596 594
597 // send queued packets 595 // send queued packets
598 if (ictx && octx) 596 if (ictx && octx)
599 { 597 {
… …
612 } 610 }
613 else 611 else
614 { 612 {
615 retry_cnt = 0; 613 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 614 establish_connection.start (NOW + 5);
617 keepalive.reset (); 615 keepalive.stop ();
618 rekey.reset (); 616 rekey.stop ();
619 } 617 }
620} 618}
621 619
622void 620void
623connection::reset_si () 621connection::reset_si ()
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 623 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 624
627 // mask out protocols we cannot establish 625 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 626 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
628 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
630 629
631 si.set (conf, protocol); 630 si.set (conf, protocol);
632} 631}
633 632
634// ensure sockinfo is valid, forward if necessary 633// ensure sockinfo is valid, forward if necessary
… …
639 { 638 {
640 connection *r = vpn->find_router (); 639 connection *r = vpn->find_router ();
641 640
642 if (r) 641 if (r)
643 { 642 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 643 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 644 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 645 return r->si;
647 } 646 }
648 else 647 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 648 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 649 conf->nodename);
… …
689connection::send_auth_request (const sockinfo &si, bool initiate) 688connection::send_auth_request (const sockinfo &si, bool initiate)
690{ 689{
691 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 690 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
692 691
693 rsachallenge chg; 692 rsachallenge chg;
694
695 rsa_cache.gen (pkt->id, chg); 693 rsa_cache.gen (pkt->id, chg);
696 694 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
697 if (0 > RSA_public_encrypt (sizeof chg,
698 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
699 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
700 fatal ("RSA_public_encrypt error");
701 695
702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 696 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
703 697
704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 698 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
705 699
… …
739} 733}
740 734
741void 735void
742connection::establish_connection_cb (time_watcher &w) 736connection::establish_connection_cb (time_watcher &w)
743{ 737{
744 if (ictx || conf == THISNODE 738 if (!ictx
739 && conf != THISNODE
745 || connectmode == conf_node::C_NEVER 740 && connectmode != conf_node::C_NEVER
746 || connectmode == conf_node::C_DISABLED) 741 && connectmode != conf_node::C_DISABLED
747 w.at = TSTAMP_CANCEL; 742 && NOW > w.at)
748 else if (w.at <= NOW)
749 { 743 {
750 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
751 745
752 if (retry_int < 3600 * 8) 746 double retry_int = double (retry_cnt & 3
753 retry_cnt++; 747 ? (retry_cnt & 3) + 1
754 748 : 1 << (retry_cnt >> 2));
755 w.at = NOW + retry_int;
756 749
757 reset_si (); 750 reset_si ();
751
752 bool slow = si.prot & PROT_SLOW;
758 753
759 if (si.prot && !si.host) 754 if (si.prot && !si.host)
760 vpn->send_connect_request (conf->id); 755 vpn->send_connect_request (conf->id);
761 else 756 else
762 { 757 {
763 const sockinfo &dsi = forward_si (si); 758 const sockinfo &dsi = forward_si (si);
759
760 slow = slow || (dsi.prot & PROT_SLOW);
764 761
765 if (dsi.valid () && auth_rate_limiter.can (dsi)) 762 if (dsi.valid () && auth_rate_limiter.can (dsi))
766 { 763 {
767 if (retry_cnt < 4) 764 if (retry_cnt < 4)
768 send_auth_request (dsi, true); 765 send_auth_request (dsi, true);
769 else 766 else
770 send_ping (dsi, 0); 767 send_ping (dsi, 0);
771 } 768 }
772 } 769 }
770
771 retry_int *= slow ? 8. : 0.7;
772
773 if (retry_int < conf->max_retry)
774 retry_cnt++;
775 else
776 retry_int = conf->max_retry;
777
778 w.start (NOW + retry_int);
773 } 779 }
774} 780}
775 781
776void 782void
777connection::reset_connection () 783connection::reset_connection ()
… …
785 run_script (run_script_cb (this, &connection::script_node_down), false); 791 run_script (run_script_cb (this, &connection::script_node_down), false);
786 } 792 }
787 793
788 delete ictx; ictx = 0; 794 delete ictx; ictx = 0;
789 delete octx; octx = 0; 795 delete octx; octx = 0;
796#if ENABLE_DNS
797 dnsv4_reset_connection ();
798#endif
790 799
791 si.host= 0; 800 si.host = 0;
792 801
793 last_activity = 0; 802 last_activity = 0;
794 retry_cnt = 0; 803 retry_cnt = 0;
795 804
796 rekey.reset (); 805 rekey.stop ();
797 keepalive.reset (); 806 keepalive.stop ();
798 establish_connection.reset (); 807 establish_connection.stop ();
799} 808}
800 809
801void 810void
802connection::shutdown () 811connection::shutdown ()
803{ 812{
… …
808} 817}
809 818
810void 819void
811connection::rekey_cb (time_watcher &w) 820connection::rekey_cb (time_watcher &w)
812{ 821{
813 w.at = TSTAMP_CANCEL;
814
815 reset_connection (); 822 reset_connection ();
816 establish_connection (); 823 establish_connection ();
817} 824}
818 825
819void 826void
820connection::send_data_packet (tap_packet *pkt, bool broadcast) 827connection::send_data_packet (tap_packet *pkt)
821{ 828{
822 vpndata_packet *p = new vpndata_packet; 829 vpndata_packet *p = new vpndata_packet;
823 int tos = 0; 830 int tos = 0;
824 831
825 // I am not hilarious about peeking into packets, but so be it. 832 // I am not hilarious about peeking into packets, but so be it.
826 if (conf->inherit_tos 833 if (conf->inherit_tos && pkt->is_ipv4 ())
827 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
828 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
829 tos = (*pkt)[15] & IPTOS_TOS_MASK; 834 tos = (*pkt)[15] & IPTOS_TOS_MASK;
830 835
831 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 836 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
832 send_vpn_packet (p, si, tos); 837 send_vpn_packet (p, si, tos);
833 838
834 delete p; 839 delete p;
835 840
836 if (oseqno > MAX_SEQNO) 841 if (oseqno > MAX_SEQNO)
837 rekey (); 842 rekey ();
838} 843}
839 844
840void 845void
841connection::inject_data_packet (tap_packet *pkt, bool broadcast) 846connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
842{ 847{
843 if (ictx && octx) 848 if (ictx && octx)
844 send_data_packet (pkt, broadcast); 849 send_data_packet (pkt);
845 else 850 else
846 { 851 {
847 if (!broadcast)//DDDD 852 if (!broadcast)//DDDD
848 data_queue.put (new tap_packet (*pkt)); 853 data_queue.put (new tap_packet (*pkt));
849 854
… …
855{ 860{
856 if (ictx && octx) 861 if (ictx && octx)
857 send_vpn_packet (pkt, si, tos); 862 send_vpn_packet (pkt, si, tos);
858 else 863 else
859 { 864 {
860 vpn_queue.put (new vpn_packet (*pkt)); 865 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
861 866
862 establish_connection (); 867 establish_connection ();
863 } 868 }
864} 869}
865 870
… …
924 if (p->initiate) 929 if (p->initiate)
925 send_auth_request (rsi, false); 930 send_auth_request (rsi, false);
926 931
927 rsachallenge k; 932 rsachallenge k;
928 933
929 if (0 > RSA_private_decrypt (sizeof (p->encr), 934 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
930 (unsigned char *)&p->encr, (unsigned char *)&k, 935 {
931 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
932 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 936 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
933 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 937 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
938 break;
939 }
934 else 940 else
935 { 941 {
936 delete octx; 942 delete octx;
937 943
938 octx = new crypto_ctx (k, 1); 944 octx = new crypto_ctx (k, 1);
939 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 945 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
940 946
941 conf->protocols = p->protocols; 947 conf->protocols = p->protocols;
948 features = p->features & config_packet::get_features ();
942 949
943 send_auth_response (rsi, p->id, k); 950 send_auth_response (rsi, p->id, k);
944 951
945 connection_established (); 952 connection_established ();
946 953
… …
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 989 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 990
984 if (!p->hmac_chk (cctx)) 991 if (!p->hmac_chk (cctx))
985 { 992 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 993 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or an synchronization error"), 994 "could be an attack, or just corruption or a synchronization error"),
988 conf->nodename, (const char *)rsi); 995 conf->nodename, (const char *)rsi);
989 break; 996 break;
990 } 997 }
991 else 998 else
992 { 999 {
… …
1041 { 1048 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1049 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1050
1044 if (!p->hmac_chk (ictx)) 1051 if (!p->hmac_chk (ictx))
1045 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"
1046 "could be an attack, or just corruption or an synchronization error"), 1053 "could be an attack, or just corruption or a synchronization error"),
1047 conf->nodename, (const char *)rsi); 1054 conf->nodename, (const char *)rsi);
1048 else 1055 else
1049 { 1056 {
1050 u32 seqno; 1057 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1058 tap_packet *d = p->unpack (this, seqno);
1052 1059
1053 if (iseqno.recv_ok (seqno)) 1060 if (iseqno.recv_ok (seqno))
1054 { 1061 {
1055 vpn->tap->send (d); 1062 vpn->tap->send (d);
1056 1063
1057 if (p->dst () == 0) // re-broadcast
1058 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1059 {
1060 connection *c = *i;
1061
1062 if (c->conf != THISNODE && c->conf != conf)
1063 c->inject_data_packet (d);
1064 }
1065
1066 if (si != rsi) 1064 if (si != rsi)
1067 { 1065 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1066 // fast re-sync on connection changes, useful especially for tcp/ip
1069 si = rsi; 1067 si = rsi;
1070 1068
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1069 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1070 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1071 }
1074
1075 delete d;
1076
1077 break;
1078 } 1072 }
1073
1074 delete d;
1075 break;
1079 } 1076 }
1080 } 1077 }
1081 1078
1082 send_reset (rsi); 1079 send_reset (rsi);
1083 break; 1080 break;
… …
1108 break; 1105 break;
1109 1106
1110 case vpn_packet::PT_CONNECT_INFO: 1107 case vpn_packet::PT_CONNECT_INFO:
1111 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1112 { 1109 {
1113 connect_info_packet *p = (connect_info_packet *) pkt; 1110 connect_info_packet *p = (connect_info_packet *)pkt;
1114 1111
1115 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1116 1113 {
1117 connection *c = vpn->conns[p->id - 1]; 1114 connection *c = vpn->conns[p->id - 1];
1118 1115
1119 c->conf->protocols = p->protocols; 1116 c->conf->protocols = p->protocols;
1120 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1117 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1121 p->si.upgrade_protocol (protocol, c->conf); 1118 p->si.upgrade_protocol (protocol, c->conf);
1122 1119
1123 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1120 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1124 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1121 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1125 1122
1126 const sockinfo &dsi = forward_si (p->si); 1123 const sockinfo &dsi = forward_si (p->si);
1127 1124
1128 if (dsi.valid ()) 1125 if (dsi.valid ())
1129 c->send_auth_request (dsi, true); 1126 c->send_auth_request (dsi, true);
1127 }
1130 } 1128 }
1131 1129
1132 break; 1130 break;
1133 1131
1134 default: 1132 default:
… …
1143 { 1141 {
1144 reset_connection (); 1142 reset_connection ();
1145 establish_connection (); 1143 establish_connection ();
1146 } 1144 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1145 else if (NOW < last_activity + ::conf.keepalive)
1148 w.at = last_activity + ::conf.keepalive; 1146 w.start (last_activity + ::conf.keepalive);
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1147 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1148 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1149 {
1152 send_ping (si); 1150 send_ping (si);
1153 w.at = NOW + 5; 1151 w.start (NOW + 5);
1154 } 1152 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1153 else if (NOW < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1154 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1155 // should delete octx, though, or something like that ;)
1158 w.at = last_activity + ::conf.keepalive + 10; 1156 w.start (last_activity + ::conf.keepalive + 10);
1159 else 1157 else
1160 reset_connection (); 1158 reset_connection ();
1161} 1159}
1162 1160
1163void connection::send_connect_request (int id) 1161void connection::send_connect_request (int id)
… …
1198 putenv ("STATE=down"); 1196 putenv ("STATE=down");
1199 1197
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1198 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1201} 1199}
1202 1200
1203connection::connection(struct vpn *vpn_) 1201connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn_) 1202: vpn(vpn), conf(conf)
1205, rekey (this, &connection::rekey_cb) 1203, rekey (this, &connection::rekey_cb)
1206, keepalive (this, &connection::keepalive_cb) 1204, keepalive (this, &connection::keepalive_cb)
1207, establish_connection (this, &connection::establish_connection_cb) 1205, establish_connection (this, &connection::establish_connection_cb)
1206#if ENABLE_DNS
1207, dns (0)
1208#endif
1208{ 1209{
1209 octx = ictx = 0; 1210 octx = ictx = 0;
1210 retry_cnt = 0; 1211 retry_cnt = 0;
1211 1212
1213 if (!conf->protocols) // make sure some protocol is enabled
1214 conf->protocols = PROT_UDPv4;
1215
1212 connectmode = conf_node::C_ALWAYS; // initial setting 1216 connectmode = conf_node::C_ALWAYS; // initial setting
1213 reset_connection (); 1217 reset_connection ();
1214} 1218}
1215 1219
1216connection::~connection () 1220connection::~connection ()

Diff Legend

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