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.67 by pcg, Thu Aug 7 16:34:21 2008 UTC vs.
Revision 1.97 by root, Tue Dec 4 13:23:17 2012 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 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 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 along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
… …
38 50
39#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
40# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
41#endif 53#endif
42 54
43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
44 57
45#define ULTRA_FAST 1 58#define ULTRA_FAST 1
46#define HLOG 15 59#define HLOG 15
47#include "lzf/lzf.h" 60#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
50 63
64//////////////////////////////////////////////////////////////////////////////
65
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev;
68
69namespace
70{
71 void // c++ requires external linkage here, apparently :(
72 rs_child_cb (ev::child &w, int revents)
73 {
74 w.stop ();
75
76 if (rs_queue.empty ())
77 return;
78
79 pid_t pid = run_script (*rs_queue.front ().first, false);
80 if (pid)
81 {
82 w.set (pid);
83 w.start ();
84 }
85 else
86 slog (L_WARN, rs_queue.front ().second);
87
88 delete rs_queue.front ().first;
89 rs_queue.pop ();
90 }
91};
92
93// despite the fancy name, this is quite a hack
94static void
95run_script_queued (run_script_cb *cb, const char *warnmsg)
96{
97 rs_queue.push (std::make_pair (cb, warnmsg));
98
99 if (!rs_child_ev.is_active ())
100 {
101 rs_child_ev.set<rs_child_cb> ();
102 rs_child_ev ();
103 }
104}
105
106//////////////////////////////////////////////////////////////////////////////
107
51struct crypto_ctx 108struct crypto_ctx
52{ 109{
53 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 111 HMAC_CTX hctx;
55 112
… …
75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
76{ 133{
77 EVP_MD_CTX ctx; 134 EVP_MD_CTX ctx;
78 135
79 EVP_MD_CTX_init (&ctx); 136 EVP_MD_CTX_init (&ctx);
80 require (EVP_DigestInit (&ctx, RSA_HASH)); 137 require (EVP_DigestInit (&ctx, RSA_HASH));
81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg)); 138 require (EVP_DigestUpdate (&ctx, &chg, sizeof chg));
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate (&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
85} 142}
86 143
87struct rsa_entry 144struct rsa_entry
88{ 145{
… …
137 cleaner.set (RSA_TTL, RSA_TTL); 194 cleaner.set (RSA_TTL, RSA_TTL);
138 } 195 }
139 196
140} rsa_cache; 197} rsa_cache;
141 198
199void
142void rsa_cache::cleaner_cb (ev::timer &w, int revents) 200rsa_cache::cleaner_cb (ev::timer &w, int revents)
143{ 201{
144 if (empty ()) 202 if (empty ())
145 w.stop (); 203 w.stop ();
146 else 204 else
147 { 205 {
… …
172 delete p; 230 delete p;
173 231
174 delete [] queue; 232 delete [] queue;
175} 233}
176 234
235void
177void pkt_queue::expire_cb (ev::timer &w, int revents) 236pkt_queue::expire_cb (ev::timer &w, int revents)
178{ 237{
179 ev_tstamp expire = ev_now () - max_ttl; 238 ev_tstamp expire = ev_now () - max_ttl;
180 239
181 for (;;) 240 for (;;)
182 { 241 {
… …
193 252
194 delete get (); 253 delete get ();
195 } 254 }
196} 255}
197 256
257void
198void pkt_queue::put (net_packet *p) 258pkt_queue::put (net_packet *p)
199{ 259{
200 ev_tstamp now = ev_now (); 260 ev_tstamp now = ev_now ();
201 261
202 // start expiry timer 262 // start expiry timer
203 if (empty ()) 263 if (empty ())
… …
212 queue[i].tstamp = now; 272 queue[i].tstamp = now;
213 273
214 i = ni; 274 i = ni;
215} 275}
216 276
217net_packet *pkt_queue::get () 277net_packet *
278pkt_queue::get ()
218{ 279{
219 if (empty ()) 280 if (empty ())
220 return 0; 281 return 0;
221 282
222 net_packet *p = queue[j].pkt; 283 net_packet *p = queue[j].pkt;
… …
246 307
247 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
248 bool can (u32 host); 309 bool can (u32 host);
249}; 310};
250 311
251net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
252 313
314bool
253bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
254{ 316{
255 iterator i; 317 iterator i;
256 318
257 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
258 if (i->host == host) 320 if (i->host == host)
… …
305 367
306///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
307 369
308unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
309 371
372void
310void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
311{ 374{
312 unsigned int xlen; 375 unsigned int xlen;
313 376
314 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
315 378
… …
333 hmac_gen (ctx); 396 hmac_gen (ctx);
334 397
335 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
336} 399}
337 400
401void
338void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
339{ 403{
340 type = type_; 404 type = type_;
341 405
342 int src = THISNODE->id; 406 int src = THISNODE->id;
343 407
… …
348 412
349#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
350#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
351 415
352struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
353 { 425 {
354 u8 data[MAXVPNDATA + DATAHDR]; // seqno
355
356 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
357 tap_packet *unpack (connection *conn, u32 &seqno);
358private:
359
360 const u32 data_hdr_size () const
361 {
362 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
363 }
364 }; 427 }
428};
365 429
366void 430void
367vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
368{ 432{
369 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
371 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
372 436
373#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
374 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
375 439
376 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
377 { 441 {
378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379 443
380 if (cl) 444 if (cl)
381 { 445 {
… …
508#endif 572#endif
509 return f; 573 return f;
510 } 574 }
511}; 575};
512 576
577void
513void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
514{ 579{
515 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
516 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
517 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
518 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
526 591
527 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
528 set_hdr (type, dst); 593 set_hdr (type, dst);
529} 594}
530 595
596bool
531bool config_packet::chk_config () const 597config_packet::chk_config () const
532{ 598{
533 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
534 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
535 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
536 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
… …
560 rsaencrdata encr; 626 rsaencrdata encr;
561 627
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 629 {
564 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
566 initiate = !!initiate_; 632 initiate = !!initiate_;
567 protocols = protocols_; 633 protocols = protocols_;
568 634
569 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
570 } 636 }
… …
619///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
620 686
621void 687void
622connection::connection_established () 688connection::connection_established ()
623{ 689{
624 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx); 690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
625 691
626 if (ictx && octx) 692 if (ictx && octx)
627 { 693 {
628 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
629 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0); 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
630 rekey.start (rekey_interval, rekey_interval); 696 rekey.start (rekey_interval, rekey_interval);
697
631 keepalive.start (::conf.keepalive); 698 keepalive.start (::conf.keepalive);
632 699
633 // send queued packets 700 // send queued packets
634 if (ictx && octx) 701 if (ictx && octx)
635 { 702 {
… …
643 { 710 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 711 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 712 delete p;
646 } 713 }
647 } 714 }
715
716 vpn->connection_established (this);
648 } 717 }
649 else 718 else
650 { 719 {
651 retry_cnt = 0; 720 retry_cnt = 0;
652 establish_connection.start (5); 721 establish_connection.start (5);
… …
656} 725}
657 726
658void 727void
659connection::reset_si () 728connection::reset_si ()
660{ 729{
730 if (vpn->can_direct (THISNODE, conf))
661 protocol = best_protocol (THISNODE->protocols & conf->protocols); 731 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
662 732 else
663 // mask out protocols we cannot establish
664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 { 733 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 734 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 735 protocol = 0;
674 } 736 }
675 737
676 si.set (conf, protocol); 738 si.set (conf, protocol);
739
740 is_direct = si.valid ();
677} 741}
678 742
679// ensure sockinfo is valid, forward if necessary 743// ensure sockinfo is valid, forward if necessary
680const sockinfo & 744const sockinfo &
681connection::forward_si (const sockinfo &si) const 745connection::forward_si (const sockinfo &si) const
682{ 746{
683 if (!si.valid ()) 747 if (!si.valid ())
684 { 748 {
685 connection *r = vpn->find_router (); 749 connection *r = vpn->find_router_for (this);
686 750
687 if (r) 751 if (r)
688 { 752 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 753 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 754 conf->nodename, r->conf->nodename);
691 return r->si; 755 return r->si;
692 } 756 }
693 else 757 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 758 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 759 conf->nodename);
696 } 760 }
697 761
698 return si; 762 return si;
699} 763}
… …
709connection::send_ping (const sockinfo &si, u8 pong) 773connection::send_ping (const sockinfo &si, u8 pong)
710{ 774{
711 ping_packet *pkt = new ping_packet; 775 ping_packet *pkt = new ping_packet;
712 776
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 777 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
778
779 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
780
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 781 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 782
716 delete pkt; 783 delete pkt;
717} 784}
718 785
… …
737 804
738 rsachallenge chg; 805 rsachallenge chg;
739 rsa_cache.gen (pkt->id, chg); 806 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 807 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
741 808
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 809 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
743 810
744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 811 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 812
746 delete pkt; 813 delete pkt;
747} 814}
… …
755 822
756 rsa_hash (id, chg, pkt->response); 823 rsa_hash (id, chg, pkt->response);
757 824
758 pkt->hmac_set (octx); 825 pkt->hmac_set (octx);
759 826
760 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 827 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
761 828
762 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 829 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 830
764 delete pkt; 831 delete pkt;
765} 832}
766 833
767void 834void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 835connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 836{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 837 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 838 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
839 conf->protocols);
772 840
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 841 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 842
775 r->hmac_set (octx); 843 r->hmac_set (octx);
776 send_vpn_packet (r, si); 844 send_vpn_packet (r, si);
… …
779} 847}
780 848
781inline void 849inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 850connection::establish_connection_cb (ev::timer &w, int revents)
783{ 851{
784 if (!ictx 852 if (!(ictx && octx)
785 && conf != THISNODE 853 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 854 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 855 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 856 && !w.is_active ())
789 { 857 {
… …
793 { 861 {
794 reset_connection (); 862 reset_connection ();
795 return; 863 return;
796 } 864 }
797 865
866 last_establish_attempt = ev_now ();
867
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 868 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 869 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 870 : 1 << (retry_cnt >> 2));
801 871
802 reset_si (); 872 reset_si ();
803 873
804 bool slow = si.prot & PROT_SLOW; 874 bool slow = si.prot & PROT_SLOW;
805 875
806 if (si.prot && !si.host) 876 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 877 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 878 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 879 w.start (1);
811 vpn->send_connect_request (conf->id); 880 vpn->send_connect_request (this);
812 } 881 }
813 else 882 else
814 { 883 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 884 if (si.valid ())
885 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
886 conf->nodename, (const char *)si);
816 887
817 const sockinfo &dsi = forward_si (si); 888 const sockinfo &dsi = forward_si (si);
818 889
819 slow = slow || (dsi.prot & PROT_SLOW); 890 slow = slow || (dsi.prot & PROT_SLOW);
820 891
… …
825 else 896 else
826 send_ping (dsi, 0); 897 send_ping (dsi, 0);
827 } 898 }
828 } 899 }
829 900
830 retry_int *= slow ? 8. : 0.7; 901 retry_int *= slow ? 8. : 0.9;
831 902
832 if (retry_int < conf->max_retry) 903 if (retry_int < conf->max_retry)
833 retry_cnt++; 904 retry_cnt++;
834 else 905 else
835 retry_int = conf->max_retry; 906 retry_int = conf->max_retry;
… …
846 slog (L_INFO, _("%s(%s): connection lost"), 917 slog (L_INFO, _("%s(%s): connection lost"),
847 conf->nodename, (const char *)si); 918 conf->nodename, (const char *)si);
848 919
849 if (::conf.script_node_down) 920 if (::conf.script_node_down)
850 { 921 {
851 run_script_cb cb; 922 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 923 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 924 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 925 }
856 } 926 }
857 927
858 delete ictx; ictx = 0; 928 delete ictx; ictx = 0;
859 delete octx; octx = 0; 929 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
863 930
864 si.host = 0; 931 si.host = 0;
865 932
866 last_activity = 0; 933 last_activity = 0.;
934 //last_si_change = 0.;
867 retry_cnt = 0; 935 retry_cnt = 0;
868 936
869 rekey.stop (); 937 rekey.stop ();
870 keepalive.stop (); 938 keepalive.stop ();
871 establish_connection.stop (); 939 establish_connection.stop ();
… …
878 send_reset (si); 946 send_reset (si);
879 947
880 reset_connection (); 948 reset_connection ();
881} 949}
882 950
951// poor-man's rekeying
883inline void 952inline void
884connection::rekey_cb (ev::timer &w, int revents) 953connection::rekey_cb (ev::timer &w, int revents)
885{ 954{
886 reset_connection (); 955 reset_connection ();
887 establish_connection (); 956 establish_connection ();
… …
905 if (oseqno > MAX_SEQNO) 974 if (oseqno > MAX_SEQNO)
906 rekey (); 975 rekey ();
907} 976}
908 977
909void 978void
979connection::post_inject_queue ()
980{
981 // force a connection every now and when when packets are sent (max 1/s)
982 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
983 establish_connection.stop ();
984
985 establish_connection ();
986}
987
988void
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 989connection::inject_data_packet (tap_packet *pkt)
911{ 990{
912 if (ictx && octx) 991 if (ictx && octx)
913 send_data_packet (pkt); 992 send_data_packet (pkt);
914 else 993 else
915 { 994 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 995 data_queue.put (new tap_packet (*pkt));
918 996 post_inject_queue ();
919 establish_connection ();
920 } 997 }
921} 998}
922 999
1000void
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1001connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 1002{
925 if (ictx && octx) 1003 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 1004 send_vpn_packet (pkt, si, tos);
927 else 1005 else
928 { 1006 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1007 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 1008 post_inject_queue ();
931 establish_connection ();
932 } 1009 }
933} 1010}
934 1011
935void 1012void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1013connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1014{
938 last_activity = ev_now (); 1015 last_activity = ev_now ();
939 1016
940 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1017 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1018 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1019
943 if (connectmode == conf_node::C_DISABLED) 1020 if (connectmode == conf_node::C_DISABLED)
944 return; 1021 return;
945 1022
946 switch (pkt->typ ()) 1023 switch (pkt->typ ())
947 { 1024 {
948 case vpn_packet::PT_PING: 1025 case vpn_packet::PT_PING:
1026 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1027
949 // we send pings instead of auth packets after some retries, 1028 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1029 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1030 // when we receive a ping.
952 if (!ictx) 1031 if (!ictx)
953 { 1032 {
954 if (auth_rate_limiter.can (rsi)) 1033 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1034 send_auth_request (rsi, true);
956 } 1035 }
957 else 1036 else
1037 // we would love to change the socket address here, but ping's aren't
1038 // authenticated, so we best ignore it.
958 send_ping (rsi, 1); // pong 1039 send_ping (rsi, 1); // pong
959 1040
960 break; 1041 break;
961 1042
962 case vpn_packet::PT_PONG: 1043 case vpn_packet::PT_PONG:
1044 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1045
1046 // a PONG might mean that the other side doesn't really know
1047 // about our desire for communication.
1048 establish_connection ();
963 break; 1049 break;
964 1050
965 case vpn_packet::PT_RESET: 1051 case vpn_packet::PT_RESET:
966 { 1052 {
967 reset_connection (); 1053 reset_connection ();
968 1054
969 config_packet *p = (config_packet *) pkt; 1055 config_packet *p = (config_packet *) pkt;
970 1056
971 if (!p->chk_config ()) 1057 if (!p->chk_config ())
972 { 1058 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1059 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
974 conf->nodename, (const char *)rsi); 1060 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED; 1061 connectmode = conf_node::C_DISABLED;
976 } 1062 }
977 else if (connectmode == conf_node::C_ALWAYS) 1063 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1064 establish_connection ();
… …
980 break; 1066 break;
981 1067
982 case vpn_packet::PT_AUTH_REQ: 1068 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1069 if (auth_rate_limiter.can (rsi))
984 { 1070 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1071 auth_req_packet *p = (auth_req_packet *)pkt;
986 1072
987 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1073 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1074 conf->nodename, p->initiate ? "initiate" : "reply",
1075 p->protocols, p->features);
988 1076
989 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1077 if (p->chk_config ()
1078 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
990 { 1079 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1080 if (p->prot_minor != PROTOCOL_MINOR)
992 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1081 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
993 conf->nodename, (const char *)rsi, 1082 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1083 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
1020 1109
1021 break; 1110 break;
1022 } 1111 }
1023 } 1112 }
1024 else 1113 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"), 1114 slog (L_WARN, _("%s(%s): protocol mismatch."),
1026 conf->nodename, (const char *)rsi); 1115 conf->nodename, (const char *)rsi);
1027 1116
1028 send_reset (rsi); 1117 send_reset (rsi);
1029 } 1118 }
1030 1119
1031 break; 1120 break;
1032 1121
1033 case vpn_packet::PT_AUTH_RES: 1122 case vpn_packet::PT_AUTH_RES:
1034 { 1123 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1124 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1125
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1126 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1127
1039 if (p->chk_config ()) 1128 if (p->chk_config ())
1040 { 1129 {
1041 if (p->prot_minor != PROTOCOL_MINOR) 1130 if (p->prot_minor != PROTOCOL_MINOR)
1042 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1131 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1045 1134
1046 rsachallenge chg; 1135 rsachallenge chg;
1047 1136
1048 if (!rsa_cache.find (p->id, chg)) 1137 if (!rsa_cache.find (p->id, chg))
1049 { 1138 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1139 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1140 conf->nodename, (const char *)rsi);
1052 break; 1141 break;
1053 } 1142 }
1054 else 1143 else
1055 { 1144 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1145 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1057 1146
1058 if (!p->hmac_chk (cctx)) 1147 if (!p->hmac_chk (cctx))
1059 { 1148 {
1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1149 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1061 "could be an attack, or just corruption or a synchronization error"), 1150 "could be an attack, or just corruption or a synchronization error."),
1062 conf->nodename, (const char *)rsi); 1151 conf->nodename, (const char *)rsi);
1063 break; 1152 break;
1064 } 1153 }
1065 else 1154 else
1066 { 1155 {
… …
1077 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1166 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1078 1167
1079 si = rsi; 1168 si = rsi;
1080 protocol = rsi.prot; 1169 protocol = rsi.prot;
1081 1170
1171 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1172 conf->nodename, (const char *)rsi,
1173 is_direct ? "direct" : "forwarded",
1174 p->prot_major, p->prot_minor);
1175
1082 connection_established (); 1176 connection_established ();
1083
1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1085 conf->nodename, (const char *)rsi,
1086 p->prot_major, p->prot_minor);
1087 1177
1088 if (::conf.script_node_up) 1178 if (::conf.script_node_up)
1089 { 1179 {
1090 run_script_cb cb; 1180 run_script_cb *cb = new run_script_cb;
1091 cb.set<connection, &connection::script_node_up> (this); 1181 cb->set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing.")); 1182 run_script_queued (cb, _("node-up command execution failed, continuing."));
1094 } 1183 }
1095 1184
1096 break; 1185 break;
1097 } 1186 }
1098 else 1187 else
1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1188 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1100 conf->nodename, (const char *)rsi); 1189 conf->nodename, (const char *)rsi);
1101 } 1190 }
1102 1191
1103 delete cctx; 1192 delete cctx;
1104 } 1193 }
… …
1120 { 1209 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1210 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1211
1123 if (!p->hmac_chk (ictx)) 1212 if (!p->hmac_chk (ictx))
1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1213 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1125 "could be an attack, or just corruption or a synchronization error"), 1214 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1215 conf->nodename, (const char *)rsi);
1127 else 1216 else
1128 { 1217 {
1129 u32 seqno; 1218 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1219 tap_packet *d = p->unpack (this, seqno);
1220 int seqclass = iseqno.seqno_classify (seqno);
1131 1221
1132 if (iseqno.recv_ok (seqno)) 1222 if (seqclass == 0) // ok
1133 { 1223 {
1134 vpn->tap->send (d); 1224 vpn->tap->send (d);
1135 1225
1136 if (si != rsi) 1226 if (si != rsi)
1137 { 1227 {
1138 // fast re-sync on source address changes, useful especially for tcp/ip 1228 // fast re-sync on source address changes, useful especially for tcp/ip
1229 //if (last_si_change < ev_now () + 5.)
1139 si = rsi; 1230 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1231 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 conf->nodename, (const char *)si, (const char *)rsi); 1232 conf->nodename, (const char *)si, (const char *)rsi);
1233
1234 si = rsi;
1235
1236 if (::conf.script_node_change)
1237 {
1238 run_script_cb *cb = new run_script_cb;
1239 cb->set<connection, &connection::script_node_change> (this);
1240 run_script_queued (cb, _("node-change command execution failed, continuing."));
1241 }
1242
1243 // }
1244 //else
1245 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1246 // conf->nodename, (const char *)si, (const char *)rsi);
1143 } 1247 }
1248 }
1249 else if (seqclass == 1) // far history
1250 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1251 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1252 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1253 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1254 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1255 else if (seqclass == 3) // reset
1256 {
1257 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1258 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1259 send_reset (rsi);
1144 } 1260 }
1145 1261
1146 delete d; 1262 delete d;
1147 break; 1263 break;
1148 } 1264 }
… …
1152 break; 1268 break;
1153 1269
1154 case vpn_packet::PT_CONNECT_REQ: 1270 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1271 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1272 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1273 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1274
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1275 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1276 {
1161 connection *c = vpn->conns[p->id - 1]; 1277 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1278 conf->protocols = p->protocols;
1163 1279
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1280 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1281 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1282 p->protocols,
1165 conf->id, p->id, c->ictx && c->octx); 1283 c->ictx && c->octx);
1166 1284
1167 if (c->ictx && c->octx) 1285 if (c->ictx && c->octx)
1168 { 1286 {
1169 // send connect_info packets to both sides, in case one is 1287 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1288 // behind a nat firewall (or both ;)
… …
1193 1311
1194 c->conf->protocols = p->protocols; 1312 c->conf->protocols = p->protocols;
1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1313 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1196 p->si.upgrade_protocol (protocol, c->conf); 1314 p->si.upgrade_protocol (protocol, c->conf);
1197 1315
1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1316 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1317 conf->nodename,
1318 vpn->conns[p->id - 1]->conf->nodename,
1319 (const char *)p->si,
1320 p->protocols,
1321 protocol,
1322 p->si.supported_protocols (c->conf),
1323 !c->ictx && !c->octx);
1200 1324
1201 const sockinfo &dsi = forward_si (p->si); 1325 const sockinfo &dsi = forward_si (p->si);
1202 1326
1203 if (dsi.valid ()) 1327 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1328 c->send_auth_request (dsi, true);
1329 else
1330 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1331 vpn->conns[p->id - 1]->conf->nodename,
1332 (const char *)p->si);
1205 } 1333 }
1206 else 1334 else
1207 slog (L_WARN, 1335 slog (L_WARN,
1208 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1336 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1209 p->id); 1337 p->id);
… …
1218} 1346}
1219 1347
1220inline void 1348inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1349connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1350{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1351 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1352
1353 if (when >= 0)
1354 w.start (when);
1355 else if (when < -15)
1224 { 1356 {
1225 reset_connection (); 1357 reset_connection ();
1226 establish_connection (); 1358 establish_connection ();
1227 } 1359 }
1228 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1360 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1361 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1362 {
1363 w.start (3);
1233 send_ping (si); 1364 send_ping (si);
1234 w.start (5);
1235 } 1365 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1366 else if (when >= -10)
1237 // hold ondemand connections implicitly a few seconds longer 1367 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1368 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1369 w.start (when + 10);
1240 else 1370 else
1241 reset_connection (); 1371 reset_connection ();
1242} 1372}
1243 1373
1374void
1244void connection::send_connect_request (int id) 1375connection::send_connect_request (int id)
1245{ 1376{
1246 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1377 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1247 1378
1248 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1379 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1380 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1381 THISNODE->protocols);
1249 p->hmac_set (octx); 1382 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1383 send_vpn_packet (p, si);
1251 1384
1252 delete p; 1385 delete p;
1253} 1386}
1254 1387
1388void
1255void connection::script_init_env (const char *ext) 1389connection::script_init_env (const char *ext)
1256{ 1390{
1257 char *env; 1391 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1392 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1393 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1394 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1395 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1396 conf->id & 0xff); putenv (env);
1263} 1397}
1264 1398
1399void
1265void connection::script_init_connect_env () 1400connection::script_init_connect_env ()
1266{ 1401{
1267 vpn->script_init_env (); 1402 vpn->script_init_env ();
1268 1403
1269 char *env; 1404 char *env;
1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1405 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1406 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1407 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1408 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1409 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1410}
1275 1411
1276inline const char * 1412inline const char *
1277connection::script_node_up () 1413connection::script_node_up ()
1278{ 1414{
… …
1288 1424
1289 return filename; 1425 return filename;
1290} 1426}
1291 1427
1292inline const char * 1428inline const char *
1429connection::script_node_change ()
1430{
1431 script_init_connect_env ();
1432
1433 putenv ((char *)"STATE=change");
1434
1435 char *filename;
1436 asprintf (&filename,
1437 "%s/%s",
1438 confbase,
1439 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1440
1441 return filename;
1442}
1443
1444inline const char *
1293connection::script_node_down () 1445connection::script_node_down ()
1294{ 1446{
1295 script_init_connect_env (); 1447 script_init_connect_env ();
1296 1448
1297 putenv ((char *)"STATE=down"); 1449 putenv ((char *)"STATE=down");
… …
1308connection::connection (struct vpn *vpn, conf_node *conf) 1460connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1461: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1462#if ENABLE_DNS
1311 dns (0), 1463 dns (0),
1312#endif 1464#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1465 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1466 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1467{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1468 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1469 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1470 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1471
1472 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1473 octx = ictx = 0;
1321 retry_cnt = 0;
1322
1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325 1474
1326 connectmode = conf->connectmode; 1475 connectmode = conf->connectmode;
1327 1476
1328 // queue a dummy packet to force an initial connection attempt 1477 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1478 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1479 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1480
1336 reset_connection (); 1481 reset_connection ();
1337} 1482}
1338 1483
1339connection::~connection () 1484connection::~connection ()
1340{ 1485{
1341 shutdown (); 1486 shutdown ();
1342} 1487}
1343 1488
1489void
1344void connection_init () 1490connection_init ()
1345{ 1491{
1346 auth_rate_limiter.clear (); 1492 auth_rate_limiter.clear ();
1347 reset_rate_limiter.clear (); 1493 reset_rate_limiter.clear ();
1348} 1494}
1349 1495

Diff Legend

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