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.30 by pcg, Thu Jan 29 19:22:05 2004 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 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 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 18*/
18 19
19#include "config.h" 20#include "config.h"
20 21
21extern "C" { 22#include <cassert>
22# include "lzf/lzf.h"
23}
24 23
25#include <list> 24#include <list>
26 25
27#include <openssl/rand.h> 26#include <openssl/rand.h>
28#include <openssl/evp.h> 27#include <openssl/evp.h>
… …
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;
… …
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 static const double ALPHA = 1. - 1. / 600.; // allow bursts
203 static const double CUTOFF = 20.; // one event every CUTOFF seconds 208 static const double CUTOFF = 10.; // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - 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
… …
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 = 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;
… …
242 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * ALPHA;
243 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * 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 > CUTOFF;
248 256
257 if (dif > MAXDIF)
258 {
259 ri.pcnt = 1.;
260 ri.diff = 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);
… …
336 d[0] = cl >> 8; 349 d[0] = cl >> 8;
337 d[1] = cl; 350 d[1] = cl;
338 } 351 }
339#endif 352#endif
340 353
341 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
342 355
343 struct { 356 struct {
344#if RAND_SIZE 357#if RAND_SIZE
345 u8 rnd[RAND_SIZE]; 358 u8 rnd[RAND_SIZE];
346#endif 359#endif
… …
350 datahdr.seqno = ntohl (seqno); 363 datahdr.seqno = ntohl (seqno);
351#if RAND_SIZE 364#if RAND_SIZE
352 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 365 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
353#endif 366#endif
354 367
355 EVP_EncryptUpdate (cctx, 368 require (EVP_EncryptUpdate (cctx,
356 (unsigned char *) data + outl, &outl2, 369 (unsigned char *) data + outl, &outl2,
357 (unsigned char *) &datahdr, DATAHDR); 370 (unsigned char *) &datahdr, DATAHDR));
358 outl += outl2; 371 outl += outl2;
359 372
360 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
361 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
362 (unsigned char *) d, l); 375 (unsigned char *) d, l));
363 outl += outl2; 376 outl += outl2;
364 377
365 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 378 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
366 outl += outl2; 379 outl += outl2;
367 380
368 len = outl + data_hdr_size (); 381 len = outl + data_hdr_size ();
369 382
370 set_hdr (type, dst); 383 set_hdr (type, dst);
… …
379 int outl = 0, outl2; 392 int outl = 0, outl2;
380 tap_packet *p = new tap_packet; 393 tap_packet *p = new tap_packet;
381 u8 *d; 394 u8 *d;
382 u32 l = len - data_hdr_size (); 395 u32 l = len - data_hdr_size ();
383 396
384 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 397 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
385 398
386#if ENABLE_COMPRESSION 399#if ENABLE_COMPRESSION
387 u8 cdata[MAX_MTU]; 400 u8 cdata[MAX_MTU];
388 401
389 if (type == PT_DATA_COMPRESSED) 402 if (type == PT_DATA_COMPRESSED)
… …
391 else 404 else
392#endif 405#endif
393 d = &(*p)[6 + 6 - DATAHDR]; 406 d = &(*p)[6 + 6 - DATAHDR];
394 407
395 /* this overwrites part of the src mac, but we fix that later */ 408 /* this overwrites part of the src mac, but we fix that later */
396 EVP_DecryptUpdate (cctx, 409 require (EVP_DecryptUpdate (cctx,
397 d, &outl2, 410 d, &outl2,
398 (unsigned char *)&data, len - data_hdr_size ()); 411 (unsigned char *)&data, len - data_hdr_size ()));
399 outl += outl2; 412 outl += outl2;
400 413
401 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 414 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
402 outl += outl2; 415 outl += outl2;
403 416
404 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 417 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
405 418
406 id2mac (dst () ? dst() : THISNODE->id, p->dst); 419 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
467 set_hdr (type, dst); 480 set_hdr (type, dst);
468} 481}
469 482
470bool config_packet::chk_config () const 483bool config_packet::chk_config () const
471{ 484{
472 return prot_major == PROTOCOL_MAJOR 485 if (prot_major != PROTOCOL_MAJOR)
473 && randsize == RAND_SIZE 486 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474 && hmaclen == HMACLENGTH 487 else if (randsize != RAND_SIZE)
475 && flags == curflags () 488 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
489 else if (hmaclen != HMACLENGTH)
490 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
476 && challengelen == sizeof (rsachallenge) 493 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 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)) 497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
498 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)); 499 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
500 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
501 else
502 return true;
503
504 return false;
480} 505}
481 506
482struct auth_req_packet : config_packet 507struct auth_req_packet : config_packet
483{ 508{
484 char magic[8]; 509 char magic[8];
485 u8 initiate; // false if this is just an automatic reply 510 u8 initiate; // false if this is just an automatic reply
486 u8 protocols; // supported protocols (will get patches on forward) 511 u8 protocols; // supported protocols (will be patched on forward)
487 u8 pad2, pad3; 512 u8 pad2, pad3;
488 rsaid id; 513 rsaid id;
489 rsaencrdata encr; 514 rsaencrdata encr;
490 515
491 auth_req_packet (int dst, bool initiate_, u8 protocols_) 516 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
546}; 571};
547 572
548///////////////////////////////////////////////////////////////////////////// 573/////////////////////////////////////////////////////////////////////////////
549 574
550void 575void
576connection::connection_established ()
577{
578 if (ictx && octx)
579 {
580 connectmode = conf->connectmode;
581
582 rekey.start (NOW + ::conf.rekey);
583 keepalive.start (NOW + ::conf.keepalive);
584
585 // send queued packets
586 if (ictx && octx)
587 {
588 while (tap_packet *p = (tap_packet *)data_queue.get ())
589 {
590 send_data_packet (p);
591 delete p;
592 }
593
594 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
595 {
596 send_vpn_packet (p, si, IPTOS_RELIABILITY);
597 delete p;
598 }
599 }
600 }
601 else
602 {
603 retry_cnt = 0;
604 establish_connection.start (NOW + 5);
605 keepalive.stop ();
606 rekey.stop ();
607 }
608}
609
610void
551connection::reset_dstaddr () 611connection::reset_si ()
552{ 612{
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); 613 protocol = best_protocol (THISNODE->protocols & conf->protocols);
587 614
588 // mask out protocols we cannot establish 615 // mask out protocols we cannot establish
589 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 616 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
590 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
591 618
592 if (protocol) 619 si.set (conf, protocol);
620}
621
622// ensure sockinfo is valid, forward if necessary
623const sockinfo &
624connection::forward_si (const sockinfo &si) const
625{
626 if (!si.valid ())
627 {
628 connection *r = vpn->find_router ();
629
630 if (r)
631 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"),
633 conf->nodename, r->conf->nodename);
634 return r->si;
635 }
636 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
638 conf->nodename);
593 { 639 }
594 rsachallenge chg;
595 640
596 rsa_cache.gen (pkt->id, chg); 641 return si;
642}
597 643
598 if (0 > RSA_public_encrypt (sizeof chg, 644void
599 (unsigned char *)&chg, (unsigned char *)&pkt->encr, 645connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
600 conf->rsa_key, RSA_PKCS1_OAEP_PADDING)) 646{
601 fatal ("RSA_public_encrypt error"); 647 if (!vpn->send_vpn_packet (pkt, si, tos))
648 reset_connection ();
649}
602 650
603 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 651void
652connection::send_ping (const sockinfo &si, u8 pong)
653{
654 ping_packet *pkt = new ping_packet;
604 655
605 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 656 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
657 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
658
659 delete pkt;
660}
661
662void
663connection::send_reset (const sockinfo &si)
664{
665 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
666 {
667 config_packet *pkt = new config_packet;
668
669 pkt->setup (vpn_packet::PT_RESET, conf->id);
670 send_vpn_packet (pkt, si, IPTOS_MINCOST);
606 671
607 delete pkt; 672 delete pkt;
608 } 673 }
609 else 674}
610 ; // silently fail 675
676void
677connection::send_auth_request (const sockinfo &si, bool initiate)
678{
679 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
680
681 rsachallenge chg;
682 rsa_cache.gen (pkt->id, chg);
683 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
684
685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
686
687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
688
689 delete pkt;
611} 690}
612 691
613void 692void
614connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 693connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
615{ 694{
… …
643} 722}
644 723
645void 724void
646connection::establish_connection_cb (time_watcher &w) 725connection::establish_connection_cb (time_watcher &w)
647{ 726{
648 if (ictx || conf == THISNODE 727 if (!ictx
728 && conf != THISNODE
649 || connectmode == conf_node::C_NEVER 729 && connectmode != conf_node::C_NEVER
650 || connectmode == conf_node::C_DISABLED) 730 && connectmode != conf_node::C_DISABLED
651 w.at = TSTAMP_CANCEL; 731 && NOW > w.at)
652 else if (w.at <= NOW)
653 { 732 {
654 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
655 734
656 if (retry_int < 3600 * 8) 735 if (retry_int < 3600 * 8)
657 retry_cnt++; 736 retry_cnt++;
658 737
659 w.at = NOW + retry_int; 738 w.start (NOW + retry_int);
660 739
661 if (conf->hostname) 740 reset_si ();
741
742 if (si.prot && !si.host)
743 vpn->send_connect_request (conf->id);
744 else
662 { 745 {
663 reset_dstaddr (); 746 const sockinfo &dsi = forward_si (si);
747
664 if (si.host && auth_rate_limiter.can (si)) 748 if (dsi.valid () && auth_rate_limiter.can (dsi))
665 { 749 {
666 if (retry_cnt < 4) 750 if (retry_cnt < 4)
667 send_auth_request (si, true); 751 send_auth_request (dsi, true);
668 else 752 else
669 send_ping (si, 0); 753 send_ping (dsi, 0);
670 } 754 }
671 } 755 }
672 else
673 vpn->connect_request (conf->id);
674 } 756 }
675} 757}
676 758
677void 759void
678connection::reset_connection () 760connection::reset_connection ()
… …
692 si.host= 0; 774 si.host= 0;
693 775
694 last_activity = 0; 776 last_activity = 0;
695 retry_cnt = 0; 777 retry_cnt = 0;
696 778
697 rekey.reset (); 779 rekey.stop ();
698 keepalive.reset (); 780 keepalive.stop ();
699 establish_connection.reset (); 781 establish_connection.stop ();
700} 782}
701 783
702void 784void
703connection::shutdown () 785connection::shutdown ()
704{ 786{
… …
709} 791}
710 792
711void 793void
712connection::rekey_cb (time_watcher &w) 794connection::rekey_cb (time_watcher &w)
713{ 795{
714 w.at = TSTAMP_CANCEL;
715
716 reset_connection (); 796 reset_connection ();
717 establish_connection (); 797 establish_connection ();
718} 798}
719 799
720void 800void
721connection::send_data_packet (tap_packet *pkt, bool broadcast) 801connection::send_data_packet (tap_packet *pkt)
722{ 802{
723 vpndata_packet *p = new vpndata_packet; 803 vpndata_packet *p = new vpndata_packet;
724 int tos = 0; 804 int tos = 0;
725 805
726 if (conf->inherit_tos 806 // I am not hilarious about peeking into packets, but so be it.
727 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 807 if (conf->inherit_tos && pkt->is_ipv4 ())
728 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
729 tos = (*pkt)[15] & IPTOS_TOS_MASK; 808 tos = (*pkt)[15] & IPTOS_TOS_MASK;
730 809
731 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 810 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
732 send_vpn_packet (p, si, tos); 811 send_vpn_packet (p, si, tos);
733 812
734 delete p; 813 delete p;
735 814
736 if (oseqno > MAX_SEQNO) 815 if (oseqno > MAX_SEQNO)
737 rekey (); 816 rekey ();
738} 817}
739 818
740void 819void
741connection::inject_data_packet (tap_packet *pkt, bool broadcast) 820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
742{ 821{
743 if (ictx && octx) 822 if (ictx && octx)
744 send_data_packet (pkt, broadcast); 823 send_data_packet (pkt);
745 else 824 else
746 { 825 {
747 if (!broadcast)//DDDD 826 if (!broadcast)//DDDD
748 queue.put (new tap_packet (*pkt)); 827 data_queue.put (new tap_packet (*pkt));
828
829 establish_connection ();
830 }
831}
832
833void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
834{
835 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos);
837 else
838 {
839 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
749 840
750 establish_connection (); 841 establish_connection ();
751 } 842 }
752} 843}
753 844
… …
812 if (p->initiate) 903 if (p->initiate)
813 send_auth_request (rsi, false); 904 send_auth_request (rsi, false);
814 905
815 rsachallenge k; 906 rsachallenge k;
816 907
817 if (0 > RSA_private_decrypt (sizeof (p->encr), 908 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
818 (unsigned char *)&p->encr, (unsigned char *)&k, 909 {
819 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
820 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 910 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
821 conf->nodename, (const char *)rsi); 911 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
912 break;
913 }
822 else 914 else
823 { 915 {
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; 916 delete octx;
833 917
834 octx = new crypto_ctx (k, 1); 918 octx = new crypto_ctx (k, 1);
835 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
836 920
837 conf->protocols = p->protocols; 921 conf->protocols = p->protocols;
922
838 send_auth_response (rsi, p->id, k); 923 send_auth_response (rsi, p->id, k);
924
925 connection_established ();
839 926
840 break; 927 break;
841 } 928 }
842 } 929 }
930 else
931 slog (L_WARN, _("%s(%s): protocol mismatch"),
932 conf->nodename, (const char *)rsi);
843 933
844 send_reset (rsi); 934 send_reset (rsi);
845 } 935 }
846 936
847 break; 937 break;
… …
860 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 950 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
861 951
862 rsachallenge chg; 952 rsachallenge chg;
863 953
864 if (!rsa_cache.find (p->id, chg)) 954 if (!rsa_cache.find (p->id, chg))
955 {
865 slog (L_ERR, _("%s(%s): unrequested auth response"), 956 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
866 conf->nodename, (const char *)rsi); 957 conf->nodename, (const char *)rsi);
958 break;
959 }
867 else 960 else
868 { 961 {
869 crypto_ctx *cctx = new crypto_ctx (chg, 0); 962 crypto_ctx *cctx = new crypto_ctx (chg, 0);
870 963
871 if (!p->hmac_chk (cctx)) 964 if (!p->hmac_chk (cctx))
965 {
872 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 966 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"), 967 "could be an attack, or just corruption or a synchronization error"),
874 conf->nodename, (const char *)rsi); 968 conf->nodename, (const char *)rsi);
969 break;
970 }
875 else 971 else
876 { 972 {
877 rsaresponse h; 973 rsaresponse h;
878 974
879 rsa_hash (p->id, chg, h); 975 rsa_hash (p->id, chg, h);
… …
885 delete ictx; ictx = cctx; 981 delete ictx; ictx = cctx;
886 982
887 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 983 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
888 984
889 si = rsi; 985 si = rsi;
986 protocol = rsi.prot;
890 987
891 rekey.set (NOW + ::conf.rekey); 988 connection_established ();
892 keepalive.set (NOW + ::conf.keepalive);
893 989
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"), 990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
904 conf->nodename, (const char *)rsi, 991 conf->nodename, (const char *)rsi,
905 strprotocol (protocol),
906 p->prot_major, p->prot_minor); 992 p->prot_major, p->prot_minor);
907 993
908 if (::conf.script_node_up) 994 if (::conf.script_node_up)
909 run_script (run_script_cb (this, &connection::script_node_up), false); 995 run_script (run_script_cb (this, &connection::script_node_up), false);
910 996
… …
933 1019
934 if (ictx && octx) 1020 if (ictx && octx)
935 { 1021 {
936 vpndata_packet *p = (vpndata_packet *)pkt; 1022 vpndata_packet *p = (vpndata_packet *)pkt;
937 1023
938 if (rsi == si) 1024 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or a synchronization error"),
1027 conf->nodename, (const char *)rsi);
1028 else
939 { 1029 {
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 1030 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno);
1032
1033 if (iseqno.recv_ok (seqno))
945 { 1034 {
946 u32 seqno; 1035 vpn->tap->send (d);
947 tap_packet *d = p->unpack (this, seqno);
948 1036
949 if (iseqno.recv_ok (seqno)) 1037 if (si != rsi)
950 { 1038 {
951 vpn->tap->send (d); 1039 // 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; 1040 si = rsi;
1041
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi);
965 } 1044 }
1045
1046 delete d;
1047
1048 break;
966 } 1049 }
967 } 1050 }
968 else
969 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
970 } 1051 }
971 1052
972 send_reset (rsi); 1053 send_reset (rsi);
973 break; 1054 break;
974 1055
… …
976 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
977 { 1058 {
978 connect_req_packet *p = (connect_req_packet *) pkt; 1059 connect_req_packet *p = (connect_req_packet *) pkt;
979 1060
980 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
1062 connection *c = vpn->conns[p->id - 1];
981 conf->protocols = p->protocols; 1063 conf->protocols = p->protocols;
982 connection *c = vpn->conns[p->id - 1];
983 1064
984 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
985 conf->id, p->id, c->ictx && c->octx); 1066 conf->id, p->id, c->ictx && c->octx);
986 1067
987 if (c->ictx && c->octx) 1068 if (c->ictx && c->octx)
… …
989 // send connect_info packets to both sides, in case one is 1070 // send connect_info packets to both sides, in case one is
990 // behind a nat firewall (or both ;) 1071 // behind a nat firewall (or both ;)
991 c->send_connect_info (conf->id, si, conf->protocols); 1072 c->send_connect_info (conf->id, si, conf->protocols);
992 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1073 send_connect_info (c->conf->id, c->si, c->conf->protocols);
993 } 1074 }
1075 else
1076 c->establish_connection ();
994 } 1077 }
995 1078
996 break; 1079 break;
997 1080
998 case vpn_packet::PT_CONNECT_INFO: 1081 case vpn_packet::PT_CONNECT_INFO:
999 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1000 { 1083 {
1001 connect_info_packet *p = (connect_info_packet *) pkt; 1084 connect_info_packet *p = (connect_info_packet *) pkt;
1002 1085
1003 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything
1004 conf->protocols = p->protocols; 1087
1005 connection *c = vpn->conns[p->id - 1]; 1088 connection *c = vpn->conns[p->id - 1];
1089
1090 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf);
1006 1093
1007 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1008 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1009 1096
1097 const sockinfo &dsi = forward_si (p->si);
1098
1099 if (dsi.valid ())
1010 c->send_auth_request (p->si, true); 1100 c->send_auth_request (dsi, true);
1011 } 1101 }
1012 1102
1013 break; 1103 break;
1014 1104
1015 default: 1105 default:
… …
1024 { 1114 {
1025 reset_connection (); 1115 reset_connection ();
1026 establish_connection (); 1116 establish_connection ();
1027 } 1117 }
1028 else if (NOW < last_activity + ::conf.keepalive) 1118 else if (NOW < last_activity + ::conf.keepalive)
1029 w.at = last_activity + ::conf.keepalive; 1119 w.start (last_activity + ::conf.keepalive);
1030 else if (conf->connectmode != conf_node::C_ONDEMAND 1120 else if (conf->connectmode != conf_node::C_ONDEMAND
1031 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1121 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1032 { 1122 {
1033 send_ping (si); 1123 send_ping (si);
1034 w.at = NOW + 5; 1124 w.start (NOW + 5);
1035 } 1125 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;)
1129 w.start (last_activity + ::conf.keepalive + 10);
1036 else 1130 else
1037 reset_connection (); 1131 reset_connection ();
1038} 1132}
1039 1133
1040void connection::connect_request (int id) 1134void connection::send_connect_request (int id)
1041{ 1135{
1042 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1136 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1043 1137
1044 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1138 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1045 p->hmac_set (octx); 1139 p->hmac_set (octx);
… …
1075 putenv ("STATE=down"); 1169 putenv ("STATE=down");
1076 1170
1077 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1078} 1172}
1079 1173
1080// send a vpn packet out to other hosts
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}
1099
1100connection::connection(struct vpn *vpn_) 1174connection::connection(struct vpn *vpn_)
1101: vpn(vpn_) 1175: vpn(vpn_)
1102, rekey (this, &connection::rekey_cb) 1176, rekey (this, &connection::rekey_cb)
1103, keepalive (this, &connection::keepalive_cb) 1177, keepalive (this, &connection::keepalive_cb)
1104, establish_connection (this, &connection::establish_connection_cb) 1178, establish_connection (this, &connection::establish_connection_cb)

Diff Legend

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