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.13 by pcg, Fri Aug 8 07:52:26 2003 UTC vs.
Revision 1.30 by pcg, Thu Jan 29 19:22:05 2004 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
17*/ 18*/
18 19
19#include "config.h" 20#include "config.h"
20 21
21extern "C" { 22#include <cassert>
22# include "lzf/lzf.h"
23}
24 23
25#include <list> 24#include <list>
26 25
27#include <openssl/rand.h> 26#include <openssl/rand.h>
28#include <openssl/evp.h> 27#include <openssl/evp.h>
… …
35#include "slog.h" 34#include "slog.h"
36#include "device.h" 35#include "device.h"
37#include "vpn.h" 36#include "vpn.h"
38#include "connection.h" 37#include "connection.h"
39 38
39#include "netcompat.h"
40
40#if !HAVE_RAND_PSEUDO_BYTES 41#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 42# define RAND_pseudo_bytes RAND_bytes
42#endif 43#endif
43 44
44#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
45 46
47#define ULTRA_FAST 1
48#define HLOG 15
49#include "lzf/lzf.h"
50#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c"
52
46struct crypto_ctx 53struct crypto_ctx
47{ 54{
48 EVP_CIPHER_CTX cctx; 55 EVP_CIPHER_CTX cctx;
49 HMAC_CTX hctx; 56 HMAC_CTX hctx;
50 57
… …
53}; 60};
54 61
55crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 62crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56{ 63{
57 EVP_CIPHER_CTX_init (&cctx); 64 EVP_CIPHER_CTX_init (&cctx);
58 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 65 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
59 HMAC_CTX_init (&hctx); 66 HMAC_CTX_init (&hctx);
60 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 67 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
61} 68}
62 69
63crypto_ctx::~crypto_ctx () 70crypto_ctx::~crypto_ctx ()
64{ 71{
65 EVP_CIPHER_CTX_cleanup (&cctx); 72 require (EVP_CIPHER_CTX_cleanup (&cctx));
66 HMAC_CTX_cleanup (&hctx); 73 HMAC_CTX_cleanup (&hctx);
67} 74}
68 75
69static void 76static void
70rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71{ 78{
72 EVP_MD_CTX ctx; 79 EVP_MD_CTX ctx;
73 80
74 EVP_MD_CTX_init (&ctx); 81 EVP_MD_CTX_init (&ctx);
75 EVP_DigestInit (&ctx, RSA_HASH); 82 require (EVP_DigestInit (&ctx, RSA_HASH));
76 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77 EVP_DigestUpdate(&ctx, &id, sizeof id); 84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79 EVP_MD_CTX_cleanup (&ctx); 86 EVP_MD_CTX_cleanup (&ctx);
80} 87}
81 88
82struct rsa_entry { 89struct rsa_entry {
83 tstamp expire; 90 tstamp expire;
… …
131 138
132} rsa_cache; 139} rsa_cache;
133 140
134void rsa_cache::cleaner_cb (time_watcher &w) 141void rsa_cache::cleaner_cb (time_watcher &w)
135{ 142{
136 if (empty ()) 143 if (!empty ())
137 w.at = TSTAMP_CANCEL;
138 else
139 { 144 {
140 w.at = NOW + RSA_TTL; 145 w.start (NOW + RSA_TTL);
141 146
142 for (iterator i = begin (); i != end (); ) 147 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 148 if (i->expire <= NOW)
144 i = erase (i); 149 i = erase (i);
145 else 150 else
… …
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. / 180.; // allow bursts 207 static const double ALPHA = 1. - 1. / 600.; // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 208 static const double CUTOFF = 10.; // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time
205 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value
206 211
207 bool can (const sockinfo &si) { return can((u32)si.host); } 212 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 213 bool can (u32 host);
209}; 214};
210 215
211net_rate_limiter auth_rate_limiter, reset_rate_limiter; 216net_rate_limiter auth_rate_limiter, reset_rate_limiter;
212 217
… …
307} 312}
308 313
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 314#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 315#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 316
312struct vpndata_packet:vpn_packet 317struct vpndata_packet : vpn_packet
313 { 318 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 320
316 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);
317 tap_packet *unpack (connection *conn, u32 &seqno); 322 tap_packet *unpack (connection *conn, u32 &seqno);
… …
344 d[0] = cl >> 8; 349 d[0] = cl >> 8;
345 d[1] = cl; 350 d[1] = cl;
346 } 351 }
347#endif 352#endif
348 353
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 355
351 struct { 356 struct {
352#if RAND_SIZE 357#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 358 u8 rnd[RAND_SIZE];
354#endif 359#endif
… …
358 datahdr.seqno = ntohl (seqno); 363 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 364#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 365 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 366#endif
362 367
363 EVP_EncryptUpdate (cctx, 368 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 369 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 370 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 371 outl += outl2;
367 372
368 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 375 (unsigned char *) d, l));
371 outl += outl2; 376 outl += outl2;
372 377
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 378 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 379 outl += outl2;
375 380
376 len = outl + data_hdr_size (); 381 len = outl + data_hdr_size ();
377 382
378 set_hdr (type, dst); 383 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 392 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 393 tap_packet *p = new tap_packet;
389 u8 *d; 394 u8 *d;
390 u32 l = len - data_hdr_size (); 395 u32 l = len - data_hdr_size ();
391 396
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 397 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 398
394#if ENABLE_COMPRESSION 399#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 400 u8 cdata[MAX_MTU];
396 401
397 if (type == PT_DATA_COMPRESSED) 402 if (type == PT_DATA_COMPRESSED)
… …
399 else 404 else
400#endif 405#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 406 d = &(*p)[6 + 6 - DATAHDR];
402 407
403 /* this overwrites part of the src mac, but we fix that later */ 408 /* this overwrites part of the src mac, but we fix that later */
404 EVP_DecryptUpdate (cctx, 409 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 410 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 411 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 412 outl += outl2;
408 413
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 414 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 415 outl += outl2;
411 416
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 417 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 418
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 419 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
475 set_hdr (type, dst); 480 set_hdr (type, dst);
476} 481}
477 482
478bool config_packet::chk_config () const 483bool config_packet::chk_config () const
479{ 484{
480 return prot_major == PROTOCOL_MAJOR 485 if (prot_major != PROTOCOL_MAJOR)
481 && randsize == RAND_SIZE 486 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 && hmaclen == HMACLENGTH 487 else if (randsize != RAND_SIZE)
483 && flags == curflags () 488 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
489 else if (hmaclen != HMACLENGTH)
490 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
484 && challengelen == sizeof (rsachallenge) 493 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
485 && cipher_nid == htonl (EVP_CIPHER_nid (CIPHER)) 495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
486 && digest_nid == htonl (EVP_MD_type (RSA_HASH)) 497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
498 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
487 && hmac_nid == htonl (EVP_MD_type (DIGEST)); 499 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
500 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
501 else
502 return true;
503
504 return false;
488} 505}
489 506
490struct auth_req_packet : config_packet 507struct auth_req_packet : config_packet
491{ 508{
492 char magic[8]; 509 char magic[8];
493 u8 initiate; // false if this is just an automatic reply 510 u8 initiate; // false if this is just an automatic reply
494 u8 protocols; // supported protocols (will get patches on forward) 511 u8 protocols; // supported protocols (will be patched on forward)
495 u8 pad2, pad3; 512 u8 pad2, pad3;
496 rsaid id; 513 rsaid id;
497 rsaencrdata encr; 514 rsaencrdata encr;
498 515
499 auth_req_packet (int dst, bool initiate_, u8 protocols_) 516 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
583 } 600 }
584 else 601 else
585 { 602 {
586 retry_cnt = 0; 603 retry_cnt = 0;
587 establish_connection.start (NOW + 5); 604 establish_connection.start (NOW + 5);
588 keepalive.reset (); 605 keepalive.stop ();
589 rekey.reset (); 606 rekey.stop ();
590 } 607 }
591} 608}
592 609
593void 610void
594connection::reset_si () 611connection::reset_si ()
… …
660connection::send_auth_request (const sockinfo &si, bool initiate) 677connection::send_auth_request (const sockinfo &si, bool initiate)
661{ 678{
662 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 679 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
663 680
664 rsachallenge chg; 681 rsachallenge chg;
665
666 rsa_cache.gen (pkt->id, chg); 682 rsa_cache.gen (pkt->id, chg);
667 683 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
668 if (0 > RSA_public_encrypt (sizeof chg,
669 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
670 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
671 fatal ("RSA_public_encrypt error");
672 684
673 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
674 686
675 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
676 688
… …
710} 722}
711 723
712void 724void
713connection::establish_connection_cb (time_watcher &w) 725connection::establish_connection_cb (time_watcher &w)
714{ 726{
715 if (ictx || conf == THISNODE 727 if (!ictx
728 && conf != THISNODE
716 || connectmode == conf_node::C_NEVER 729 && connectmode != conf_node::C_NEVER
717 || connectmode == conf_node::C_DISABLED) 730 && connectmode != conf_node::C_DISABLED
718 w.at = TSTAMP_CANCEL; 731 && NOW > w.at)
719 else if (w.at <= NOW)
720 { 732 {
721 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
722 734
723 if (retry_int < 3600 * 8) 735 if (retry_int < 3600 * 8)
724 retry_cnt++; 736 retry_cnt++;
725 737
726 w.at = NOW + retry_int; 738 w.start (NOW + retry_int);
727 739
728 reset_si (); 740 reset_si ();
729 741
730 if (si.prot && !si.host) 742 if (si.prot && !si.host)
731 vpn->send_connect_request (conf->id); 743 vpn->send_connect_request (conf->id);
… …
762 si.host= 0; 774 si.host= 0;
763 775
764 last_activity = 0; 776 last_activity = 0;
765 retry_cnt = 0; 777 retry_cnt = 0;
766 778
767 rekey.reset (); 779 rekey.stop ();
768 keepalive.reset (); 780 keepalive.stop ();
769 establish_connection.reset (); 781 establish_connection.stop ();
770} 782}
771 783
772void 784void
773connection::shutdown () 785connection::shutdown ()
774{ 786{
… …
779} 791}
780 792
781void 793void
782connection::rekey_cb (time_watcher &w) 794connection::rekey_cb (time_watcher &w)
783{ 795{
784 w.at = TSTAMP_CANCEL;
785
786 reset_connection (); 796 reset_connection ();
787 establish_connection (); 797 establish_connection ();
788} 798}
789 799
790void 800void
791connection::send_data_packet (tap_packet *pkt, bool broadcast) 801connection::send_data_packet (tap_packet *pkt)
792{ 802{
793 vpndata_packet *p = new vpndata_packet; 803 vpndata_packet *p = new vpndata_packet;
794 int tos = 0; 804 int tos = 0;
795 805
796 // I am not hilarious about peeking into packets, but so be it. 806 // I am not hilarious about peeking into packets, but so be it.
797 if (conf->inherit_tos 807 if (conf->inherit_tos && pkt->is_ipv4 ())
798 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
799 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
800 tos = (*pkt)[15] & IPTOS_TOS_MASK; 808 tos = (*pkt)[15] & IPTOS_TOS_MASK;
801 809
802 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 810 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
803 send_vpn_packet (p, si, tos); 811 send_vpn_packet (p, si, tos);
804 812
805 delete p; 813 delete p;
806 814
807 if (oseqno > MAX_SEQNO) 815 if (oseqno > MAX_SEQNO)
808 rekey (); 816 rekey ();
809} 817}
810 818
811void 819void
812connection::inject_data_packet (tap_packet *pkt, bool broadcast) 820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
813{ 821{
814 if (ictx && octx) 822 if (ictx && octx)
815 send_data_packet (pkt, broadcast); 823 send_data_packet (pkt);
816 else 824 else
817 { 825 {
818 if (!broadcast)//DDDD 826 if (!broadcast)//DDDD
819 data_queue.put (new tap_packet (*pkt)); 827 data_queue.put (new tap_packet (*pkt));
820 828
… …
826{ 834{
827 if (ictx && octx) 835 if (ictx && octx)
828 send_vpn_packet (pkt, si, tos); 836 send_vpn_packet (pkt, si, tos);
829 else 837 else
830 { 838 {
831 vpn_queue.put (new vpn_packet (*pkt)); 839 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
832 840
833 establish_connection (); 841 establish_connection ();
834 } 842 }
835} 843}
836 844
… …
895 if (p->initiate) 903 if (p->initiate)
896 send_auth_request (rsi, false); 904 send_auth_request (rsi, false);
897 905
898 rsachallenge k; 906 rsachallenge k;
899 907
900 if (0 > RSA_private_decrypt (sizeof (p->encr), 908 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
901 (unsigned char *)&p->encr, (unsigned char *)&k, 909 {
902 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
903 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 910 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
904 conf->nodename, (const char *)rsi); 911 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
912 break;
913 }
905 else 914 else
906 { 915 {
907 delete octx; 916 delete octx;
908 917
909 octx = new crypto_ctx (k, 1); 918 octx = new crypto_ctx (k, 1);
… …
916 connection_established (); 925 connection_established ();
917 926
918 break; 927 break;
919 } 928 }
920 } 929 }
930 else
931 slog (L_WARN, _("%s(%s): protocol mismatch"),
932 conf->nodename, (const char *)rsi);
921 933
922 send_reset (rsi); 934 send_reset (rsi);
923 } 935 }
924 936
925 break; 937 break;
… …
939 951
940 rsachallenge chg; 952 rsachallenge chg;
941 953
942 if (!rsa_cache.find (p->id, chg)) 954 if (!rsa_cache.find (p->id, chg))
943 { 955 {
944 slog (L_ERR, _("%s(%s): unrequested auth response"), 956 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
945 conf->nodename, (const char *)rsi); 957 conf->nodename, (const char *)rsi);
946 break; 958 break;
947 } 959 }
948 else 960 else
949 { 961 {
950 crypto_ctx *cctx = new crypto_ctx (chg, 0); 962 crypto_ctx *cctx = new crypto_ctx (chg, 0);
951 963
952 if (!p->hmac_chk (cctx)) 964 if (!p->hmac_chk (cctx))
965 {
953 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
954 "could be an attack, or just corruption or an synchronization error"), 967 "could be an attack, or just corruption or a synchronization error"),
955 conf->nodename, (const char *)rsi); 968 conf->nodename, (const char *)rsi);
969 break;
970 }
956 else 971 else
957 { 972 {
958 rsaresponse h; 973 rsaresponse h;
959 974
960 rsa_hash (p->id, chg, h); 975 rsa_hash (p->id, chg, h);
… …
1006 { 1021 {
1007 vpndata_packet *p = (vpndata_packet *)pkt; 1022 vpndata_packet *p = (vpndata_packet *)pkt;
1008 1023
1009 if (!p->hmac_chk (ictx)) 1024 if (!p->hmac_chk (ictx))
1010 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1011 "could be an attack, or just corruption or an synchronization error"), 1026 "could be an attack, or just corruption or a synchronization error"),
1012 conf->nodename, (const char *)rsi); 1027 conf->nodename, (const char *)rsi);
1013 else 1028 else
1014 { 1029 {
1015 u32 seqno; 1030 u32 seqno;
1016 tap_packet *d = p->unpack (this, seqno); 1031 tap_packet *d = p->unpack (this, seqno);
1017 1032
1018 if (iseqno.recv_ok (seqno)) 1033 if (iseqno.recv_ok (seqno))
1019 { 1034 {
1020 vpn->tap->send (d); 1035 vpn->tap->send (d);
1021 1036
1022 if (p->dst () == 0) // re-broadcast
1023 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1024 {
1025 connection *c = *i;
1026
1027 if (c->conf != THISNODE && c->conf != conf)
1028 c->inject_data_packet (d);
1029 }
1030
1031 if (si != rsi) 1037 if (si != rsi)
1032 { 1038 {
1033 // fast re-sync on conneciton changes, useful especially for tcp/ip 1039 // fast re-sync on connection changes, useful especially for tcp/ip
1034 si = rsi; 1040 si = rsi;
1035 1041
1036 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1042 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1037 conf->nodename, (const char *)si, (const char *)rsi); 1043 conf->nodename, (const char *)si, (const char *)rsi);
1038 } 1044 }
… …
1108 { 1114 {
1109 reset_connection (); 1115 reset_connection ();
1110 establish_connection (); 1116 establish_connection ();
1111 } 1117 }
1112 else if (NOW < last_activity + ::conf.keepalive) 1118 else if (NOW < last_activity + ::conf.keepalive)
1113 w.at = last_activity + ::conf.keepalive; 1119 w.start (last_activity + ::conf.keepalive);
1114 else if (conf->connectmode != conf_node::C_ONDEMAND 1120 else if (conf->connectmode != conf_node::C_ONDEMAND
1115 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1121 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1116 { 1122 {
1117 send_ping (si); 1123 send_ping (si);
1118 w.at = NOW + 5; 1124 w.start (NOW + 5);
1119 } 1125 }
1120 else if (NOW < last_activity + ::conf.keepalive + 10) 1126 else if (NOW < last_activity + ::conf.keepalive + 10)
1121 // hold ondemand connections implicitly a few seconds longer 1127 // hold ondemand connections implicitly a few seconds longer
1122 // should delete octx, though, or something like that ;) 1128 // should delete octx, though, or something like that ;)
1123 w.at = last_activity + ::conf.keepalive + 10; 1129 w.start (last_activity + ::conf.keepalive + 10);
1124 else 1130 else
1125 reset_connection (); 1131 reset_connection ();
1126} 1132}
1127 1133
1128void connection::send_connect_request (int id) 1134void connection::send_connect_request (int id)

Diff Legend

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