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.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.31 by pcg, Sun Feb 8 07:24:25 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>
… …
43# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
44#endif 43#endif
45 44
46#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
47 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
48struct crypto_ctx 53struct crypto_ctx
49{ 54{
50 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
51 HMAC_CTX hctx; 56 HMAC_CTX hctx;
52 57
… …
55}; 60};
56 61
57crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
58{ 63{
59 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
60 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));
61 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
62 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);
63} 68}
64 69
65crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
66{ 71{
67 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
68 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
69} 74}
70 75
71static void 76static void
72rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
73{ 78{
74 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
75 80
76 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
77 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
78 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
79 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
80 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
81 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
82} 87}
83 88
84struct rsa_entry { 89struct rsa_entry {
85 tstamp expire; 90 tstamp expire;
… …
133 138
134} rsa_cache; 139} rsa_cache;
135 140
136void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
137{ 142{
138 if (empty ()) 143 if (!empty ())
139 w.at = TSTAMP_CANCEL;
140 else
141 { 144 {
142 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
143 146
144 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
145 if (i->expire <= NOW) 148 if (i->expire <= NOW)
146 i = erase (i); 149 i = erase (i);
147 else 150 else
… …
309} 312}
310 313
311#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
312#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
313 316
314struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
315 { 318 {
316 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
317 320
318 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);
319 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
332 int outl = 0, outl2; 335 int outl = 0, outl2;
333 ptype type = PT_DATA_UNCOMPRESSED; 336 ptype type = PT_DATA_UNCOMPRESSED;
334 337
335#if ENABLE_COMPRESSION 338#if ENABLE_COMPRESSION
336 u8 cdata[MAX_MTU]; 339 u8 cdata[MAX_MTU];
337 u32 cl;
338 340
341 if (conn->features & ENABLE_COMPRESSION)
342 {
339 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344
340 if (cl) 345 if (cl)
341 { 346 {
342 type = PT_DATA_COMPRESSED; 347 type = PT_DATA_COMPRESSED;
343 d = cdata; 348 d = cdata;
344 l = cl + 2; 349 l = cl + 2;
345 350
346 d[0] = cl >> 8; 351 d[0] = cl >> 8;
347 d[1] = cl; 352 d[1] = cl;
353 }
348 } 354 }
349#endif 355#endif
350 356
351 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 357 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
352 358
353 struct { 359 struct {
354#if RAND_SIZE 360#if RAND_SIZE
355 u8 rnd[RAND_SIZE]; 361 u8 rnd[RAND_SIZE];
356#endif 362#endif
… …
360 datahdr.seqno = ntohl (seqno); 366 datahdr.seqno = ntohl (seqno);
361#if RAND_SIZE 367#if RAND_SIZE
362 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 368 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
363#endif 369#endif
364 370
365 EVP_EncryptUpdate (cctx, 371 require (EVP_EncryptUpdate (cctx,
366 (unsigned char *) data + outl, &outl2, 372 (unsigned char *) data + outl, &outl2,
367 (unsigned char *) &datahdr, DATAHDR); 373 (unsigned char *) &datahdr, DATAHDR));
368 outl += outl2; 374 outl += outl2;
369 375
370 EVP_EncryptUpdate (cctx, 376 require (EVP_EncryptUpdate (cctx,
371 (unsigned char *) data + outl, &outl2, 377 (unsigned char *) data + outl, &outl2,
372 (unsigned char *) d, l); 378 (unsigned char *) d, l));
373 outl += outl2; 379 outl += outl2;
374 380
375 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 381 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
376 outl += outl2; 382 outl += outl2;
377 383
378 len = outl + data_hdr_size (); 384 len = outl + data_hdr_size ();
379 385
380 set_hdr (type, dst); 386 set_hdr (type, dst);
… …
389 int outl = 0, outl2; 395 int outl = 0, outl2;
390 tap_packet *p = new tap_packet; 396 tap_packet *p = new tap_packet;
391 u8 *d; 397 u8 *d;
392 u32 l = len - data_hdr_size (); 398 u32 l = len - data_hdr_size ();
393 399
394 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 400 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
395 401
396#if ENABLE_COMPRESSION 402#if ENABLE_COMPRESSION
397 u8 cdata[MAX_MTU]; 403 u8 cdata[MAX_MTU];
398 404
399 if (type == PT_DATA_COMPRESSED) 405 if (type == PT_DATA_COMPRESSED)
… …
401 else 407 else
402#endif 408#endif
403 d = &(*p)[6 + 6 - DATAHDR]; 409 d = &(*p)[6 + 6 - DATAHDR];
404 410
405 /* 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 */
406 EVP_DecryptUpdate (cctx, 412 require (EVP_DecryptUpdate (cctx,
407 d, &outl2, 413 d, &outl2,
408 (unsigned char *)&data, len - data_hdr_size ()); 414 (unsigned char *)&data, len - data_hdr_size ()));
409 outl += outl2; 415 outl += outl2;
410 416
411 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 417 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
412 outl += outl2; 418 outl += outl2;
413 419
414 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 420 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
415 421
416 id2mac (dst () ? dst() : THISNODE->id, p->dst); 422 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
445{ 451{
446 // actually, hmaclen cannot be checked because the hmac 452 // actually, hmaclen cannot be checked because the hmac
447 // field comes before this data, so peers with other 453 // field comes before this data, so peers with other
448 // hmacs simply will not work. 454 // hmacs simply will not work.
449 u8 prot_major, prot_minor, randsize, hmaclen; 455 u8 prot_major, prot_minor, randsize, hmaclen;
450 u8 flags, challengelen, pad2, pad3; 456 u8 flags, challengelen, features, pad3;
451 u32 cipher_nid, digest_nid, hmac_nid; 457 u32 cipher_nid, digest_nid, hmac_nid;
452
453 const u8 curflags () const
454 {
455 return 0x80
456 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
457 }
458 458
459 void setup (ptype type, int dst); 459 void setup (ptype type, int dst);
460 bool chk_config () const; 460 bool chk_config () const;
461}; 461};
462
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
462 465
463void config_packet::setup (ptype type, int dst) 466void config_packet::setup (ptype type, int dst)
464{ 467{
465 prot_major = PROTOCOL_MAJOR; 468 prot_major = PROTOCOL_MAJOR;
466 prot_minor = PROTOCOL_MINOR; 469 prot_minor = PROTOCOL_MINOR;
467 randsize = RAND_SIZE; 470 randsize = RAND_SIZE;
468 hmaclen = HMACLENGTH; 471 hmaclen = HMACLENGTH;
469 flags = curflags (); 472 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
470 challengelen = sizeof (rsachallenge); 473 challengelen = sizeof (rsachallenge);
474 features = FEATURES;
471 475
472 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
473 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 477 digest_nid = htonl (EVP_MD_type (RSA_HASH));
474 hmac_nid = htonl (EVP_MD_type (DIGEST)); 478 hmac_nid = htonl (EVP_MD_type (DIGEST));
475 479
… …
478} 482}
479 483
480bool config_packet::chk_config () const 484bool config_packet::chk_config () const
481{ 485{
482 if (prot_major != PROTOCOL_MAJOR) 486 if (prot_major != PROTOCOL_MAJOR)
483 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 487 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
484 else if (randsize != RAND_SIZE) 488 else if (randsize != RAND_SIZE)
485 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 489 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
486 else if (hmaclen != HMACLENGTH) 490 else if (hmaclen != HMACLENGTH)
487 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 491 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
492#if 0 // this implementation should handle all flag settings
488 else if (flags != curflags ()) 493 else if (flags != curflags ())
489 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ()); 494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
490 else if (challengelen != sizeof (rsachallenge)) 496 else if (challengelen != sizeof (rsachallenge))
491 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 497 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
492 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
493 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 499 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
494 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
495 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 501 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
496 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 502 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
497 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 503 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
498 else 504 else
499 return true; 505 return true;
500 506
501 return false; 507 return false;
502} 508}
503 509
504struct auth_req_packet : config_packet 510struct auth_req_packet : config_packet
505{ 511{
506 char magic[8]; 512 char magic[8];
507 u8 initiate; // false if this is just an automatic reply 513 u8 initiate; // false if this is just an automatic reply
508 u8 protocols; // supported protocols (will get patches on forward) 514 u8 protocols; // supported protocols (will be patched on forward)
509 u8 pad2, pad3; 515 u8 pad2, pad3;
510 rsaid id; 516 rsaid id;
511 rsaencrdata encr; 517 rsaencrdata encr;
512 518
513 auth_req_packet (int dst, bool initiate_, u8 protocols_) 519 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
597 } 603 }
598 else 604 else
599 { 605 {
600 retry_cnt = 0; 606 retry_cnt = 0;
601 establish_connection.start (NOW + 5); 607 establish_connection.start (NOW + 5);
602 keepalive.reset (); 608 keepalive.stop ();
603 rekey.reset (); 609 rekey.stop ();
604 } 610 }
605} 611}
606 612
607void 613void
608connection::reset_si () 614connection::reset_si ()
… …
674connection::send_auth_request (const sockinfo &si, bool initiate) 680connection::send_auth_request (const sockinfo &si, bool initiate)
675{ 681{
676 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 682 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
677 683
678 rsachallenge chg; 684 rsachallenge chg;
679
680 rsa_cache.gen (pkt->id, chg); 685 rsa_cache.gen (pkt->id, chg);
681 686 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
682 if (0 > RSA_public_encrypt (sizeof chg,
683 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
684 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
685 fatal ("RSA_public_encrypt error");
686 687
687 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 688 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
688 689
689 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 690 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
690 691
… …
724} 725}
725 726
726void 727void
727connection::establish_connection_cb (time_watcher &w) 728connection::establish_connection_cb (time_watcher &w)
728{ 729{
729 if (ictx || conf == THISNODE 730 if (!ictx
731 && conf != THISNODE
730 || connectmode == conf_node::C_NEVER 732 && connectmode != conf_node::C_NEVER
731 || connectmode == conf_node::C_DISABLED) 733 && connectmode != conf_node::C_DISABLED
732 w.at = TSTAMP_CANCEL; 734 && NOW > w.at)
733 else if (w.at <= NOW)
734 { 735 {
735 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
736 737
737 if (retry_int < 3600 * 8) 738 if (retry_int < 3600 * 8)
738 retry_cnt++; 739 retry_cnt++;
739 740
740 w.at = NOW + retry_int; 741 w.start (NOW + retry_int);
741 742
742 reset_si (); 743 reset_si ();
743 744
744 if (si.prot && !si.host) 745 if (si.prot && !si.host)
745 vpn->send_connect_request (conf->id); 746 vpn->send_connect_request (conf->id);
… …
776 si.host= 0; 777 si.host= 0;
777 778
778 last_activity = 0; 779 last_activity = 0;
779 retry_cnt = 0; 780 retry_cnt = 0;
780 781
781 rekey.reset (); 782 rekey.stop ();
782 keepalive.reset (); 783 keepalive.stop ();
783 establish_connection.reset (); 784 establish_connection.stop ();
784} 785}
785 786
786void 787void
787connection::shutdown () 788connection::shutdown ()
788{ 789{
… …
793} 794}
794 795
795void 796void
796connection::rekey_cb (time_watcher &w) 797connection::rekey_cb (time_watcher &w)
797{ 798{
798 w.at = TSTAMP_CANCEL;
799
800 reset_connection (); 799 reset_connection ();
801 establish_connection (); 800 establish_connection ();
802} 801}
803 802
804void 803void
… …
838{ 837{
839 if (ictx && octx) 838 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos); 839 send_vpn_packet (pkt, si, tos);
841 else 840 else
842 { 841 {
843 vpn_queue.put (new vpn_packet (*pkt)); 842 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
844 843
845 establish_connection (); 844 establish_connection ();
846 } 845 }
847} 846}
848 847
… …
907 if (p->initiate) 906 if (p->initiate)
908 send_auth_request (rsi, false); 907 send_auth_request (rsi, false);
909 908
910 rsachallenge k; 909 rsachallenge k;
911 910
912 if (0 > RSA_private_decrypt (sizeof (p->encr), 911 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913 (unsigned char *)&p->encr, (unsigned char *)&k, 912 {
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 913 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 914 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
915 break;
916 }
917 else 917 else
918 { 918 {
919 delete octx; 919 delete octx;
920 920
921 octx = new crypto_ctx (k, 1); 921 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 923
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
924 conf->protocols = p->protocols; 927 conf->protocols = p->protocols;
928 features = p->features & FEATURES;
925 929
926 send_auth_response (rsi, p->id, k); 930 send_auth_response (rsi, p->id, k);
927 931
928 connection_established (); 932 connection_established ();
929 933
… …
965 crypto_ctx *cctx = new crypto_ctx (chg, 0); 969 crypto_ctx *cctx = new crypto_ctx (chg, 0);
966 970
967 if (!p->hmac_chk (cctx)) 971 if (!p->hmac_chk (cctx))
968 { 972 {
969 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 973 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
970 "could be an attack, or just corruption or an synchronization error"), 974 "could be an attack, or just corruption or a synchronization error"),
971 conf->nodename, (const char *)rsi); 975 conf->nodename, (const char *)rsi);
972 break; 976 break;
973 } 977 }
974 else 978 else
975 { 979 {
… …
1024 { 1028 {
1025 vpndata_packet *p = (vpndata_packet *)pkt; 1029 vpndata_packet *p = (vpndata_packet *)pkt;
1026 1030
1027 if (!p->hmac_chk (ictx)) 1031 if (!p->hmac_chk (ictx))
1028 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1032 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1029 "could be an attack, or just corruption or an synchronization error"), 1033 "could be an attack, or just corruption or a synchronization error"),
1030 conf->nodename, (const char *)rsi); 1034 conf->nodename, (const char *)rsi);
1031 else 1035 else
1032 { 1036 {
1033 u32 seqno; 1037 u32 seqno;
1034 tap_packet *d = p->unpack (this, seqno); 1038 tap_packet *d = p->unpack (this, seqno);
… …
1117 { 1121 {
1118 reset_connection (); 1122 reset_connection ();
1119 establish_connection (); 1123 establish_connection ();
1120 } 1124 }
1121 else if (NOW < last_activity + ::conf.keepalive) 1125 else if (NOW < last_activity + ::conf.keepalive)
1122 w.at = last_activity + ::conf.keepalive; 1126 w.start (last_activity + ::conf.keepalive);
1123 else if (conf->connectmode != conf_node::C_ONDEMAND 1127 else if (conf->connectmode != conf_node::C_ONDEMAND
1124 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1128 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1125 { 1129 {
1126 send_ping (si); 1130 send_ping (si);
1127 w.at = NOW + 5; 1131 w.start (NOW + 5);
1128 } 1132 }
1129 else if (NOW < last_activity + ::conf.keepalive + 10) 1133 else if (NOW < last_activity + ::conf.keepalive + 10)
1130 // hold ondemand connections implicitly a few seconds longer 1134 // hold ondemand connections implicitly a few seconds longer
1131 // should delete octx, though, or something like that ;) 1135 // should delete octx, though, or something like that ;)
1132 w.at = last_activity + ::conf.keepalive + 10; 1136 w.start (last_activity + ::conf.keepalive + 10);
1133 else 1137 else
1134 reset_connection (); 1138 reset_connection ();
1135} 1139}
1136 1140
1137void connection::send_connect_request (int id) 1141void connection::send_connect_request (int id)

Diff Legend

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