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.14 by pcg, Fri Aug 8 09:29:22 2003 UTC vs.
Revision 1.43 by pcg, Fri Mar 4 04:52:38 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>
… …
35#include "slog.h" 36#include "slog.h"
36#include "device.h" 37#include "device.h"
37#include "vpn.h" 38#include "vpn.h"
38#include "connection.h" 39#include "connection.h"
39 40
41#include "netcompat.h"
42
40#if !HAVE_RAND_PSEUDO_BYTES 43#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 44# define RAND_pseudo_bytes RAND_bytes
42#endif 45#endif
43 46
44#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48
49#define ULTRA_FAST 1
50#define HLOG 15
51#include "lzf/lzf.h"
52#include "lzf/lzf_c.c"
53#include "lzf/lzf_d.c"
45 54
46struct crypto_ctx 55struct crypto_ctx
47{ 56{
48 EVP_CIPHER_CTX cctx; 57 EVP_CIPHER_CTX cctx;
49 HMAC_CTX hctx; 58 HMAC_CTX hctx;
… …
53}; 62};
54 63
55crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 64crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56{ 65{
57 EVP_CIPHER_CTX_init (&cctx); 66 EVP_CIPHER_CTX_init (&cctx);
58 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 67 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59 HMAC_CTX_init (&hctx); 68 HMAC_CTX_init (&hctx);
60 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 69 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61} 70}
62 71
63crypto_ctx::~crypto_ctx () 72crypto_ctx::~crypto_ctx ()
64{ 73{
65 EVP_CIPHER_CTX_cleanup (&cctx); 74 require (EVP_CIPHER_CTX_cleanup (&cctx));
66 HMAC_CTX_cleanup (&hctx); 75 HMAC_CTX_cleanup (&hctx);
67} 76}
68 77
69static void 78static void
70rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 79rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71{ 80{
72 EVP_MD_CTX ctx; 81 EVP_MD_CTX ctx;
73 82
74 EVP_MD_CTX_init (&ctx); 83 EVP_MD_CTX_init (&ctx);
75 EVP_DigestInit (&ctx, RSA_HASH); 84 require (EVP_DigestInit (&ctx, RSA_HASH));
76 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 85 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77 EVP_DigestUpdate(&ctx, &id, sizeof id); 86 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79 EVP_MD_CTX_cleanup (&ctx); 88 EVP_MD_CTX_cleanup (&ctx);
80} 89}
81 90
82struct rsa_entry { 91struct rsa_entry {
83 tstamp expire; 92 tstamp expire;
… …
131 140
132} rsa_cache; 141} rsa_cache;
133 142
134void rsa_cache::cleaner_cb (time_watcher &w) 143void rsa_cache::cleaner_cb (time_watcher &w)
135{ 144{
136 if (empty ()) 145 if (!empty ())
137 w.at = TSTAMP_CANCEL;
138 else
139 { 146 {
140 w.at = NOW + RSA_TTL; 147 w.start (NOW + RSA_TTL);
141 148
142 for (iterator i = begin (); i != end (); ) 149 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 150 if (i->expire <= NOW)
144 i = erase (i); 151 i = erase (i);
145 else 152 else
… …
197// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
198// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
199// but low on resources. 206// but low on resources.
200struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
201{ 208{
202 static const double ALPHA = 1. - 1. / 180.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
205 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
206 213
207 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 215 bool can (u32 host);
209}; 216};
210 217
211net_rate_limiter auth_rate_limiter, reset_rate_limiter; 218net_rate_limiter auth_rate_limiter, reset_rate_limiter;
212 219
… …
215 iterator i; 222 iterator i;
216 223
217 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
218 if (i->host == host) 225 if (i->host == host)
219 break; 226 break;
220 else if (i->last < NOW - EXPIRE) 227 else if (i->last < NOW - NRL_EXPIRE)
221 i = erase (i); 228 i = erase (i);
222 else 229 else
223 i++; 230 i++;
224 231
225 if (i == end ()) 232 if (i == end ())
226 { 233 {
227 net_rateinfo ri; 234 net_rateinfo ri;
228 235
229 ri.host = host; 236 ri.host = host;
230 ri.pcnt = 1.; 237 ri.pcnt = 1.;
231 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
232 ri.last = NOW; 239 ri.last = NOW;
233 240
234 push_front (ri); 241 push_front (ri);
235 242
236 return true; 243 return true;
… …
238 else 245 else
239 { 246 {
240 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
241 erase (i); 248 erase (i);
242 249
243 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
244 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
245 252
246 ri.last = NOW; 253 ri.last = NOW;
247 254
248 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
249 256
250 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
251 258
252 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
253 { 260 {
254 ri.pcnt = 1.; 261 ri.pcnt = 1.;
255 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
256 } 263 }
257 else if (send) 264 else if (send)
258 ri.pcnt++; 265 ri.pcnt++;
259 266
260 push_front (ri); 267 push_front (ri);
… …
307} 314}
308 315
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 318
312struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
313 { 320 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 322
316 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
317 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
330 int outl = 0, outl2; 337 int outl = 0, outl2;
331 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
332 339
333#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
334 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
335 u32 cl;
336 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
337 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
338 if (cl) 347 if (cl)
339 { 348 {
340 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
341 d = cdata; 350 d = cdata;
342 l = cl + 2; 351 l = cl + 2;
343 352
344 d[0] = cl >> 8; 353 d[0] = cl >> 8;
345 d[1] = cl; 354 d[1] = cl;
355 }
346 } 356 }
347#endif 357#endif
348 358
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 360
351 struct { 361 struct {
352#if RAND_SIZE 362#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
354#endif 364#endif
… …
358 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 369#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 371#endif
362 372
363 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 376 outl += outl2;
367 377
368 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 380 (unsigned char *) d, l));
371 outl += outl2; 381 outl += outl2;
372 382
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 384 outl += outl2;
375 385
376 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
377 387
378 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 397 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
389 u8 *d; 399 u8 *d;
390 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
391 401
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 403
394#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
396 406
397 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
399 else 409 else
400#endif 410#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
402 412
403 /* this overwrites part of the src mac, but we fix that later */ 413 /* this overwrites part of the src mac, but we fix that later */
404 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 415 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 417 outl += outl2;
408 418
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 420 outl += outl2;
411 421
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 423
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
443{ 453{
444 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
445 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
446 // hmacs simply will not work. 456 // hmacs simply will not work.
447 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
448 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
449 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
450
451 const u8 curflags () const
452 {
453 return 0x80
454 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
455 }
456 460
457 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
458 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473 return f;
474 }
459}; 475};
460 476
461void config_packet::setup (ptype type, int dst) 477void config_packet::setup (ptype type, int dst)
462{ 478{
463 prot_major = PROTOCOL_MAJOR; 479 prot_major = PROTOCOL_MAJOR;
464 prot_minor = PROTOCOL_MINOR; 480 prot_minor = PROTOCOL_MINOR;
465 randsize = RAND_SIZE; 481 randsize = RAND_SIZE;
466 hmaclen = HMACLENGTH; 482 hmaclen = HMACLENGTH;
467 flags = curflags (); 483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
468 challengelen = sizeof (rsachallenge); 484 challengelen = sizeof (rsachallenge);
485 features = get_features ();
469 486
470 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
472 hmac_nid = htonl (EVP_MD_type (DIGEST)); 489 hmac_nid = htonl (EVP_MD_type (DIGEST));
473 490
… …
475 set_hdr (type, dst); 492 set_hdr (type, dst);
476} 493}
477 494
478bool config_packet::chk_config () const 495bool config_packet::chk_config () const
479{ 496{
480 return prot_major == PROTOCOL_MAJOR 497 if (prot_major != PROTOCOL_MAJOR)
481 && randsize == RAND_SIZE 498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 && hmaclen == HMACLENGTH 499 else if (randsize != RAND_SIZE)
483 && flags == curflags () 500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
484 && challengelen == sizeof (rsachallenge) 507 else if (challengelen != sizeof (rsachallenge))
508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
485 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
486 && digest_nid == htonl (EVP_MD_type (RSA_HASH)) 511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
512 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
487 && hmac_nid == htonl (EVP_MD_type (DIGEST)); 513 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
514 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
515 else
516 return true;
517
518 return false;
488} 519}
489 520
490struct auth_req_packet : config_packet 521struct auth_req_packet : config_packet
491{ 522{
492 char magic[8]; 523 char magic[8];
493 u8 initiate; // false if this is just an automatic reply 524 u8 initiate; // false if this is just an automatic reply
494 u8 protocols; // supported protocols (will get patches on forward) 525 u8 protocols; // supported protocols (will be patched on forward)
495 u8 pad2, pad3; 526 u8 pad2, pad3;
496 rsaid id; 527 rsaid id;
497 rsaencrdata encr; 528 rsaencrdata encr;
498 529
499 auth_req_packet (int dst, bool initiate_, u8 protocols_) 530 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
560{ 591{
561 if (ictx && octx) 592 if (ictx && octx)
562 { 593 {
563 connectmode = conf->connectmode; 594 connectmode = conf->connectmode;
564 595
596 // make sure rekeying timeouts are slightly asymmetric
565 rekey.start (NOW + ::conf.rekey); 597 rekey.start (NOW + ::conf.rekey
598 + (conf->id > THISNODE->id ? 10 : 0));
566 keepalive.start (NOW + ::conf.keepalive); 599 keepalive.start (NOW + ::conf.keepalive);
567 600
568 // send queued packets 601 // send queued packets
569 if (ictx && octx) 602 if (ictx && octx)
570 { 603 {
… …
583 } 616 }
584 else 617 else
585 { 618 {
586 retry_cnt = 0; 619 retry_cnt = 0;
587 establish_connection.start (NOW + 5); 620 establish_connection.start (NOW + 5);
588 keepalive.reset (); 621 keepalive.stop ();
589 rekey.reset (); 622 rekey.stop ();
590 } 623 }
591} 624}
592 625
593void 626void
594connection::reset_si () 627connection::reset_si ()
… …
596 protocol = best_protocol (THISNODE->protocols & conf->protocols); 629 protocol = best_protocol (THISNODE->protocols & conf->protocols);
597 630
598 // mask out protocols we cannot establish 631 // mask out protocols we cannot establish
599 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 632 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
600 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
601 635
602 si.set (conf, protocol); 636 si.set (conf, protocol);
603} 637}
604 638
605// ensure sockinfo is valid, forward if necessary 639// ensure sockinfo is valid, forward if necessary
… …
625} 659}
626 660
627void 661void
628connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
629{ 663{
630 if (!vpn->send_vpn_packet (pkt, si, tos)) 664 bool ok;
665
666 switch (si.prot)
667 {
668 case PROT_IPv4:
669 ok = vpn->send_ipv4_packet (pkt, si, tos); break;
670 case PROT_UDPv4:
671 ok = vpn->send_udpv4_packet (pkt, si, tos); break;
672#if ENABLE_TCP
673 case PROT_TCPv4:
674 ok = vpn->send_tcpv4_packet (pkt, si, tos); break;
675#endif
676#if ENABLE_ICMP
677 case PROT_ICMPv4:
678 ok = vpn->send_icmpv4_packet (pkt, si, tos); break;
679#endif
680#if ENABLE_DNS
681 case PROT_DNSv4:
682 ok = send_dnsv4_packet (pkt, si, tos); break;
683#endif
684
685 default:
686 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
687 ok = false;
688 }
689
690 if (!ok)
631 reset_connection (); 691 reset_connection ();
632} 692}
633 693
634void 694void
635connection::send_ping (const sockinfo &si, u8 pong) 695connection::send_ping (const sockinfo &si, u8 pong)
… …
660connection::send_auth_request (const sockinfo &si, bool initiate) 720connection::send_auth_request (const sockinfo &si, bool initiate)
661{ 721{
662 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 722 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
663 723
664 rsachallenge chg; 724 rsachallenge chg;
665
666 rsa_cache.gen (pkt->id, chg); 725 rsa_cache.gen (pkt->id, chg);
667 726 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
668 if (0 > RSA_public_encrypt (sizeof chg,
669 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
670 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
671 fatal ("RSA_public_encrypt error");
672 727
673 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 728 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
674 729
675 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 730 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
676 731
… …
710} 765}
711 766
712void 767void
713connection::establish_connection_cb (time_watcher &w) 768connection::establish_connection_cb (time_watcher &w)
714{ 769{
715 if (ictx || conf == THISNODE 770 if (!ictx
771 && conf != THISNODE
716 || connectmode == conf_node::C_NEVER 772 && connectmode != conf_node::C_NEVER
717 || connectmode == conf_node::C_DISABLED) 773 && connectmode != conf_node::C_DISABLED
718 w.at = TSTAMP_CANCEL; 774 && NOW > w.at)
719 else if (w.at <= NOW)
720 { 775 {
721 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 776 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
722 777
723 if (retry_int < 3600 * 8) 778 if (retry_int < conf->max_retry)
724 retry_cnt++; 779 retry_cnt++;
780 else
781 retry_int = conf->max_retry;
725 782
726 w.at = NOW + retry_int; 783 w.start (NOW + retry_int);
727 784
728 reset_si (); 785 reset_si ();
729 786
730 if (si.prot && !si.host) 787 if (si.prot && !si.host)
731 vpn->send_connect_request (conf->id); 788 vpn->send_connect_request (conf->id);
… …
757 } 814 }
758 815
759 delete ictx; ictx = 0; 816 delete ictx; ictx = 0;
760 delete octx; octx = 0; 817 delete octx; octx = 0;
761 818
762 si.host= 0; 819 si.host = 0;
763 820
764 last_activity = 0; 821 last_activity = 0;
765 retry_cnt = 0; 822 retry_cnt = 0;
766 823
767 rekey.reset (); 824 rekey.stop ();
768 keepalive.reset (); 825 keepalive.stop ();
769 establish_connection.reset (); 826 establish_connection.stop ();
770} 827}
771 828
772void 829void
773connection::shutdown () 830connection::shutdown ()
774{ 831{
… …
779} 836}
780 837
781void 838void
782connection::rekey_cb (time_watcher &w) 839connection::rekey_cb (time_watcher &w)
783{ 840{
784 w.at = TSTAMP_CANCEL;
785
786 reset_connection (); 841 reset_connection ();
787 establish_connection (); 842 establish_connection ();
788} 843}
789 844
790void 845void
791connection::send_data_packet (tap_packet *pkt, bool broadcast) 846connection::send_data_packet (tap_packet *pkt)
792{ 847{
793 vpndata_packet *p = new vpndata_packet; 848 vpndata_packet *p = new vpndata_packet;
794 int tos = 0; 849 int tos = 0;
795 850
796 // I am not hilarious about peeking into packets, but so be it. 851 // I am not hilarious about peeking into packets, but so be it.
797 if (conf->inherit_tos 852 if (conf->inherit_tos && pkt->is_ipv4 ())
798 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
799 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
800 tos = (*pkt)[15] & IPTOS_TOS_MASK; 853 tos = (*pkt)[15] & IPTOS_TOS_MASK;
801 854
802 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 855 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
803 send_vpn_packet (p, si, tos); 856 send_vpn_packet (p, si, tos);
804 857
805 delete p; 858 delete p;
806 859
807 if (oseqno > MAX_SEQNO) 860 if (oseqno > MAX_SEQNO)
808 rekey (); 861 rekey ();
809} 862}
810 863
811void 864void
812connection::inject_data_packet (tap_packet *pkt, bool broadcast) 865connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
813{ 866{
814 if (ictx && octx) 867 if (ictx && octx)
815 send_data_packet (pkt, broadcast); 868 send_data_packet (pkt);
816 else 869 else
817 { 870 {
818 if (!broadcast)//DDDD 871 if (!broadcast)//DDDD
819 data_queue.put (new tap_packet (*pkt)); 872 data_queue.put (new tap_packet (*pkt));
820 873
… …
826{ 879{
827 if (ictx && octx) 880 if (ictx && octx)
828 send_vpn_packet (pkt, si, tos); 881 send_vpn_packet (pkt, si, tos);
829 else 882 else
830 { 883 {
831 vpn_queue.put (new vpn_packet (*pkt)); 884 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
832 885
833 establish_connection (); 886 establish_connection ();
834 } 887 }
835} 888}
836 889
… …
895 if (p->initiate) 948 if (p->initiate)
896 send_auth_request (rsi, false); 949 send_auth_request (rsi, false);
897 950
898 rsachallenge k; 951 rsachallenge k;
899 952
900 if (0 > RSA_private_decrypt (sizeof (p->encr), 953 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
901 (unsigned char *)&p->encr, (unsigned char *)&k, 954 {
902 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
903 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 955 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
904 conf->nodename, (const char *)rsi); 956 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
957 break;
958 }
905 else 959 else
906 { 960 {
907 delete octx; 961 delete octx;
908 962
909 octx = new crypto_ctx (k, 1); 963 octx = new crypto_ctx (k, 1);
910 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 964 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
911 965
966 // compatibility code, remove when no longer required
967 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
968
912 conf->protocols = p->protocols; 969 conf->protocols = p->protocols;
970 features = p->features & config_packet::get_features ();
913 971
914 send_auth_response (rsi, p->id, k); 972 send_auth_response (rsi, p->id, k);
915 973
916 connection_established (); 974 connection_established ();
917 975
918 break; 976 break;
919 } 977 }
920 } 978 }
979 else
980 slog (L_WARN, _("%s(%s): protocol mismatch"),
981 conf->nodename, (const char *)rsi);
921 982
922 send_reset (rsi); 983 send_reset (rsi);
923 } 984 }
924 985
925 break; 986 break;
… …
939 1000
940 rsachallenge chg; 1001 rsachallenge chg;
941 1002
942 if (!rsa_cache.find (p->id, chg)) 1003 if (!rsa_cache.find (p->id, chg))
943 { 1004 {
944 slog (L_ERR, _("%s(%s): unrequested auth response"), 1005 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
945 conf->nodename, (const char *)rsi); 1006 conf->nodename, (const char *)rsi);
946 break; 1007 break;
947 } 1008 }
948 else 1009 else
949 { 1010 {
950 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1011 crypto_ctx *cctx = new crypto_ctx (chg, 0);
951 1012
952 if (!p->hmac_chk (cctx)) 1013 if (!p->hmac_chk (cctx))
1014 {
953 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1015 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
954 "could be an attack, or just corruption or an synchronization error"), 1016 "could be an attack, or just corruption or a synchronization error"),
955 conf->nodename, (const char *)rsi); 1017 conf->nodename, (const char *)rsi);
1018 break;
1019 }
956 else 1020 else
957 { 1021 {
958 rsaresponse h; 1022 rsaresponse h;
959 1023
960 rsa_hash (p->id, chg, h); 1024 rsa_hash (p->id, chg, h);
… …
1006 { 1070 {
1007 vpndata_packet *p = (vpndata_packet *)pkt; 1071 vpndata_packet *p = (vpndata_packet *)pkt;
1008 1072
1009 if (!p->hmac_chk (ictx)) 1073 if (!p->hmac_chk (ictx))
1010 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1074 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1011 "could be an attack, or just corruption or an synchronization error"), 1075 "could be an attack, or just corruption or a synchronization error"),
1012 conf->nodename, (const char *)rsi); 1076 conf->nodename, (const char *)rsi);
1013 else 1077 else
1014 { 1078 {
1015 u32 seqno; 1079 u32 seqno;
1016 tap_packet *d = p->unpack (this, seqno); 1080 tap_packet *d = p->unpack (this, seqno);
1017 1081
1018 if (iseqno.recv_ok (seqno)) 1082 if (iseqno.recv_ok (seqno))
1019 { 1083 {
1020 vpn->tap->send (d); 1084 vpn->tap->send (d);
1021 1085
1022 if (p->dst () == 0) // re-broadcast
1023 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1024 {
1025 connection *c = *i;
1026
1027 if (c->conf != THISNODE && c->conf != conf)
1028 c->inject_data_packet (d);
1029 }
1030
1031 if (si != rsi) 1086 if (si != rsi)
1032 { 1087 {
1033 // fast re-sync on connection changes, useful especially for tcp/ip 1088 // fast re-sync on connection changes, useful especially for tcp/ip
1034 si = rsi; 1089 si = rsi;
1035 1090
1036 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1091 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1037 conf->nodename, (const char *)si, (const char *)rsi); 1092 conf->nodename, (const char *)si, (const char *)rsi);
1038 } 1093 }
1039
1040 delete d;
1041
1042 break;
1043 } 1094 }
1095
1096 delete d;
1097 break;
1044 } 1098 }
1045 } 1099 }
1046 1100
1047 send_reset (rsi); 1101 send_reset (rsi);
1048 break; 1102 break;
… …
1073 break; 1127 break;
1074 1128
1075 case vpn_packet::PT_CONNECT_INFO: 1129 case vpn_packet::PT_CONNECT_INFO:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1130 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1131 {
1078 connect_info_packet *p = (connect_info_packet *) pkt; 1132 connect_info_packet *p = (connect_info_packet *)pkt;
1079 1133
1080 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1134 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1081 1135 {
1082 connection *c = vpn->conns[p->id - 1]; 1136 connection *c = vpn->conns[p->id - 1];
1083 1137
1084 c->conf->protocols = p->protocols; 1138 c->conf->protocols = p->protocols;
1085 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1139 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1086 p->si.upgrade_protocol (protocol, c->conf); 1140 p->si.upgrade_protocol (protocol, c->conf);
1087 1141
1088 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1142 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1089 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1143 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1090 1144
1091 const sockinfo &dsi = forward_si (p->si); 1145 const sockinfo &dsi = forward_si (p->si);
1092 1146
1093 if (dsi.valid ()) 1147 if (dsi.valid ())
1094 c->send_auth_request (dsi, true); 1148 c->send_auth_request (dsi, true);
1149 }
1095 } 1150 }
1096 1151
1097 break; 1152 break;
1098 1153
1099 default: 1154 default:
… …
1108 { 1163 {
1109 reset_connection (); 1164 reset_connection ();
1110 establish_connection (); 1165 establish_connection ();
1111 } 1166 }
1112 else if (NOW < last_activity + ::conf.keepalive) 1167 else if (NOW < last_activity + ::conf.keepalive)
1113 w.at = last_activity + ::conf.keepalive; 1168 w.start (last_activity + ::conf.keepalive);
1114 else if (conf->connectmode != conf_node::C_ONDEMAND 1169 else if (conf->connectmode != conf_node::C_ONDEMAND
1115 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1170 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1116 { 1171 {
1117 send_ping (si); 1172 send_ping (si);
1118 w.at = NOW + 5; 1173 w.start (NOW + 5);
1119 } 1174 }
1120 else if (NOW < last_activity + ::conf.keepalive + 10) 1175 else if (NOW < last_activity + ::conf.keepalive + 10)
1121 // hold ondemand connections implicitly a few seconds longer 1176 // hold ondemand connections implicitly a few seconds longer
1122 // should delete octx, though, or something like that ;) 1177 // should delete octx, though, or something like that ;)
1123 w.at = last_activity + ::conf.keepalive + 10; 1178 w.start (last_activity + ::conf.keepalive + 10);
1124 else 1179 else
1125 reset_connection (); 1180 reset_connection ();
1126} 1181}
1127 1182
1128void connection::send_connect_request (int id) 1183void connection::send_connect_request (int id)
… …
1163 putenv ("STATE=down"); 1218 putenv ("STATE=down");
1164 1219
1165 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1220 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1166} 1221}
1167 1222
1168connection::connection(struct vpn *vpn_) 1223connection::connection (struct vpn *vpn, conf_node *conf)
1169: vpn(vpn_) 1224: vpn(vpn), conf(conf)
1170, rekey (this, &connection::rekey_cb) 1225, rekey (this, &connection::rekey_cb)
1171, keepalive (this, &connection::keepalive_cb) 1226, keepalive (this, &connection::keepalive_cb)
1172, establish_connection (this, &connection::establish_connection_cb) 1227, establish_connection (this, &connection::establish_connection_cb)
1228#if ENABLE_DNS
1229, dns (0)
1230#endif
1173{ 1231{
1174 octx = ictx = 0; 1232 octx = ictx = 0;
1175 retry_cnt = 0; 1233 retry_cnt = 0;
1176 1234
1235 if (!conf->protocols) // make sure some protocol is enabled
1236 conf->protocols = PROT_UDPv4;
1237
1177 connectmode = conf_node::C_ALWAYS; // initial setting 1238 connectmode = conf_node::C_ALWAYS; // initial setting
1178 reset_connection (); 1239 reset_connection ();
1179} 1240}
1180 1241
1181connection::~connection () 1242connection::~connection ()

Diff Legend

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