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.95 by root, Tue Mar 8 17:33:30 2011 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);
… …
643 { 709 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 711 delete p;
646 } 712 }
647 } 713 }
714
715 vpn->connection_established (this);
648 } 716 }
649 else 717 else
650 { 718 {
651 retry_cnt = 0; 719 retry_cnt = 0;
652 establish_connection.start (5); 720 establish_connection.start (5);
… …
656} 724}
657 725
658void 726void
659connection::reset_si () 727connection::reset_si ()
660{ 728{
729 if (vpn->can_direct (THISNODE, conf))
661 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
662 731 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 { 732 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 734 protocol = 0;
674 } 735 }
675 736
676 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
677} 740}
678 741
679// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
680const sockinfo & 743const sockinfo &
681connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
682{ 745{
683 if (!si.valid ()) 746 if (!si.valid ())
684 { 747 {
685 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
686 749
687 if (r) 750 if (r)
688 { 751 {
689 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
691 return r->si; 754 return r->si;
692 } 755 }
693 else 756 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 758 conf->nodename);
696 } 759 }
697 760
698 return si; 761 return si;
699} 762}
… …
709connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
710{ 773{
711 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
712 775
713 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 781
716 delete pkt; 782 delete pkt;
717} 783}
718 784
… …
737 803
738 rsachallenge chg; 804 rsachallenge chg;
739 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
741 807
742 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
743 809
744 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
745 811
746 delete pkt; 812 delete pkt;
747} 813}
… …
755 821
756 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
757 823
758 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
759 825
760 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
761 827
762 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
763 829
764 delete pkt; 830 delete pkt;
765} 831}
766 832
767void 833void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 835{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
838 conf->protocols);
772 839
773 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 840 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
774 841
775 r->hmac_set (octx); 842 r->hmac_set (octx);
776 send_vpn_packet (r, si); 843 send_vpn_packet (r, si);
… …
779} 846}
780 847
781inline void 848inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 849connection::establish_connection_cb (ev::timer &w, int revents)
783{ 850{
784 if (!ictx 851 if (!(ictx && octx)
785 && conf != THISNODE 852 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 853 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 854 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 855 && !w.is_active ())
789 { 856 {
… …
793 { 860 {
794 reset_connection (); 861 reset_connection ();
795 return; 862 return;
796 } 863 }
797 864
865 last_establish_attempt = ev_now ();
866
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 867 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 868 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 869 : 1 << (retry_cnt >> 2));
801 870
802 reset_si (); 871 reset_si ();
803 872
804 bool slow = si.prot & PROT_SLOW; 873 bool slow = si.prot & PROT_SLOW;
805 874
806 if (si.prot && !si.host) 875 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 876 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 877 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 878 w.start (1);
811 vpn->send_connect_request (conf->id); 879 vpn->send_connect_request (this);
812 } 880 }
813 else 881 else
814 { 882 {
815 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 883 if (si.valid ())
884 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
885 conf->nodename, (const char *)si);
816 886
817 const sockinfo &dsi = forward_si (si); 887 const sockinfo &dsi = forward_si (si);
818 888
819 slow = slow || (dsi.prot & PROT_SLOW); 889 slow = slow || (dsi.prot & PROT_SLOW);
820 890
… …
825 else 895 else
826 send_ping (dsi, 0); 896 send_ping (dsi, 0);
827 } 897 }
828 } 898 }
829 899
830 retry_int *= slow ? 8. : 0.7; 900 retry_int *= slow ? 8. : 0.9;
831 901
832 if (retry_int < conf->max_retry) 902 if (retry_int < conf->max_retry)
833 retry_cnt++; 903 retry_cnt++;
834 else 904 else
835 retry_int = conf->max_retry; 905 retry_int = conf->max_retry;
… …
846 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost"),
847 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si);
848 918
849 if (::conf.script_node_down) 919 if (::conf.script_node_down)
850 { 920 {
851 run_script_cb cb; 921 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 922 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 924 }
856 } 925 }
857 926
858 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
859 delete octx; octx = 0; 928 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
863 929
864 si.host = 0; 930 si.host = 0;
865 931
866 last_activity = 0; 932 last_activity = 0.;
933 //last_si_change = 0.;
867 retry_cnt = 0; 934 retry_cnt = 0;
868 935
869 rekey.stop (); 936 rekey.stop ();
870 keepalive.stop (); 937 keepalive.stop ();
871 establish_connection.stop (); 938 establish_connection.stop ();
… …
878 send_reset (si); 945 send_reset (si);
879 946
880 reset_connection (); 947 reset_connection ();
881} 948}
882 949
950// poor-man's rekeying
883inline void 951inline void
884connection::rekey_cb (ev::timer &w, int revents) 952connection::rekey_cb (ev::timer &w, int revents)
885{ 953{
886 reset_connection (); 954 reset_connection ();
887 establish_connection (); 955 establish_connection ();
… …
905 if (oseqno > MAX_SEQNO) 973 if (oseqno > MAX_SEQNO)
906 rekey (); 974 rekey ();
907} 975}
908 976
909void 977void
978connection::post_inject_queue ()
979{
980 // force a connection every now and when when packets are sent (max 1/s)
981 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
982 establish_connection.stop ();
983
984 establish_connection ();
985}
986
987void
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 988connection::inject_data_packet (tap_packet *pkt)
911{ 989{
912 if (ictx && octx) 990 if (ictx && octx)
913 send_data_packet (pkt); 991 send_data_packet (pkt);
914 else 992 else
915 { 993 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 994 data_queue.put (new tap_packet (*pkt));
918 995 post_inject_queue ();
919 establish_connection ();
920 } 996 }
921} 997}
922 998
999void
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1000connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 1001{
925 if (ictx && octx) 1002 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 1003 send_vpn_packet (pkt, si, tos);
927 else 1004 else
928 { 1005 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1006 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 1007 post_inject_queue ();
931 establish_connection ();
932 } 1008 }
933} 1009}
934 1010
935void 1011void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1012connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1013{
938 last_activity = ev_now (); 1014 last_activity = ev_now ();
939 1015
940 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1016 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1017 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1018
943 if (connectmode == conf_node::C_DISABLED) 1019 if (connectmode == conf_node::C_DISABLED)
944 return; 1020 return;
945 1021
946 switch (pkt->typ ()) 1022 switch (pkt->typ ())
947 { 1023 {
948 case vpn_packet::PT_PING: 1024 case vpn_packet::PT_PING:
1025 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1026
949 // we send pings instead of auth packets after some retries, 1027 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1028 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1029 // when we receive a ping.
952 if (!ictx) 1030 if (!ictx)
953 { 1031 {
954 if (auth_rate_limiter.can (rsi)) 1032 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1033 send_auth_request (rsi, true);
956 } 1034 }
957 else 1035 else
1036 // we would love to change the socket address here, but ping's aren't
1037 // authenticated, so we best ignore it.
958 send_ping (rsi, 1); // pong 1038 send_ping (rsi, 1); // pong
959 1039
960 break; 1040 break;
961 1041
962 case vpn_packet::PT_PONG: 1042 case vpn_packet::PT_PONG:
1043 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1044
1045 // a PONG might mean that the other side doesn't really know
1046 // about our desire for communication.
1047 establish_connection ();
963 break; 1048 break;
964 1049
965 case vpn_packet::PT_RESET: 1050 case vpn_packet::PT_RESET:
966 { 1051 {
967 reset_connection (); 1052 reset_connection ();
968 1053
969 config_packet *p = (config_packet *) pkt; 1054 config_packet *p = (config_packet *) pkt;
970 1055
971 if (!p->chk_config ()) 1056 if (!p->chk_config ())
972 { 1057 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1058 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
974 conf->nodename, (const char *)rsi); 1059 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED; 1060 connectmode = conf_node::C_DISABLED;
976 } 1061 }
977 else if (connectmode == conf_node::C_ALWAYS) 1062 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1063 establish_connection ();
… …
980 break; 1065 break;
981 1066
982 case vpn_packet::PT_AUTH_REQ: 1067 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1068 if (auth_rate_limiter.can (rsi))
984 { 1069 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1070 auth_req_packet *p = (auth_req_packet *)pkt;
986 1071
987 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1072 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1073 conf->nodename, p->initiate ? "initiate" : "reply",
1074 p->protocols, p->features);
988 1075
989 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1076 if (p->chk_config ()
1077 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
990 { 1078 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
992 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
993 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
1020 1108
1021 break; 1109 break;
1022 } 1110 }
1023 } 1111 }
1024 else 1112 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
1026 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
1027 1115
1028 send_reset (rsi); 1116 send_reset (rsi);
1029 } 1117 }
1030 1118
1031 break; 1119 break;
1032 1120
1033 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
1034 { 1122 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1124
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1126
1039 if (p->chk_config ()) 1127 if (p->chk_config ())
1040 { 1128 {
1041 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
1042 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1045 1133
1046 rsachallenge chg; 1134 rsachallenge chg;
1047 1135
1048 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
1049 { 1137 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
1052 break; 1140 break;
1053 } 1141 }
1054 else 1142 else
1055 { 1143 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1057 1145
1058 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
1059 { 1147 {
1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1148 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"), 1149 "could be an attack, or just corruption or a synchronization error."),
1062 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
1063 break; 1151 break;
1064 } 1152 }
1065 else 1153 else
1066 { 1154 {
… …
1077 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1078 1166
1079 si = rsi; 1167 si = rsi;
1080 protocol = rsi.prot; 1168 protocol = rsi.prot;
1081 1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
1082 connection_established (); 1175 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 1176
1088 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1089 { 1178 {
1090 run_script_cb cb; 1179 run_script_cb *cb = new run_script_cb;
1091 cb.set<connection, &connection::script_node_up> (this); 1180 cb->set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1094 } 1182 }
1095 1183
1096 break; 1184 break;
1097 } 1185 }
1098 else 1186 else
1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1100 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1101 } 1189 }
1102 1190
1103 delete cctx; 1191 delete cctx;
1104 } 1192 }
… …
1120 { 1208 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1210
1123 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1124 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1212 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1125 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1127 else 1215 else
1128 { 1216 {
1129 u32 seqno; 1217 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1131 1220
1132 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1133 { 1222 {
1134 vpn->tap->send (d); 1223 vpn->tap->send (d);
1135 1224
1136 if (si != rsi) 1225 if (si != rsi)
1137 { 1226 {
1138 // fast re-sync on source address changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1139 si = rsi; 1229 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 conf->nodename, (const char *)si, (const char *)rsi); 1231 conf->nodename, (const char *)si, (const char *)rsi);
1232
1233 si = rsi;
1234
1235 if (::conf.script_node_change)
1236 {
1237 run_script_cb *cb = new run_script_cb;
1238 cb->set<connection, &connection::script_node_change> (this);
1239 run_script_queued (cb, _("node-change command execution failed, continuing."));
1240 }
1241
1242 // }
1243 //else
1244 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1245 // conf->nodename, (const char *)si, (const char *)rsi);
1143 } 1246 }
1247 }
1248 else if (seqclass == 1) // far history
1249 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1250 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1251 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1252 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 3) // reset
1255 {
1256 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1257 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1258 send_reset (rsi);
1144 } 1259 }
1145 1260
1146 delete d; 1261 delete d;
1147 break; 1262 break;
1148 } 1263 }
… …
1152 break; 1267 break;
1153 1268
1154 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1271 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1273
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1275 {
1161 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1277 conf->protocols = p->protocols;
1163 1278
1164 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1281 p->protocols,
1165 conf->id, p->id, c->ictx && c->octx); 1282 c->ictx && c->octx);
1166 1283
1167 if (c->ictx && c->octx) 1284 if (c->ictx && c->octx)
1168 { 1285 {
1169 // send connect_info packets to both sides, in case one is 1286 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1287 // behind a nat firewall (or both ;)
… …
1193 1310
1194 c->conf->protocols = p->protocols; 1311 c->conf->protocols = p->protocols;
1195 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1312 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1196 p->si.upgrade_protocol (protocol, c->conf); 1313 p->si.upgrade_protocol (protocol, c->conf);
1197 1314
1198 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1315 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1199 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1316 conf->nodename,
1317 vpn->conns[p->id - 1]->conf->nodename,
1318 (const char *)p->si,
1319 p->protocols,
1320 !c->ictx && !c->octx);
1200 1321
1201 const sockinfo &dsi = forward_si (p->si); 1322 const sockinfo &dsi = forward_si (p->si);
1202 1323
1203 if (dsi.valid ()) 1324 if (dsi.valid ())
1204 c->send_auth_request (dsi, true); 1325 c->send_auth_request (dsi, true);
… …
1218} 1339}
1219 1340
1220inline void 1341inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1342connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1343{
1223 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1344 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1224 { 1345 {
1225 reset_connection (); 1346 reset_connection ();
1226 establish_connection (); 1347 establish_connection ();
1227 } 1348 }
1228 else if (ev_now () < last_activity + ::conf.keepalive) 1349 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ()); 1350 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1351 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1352 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1353 {
1233 send_ping (si); 1354 send_ping (si);
1234 w.start (5); 1355 w.start (3);
1235 } 1356 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1357 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1237 // hold ondemand connections implicitly a few seconds longer 1358 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1359 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1360 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1240 else 1361 else
1241 reset_connection (); 1362 reset_connection ();
1242} 1363}
1243 1364
1365void
1244void connection::send_connect_request (int id) 1366connection::send_connect_request (int id)
1245{ 1367{
1246 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1368 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1247 1369
1248 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1370 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1371 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1372 THISNODE->protocols);
1249 p->hmac_set (octx); 1373 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1374 send_vpn_packet (p, si);
1251 1375
1252 delete p; 1376 delete p;
1253} 1377}
1254 1378
1379void
1255void connection::script_init_env (const char *ext) 1380connection::script_init_env (const char *ext)
1256{ 1381{
1257 char *env; 1382 char *env;
1258 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1383 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1384 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1385 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1386 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1387 conf->id & 0xff); putenv (env);
1263} 1388}
1264 1389
1390void
1265void connection::script_init_connect_env () 1391connection::script_init_connect_env ()
1266{ 1392{
1267 vpn->script_init_env (); 1393 vpn->script_init_env ();
1268 1394
1269 char *env; 1395 char *env;
1270 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1396 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1397 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1398 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1399 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1400 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1401}
1275 1402
1276inline const char * 1403inline const char *
1277connection::script_node_up () 1404connection::script_node_up ()
1278{ 1405{
… …
1288 1415
1289 return filename; 1416 return filename;
1290} 1417}
1291 1418
1292inline const char * 1419inline const char *
1420connection::script_node_change ()
1421{
1422 script_init_connect_env ();
1423
1424 putenv ((char *)"STATE=change");
1425
1426 char *filename;
1427 asprintf (&filename,
1428 "%s/%s",
1429 confbase,
1430 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1431
1432 return filename;
1433}
1434
1435inline const char *
1293connection::script_node_down () 1436connection::script_node_down ()
1294{ 1437{
1295 script_init_connect_env (); 1438 script_init_connect_env ();
1296 1439
1297 putenv ((char *)"STATE=down"); 1440 putenv ((char *)"STATE=down");
… …
1308connection::connection (struct vpn *vpn, conf_node *conf) 1451connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1452: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1453#if ENABLE_DNS
1311 dns (0), 1454 dns (0),
1312#endif 1455#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1456 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1457 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1458{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1459 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1460 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1461 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1462
1463 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1464 octx = ictx = 0;
1321 retry_cnt = 0;
1322
1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325 1465
1326 connectmode = conf->connectmode; 1466 connectmode = conf->connectmode;
1327 1467
1328 // queue a dummy packet to force an initial connection attempt 1468 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1469 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1470 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1471
1336 reset_connection (); 1472 reset_connection ();
1337} 1473}
1338 1474
1339connection::~connection () 1475connection::~connection ()
1340{ 1476{
1341 shutdown (); 1477 shutdown ();
1342} 1478}
1343 1479
1480void
1344void connection_init () 1481connection_init ()
1345{ 1482{
1346 auth_rate_limiter.clear (); 1483 auth_rate_limiter.clear ();
1347 reset_rate_limiter.clear (); 1484 reset_rate_limiter.clear ();
1348} 1485}
1349 1486

Diff Legend

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