ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines