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.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.36 by pcg, Sun May 30 17:36:00 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# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 20.; // one event every CUTOFF seconds 208# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
205 211
206 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
207 bool can (u32 host); 213 bool can (u32 host);
208}; 214};
209 215
210net_rate_limiter auth_rate_limiter, reset_rate_limiter; 216net_rate_limiter auth_rate_limiter, reset_rate_limiter;
211 217
… …
214 iterator i; 220 iterator i;
215 221
216 for (i = begin (); i != end (); ) 222 for (i = begin (); i != end (); )
217 if (i->host == host) 223 if (i->host == host)
218 break; 224 break;
219 else if (i->last < NOW - EXPIRE) 225 else if (i->last < NOW - NRL_EXPIRE)
220 i = erase (i); 226 i = erase (i);
221 else 227 else
222 i++; 228 i++;
223 229
224 if (i == end ()) 230 if (i == end ())
225 { 231 {
226 net_rateinfo ri; 232 net_rateinfo ri;
227 233
228 ri.host = host; 234 ri.host = host;
229 ri.pcnt = 1.; 235 ri.pcnt = 1.;
230 ri.diff = CUTOFF * (1. / (1. - ALPHA)); 236 ri.diff = NRL_MAXDIF;
231 ri.last = NOW; 237 ri.last = NOW;
232 238
233 push_front (ri); 239 push_front (ri);
234 240
235 return true; 241 return true;
… …
237 else 243 else
238 { 244 {
239 net_rateinfo ri (*i); 245 net_rateinfo ri (*i);
240 erase (i); 246 erase (i);
241 247
242 ri.pcnt = ri.pcnt * ALPHA; 248 ri.pcnt = ri.pcnt * NRL_ALPHA;
243 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
244 250
245 ri.last = NOW; 251 ri.last = NOW;
246 252
253 double dif = ri.diff / ri.pcnt;
254
247 bool send = ri.diff / ri.pcnt > CUTOFF; 255 bool send = dif > NRL_CUTOFF;
248 256
257 if (dif > NRL_MAXDIF)
258 {
259 ri.pcnt = 1.;
260 ri.diff = NRL_MAXDIF;
261 }
249 if (send) 262 else if (send)
250 ri.pcnt++; 263 ri.pcnt++;
251 264
252 push_front (ri); 265 push_front (ri);
253 266
254 return send; 267 return send;
… …
299} 312}
300 313
301#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
302#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
303 316
304struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
305 { 318 {
306 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
307 320
308 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
309 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
322 int outl = 0, outl2; 335 int outl = 0, outl2;
323 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
324 337
325#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
326 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
327 u32 cl;
328 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
329 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
330 if (cl) 345 if (cl)
331 { 346 {
332 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
333 d = cdata; 348 d = cdata;
334 l = cl + 2; 349 l = cl + 2;
335 350
336 d[0] = cl >> 8; 351 d[0] = cl >> 8;
337 d[1] = cl; 352 d[1] = cl;
353 }
338 } 354 }
339#endif 355#endif
340 356
341 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
342 358
343 struct { 359 struct {
344#if RAND_SIZE 360#if RAND_SIZE
345 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
346#endif 362#endif
… …
350 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
351#if RAND_SIZE 367#if RAND_SIZE
352 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
353#endif 369#endif
354 370
355 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
356 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
357 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
358 outl += outl2; 374 outl += outl2;
359 375
360 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
361 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
362 (unsigned char *) d, l); 378 (unsigned char *) d, l));
363 outl += outl2; 379 outl += outl2;
364 380
365 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
366 outl += outl2; 382 outl += outl2;
367 383
368 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
369 385
370 set_hdr (type, dst); 386 set_hdr (type, dst);
… …
379 int outl = 0, outl2; 395 int outl = 0, outl2;
380 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
381 u8 *d; 397 u8 *d;
382 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
383 399
384 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
385 401
386#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
387 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
388 404
389 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
… …
391 else 407 else
392#endif 408#endif
393 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
394 410
395 /* this overwrites part of the src mac, but we fix that later */ 411 /* this overwrites part of the src mac, but we fix that later */
396 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
397 d, &outl2, 413 d, &outl2,
398 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
399 outl += outl2; 415 outl += outl2;
400 416
401 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
402 outl += outl2; 418 outl += outl2;
403 419
404 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
405 421
406 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
435{ 451{
436 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
437 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
438 // hmacs simply will not work. 454 // hmacs simply will not work.
439 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
440 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
441 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
442
443 const u8 curflags () const
444 {
445 return 0x80
446 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
447 }
448 458
449 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
450 bool chk_config () const; 460 bool chk_config () const;
461
462 static u8 get_features ()
463 {
464 u8 f = 0;
465#if ENABLE_COMPRESSION
466 f |= FEATURE_COMPRESSION;
467#endif
468#if ENABLE_ROHC
469 f |= FEATURE_ROHC;
470#endif
471 return f;
472 }
451}; 473};
452 474
453void config_packet::setup (ptype type, int dst) 475void config_packet::setup (ptype type, int dst)
454{ 476{
455 prot_major = PROTOCOL_MAJOR; 477 prot_major = PROTOCOL_MAJOR;
456 prot_minor = PROTOCOL_MINOR; 478 prot_minor = PROTOCOL_MINOR;
457 randsize = RAND_SIZE; 479 randsize = RAND_SIZE;
458 hmaclen = HMACLENGTH; 480 hmaclen = HMACLENGTH;
459 flags = curflags (); 481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
460 challengelen = sizeof (rsachallenge); 482 challengelen = sizeof (rsachallenge);
483 features = get_features ();
461 484
462 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
463 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
464 hmac_nid = htonl (EVP_MD_type (DIGEST)); 487 hmac_nid = htonl (EVP_MD_type (DIGEST));
465 488
… …
467 set_hdr (type, dst); 490 set_hdr (type, dst);
468} 491}
469 492
470bool config_packet::chk_config () const 493bool config_packet::chk_config () const
471{ 494{
472 return prot_major == PROTOCOL_MAJOR 495 if (prot_major != PROTOCOL_MAJOR)
473 && randsize == RAND_SIZE 496 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474 && hmaclen == HMACLENGTH 497 else if (randsize != RAND_SIZE)
475 && flags == curflags () 498 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
499 else if (hmaclen != HMACLENGTH)
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
476 && challengelen == sizeof (rsachallenge) 505 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 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)) 509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 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)); 511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else
514 return true;
515
516 return false;
480} 517}
481 518
482struct auth_req_packet : config_packet 519struct auth_req_packet : config_packet
483{ 520{
484 char magic[8]; 521 char magic[8];
485 u8 initiate; // false if this is just an automatic reply 522 u8 initiate; // false if this is just an automatic reply
486 u8 protocols; // supported protocols (will get patches on forward) 523 u8 protocols; // supported protocols (will be patched on forward)
487 u8 pad2, pad3; 524 u8 pad2, pad3;
488 rsaid id; 525 rsaid id;
489 rsaencrdata encr; 526 rsaencrdata encr;
490 527
491 auth_req_packet (int dst, bool initiate_, u8 protocols_) 528 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
544 len = sizeof (*this) - sizeof (net_packet); 581 len = sizeof (*this) - sizeof (net_packet);
545 } 582 }
546}; 583};
547 584
548///////////////////////////////////////////////////////////////////////////// 585/////////////////////////////////////////////////////////////////////////////
586
587void
588connection::connection_established ()
589{
590 if (ictx && octx)
591 {
592 connectmode = conf->connectmode;
593
594 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey
596 + (conf->id > THISNODE->id ? 10 : 0));
597 keepalive.start (NOW + ::conf.keepalive);
598
599 // send queued packets
600 if (ictx && octx)
601 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 {
604 send_data_packet (p);
605 delete p;
606 }
607
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p;
612 }
613 }
614 }
615 else
616 {
617 retry_cnt = 0;
618 establish_connection.start (NOW + 5);
619 keepalive.stop ();
620 rekey.stop ();
621 }
622}
549 623
550void 624void
551connection::reset_si () 625connection::reset_si ()
552{ 626{
553 protocol = best_protocol (THISNODE->protocols & conf->protocols); 627 protocol = best_protocol (THISNODE->protocols & conf->protocols);
… …
580 654
581 return si; 655 return si;
582} 656}
583 657
584void 658void
659connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
660{
661 if (!vpn->send_vpn_packet (pkt, si, tos))
662 reset_connection ();
663}
664
665void
585connection::send_ping (const sockinfo &si, u8 pong) 666connection::send_ping (const sockinfo &si, u8 pong)
586{ 667{
587 ping_packet *pkt = new ping_packet; 668 ping_packet *pkt = new ping_packet;
588 669
589 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 670 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
590 vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 671 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
591 672
592 delete pkt; 673 delete pkt;
593} 674}
594 675
595void 676void
… …
598 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) 679 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
599 { 680 {
600 config_packet *pkt = new config_packet; 681 config_packet *pkt = new config_packet;
601 682
602 pkt->setup (vpn_packet::PT_RESET, conf->id); 683 pkt->setup (vpn_packet::PT_RESET, conf->id);
603 vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); 684 send_vpn_packet (pkt, si, IPTOS_MINCOST);
604 685
605 delete pkt; 686 delete pkt;
606 } 687 }
607} 688}
608 689
… …
610connection::send_auth_request (const sockinfo &si, bool initiate) 691connection::send_auth_request (const sockinfo &si, bool initiate)
611{ 692{
612 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 693 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
613 694
614 rsachallenge chg; 695 rsachallenge chg;
615
616 rsa_cache.gen (pkt->id, chg); 696 rsa_cache.gen (pkt->id, chg);
617 697 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
618 if (0 > RSA_public_encrypt (sizeof chg,
619 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
620 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
621 fatal ("RSA_public_encrypt error");
622 698
623 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 699 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
624 700
625 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 701 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
626
627 702
628 delete pkt; 703 delete pkt;
629} 704}
630 705
631void 706void
… …
639 714
640 pkt->hmac_set (octx); 715 pkt->hmac_set (octx);
641 716
642 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 717 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
643 718
644 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 719 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
645 720
646 delete pkt; 721 delete pkt;
647} 722}
648 723
649void 724void
… …
653 conf->id, rid, (const char *)rsi); 728 conf->id, rid, (const char *)rsi);
654 729
655 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 730 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
656 731
657 r->hmac_set (octx); 732 r->hmac_set (octx);
658 vpn->send_vpn_packet (r, si); 733 send_vpn_packet (r, si);
659 734
660 delete r; 735 delete r;
661} 736}
662 737
663void 738void
664connection::establish_connection_cb (time_watcher &w) 739connection::establish_connection_cb (time_watcher &w)
665{ 740{
666 if (ictx || conf == THISNODE 741 if (!ictx
742 && conf != THISNODE
667 || connectmode == conf_node::C_NEVER 743 && connectmode != conf_node::C_NEVER
668 || connectmode == conf_node::C_DISABLED) 744 && connectmode != conf_node::C_DISABLED
669 w.at = TSTAMP_CANCEL; 745 && NOW > w.at)
670 else if (w.at <= NOW)
671 { 746 {
672 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
673 748
674 if (retry_int < 3600 * 8) 749 if (retry_int < 3600 * 8)
675 retry_cnt++; 750 retry_cnt++;
676 751
677 w.at = NOW + retry_int; 752 w.start (NOW + retry_int);
678 753
679 reset_si (); 754 reset_si ();
680 755
681 if (si.prot && !si.host) 756 if (si.prot && !si.host)
682 vpn->connect_request (conf->id); 757 vpn->send_connect_request (conf->id);
683 else 758 else
684 { 759 {
685 const sockinfo &dsi = forward_si (si); 760 const sockinfo &dsi = forward_si (si);
686 761
687 if (dsi.valid () && auth_rate_limiter.can (dsi)) 762 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
713 si.host= 0; 788 si.host= 0;
714 789
715 last_activity = 0; 790 last_activity = 0;
716 retry_cnt = 0; 791 retry_cnt = 0;
717 792
718 rekey.reset (); 793 rekey.stop ();
719 keepalive.reset (); 794 keepalive.stop ();
720 establish_connection.reset (); 795 establish_connection.stop ();
721} 796}
722 797
723void 798void
724connection::shutdown () 799connection::shutdown ()
725{ 800{
… …
730} 805}
731 806
732void 807void
733connection::rekey_cb (time_watcher &w) 808connection::rekey_cb (time_watcher &w)
734{ 809{
735 w.at = TSTAMP_CANCEL;
736
737 reset_connection (); 810 reset_connection ();
738 establish_connection (); 811 establish_connection ();
739} 812}
740 813
741void 814void
742connection::send_data_packet (tap_packet *pkt, bool broadcast) 815connection::send_data_packet (tap_packet *pkt)
743{ 816{
744 vpndata_packet *p = new vpndata_packet; 817 vpndata_packet *p = new vpndata_packet;
745 int tos = 0; 818 int tos = 0;
746 819
747 if (conf->inherit_tos 820 // I am not hilarious about peeking into packets, but so be it.
748 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 821 if (conf->inherit_tos && pkt->is_ipv4 ())
749 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
750 tos = (*pkt)[15] & IPTOS_TOS_MASK; 822 tos = (*pkt)[15] & IPTOS_TOS_MASK;
751 823
752 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 824 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
753 vpn->send_vpn_packet (p, si, tos); 825 send_vpn_packet (p, si, tos);
754 826
755 delete p; 827 delete p;
756 828
757 if (oseqno > MAX_SEQNO) 829 if (oseqno > MAX_SEQNO)
758 rekey (); 830 rekey ();
759} 831}
760 832
761void 833void
762connection::inject_data_packet (tap_packet *pkt, bool broadcast) 834connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
763{ 835{
764 if (ictx && octx) 836 if (ictx && octx)
765 send_data_packet (pkt, broadcast); 837 send_data_packet (pkt);
766 else 838 else
767 { 839 {
768 if (!broadcast)//DDDD 840 if (!broadcast)//DDDD
769 queue.put (new tap_packet (*pkt)); 841 data_queue.put (new tap_packet (*pkt));
770 842
771 establish_connection (); 843 establish_connection ();
772 } 844 }
773} 845}
774 846
775void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 847void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
776{ 848{
777 if (ictx && octx) 849 if (ictx && octx)
778 vpn->send_vpn_packet (pkt, si, tos); 850 send_vpn_packet (pkt, si, tos);
779 else 851 else
852 {
853 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
854
780 establish_connection (); 855 establish_connection ();
856 }
781} 857}
782 858
783void 859void
784connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 860connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
785{ 861{
… …
841 if (p->initiate) 917 if (p->initiate)
842 send_auth_request (rsi, false); 918 send_auth_request (rsi, false);
843 919
844 rsachallenge k; 920 rsachallenge k;
845 921
846 if (0 > RSA_private_decrypt (sizeof (p->encr), 922 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
847 (unsigned char *)&p->encr, (unsigned char *)&k, 923 {
848 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
849 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 924 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
850 conf->nodename, (const char *)rsi); 925 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
926 break;
927 }
851 else 928 else
852 { 929 {
853 retry_cnt = 0;
854 establish_connection.start (NOW + 8); //? ;)
855 keepalive.reset ();
856 rekey.reset ();
857
858 delete ictx;
859 ictx = 0;
860
861 delete octx; 930 delete octx;
862 931
863 octx = new crypto_ctx (k, 1); 932 octx = new crypto_ctx (k, 1);
864 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 933 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
865 934
935 // compatibility code, remove when no longer required
936 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
937
866 conf->protocols = p->protocols; 938 conf->protocols = p->protocols;
939 features = p->features & config_packet::get_features ();
940
867 send_auth_response (rsi, p->id, k); 941 send_auth_response (rsi, p->id, k);
942
943 connection_established ();
868 944
869 break; 945 break;
870 } 946 }
871 } 947 }
948 else
949 slog (L_WARN, _("%s(%s): protocol mismatch"),
950 conf->nodename, (const char *)rsi);
872 951
873 send_reset (rsi); 952 send_reset (rsi);
874 } 953 }
875 954
876 break; 955 break;
… …
889 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 968 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
890 969
891 rsachallenge chg; 970 rsachallenge chg;
892 971
893 if (!rsa_cache.find (p->id, chg)) 972 if (!rsa_cache.find (p->id, chg))
973 {
894 slog (L_ERR, _("%s(%s): unrequested auth response"), 974 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
895 conf->nodename, (const char *)rsi); 975 conf->nodename, (const char *)rsi);
976 break;
977 }
896 else 978 else
897 { 979 {
898 crypto_ctx *cctx = new crypto_ctx (chg, 0); 980 crypto_ctx *cctx = new crypto_ctx (chg, 0);
899 981
900 if (!p->hmac_chk (cctx)) 982 if (!p->hmac_chk (cctx))
983 {
901 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 984 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
902 "could be an attack, or just corruption or an synchronization error"), 985 "could be an attack, or just corruption or a synchronization error"),
903 conf->nodename, (const char *)rsi); 986 conf->nodename, (const char *)rsi);
987 break;
988 }
904 else 989 else
905 { 990 {
906 rsaresponse h; 991 rsaresponse h;
907 992
908 rsa_hash (p->id, chg, h); 993 rsa_hash (p->id, chg, h);
… …
916 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1001 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
917 1002
918 si = rsi; 1003 si = rsi;
919 protocol = rsi.prot; 1004 protocol = rsi.prot;
920 1005
921 rekey.start (NOW + ::conf.rekey); 1006 connection_established ();
922 keepalive.start (NOW + ::conf.keepalive);
923
924 // send queued packets
925 while (tap_packet *p = queue.get ())
926 {
927 send_data_packet (p);
928 delete p;
929 }
930
931 connectmode = conf->connectmode;
932 1007
933 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1008 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
934 conf->nodename, (const char *)rsi, 1009 conf->nodename, (const char *)rsi,
935 p->prot_major, p->prot_minor); 1010 p->prot_major, p->prot_minor);
936 1011
… …
962 1037
963 if (ictx && octx) 1038 if (ictx && octx)
964 { 1039 {
965 vpndata_packet *p = (vpndata_packet *)pkt; 1040 vpndata_packet *p = (vpndata_packet *)pkt;
966 1041
967 if (rsi == si) 1042 if (!p->hmac_chk (ictx))
1043 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1044 "could be an attack, or just corruption or a synchronization error"),
1045 conf->nodename, (const char *)rsi);
1046 else
968 { 1047 {
969 if (!p->hmac_chk (ictx))
970 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
971 "could be an attack, or just corruption or an synchronization error"),
972 conf->nodename, (const char *)rsi);
973 else 1048 u32 seqno;
1049 tap_packet *d = p->unpack (this, seqno);
1050
1051 if (iseqno.recv_ok (seqno))
974 { 1052 {
975 u32 seqno; 1053 vpn->tap->send (d);
976 tap_packet *d = p->unpack (this, seqno);
977 1054
978 if (iseqno.recv_ok (seqno)) 1055 if (si != rsi)
979 { 1056 {
980 vpn->tap->send (d); 1057 // fast re-sync on connection changes, useful especially for tcp/ip
981
982 if (p->dst () == 0) // re-broadcast
983 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
984 {
985 connection *c = *i;
986
987 if (c->conf != THISNODE && c->conf != conf)
988 c->inject_data_packet (d);
989 }
990
991 delete d;
992
993 break; 1058 si = rsi;
1059
1060 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1061 conf->nodename, (const char *)si, (const char *)rsi);
994 } 1062 }
995 } 1063 }
1064
1065 delete d;
1066 break;
996 } 1067 }
997 else
998 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
999 } 1068 }
1000 1069
1001 send_reset (rsi); 1070 send_reset (rsi);
1002 break; 1071 break;
1003 1072
… …
1018 // send connect_info packets to both sides, in case one is 1087 // send connect_info packets to both sides, in case one is
1019 // behind a nat firewall (or both ;) 1088 // behind a nat firewall (or both ;)
1020 c->send_connect_info (conf->id, si, conf->protocols); 1089 c->send_connect_info (conf->id, si, conf->protocols);
1021 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1090 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1022 } 1091 }
1092 else
1093 c->establish_connection ();
1023 } 1094 }
1024 1095
1025 break; 1096 break;
1026 1097
1027 case vpn_packet::PT_CONNECT_INFO: 1098 case vpn_packet::PT_CONNECT_INFO:
… …
1060 { 1131 {
1061 reset_connection (); 1132 reset_connection ();
1062 establish_connection (); 1133 establish_connection ();
1063 } 1134 }
1064 else if (NOW < last_activity + ::conf.keepalive) 1135 else if (NOW < last_activity + ::conf.keepalive)
1065 w.at = last_activity + ::conf.keepalive; 1136 w.start (last_activity + ::conf.keepalive);
1066 else if (conf->connectmode != conf_node::C_ONDEMAND 1137 else if (conf->connectmode != conf_node::C_ONDEMAND
1067 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1138 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1068 { 1139 {
1069 send_ping (si); 1140 send_ping (si);
1070 w.at = NOW + 5; 1141 w.start (NOW + 5);
1071 } 1142 }
1143 else if (NOW < last_activity + ::conf.keepalive + 10)
1144 // hold ondemand connections implicitly a few seconds longer
1145 // should delete octx, though, or something like that ;)
1146 w.start (last_activity + ::conf.keepalive + 10);
1072 else 1147 else
1073 reset_connection (); 1148 reset_connection ();
1074} 1149}
1075 1150
1076void connection::connect_request (int id) 1151void connection::send_connect_request (int id)
1077{ 1152{
1078 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1153 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1079 1154
1080 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1155 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1081 p->hmac_set (octx); 1156 p->hmac_set (octx);
1082 vpn->send_vpn_packet (p, si); 1157 send_vpn_packet (p, si);
1083 1158
1084 delete p; 1159 delete p;
1085} 1160}
1086 1161
1087void connection::script_node () 1162void connection::script_node ()

Diff Legend

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