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.66 by pcg, Thu Dec 6 00:35:29 2007 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 {
… …
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);
… …
748} 846}
749 847
750inline void 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;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
824 929
825 si.host = 0; 930 si.host = 0;
826 931
827 last_activity = 0; 932 last_activity = 0.;
933 //last_si_change = 0.;
828 retry_cnt = 0; 934 retry_cnt = 0;
829 935
830 rekey.stop (); 936 rekey.stop ();
831 keepalive.stop (); 937 keepalive.stop ();
832 establish_connection.stop (); 938 establish_connection.stop ();
… …
839 send_reset (si); 945 send_reset (si);
840 946
841 reset_connection (); 947 reset_connection ();
842} 948}
843 949
950// poor-man's rekeying
844inline void 951inline void
845connection::rekey_cb (ev::timer &w, int revents) 952connection::rekey_cb (ev::timer &w, int revents)
846{ 953{
847 reset_connection (); 954 reset_connection ();
848 establish_connection (); 955 establish_connection ();
… …
866 if (oseqno > MAX_SEQNO) 973 if (oseqno > MAX_SEQNO)
867 rekey (); 974 rekey ();
868} 975}
869 976
870void 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
871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 988connection::inject_data_packet (tap_packet *pkt)
872{ 989{
873 if (ictx && octx) 990 if (ictx && octx)
874 send_data_packet (pkt); 991 send_data_packet (pkt);
875 else 992 else
876 { 993 {
877 if (!broadcast)
878 data_queue.put (new tap_packet (*pkt)); 994 data_queue.put (new tap_packet (*pkt));
879 995 post_inject_queue ();
880 establish_connection ();
881 } 996 }
882} 997}
883 998
999void
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1000connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{ 1001{
886 if (ictx && octx) 1002 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos); 1003 send_vpn_packet (pkt, si, tos);
888 else 1004 else
889 { 1005 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1006 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891 1007 post_inject_queue ();
892 establish_connection ();
893 } 1008 }
894} 1009}
895 1010
896void 1011void
897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1012connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
898{ 1013{
899 last_activity = ev_now (); 1014 last_activity = ev_now ();
900 1015
901 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.",
902 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1017 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
903 1018
904 if (connectmode == conf_node::C_DISABLED) 1019 if (connectmode == conf_node::C_DISABLED)
905 return; 1020 return;
906 1021
907 switch (pkt->typ ()) 1022 switch (pkt->typ ())
908 { 1023 {
909 case vpn_packet::PT_PING: 1024 case vpn_packet::PT_PING:
1025 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1026
910 // we send pings instead of auth packets after some retries, 1027 // we send pings instead of auth packets after some retries,
911 // so reset the retry counter and establish a connection 1028 // so reset the retry counter and establish a connection
912 // when we receive a ping. 1029 // when we receive a ping.
913 if (!ictx) 1030 if (!ictx)
914 { 1031 {
915 if (auth_rate_limiter.can (rsi)) 1032 if (auth_rate_limiter.can (rsi))
916 send_auth_request (rsi, true); 1033 send_auth_request (rsi, true);
917 } 1034 }
918 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.
919 send_ping (rsi, 1); // pong 1038 send_ping (rsi, 1); // pong
920 1039
921 break; 1040 break;
922 1041
923 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 ();
924 break; 1048 break;
925 1049
926 case vpn_packet::PT_RESET: 1050 case vpn_packet::PT_RESET:
927 { 1051 {
928 reset_connection (); 1052 reset_connection ();
929 1053
930 config_packet *p = (config_packet *) pkt; 1054 config_packet *p = (config_packet *) pkt;
931 1055
932 if (!p->chk_config ()) 1056 if (!p->chk_config ())
933 { 1057 {
934 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1058 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
935 conf->nodename, (const char *)rsi); 1059 conf->nodename, (const char *)rsi);
936 connectmode = conf_node::C_DISABLED; 1060 connectmode = conf_node::C_DISABLED;
937 } 1061 }
938 else if (connectmode == conf_node::C_ALWAYS) 1062 else if (connectmode == conf_node::C_ALWAYS)
939 establish_connection (); 1063 establish_connection ();
… …
941 break; 1065 break;
942 1066
943 case vpn_packet::PT_AUTH_REQ: 1067 case vpn_packet::PT_AUTH_REQ:
944 if (auth_rate_limiter.can (rsi)) 1068 if (auth_rate_limiter.can (rsi))
945 { 1069 {
946 auth_req_packet *p = (auth_req_packet *) pkt; 1070 auth_req_packet *p = (auth_req_packet *)pkt;
947 1071
948 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);
949 1075
950 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)))
951 { 1078 {
952 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
953 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."),
954 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
955 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
981 1108
982 break; 1109 break;
983 } 1110 }
984 } 1111 }
985 else 1112 else
986 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
987 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
988 1115
989 send_reset (rsi); 1116 send_reset (rsi);
990 } 1117 }
991 1118
992 break; 1119 break;
993 1120
994 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
995 { 1122 {
996 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
997 1124
998 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
999 1126
1000 if (p->chk_config ()) 1127 if (p->chk_config ())
1001 { 1128 {
1002 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
1003 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."),
… …
1006 1133
1007 rsachallenge chg; 1134 rsachallenge chg;
1008 1135
1009 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
1010 { 1137 {
1011 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1012 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
1013 break; 1140 break;
1014 } 1141 }
1015 else 1142 else
1016 { 1143 {
1017 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1018 1145
1019 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
1020 { 1147 {
1021 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"
1022 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
1023 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
1024 break; 1151 break;
1025 } 1152 }
1026 else 1153 else
1027 { 1154 {
… …
1038 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
1039 1166
1040 si = rsi; 1167 si = rsi;
1041 protocol = rsi.prot; 1168 protocol = rsi.prot;
1042 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
1043 connection_established (); 1175 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 1176
1049 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1050 { 1178 {
1051 run_script_cb cb; 1179 run_script_cb *cb = new run_script_cb;
1052 cb.set<connection, &connection::script_node_up> (this); 1180 cb->set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1055 } 1182 }
1056 1183
1057 break; 1184 break;
1058 } 1185 }
1059 else 1186 else
1060 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."),
1061 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1062 } 1189 }
1063 1190
1064 delete cctx; 1191 delete cctx;
1065 } 1192 }
… …
1081 { 1208 {
1082 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1083 1210
1084 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1085 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"
1086 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1087 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1088 else 1215 else
1089 { 1216 {
1090 u32 seqno; 1217 u32 seqno;
1091 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1092 1220
1093 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1094 { 1222 {
1095 vpn->tap->send (d); 1223 vpn->tap->send (d);
1096 1224
1097 if (si != rsi) 1225 if (si != rsi)
1098 { 1226 {
1099 // 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.)
1100 si = rsi; 1229 // {
1101
1102 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1103 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);
1104 } 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);
1105 } 1259 }
1106 1260
1107 delete d; 1261 delete d;
1108 break; 1262 break;
1109 } 1263 }
… …
1113 break; 1267 break;
1114 1268
1115 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1117 { 1271 {
1118 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1119 1273
1120 if (p->id > 0 && p->id <= vpn->conns.size ()) 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1121 { 1275 {
1122 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols; 1277 conf->protocols = p->protocols;
1124 1278
1125 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,
1126 conf->id, p->id, c->ictx && c->octx); 1282 c->ictx && c->octx);
1127 1283
1128 if (c->ictx && c->octx) 1284 if (c->ictx && c->octx)
1129 { 1285 {
1130 // send connect_info packets to both sides, in case one is 1286 // send connect_info packets to both sides, in case one is
1131 // behind a nat firewall (or both ;) 1287 // behind a nat firewall (or both ;)
… …
1154 1310
1155 c->conf->protocols = p->protocols; 1311 c->conf->protocols = p->protocols;
1156 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));
1157 p->si.upgrade_protocol (protocol, c->conf); 1313 p->si.upgrade_protocol (protocol, c->conf);
1158 1314
1159 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1315 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); 1316 conf->nodename,
1317 vpn->conns[p->id - 1]->conf->nodename,
1318 (const char *)p->si,
1319 p->protocols,
1320 !c->ictx && !c->octx);
1161 1321
1162 const sockinfo &dsi = forward_si (p->si); 1322 const sockinfo &dsi = forward_si (p->si);
1163 1323
1164 if (dsi.valid ()) 1324 if (dsi.valid ())
1165 c->send_auth_request (dsi, true); 1325 c->send_auth_request (dsi, true);
… …
1179} 1339}
1180 1340
1181inline void 1341inline void
1182connection::keepalive_cb (ev::timer &w, int revents) 1342connection::keepalive_cb (ev::timer &w, int revents)
1183{ 1343{
1184 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1344 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1185 { 1345 {
1186 reset_connection (); 1346 reset_connection ();
1187 establish_connection (); 1347 establish_connection ();
1188 } 1348 }
1189 else if (ev_now () < last_activity + ::conf.keepalive) 1349 else if (ev_now () < last_activity + ::conf.keepalive)
1190 w.start (last_activity + ::conf.keepalive - ev::now ()); 1350 w.start (last_activity + ::conf.keepalive - ev::now ());
1191 else if (conf->connectmode != conf_node::C_ONDEMAND 1351 else if (conf->connectmode != conf_node::C_ONDEMAND
1192 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1352 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1193 { 1353 {
1194 send_ping (si); 1354 send_ping (si);
1195 w.start (5); 1355 w.start (3);
1196 } 1356 }
1197 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1357 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1198 // hold ondemand connections implicitly a few seconds longer 1358 // hold ondemand connections implicitly a few seconds longer
1199 // should delete octx, though, or something like that ;) 1359 // should delete octx, though, or something like that ;)
1200 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1360 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1201 else 1361 else
1202 reset_connection (); 1362 reset_connection ();
1203} 1363}
1204 1364
1365void
1205void connection::send_connect_request (int id) 1366connection::send_connect_request (int id)
1206{ 1367{
1207 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);
1208 1369
1209 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);
1210 p->hmac_set (octx); 1373 p->hmac_set (octx);
1211 send_vpn_packet (p, si); 1374 send_vpn_packet (p, si);
1212 1375
1213 delete p; 1376 delete p;
1214} 1377}
1215 1378
1379void
1216void connection::script_init_env (const char *ext) 1380connection::script_init_env (const char *ext)
1217{ 1381{
1218 char *env; 1382 char *env;
1219 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);
1220 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1384 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1221 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1385 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1222 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1386 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1223 conf->id & 0xff); putenv (env); 1387 conf->id & 0xff); putenv (env);
1224} 1388}
1225 1389
1390void
1226void connection::script_init_connect_env () 1391connection::script_init_connect_env ()
1227{ 1392{
1228 vpn->script_init_env (); 1393 vpn->script_init_env ();
1229 1394
1230 char *env; 1395 char *env;
1231 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);
1232 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1398 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1233 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1399 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1234 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1400 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1235} 1401}
1236 1402
1237inline const char * 1403inline const char *
1238connection::script_node_up () 1404connection::script_node_up ()
1239{ 1405{
… …
1249 1415
1250 return filename; 1416 return filename;
1251} 1417}
1252 1418
1253inline 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 *
1254connection::script_node_down () 1436connection::script_node_down ()
1255{ 1437{
1256 script_init_connect_env (); 1438 script_init_connect_env ();
1257 1439
1258 putenv ((char *)"STATE=down"); 1440 putenv ((char *)"STATE=down");
… …
1265 1447
1266 return filename; 1448 return filename;
1267} 1449}
1268 1450
1269connection::connection (struct vpn *vpn, conf_node *conf) 1451connection::connection (struct vpn *vpn, conf_node *conf)
1270: vpn(vpn), conf(conf) 1452: vpn(vpn), conf(conf),
1271#if ENABLE_DNS 1453#if ENABLE_DNS
1272, dns (0) 1454 dns (0),
1273#endif 1455#endif
1456 data_queue(conf->max_ttl, conf->max_queue + 1),
1457 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1274{ 1458{
1275 rekey .set<connection, &connection::rekey_cb > (this); 1459 rekey .set<connection, &connection::rekey_cb > (this);
1276 keepalive .set<connection, &connection::keepalive_cb > (this); 1460 keepalive .set<connection, &connection::keepalive_cb > (this);
1277 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1461 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1278 1462
1463 last_establish_attempt = 0.;
1279 octx = ictx = 0; 1464 octx = ictx = 0;
1280 retry_cnt = 0;
1281 1465
1282 if (!conf->protocols) // make sure some protocol is enabled 1466 connectmode = conf->connectmode;
1283 conf->protocols = PROT_UDPv4;
1284 1467
1285 connectmode = conf_node::C_ALWAYS; // initial setting 1468 // queue a dummy packet to force an initial connection attempt
1469 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1470 vpn_queue.put (new net_packet);
1471
1286 reset_connection (); 1472 reset_connection ();
1287} 1473}
1288 1474
1289connection::~connection () 1475connection::~connection ()
1290{ 1476{
1291 shutdown (); 1477 shutdown ();
1292} 1478}
1293 1479
1480void
1294void connection_init () 1481connection_init ()
1295{ 1482{
1296 auth_rate_limiter.clear (); 1483 auth_rate_limiter.clear ();
1297 reset_rate_limiter.clear (); 1484 reset_rate_limiter.clear ();
1298} 1485}
1299 1486

Diff Legend

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