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.11 by pcg, Sun Apr 13 00:35:46 2003 UTC vs.
Revision 1.46 by pcg, Sat Mar 5 19:13:15 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. / 180.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
205 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
206 213
207 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 215 bool can (u32 host);
209}; 216};
210 217
211net_rate_limiter auth_rate_limiter, reset_rate_limiter; 218net_rate_limiter auth_rate_limiter, reset_rate_limiter;
212 219
… …
215 iterator i; 222 iterator i;
216 223
217 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
218 if (i->host == host) 225 if (i->host == host)
219 break; 226 break;
220 else if (i->last < NOW - EXPIRE) 227 else if (i->last < NOW - NRL_EXPIRE)
221 i = erase (i); 228 i = erase (i);
222 else 229 else
223 i++; 230 i++;
224 231
225 if (i == end ()) 232 if (i == end ())
226 { 233 {
227 net_rateinfo ri; 234 net_rateinfo ri;
228 235
229 ri.host = host; 236 ri.host = host;
230 ri.pcnt = 1.; 237 ri.pcnt = 1.;
231 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
232 ri.last = NOW; 239 ri.last = NOW;
233 240
234 push_front (ri); 241 push_front (ri);
235 242
236 return true; 243 return true;
… …
238 else 245 else
239 { 246 {
240 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
241 erase (i); 248 erase (i);
242 249
243 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
244 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last);
245 252
246 ri.last = NOW; 253 ri.last = NOW;
247 254
248 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
249 256
250 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
251 258
252 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
253 { 260 {
254 ri.pcnt = 1.; 261 ri.pcnt = 1.;
255 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
256 } 263 }
257 else if (send) 264 else if (send)
258 ri.pcnt++; 265 ri.pcnt++;
259 266
260 push_front (ri); 267 push_front (ri);
… …
307} 314}
308 315
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 318
312struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
313 { 320 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 322
316 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
317 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
330 int outl = 0, outl2; 337 int outl = 0, outl2;
331 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
332 339
333#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
334 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
335 u32 cl;
336 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
337 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
338 if (cl) 347 if (cl)
339 { 348 {
340 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
341 d = cdata; 350 d = cdata;
342 l = cl + 2; 351 l = cl + 2;
343 352
344 d[0] = cl >> 8; 353 d[0] = cl >> 8;
345 d[1] = cl; 354 d[1] = cl;
355 }
346 } 356 }
347#endif 357#endif
348 358
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 360
351 struct { 361 struct {
352#if RAND_SIZE 362#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
354#endif 364#endif
… …
358 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 369#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 371#endif
362 372
363 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 376 outl += outl2;
367 377
368 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 380 (unsigned char *) d, l));
371 outl += outl2; 381 outl += outl2;
372 382
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 384 outl += outl2;
375 385
376 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
377 387
378 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 397 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
389 u8 *d; 399 u8 *d;
390 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
391 401
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 403
394#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
396 406
397 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
399 else 409 else
400#endif 410#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
402 412
403 /* this overwrites part of the src mac, but we fix that later */ 413 /* this overwrites part of the src mac, but we fix that later */
404 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 415 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 417 outl += outl2;
408 418
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 420 outl += outl2;
411 421
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 423
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
443{ 453{
444 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
445 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
446 // hmacs simply will not work. 456 // hmacs simply will not work.
447 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
448 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
449 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
450
451 const u8 curflags () const
452 {
453 return 0x80
454 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
455 }
456 460
457 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
458 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473 return f;
474 }
459}; 475};
460 476
461void config_packet::setup (ptype type, int dst) 477void config_packet::setup (ptype type, int dst)
462{ 478{
463 prot_major = PROTOCOL_MAJOR; 479 prot_major = PROTOCOL_MAJOR;
464 prot_minor = PROTOCOL_MINOR; 480 prot_minor = PROTOCOL_MINOR;
465 randsize = RAND_SIZE; 481 randsize = RAND_SIZE;
466 hmaclen = HMACLENGTH; 482 hmaclen = HMACLENGTH;
467 flags = curflags (); 483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
468 challengelen = sizeof (rsachallenge); 484 challengelen = sizeof (rsachallenge);
485 features = get_features ();
469 486
470 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
472 hmac_nid = htonl (EVP_MD_type (DIGEST)); 489 hmac_nid = htonl (EVP_MD_type (DIGEST));
473 490
… …
475 set_hdr (type, dst); 492 set_hdr (type, dst);
476} 493}
477 494
478bool config_packet::chk_config () const 495bool config_packet::chk_config () const
479{ 496{
480 return prot_major == PROTOCOL_MAJOR 497 if (prot_major != PROTOCOL_MAJOR)
481 && randsize == RAND_SIZE 498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 && hmaclen == HMACLENGTH 499 else if (randsize != RAND_SIZE)
483 && flags == curflags () 500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
484 && challengelen == sizeof (rsachallenge) 507 else if (challengelen != sizeof (rsachallenge))
508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
485 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
486 && digest_nid == htonl (EVP_MD_type (RSA_HASH)) 511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
512 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
487 && hmac_nid == htonl (EVP_MD_type (DIGEST)); 513 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
514 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
515 else
516 return true;
517
518 return false;
488} 519}
489 520
490struct auth_req_packet : config_packet 521struct auth_req_packet : config_packet
491{ 522{
492 char magic[8]; 523 char magic[8];
493 u8 initiate; // false if this is just an automatic reply 524 u8 initiate; // false if this is just an automatic reply
494 u8 protocols; // supported protocols (will get patches on forward) 525 u8 protocols; // supported protocols (will be patched on forward)
495 u8 pad2, pad3; 526 u8 pad2, pad3;
496 rsaid id; 527 rsaid id;
497 rsaencrdata encr; 528 rsaencrdata encr;
498 529
499 auth_req_packet (int dst, bool initiate_, u8 protocols_) 530 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
560{ 591{
561 if (ictx && octx) 592 if (ictx && octx)
562 { 593 {
563 connectmode = conf->connectmode; 594 connectmode = conf->connectmode;
564 595
596 // make sure rekeying timeouts are slightly asymmetric
565 rekey.start (NOW + ::conf.rekey); 597 rekey.start (NOW + ::conf.rekey
598 + (conf->id > THISNODE->id ? 10 : 0));
566 keepalive.start (NOW + ::conf.keepalive); 599 keepalive.start (NOW + ::conf.keepalive);
567 600
568 // send queued packets 601 // send queued packets
569 if (ictx && octx) 602 if (ictx && octx)
603 {
570 while (tap_packet *p = queue.get ()) 604 while (tap_packet *p = (tap_packet *)data_queue.get ())
571 { 605 {
572 send_data_packet (p); 606 send_data_packet (p);
573 delete p; 607 delete p;
574 } 608 }
609
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p;
614 }
615 }
575 } 616 }
576 else 617 else
577 { 618 {
578 retry_cnt = 0; 619 retry_cnt = 0;
579 establish_connection.start (NOW + 5); 620 establish_connection.start (NOW + 5);
580 keepalive.reset (); 621 keepalive.stop ();
581 rekey.reset (); 622 rekey.stop ();
582 } 623 }
583} 624}
584 625
585void 626void
586connection::reset_si () 627connection::reset_si ()
… …
588 protocol = best_protocol (THISNODE->protocols & conf->protocols); 629 protocol = best_protocol (THISNODE->protocols & conf->protocols);
589 630
590 // mask out protocols we cannot establish 631 // mask out protocols we cannot establish
591 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 632 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
592 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
593 635
594 si.set (conf, protocol); 636 si.set (conf, protocol);
595} 637}
596 638
597// ensure sockinfo is valid, forward if necessary 639// ensure sockinfo is valid, forward if necessary
… …
602 { 644 {
603 connection *r = vpn->find_router (); 645 connection *r = vpn->find_router ();
604 646
605 if (r) 647 if (r)
606 { 648 {
607 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
608 conf->nodename, r->conf->nodename); 650 conf->nodename, r->conf->nodename, (const char *)r->si);
609 return r->si; 651 return r->si;
610 } 652 }
611 else 653 else
612 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
613 conf->nodename); 655 conf->nodename);
… …
652connection::send_auth_request (const sockinfo &si, bool initiate) 694connection::send_auth_request (const sockinfo &si, bool initiate)
653{ 695{
654 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 696 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
655 697
656 rsachallenge chg; 698 rsachallenge chg;
657
658 rsa_cache.gen (pkt->id, chg); 699 rsa_cache.gen (pkt->id, chg);
659 700 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
660 if (0 > RSA_public_encrypt (sizeof chg,
661 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
662 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
663 fatal ("RSA_public_encrypt error");
664 701
665 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
666 703
667 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
668 705
… …
702} 739}
703 740
704void 741void
705connection::establish_connection_cb (time_watcher &w) 742connection::establish_connection_cb (time_watcher &w)
706{ 743{
707 if (ictx || conf == THISNODE 744 if (!ictx
745 && conf != THISNODE
708 || connectmode == conf_node::C_NEVER 746 && connectmode != conf_node::C_NEVER
709 || connectmode == conf_node::C_DISABLED) 747 && connectmode != conf_node::C_DISABLED
710 w.at = TSTAMP_CANCEL; 748 && NOW > w.at)
711 else if (w.at <= NOW)
712 { 749 {
713 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
714 751
715 if (retry_int < 3600 * 8) 752 if (retry_int < conf->max_retry)
716 retry_cnt++; 753 retry_cnt++;
754 else
755 retry_int = conf->max_retry;
717 756
718 w.at = NOW + retry_int; 757 w.start (NOW + retry_int);
719 758
720 reset_si (); 759 reset_si ();
721 760
722 if (si.prot && !si.host) 761 if (si.prot && !si.host)
723 vpn->send_connect_request (conf->id); 762 vpn->send_connect_request (conf->id);
… …
748 run_script (run_script_cb (this, &connection::script_node_down), false); 787 run_script (run_script_cb (this, &connection::script_node_down), false);
749 } 788 }
750 789
751 delete ictx; ictx = 0; 790 delete ictx; ictx = 0;
752 delete octx; octx = 0; 791 delete octx; octx = 0;
792#if ENABLE_DNS
793 dnsv4_reset_connection ();
794#endif
753 795
754 si.host= 0; 796 si.host = 0;
755 797
756 last_activity = 0; 798 last_activity = 0;
757 retry_cnt = 0; 799 retry_cnt = 0;
758 800
759 rekey.reset (); 801 rekey.stop ();
760 keepalive.reset (); 802 keepalive.stop ();
761 establish_connection.reset (); 803 establish_connection.stop ();
762} 804}
763 805
764void 806void
765connection::shutdown () 807connection::shutdown ()
766{ 808{
… …
771} 813}
772 814
773void 815void
774connection::rekey_cb (time_watcher &w) 816connection::rekey_cb (time_watcher &w)
775{ 817{
776 w.at = TSTAMP_CANCEL;
777
778 reset_connection (); 818 reset_connection ();
779 establish_connection (); 819 establish_connection ();
780} 820}
781 821
782void 822void
783connection::send_data_packet (tap_packet *pkt, bool broadcast) 823connection::send_data_packet (tap_packet *pkt)
784{ 824{
785 vpndata_packet *p = new vpndata_packet; 825 vpndata_packet *p = new vpndata_packet;
786 int tos = 0; 826 int tos = 0;
787 827
788 if (conf->inherit_tos 828 // I am not hilarious about peeking into packets, but so be it.
789 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 829 if (conf->inherit_tos && pkt->is_ipv4 ())
790 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
791 tos = (*pkt)[15] & IPTOS_TOS_MASK; 830 tos = (*pkt)[15] & IPTOS_TOS_MASK;
792 831
793 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 832 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
794 send_vpn_packet (p, si, tos); 833 send_vpn_packet (p, si, tos);
795 834
796 delete p; 835 delete p;
797 836
798 if (oseqno > MAX_SEQNO) 837 if (oseqno > MAX_SEQNO)
799 rekey (); 838 rekey ();
800} 839}
801 840
802void 841void
803connection::inject_data_packet (tap_packet *pkt, bool broadcast) 842connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
804{ 843{
805 if (ictx && octx) 844 if (ictx && octx)
806 send_data_packet (pkt, broadcast); 845 send_data_packet (pkt);
807 else 846 else
808 { 847 {
809 if (!broadcast)//DDDD 848 if (!broadcast)//DDDD
810 queue.put (new tap_packet (*pkt)); 849 data_queue.put (new tap_packet (*pkt));
811 850
812 establish_connection (); 851 establish_connection ();
813 } 852 }
814} 853}
815 854
816void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 855void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
817{ 856{
818 if (ictx && octx) 857 if (ictx && octx)
819 send_vpn_packet (pkt, si, tos); 858 send_vpn_packet (pkt, si, tos);
820 else 859 else
860 {
861 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
862
821 establish_connection (); 863 establish_connection ();
864 }
822} 865}
823 866
824void 867void
825connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 868connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
826{ 869{
… …
882 if (p->initiate) 925 if (p->initiate)
883 send_auth_request (rsi, false); 926 send_auth_request (rsi, false);
884 927
885 rsachallenge k; 928 rsachallenge k;
886 929
887 if (0 > RSA_private_decrypt (sizeof (p->encr), 930 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
888 (unsigned char *)&p->encr, (unsigned char *)&k, 931 {
889 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
890 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 932 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
891 conf->nodename, (const char *)rsi); 933 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
934 break;
935 }
892 else 936 else
893 { 937 {
894 delete octx; 938 delete octx;
895 939
896 octx = new crypto_ctx (k, 1); 940 octx = new crypto_ctx (k, 1);
897 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 941 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
898 942
943 // compatibility code, remove when no longer required
944 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
945
899 conf->protocols = p->protocols; 946 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features ();
900 948
901 send_auth_response (rsi, p->id, k); 949 send_auth_response (rsi, p->id, k);
902 950
903 connection_established (); 951 connection_established ();
904 952
905 break; 953 break;
906 } 954 }
907 } 955 }
956 else
957 slog (L_WARN, _("%s(%s): protocol mismatch"),
958 conf->nodename, (const char *)rsi);
908 959
909 send_reset (rsi); 960 send_reset (rsi);
910 } 961 }
911 962
912 break; 963 break;
… …
925 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 976 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
926 977
927 rsachallenge chg; 978 rsachallenge chg;
928 979
929 if (!rsa_cache.find (p->id, chg)) 980 if (!rsa_cache.find (p->id, chg))
981 {
930 slog (L_ERR, _("%s(%s): unrequested auth response"), 982 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
931 conf->nodename, (const char *)rsi); 983 conf->nodename, (const char *)rsi);
984 break;
985 }
932 else 986 else
933 { 987 {
934 crypto_ctx *cctx = new crypto_ctx (chg, 0); 988 crypto_ctx *cctx = new crypto_ctx (chg, 0);
935 989
936 if (!p->hmac_chk (cctx)) 990 if (!p->hmac_chk (cctx))
991 {
937 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 992 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
938 "could be an attack, or just corruption or an synchronization error"), 993 "could be an attack, or just corruption or a synchronization error"),
939 conf->nodename, (const char *)rsi); 994 conf->nodename, (const char *)rsi);
995 break;
996 }
940 else 997 else
941 { 998 {
942 rsaresponse h; 999 rsaresponse h;
943 1000
944 rsa_hash (p->id, chg, h); 1001 rsa_hash (p->id, chg, h);
… …
990 { 1047 {
991 vpndata_packet *p = (vpndata_packet *)pkt; 1048 vpndata_packet *p = (vpndata_packet *)pkt;
992 1049
993 if (!p->hmac_chk (ictx)) 1050 if (!p->hmac_chk (ictx))
994 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1051 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
995 "could be an attack, or just corruption or an synchronization error"), 1052 "could be an attack, or just corruption or a synchronization error"),
996 conf->nodename, (const char *)rsi); 1053 conf->nodename, (const char *)rsi);
997 else 1054 else
998 { 1055 {
999 u32 seqno; 1056 u32 seqno;
1000 tap_packet *d = p->unpack (this, seqno); 1057 tap_packet *d = p->unpack (this, seqno);
1001 1058
1002 if (iseqno.recv_ok (seqno)) 1059 if (iseqno.recv_ok (seqno))
1003 { 1060 {
1004 vpn->tap->send (d); 1061 vpn->tap->send (d);
1005 1062
1006 if (p->dst () == 0) // re-broadcast
1007 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1008 {
1009 connection *c = *i;
1010
1011 if (c->conf != THISNODE && c->conf != conf)
1012 c->inject_data_packet (d);
1013 }
1014
1015 if (si != rsi) 1063 if (si != rsi)
1016 { 1064 {
1017 // fast re-sync on conneciton changes, useful especially for tcp/ip 1065 // fast re-sync on connection changes, useful especially for tcp/ip
1018 si = rsi; 1066 si = rsi;
1019 1067
1020 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1068 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1021 conf->nodename, (const char *)si, (const char *)rsi); 1069 conf->nodename, (const char *)si, (const char *)rsi);
1022 } 1070 }
1023
1024 delete d;
1025
1026 break;
1027 } 1071 }
1072
1073 delete d;
1074 break;
1028 } 1075 }
1029 } 1076 }
1030 1077
1031 send_reset (rsi); 1078 send_reset (rsi);
1032 break; 1079 break;
… …
1057 break; 1104 break;
1058 1105
1059 case vpn_packet::PT_CONNECT_INFO: 1106 case vpn_packet::PT_CONNECT_INFO:
1060 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1107 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1061 { 1108 {
1062 connect_info_packet *p = (connect_info_packet *) pkt; 1109 connect_info_packet *p = (connect_info_packet *)pkt;
1063 1110
1064 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1111 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything
1065 1112 {
1066 connection *c = vpn->conns[p->id - 1]; 1113 connection *c = vpn->conns[p->id - 1];
1067 1114
1068 c->conf->protocols = p->protocols; 1115 c->conf->protocols = p->protocols;
1069 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1116 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1070 p->si.upgrade_protocol (protocol, c->conf); 1117 p->si.upgrade_protocol (protocol, c->conf);
1071 1118
1072 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1119 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1073 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1120 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1074 1121
1075 const sockinfo &dsi = forward_si (p->si); 1122 const sockinfo &dsi = forward_si (p->si);
1076 1123
1077 if (dsi.valid ()) 1124 if (dsi.valid ())
1078 c->send_auth_request (dsi, true); 1125 c->send_auth_request (dsi, true);
1126 }
1079 } 1127 }
1080 1128
1081 break; 1129 break;
1082 1130
1083 default: 1131 default:
… …
1092 { 1140 {
1093 reset_connection (); 1141 reset_connection ();
1094 establish_connection (); 1142 establish_connection ();
1095 } 1143 }
1096 else if (NOW < last_activity + ::conf.keepalive) 1144 else if (NOW < last_activity + ::conf.keepalive)
1097 w.at = last_activity + ::conf.keepalive; 1145 w.start (last_activity + ::conf.keepalive);
1098 else if (conf->connectmode != conf_node::C_ONDEMAND 1146 else if (conf->connectmode != conf_node::C_ONDEMAND
1099 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1147 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1100 { 1148 {
1101 send_ping (si); 1149 send_ping (si);
1102 w.at = NOW + 5; 1150 w.start (NOW + 5);
1103 } 1151 }
1152 else if (NOW < last_activity + ::conf.keepalive + 10)
1153 // hold ondemand connections implicitly a few seconds longer
1154 // should delete octx, though, or something like that ;)
1155 w.start (last_activity + ::conf.keepalive + 10);
1104 else 1156 else
1105 reset_connection (); 1157 reset_connection ();
1106} 1158}
1107 1159
1108void connection::send_connect_request (int id) 1160void connection::send_connect_request (int id)
… …
1143 putenv ("STATE=down"); 1195 putenv ("STATE=down");
1144 1196
1145 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1197 return ::conf.script_node_up ? ::conf.script_node_down : "node-down";
1146} 1198}
1147 1199
1148connection::connection(struct vpn *vpn_) 1200connection::connection (struct vpn *vpn, conf_node *conf)
1149: vpn(vpn_) 1201: vpn(vpn), conf(conf)
1150, rekey (this, &connection::rekey_cb) 1202, rekey (this, &connection::rekey_cb)
1151, keepalive (this, &connection::keepalive_cb) 1203, keepalive (this, &connection::keepalive_cb)
1152, establish_connection (this, &connection::establish_connection_cb) 1204, establish_connection (this, &connection::establish_connection_cb)
1205#if ENABLE_DNS
1206, dns (0)
1207#endif
1153{ 1208{
1154 octx = ictx = 0; 1209 octx = ictx = 0;
1155 retry_cnt = 0; 1210 retry_cnt = 0;
1156 1211
1212 if (!conf->protocols) // make sure some protocol is enabled
1213 conf->protocols = PROT_UDPv4;
1214
1157 connectmode = conf_node::C_ALWAYS; // initial setting 1215 connectmode = conf_node::C_ALWAYS; // initial setting
1158 reset_connection (); 1216 reset_connection ();
1159} 1217}
1160 1218
1161connection::~connection () 1219connection::~connection ()

Diff Legend

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