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.65 by pcg, Tue Dec 4 17:17:20 2007 UTC vs.
Revision 1.93 by root, Tue Feb 15 13:31:23 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"
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//////////////////////////////////////////////////////////////////////////////
50 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;
… …
91 rsachallenge chg; 148 rsachallenge chg;
92}; 149};
93 150
94struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
95{ 152{
96 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
97 154
98 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
99 { 156 {
100 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
101 { 158 {
… …
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 {
… …
153 } 211 }
154} 212}
155 213
156////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
157 215
158void pkt_queue::put (net_packet *p) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
217: max_ttl (max_ttl), max_queue (max_queue)
159{ 218{
160 if (queue[i]) 219 queue = new pkt [max_queue];
161 {
162 delete queue[i];
163 j = (j + 1) % QUEUEDEPTH;
164 }
165 220
166 queue[i] = p;
167
168 i = (i + 1) % QUEUEDEPTH;
169}
170
171net_packet *pkt_queue::get ()
172{
173 net_packet *p = queue[j];
174
175 if (p)
176 {
177 queue[j] = 0;
178 j = (j + 1) % QUEUEDEPTH;
179 }
180
181 return p;
182}
183
184pkt_queue::pkt_queue ()
185{
186 memset (queue, 0, sizeof (queue));
187 i = 0; 221 i = 0;
188 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
189} 225}
190 226
191pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
192{ 228{
193 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
194 delete queue[i]; 232 delete [] queue;
233}
234
235void
236pkt_queue::expire_cb (ev::timer &w, int revents)
237{
238 ev_tstamp expire = ev_now () - max_ttl;
239
240 for (;;)
241 {
242 if (empty ())
243 break;
244
245 double diff = queue[j].tstamp - expire;
246
247 if (diff >= 0.)
248 {
249 w.start (diff > 0.5 ? diff : 0.5);
250 break;
251 }
252
253 delete get ();
254 }
255}
256
257void
258pkt_queue::put (net_packet *p)
259{
260 ev_tstamp now = ev_now ();
261
262 // start expiry timer
263 if (empty ())
264 expire.start (max_ttl);
265
266 int ni = i + 1 == max_queue ? 0 : i + 1;
267
268 if (ni == j)
269 delete get ();
270
271 queue[i].pkt = p;
272 queue[i].tstamp = now;
273
274 i = ni;
275}
276
277net_packet *
278pkt_queue::get ()
279{
280 if (empty ())
281 return 0;
282
283 net_packet *p = queue[j].pkt;
284 queue[j].pkt = 0;
285
286 j = j + 1 == max_queue ? 0 : j + 1;
287
288 return p;
195} 289}
196 290
197struct net_rateinfo 291struct net_rateinfo
198{ 292{
199 u32 host; 293 u32 host;
… …
213 307
214 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
215 bool can (u32 host); 309 bool can (u32 host);
216}; 310};
217 311
218net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
219 313
314bool
220bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
221{ 316{
222 iterator i; 317 iterator i;
223 318
224 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
225 if (i->host == host) 320 if (i->host == host)
… …
272 367
273///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
274 369
275unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
276 371
372void
277void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
278{ 374{
279 unsigned int xlen; 375 unsigned int xlen;
280 376
281 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
282 378
… …
300 hmac_gen (ctx); 396 hmac_gen (ctx);
301 397
302 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
303} 399}
304 400
401void
305void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
306{ 403{
307 type = type_; 404 type = type_;
308 405
309 int src = THISNODE->id; 406 int src = THISNODE->id;
310 407
… …
315 412
316#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
317#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
318 415
319struct 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
320 { 425 {
321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
322
323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
324 tap_packet *unpack (connection *conn, u32 &seqno);
325private:
326
327 const u32 data_hdr_size () const
328 {
329 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
330 }
331 }; 427 }
428};
332 429
333void 430void
334vpndata_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)
335{ 432{
336 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
338 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
339 436
340#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
341 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
342 439
343 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
344 { 441 {
345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346 443
347 if (cl) 444 if (cl)
348 { 445 {
… …
475#endif 572#endif
476 return f; 573 return f;
477 } 574 }
478}; 575};
479 576
577void
480void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
481{ 579{
482 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
483 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
484 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
485 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
493 591
494 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
495 set_hdr (type, dst); 593 set_hdr (type, dst);
496} 594}
497 595
596bool
498bool config_packet::chk_config () const 597config_packet::chk_config () const
499{ 598{
500 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
501 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);
502 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
503 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);
… …
527 rsaencrdata encr; 626 rsaencrdata encr;
528 627
529 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
530 { 629 {
531 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
532 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
533 initiate = !!initiate_; 632 initiate = !!initiate_;
534 protocols = protocols_; 633 protocols = protocols_;
535 634
536 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
537 } 636 }
… …
586///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
587 686
588void 687void
589connection::connection_established () 688connection::connection_established ()
590{ 689{
591 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);
592 691
593 if (ictx && octx) 692 if (ictx && octx)
594 { 693 {
595 connectmode = conf->connectmode;
596
597 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
598 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);
599 rekey.start (rekey_interval, rekey_interval); 696 rekey.start (rekey_interval, rekey_interval);
600 keepalive.start (::conf.keepalive); 697 keepalive.start (::conf.keepalive);
601 698
602 // send queued packets 699 // send queued packets
603 if (ictx && octx) 700 if (ictx && octx)
604 { 701 {
605 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
606 { 703 {
607 send_data_packet (p); 704 if (p->len) send_data_packet (p);
608 delete p; 705 delete p;
609 } 706 }
610 707
611 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
612 { 709 {
613 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
614 delete p; 711 delete p;
615 } 712 }
616 } 713 }
714
715 vpn->connection_established (this);
617 } 716 }
618 else 717 else
619 { 718 {
620 retry_cnt = 0; 719 retry_cnt = 0;
621 establish_connection.start (5); 720 establish_connection.start (5);
… …
625} 724}
626 725
627void 726void
628connection::reset_si () 727connection::reset_si ()
629{ 728{
729 if (vpn->can_direct (THISNODE, conf))
630 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
631 731 else
632 // mask out protocols we cannot establish
633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 { 732 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
642 protocol = 0; 734 protocol = 0;
643 } 735 }
644 736
645 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
646} 740}
647 741
648// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
649const sockinfo & 743const sockinfo &
650connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
651{ 745{
652 if (!si.valid ()) 746 if (!si.valid ())
653 { 747 {
654 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
655 749
656 if (r) 750 if (r)
657 { 751 {
658 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."),
659 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
660 return r->si; 754 return r->si;
661 } 755 }
662 else 756 else
663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
664 conf->nodename); 758 conf->nodename);
665 } 759 }
666 760
667 return si; 761 return si;
668} 762}
… …
678connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
679{ 773{
680 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
681 775
682 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
683 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
684 781
685 delete pkt; 782 delete pkt;
686} 783}
687 784
… …
706 803
707 rsachallenge chg; 804 rsachallenge chg;
708 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
709 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
710 807
711 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);
712 809
713 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
714 811
715 delete pkt; 812 delete pkt;
716} 813}
… …
724 821
725 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
726 823
727 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
728 825
729 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);
730 827
731 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
732 829
733 delete pkt; 830 delete pkt;
734} 831}
735 832
736void 833void
737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
738{ 835{
739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
740 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
838 conf->protocols);
741 839
742 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);
743 841
744 r->hmac_set (octx); 842 r->hmac_set (octx);
745 send_vpn_packet (r, si); 843 send_vpn_packet (r, si);
746 844
747 delete r; 845 delete r;
748} 846}
749 847
750void 848inline void
751connection::establish_connection_cb (ev::timer &w, int revents) 849connection::establish_connection_cb (ev::timer &w, int revents)
752{ 850{
753 if (!ictx 851 if (!(ictx && octx)
754 && conf != THISNODE 852 && conf != THISNODE
755 && connectmode != conf_node::C_NEVER 853 && connectmode != conf_node::C_NEVER
756 && connectmode != conf_node::C_DISABLED 854 && connectmode != conf_node::C_DISABLED
757 && !w.is_active ()) 855 && !w.is_active ())
758 { 856 {
857 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
858 // and stop trying. should probably be handled by a per-connection expire handler.
859 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
860 {
861 reset_connection ();
862 return;
863 }
864
865 last_establish_attempt = ev_now ();
866
759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 867 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
760 ? (retry_cnt & 3) + 1 868 ? (retry_cnt & 3) + 1
761 : 1 << (retry_cnt >> 2)); 869 : 1 << (retry_cnt >> 2));
762 870
763 reset_si (); 871 reset_si ();
764 872
765 bool slow = si.prot & PROT_SLOW; 873 bool slow = si.prot & PROT_SLOW;
766 874
767 if (si.prot && !si.host) 875 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
768 { 876 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */ 877 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1); 878 w.start (1);
772 vpn->send_connect_request (conf->id); 879 vpn->send_connect_request (this);
773 } 880 }
774 else 881 else
775 { 882 {
776 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);
777 886
778 const sockinfo &dsi = forward_si (si); 887 const sockinfo &dsi = forward_si (si);
779 888
780 slow = slow || (dsi.prot & PROT_SLOW); 889 slow = slow || (dsi.prot & PROT_SLOW);
781 890
… …
786 else 895 else
787 send_ping (dsi, 0); 896 send_ping (dsi, 0);
788 } 897 }
789 } 898 }
790 899
791 retry_int *= slow ? 8. : 0.7; 900 retry_int *= slow ? 8. : 0.9;
792 901
793 if (retry_int < conf->max_retry) 902 if (retry_int < conf->max_retry)
794 retry_cnt++; 903 retry_cnt++;
795 else 904 else
796 retry_int = conf->max_retry; 905 retry_int = conf->max_retry;
… …
807 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost"),
808 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si);
809 918
810 if (::conf.script_node_down) 919 if (::conf.script_node_down)
811 { 920 {
812 run_script_cb cb; 921 run_script_cb *cb = new run_script_cb;
813 cb.set<connection, &connection::script_node_down> (this); 922 cb->set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
816 } 924 }
817 } 925 }
818 926
819 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
820 delete octx; octx = 0; 928 delete octx; octx = 0;
… …
822 dnsv4_reset_connection (); 930 dnsv4_reset_connection ();
823#endif 931#endif
824 932
825 si.host = 0; 933 si.host = 0;
826 934
827 last_activity = 0; 935 last_activity = 0.;
936 //last_si_change = 0.;
828 retry_cnt = 0; 937 retry_cnt = 0;
829 938
830 rekey.stop (); 939 rekey.stop ();
831 keepalive.stop (); 940 keepalive.stop ();
832 establish_connection.stop (); 941 establish_connection.stop ();
… …
839 send_reset (si); 948 send_reset (si);
840 949
841 reset_connection (); 950 reset_connection ();
842} 951}
843 952
844void 953// poor-man's rekeying
954inline void
845connection::rekey_cb (ev::timer &w, int revents) 955connection::rekey_cb (ev::timer &w, int revents)
846{ 956{
847 reset_connection (); 957 reset_connection ();
848 establish_connection (); 958 establish_connection ();
849} 959}
… …
866 if (oseqno > MAX_SEQNO) 976 if (oseqno > MAX_SEQNO)
867 rekey (); 977 rekey ();
868} 978}
869 979
870void 980void
981connection::post_inject_queue ()
982{
983 // force a connection every now and when when packets are sent (max 1/s)
984 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
985 establish_connection.stop ();
986
987 establish_connection ();
988}
989
990void
871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 991connection::inject_data_packet (tap_packet *pkt)
872{ 992{
873 if (ictx && octx) 993 if (ictx && octx)
874 send_data_packet (pkt); 994 send_data_packet (pkt);
875 else 995 else
876 { 996 {
877 if (!broadcast)
878 data_queue.put (new tap_packet (*pkt)); 997 data_queue.put (new tap_packet (*pkt));
879 998 post_inject_queue ();
880 establish_connection ();
881 } 999 }
882} 1000}
883 1001
1002void
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1003connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{ 1004{
886 if (ictx && octx) 1005 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos); 1006 send_vpn_packet (pkt, si, tos);
888 else 1007 else
889 { 1008 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1009 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891 1010 post_inject_queue ();
892 establish_connection ();
893 } 1011 }
894} 1012}
895 1013
896void 1014void
897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1015connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
898{ 1016{
899 last_activity = ev_now (); 1017 last_activity = ev_now ();
900 1018
901 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1019 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
902 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1020 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
903 1021
904 if (connectmode == conf_node::C_DISABLED) 1022 if (connectmode == conf_node::C_DISABLED)
905 return; 1023 return;
906 1024
907 switch (pkt->typ ()) 1025 switch (pkt->typ ())
908 { 1026 {
909 case vpn_packet::PT_PING: 1027 case vpn_packet::PT_PING:
1028 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1029
910 // we send pings instead of auth packets after some retries, 1030 // we send pings instead of auth packets after some retries,
911 // so reset the retry counter and establish a connection 1031 // so reset the retry counter and establish a connection
912 // when we receive a ping. 1032 // when we receive a ping.
913 if (!ictx) 1033 if (!ictx)
914 { 1034 {
915 if (auth_rate_limiter.can (rsi)) 1035 if (auth_rate_limiter.can (rsi))
916 send_auth_request (rsi, true); 1036 send_auth_request (rsi, true);
917 } 1037 }
918 else 1038 else
1039 // we would love to change the socket address here, but ping's aren't
1040 // authenticated, so we best ignore it.
919 send_ping (rsi, 1); // pong 1041 send_ping (rsi, 1); // pong
920 1042
921 break; 1043 break;
922 1044
923 case vpn_packet::PT_PONG: 1045 case vpn_packet::PT_PONG:
1046 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1047
1048 // a PONG might mean that the other side doesn't really know
1049 // about our desire for communication.
1050 establish_connection ();
924 break; 1051 break;
925 1052
926 case vpn_packet::PT_RESET: 1053 case vpn_packet::PT_RESET:
927 { 1054 {
928 reset_connection (); 1055 reset_connection ();
929 1056
930 config_packet *p = (config_packet *) pkt; 1057 config_packet *p = (config_packet *) pkt;
931 1058
932 if (!p->chk_config ()) 1059 if (!p->chk_config ())
933 { 1060 {
934 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1061 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
935 conf->nodename, (const char *)rsi); 1062 conf->nodename, (const char *)rsi);
936 connectmode = conf_node::C_DISABLED; 1063 connectmode = conf_node::C_DISABLED;
937 } 1064 }
938 else if (connectmode == conf_node::C_ALWAYS) 1065 else if (connectmode == conf_node::C_ALWAYS)
939 establish_connection (); 1066 establish_connection ();
… …
941 break; 1068 break;
942 1069
943 case vpn_packet::PT_AUTH_REQ: 1070 case vpn_packet::PT_AUTH_REQ:
944 if (auth_rate_limiter.can (rsi)) 1071 if (auth_rate_limiter.can (rsi))
945 { 1072 {
946 auth_req_packet *p = (auth_req_packet *) pkt; 1073 auth_req_packet *p = (auth_req_packet *)pkt;
947 1074
948 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1075 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1076 conf->nodename, p->initiate ? "initiate" : "reply",
1077 p->protocols, p->features);
949 1078
950 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1079 if (p->chk_config ()
1080 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
951 { 1081 {
952 if (p->prot_minor != PROTOCOL_MINOR) 1082 if (p->prot_minor != PROTOCOL_MINOR)
953 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1083 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
954 conf->nodename, (const char *)rsi, 1084 conf->nodename, (const char *)rsi,
955 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1085 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
981 1111
982 break; 1112 break;
983 } 1113 }
984 } 1114 }
985 else 1115 else
986 slog (L_WARN, _("%s(%s): protocol mismatch"), 1116 slog (L_WARN, _("%s(%s): protocol mismatch."),
987 conf->nodename, (const char *)rsi); 1117 conf->nodename, (const char *)rsi);
988 1118
989 send_reset (rsi); 1119 send_reset (rsi);
990 } 1120 }
991 1121
992 break; 1122 break;
993 1123
994 case vpn_packet::PT_AUTH_RES: 1124 case vpn_packet::PT_AUTH_RES:
995 { 1125 {
996 auth_res_packet *p = (auth_res_packet *) pkt; 1126 auth_res_packet *p = (auth_res_packet *)pkt;
997 1127
998 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1128 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
999 1129
1000 if (p->chk_config ()) 1130 if (p->chk_config ())
1001 { 1131 {
1002 if (p->prot_minor != PROTOCOL_MINOR) 1132 if (p->prot_minor != PROTOCOL_MINOR)
1003 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1133 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1006 1136
1007 rsachallenge chg; 1137 rsachallenge chg;
1008 1138
1009 if (!rsa_cache.find (p->id, chg)) 1139 if (!rsa_cache.find (p->id, chg))
1010 { 1140 {
1011 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1141 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1012 conf->nodename, (const char *)rsi); 1142 conf->nodename, (const char *)rsi);
1013 break; 1143 break;
1014 } 1144 }
1015 else 1145 else
1016 { 1146 {
1017 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1147 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1018 1148
1019 if (!p->hmac_chk (cctx)) 1149 if (!p->hmac_chk (cctx))
1020 { 1150 {
1021 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1151 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1022 "could be an attack, or just corruption or a synchronization error"), 1152 "could be an attack, or just corruption or a synchronization error."),
1023 conf->nodename, (const char *)rsi); 1153 conf->nodename, (const char *)rsi);
1024 break; 1154 break;
1025 } 1155 }
1026 else 1156 else
1027 { 1157 {
… …
1038 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1168 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1039 1169
1040 si = rsi; 1170 si = rsi;
1041 protocol = rsi.prot; 1171 protocol = rsi.prot;
1042 1172
1173 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1174 conf->nodename, (const char *)rsi,
1175 is_direct ? "direct" : "forwarded",
1176 p->prot_major, p->prot_minor);
1177
1043 connection_established (); 1178 connection_established ();
1044
1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1046 conf->nodename, (const char *)rsi,
1047 p->prot_major, p->prot_minor);
1048 1179
1049 if (::conf.script_node_up) 1180 if (::conf.script_node_up)
1050 { 1181 {
1051 run_script_cb cb; 1182 run_script_cb *cb = new run_script_cb;
1052 cb.set<connection, &connection::script_node_up> (this); 1183 cb->set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing.")); 1184 run_script_queued (cb, _("node-up command execution failed, continuing."));
1055 } 1185 }
1056 1186
1057 break; 1187 break;
1058 } 1188 }
1059 else 1189 else
1060 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1190 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1061 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1062 } 1192 }
1063 1193
1064 delete cctx; 1194 delete cctx;
1065 } 1195 }
… …
1081 { 1211 {
1082 vpndata_packet *p = (vpndata_packet *)pkt; 1212 vpndata_packet *p = (vpndata_packet *)pkt;
1083 1213
1084 if (!p->hmac_chk (ictx)) 1214 if (!p->hmac_chk (ictx))
1085 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1215 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1086 "could be an attack, or just corruption or a synchronization error"), 1216 "could be an attack, or just corruption or a synchronization error."),
1087 conf->nodename, (const char *)rsi); 1217 conf->nodename, (const char *)rsi);
1088 else 1218 else
1089 { 1219 {
1090 u32 seqno; 1220 u32 seqno;
1091 tap_packet *d = p->unpack (this, seqno); 1221 tap_packet *d = p->unpack (this, seqno);
1222 int seqclass = iseqno.seqno_classify (seqno);
1092 1223
1093 if (iseqno.recv_ok (seqno)) 1224 if (seqclass == 0) // ok
1094 { 1225 {
1095 vpn->tap->send (d); 1226 vpn->tap->send (d);
1096 1227
1097 if (si != rsi) 1228 if (si != rsi)
1098 { 1229 {
1099 // fast re-sync on source address changes, useful especially for tcp/ip 1230 // fast re-sync on source address changes, useful especially for tcp/ip
1231 //if (last_si_change < ev_now () + 5.)
1100 si = rsi; 1232 // {
1101
1102 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1233 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1103 conf->nodename, (const char *)si, (const char *)rsi); 1234 conf->nodename, (const char *)si, (const char *)rsi);
1235
1236 si = rsi;
1237
1238 if (::conf.script_node_change)
1239 {
1240 run_script_cb *cb = new run_script_cb;
1241 cb->set<connection, &connection::script_node_change> (this);
1242 run_script_queued (cb, _("node-change command execution failed, continuing."));
1243 }
1244
1245 // }
1246 //else
1247 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1248 // conf->nodename, (const char *)si, (const char *)rsi);
1104 } 1249 }
1250 }
1251 else if (seqclass == 1) // far history
1252 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1255 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1256 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1257 else if (seqclass == 3) // reset
1258 {
1259 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1260 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1261 send_reset (rsi);
1105 } 1262 }
1106 1263
1107 delete d; 1264 delete d;
1108 break; 1265 break;
1109 } 1266 }
… …
1113 break; 1270 break;
1114 1271
1115 case vpn_packet::PT_CONNECT_REQ: 1272 case vpn_packet::PT_CONNECT_REQ:
1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1273 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1117 { 1274 {
1118 connect_req_packet *p = (connect_req_packet *) pkt; 1275 connect_req_packet *p = (connect_req_packet *)pkt;
1119 1276
1120 if (p->id > 0 && p->id <= vpn->conns.size ()) 1277 if (p->id > 0 && p->id <= vpn->conns.size ())
1121 { 1278 {
1122 connection *c = vpn->conns[p->id - 1]; 1279 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols; 1280 conf->protocols = p->protocols;
1124 1281
1125 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1282 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1283 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1284 p->protocols,
1126 conf->id, p->id, c->ictx && c->octx); 1285 c->ictx && c->octx);
1127 1286
1128 if (c->ictx && c->octx) 1287 if (c->ictx && c->octx)
1129 { 1288 {
1130 // send connect_info packets to both sides, in case one is 1289 // send connect_info packets to both sides, in case one is
1131 // behind a nat firewall (or both ;) 1290 // behind a nat firewall (or both ;)
… …
1154 1313
1155 c->conf->protocols = p->protocols; 1314 c->conf->protocols = p->protocols;
1156 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1315 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1157 p->si.upgrade_protocol (protocol, c->conf); 1316 p->si.upgrade_protocol (protocol, c->conf);
1158 1317
1159 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1318 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1160 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1319 conf->nodename,
1320 vpn->conns[p->id - 1]->conf->nodename,
1321 (const char *)p->si,
1322 p->protocols,
1323 !c->ictx && !c->octx);
1161 1324
1162 const sockinfo &dsi = forward_si (p->si); 1325 const sockinfo &dsi = forward_si (p->si);
1163 1326
1164 if (dsi.valid ()) 1327 if (dsi.valid ())
1165 c->send_auth_request (dsi, true); 1328 c->send_auth_request (dsi, true);
… …
1176 send_reset (rsi); 1339 send_reset (rsi);
1177 break; 1340 break;
1178 } 1341 }
1179} 1342}
1180 1343
1344inline void
1181void connection::keepalive_cb (ev::timer &w, int revents) 1345connection::keepalive_cb (ev::timer &w, int revents)
1182{ 1346{
1183 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1347 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1184 { 1348 {
1185 reset_connection (); 1349 reset_connection ();
1186 establish_connection (); 1350 establish_connection ();
1187 } 1351 }
1188 else if (ev_now () < last_activity + ::conf.keepalive) 1352 else if (ev_now () < last_activity + ::conf.keepalive)
1189 w.start (last_activity + ::conf.keepalive - ev::now ()); 1353 w.start (last_activity + ::conf.keepalive - ev::now ());
1190 else if (conf->connectmode != conf_node::C_ONDEMAND 1354 else if (conf->connectmode != conf_node::C_ONDEMAND
1191 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1355 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1192 { 1356 {
1193 send_ping (si); 1357 send_ping (si);
1194 w.start (5); 1358 w.start (3);
1195 } 1359 }
1196 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1360 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1197 // hold ondemand connections implicitly a few seconds longer 1361 // hold ondemand connections implicitly a few seconds longer
1198 // should delete octx, though, or something like that ;) 1362 // should delete octx, though, or something like that ;)
1199 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1363 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1200 else 1364 else
1201 reset_connection (); 1365 reset_connection ();
1202} 1366}
1203 1367
1368void
1204void connection::send_connect_request (int id) 1369connection::send_connect_request (int id)
1205{ 1370{
1206 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1371 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1207 1372
1208 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1373 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1374 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1375 THISNODE->protocols);
1209 p->hmac_set (octx); 1376 p->hmac_set (octx);
1210 send_vpn_packet (p, si); 1377 send_vpn_packet (p, si);
1211 1378
1212 delete p; 1379 delete p;
1213} 1380}
1214 1381
1382void
1215void connection::script_init_env (const char *ext) 1383connection::script_init_env (const char *ext)
1216{ 1384{
1217 char *env; 1385 char *env;
1218 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1386 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1219 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1387 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1220 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1388 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1221 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1389 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1222 conf->id & 0xff); putenv (env); 1390 conf->id & 0xff); putenv (env);
1223} 1391}
1224 1392
1393void
1225void connection::script_init_connect_env () 1394connection::script_init_connect_env ()
1226{ 1395{
1227 vpn->script_init_env (); 1396 vpn->script_init_env ();
1228 1397
1229 char *env; 1398 char *env;
1230 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1399 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1400 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1231 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1401 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1232 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1402 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1233 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1403 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1234} 1404}
1235 1405
1406inline const char *
1236const char *connection::script_node_up () 1407connection::script_node_up ()
1237{ 1408{
1238 script_init_connect_env (); 1409 script_init_connect_env ();
1239 1410
1240 putenv ((char *)"STATE=up"); 1411 putenv ((char *)"STATE=up");
1241 1412
… …
1246 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1417 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1247 1418
1248 return filename; 1419 return filename;
1249} 1420}
1250 1421
1422inline const char *
1423connection::script_node_change ()
1424{
1425 script_init_connect_env ();
1426
1427 putenv ((char *)"STATE=change");
1428
1429 char *filename;
1430 asprintf (&filename,
1431 "%s/%s",
1432 confbase,
1433 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1434
1435 return filename;
1436}
1437
1438inline const char *
1251const char *connection::script_node_down () 1439connection::script_node_down ()
1252{ 1440{
1253 script_init_connect_env (); 1441 script_init_connect_env ();
1254 1442
1255 putenv ((char *)"STATE=down"); 1443 putenv ((char *)"STATE=down");
1256 1444
… …
1262 1450
1263 return filename; 1451 return filename;
1264} 1452}
1265 1453
1266connection::connection (struct vpn *vpn, conf_node *conf) 1454connection::connection (struct vpn *vpn, conf_node *conf)
1267: vpn(vpn), conf(conf) 1455: vpn(vpn), conf(conf),
1268#if ENABLE_DNS 1456#if ENABLE_DNS
1269, dns (0) 1457 dns (0),
1270#endif 1458#endif
1459 data_queue(conf->max_ttl, conf->max_queue + 1),
1460 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1271{ 1461{
1272 rekey .set<connection, &connection::rekey_cb > (this); 1462 rekey .set<connection, &connection::rekey_cb > (this);
1273 keepalive .set<connection, &connection::keepalive_cb > (this); 1463 keepalive .set<connection, &connection::keepalive_cb > (this);
1274 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1464 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1275 1465
1466 last_establish_attempt = 0.;
1276 octx = ictx = 0; 1467 octx = ictx = 0;
1277 retry_cnt = 0;
1278 1468
1279 if (!conf->protocols) // make sure some protocol is enabled 1469 connectmode = conf->connectmode;
1280 conf->protocols = PROT_UDPv4;
1281 1470
1282 connectmode = conf_node::C_ALWAYS; // initial setting 1471 // queue a dummy packet to force an initial connection attempt
1472 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1473 vpn_queue.put (new net_packet);
1474
1283 reset_connection (); 1475 reset_connection ();
1284} 1476}
1285 1477
1286connection::~connection () 1478connection::~connection ()
1287{ 1479{
1288 shutdown (); 1480 shutdown ();
1289} 1481}
1290 1482
1483void
1291void connection_init () 1484connection_init ()
1292{ 1485{
1293 auth_rate_limiter.clear (); 1486 auth_rate_limiter.clear ();
1294 reset_rate_limiter.clear (); 1487 reset_rate_limiter.clear ();
1295} 1488}
1296 1489

Diff Legend

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