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.97 by root, Tue Dec 4 13:23:17 2012 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010,2011 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <list> 34#include <list>
35#include <queue>
36#include <utility>
25 37
26#include <openssl/rand.h> 38#include <openssl/rand.h>
27#include <openssl/evp.h> 39#include <openssl/evp.h>
28#include <openssl/rsa.h> 40#include <openssl/rsa.h>
29#include <openssl/err.h> 41#include <openssl/err.h>
… …
38 50
39#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
40# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
41#endif 53#endif
42 54
43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC_OLD "vped\xbd\xc6\xdb\x82" // 8 bytes of magic (still used in the protocol)
56#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic (understood but not generated)
44 57
45#define ULTRA_FAST 1 58#define ULTRA_FAST 1
46#define HLOG 15 59#define HLOG 15
47#include "lzf/lzf.h" 60#include "lzf/lzf.h"
48#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
50 63
64//////////////////////////////////////////////////////////////////////////////
65
66static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
67static ev::child rs_child_ev;
68
69namespace
70{
71 void // c++ requires external linkage here, apparently :(
72 rs_child_cb (ev::child &w, int revents)
73 {
74 w.stop ();
75
76 if (rs_queue.empty ())
77 return;
78
79 pid_t pid = run_script (*rs_queue.front ().first, false);
80 if (pid)
81 {
82 w.set (pid);
83 w.start ();
84 }
85 else
86 slog (L_WARN, rs_queue.front ().second);
87
88 delete rs_queue.front ().first;
89 rs_queue.pop ();
90 }
91};
92
93// despite the fancy name, this is quite a hack
94static void
95run_script_queued (run_script_cb *cb, const char *warnmsg)
96{
97 rs_queue.push (std::make_pair (cb, warnmsg));
98
99 if (!rs_child_ev.is_active ())
100 {
101 rs_child_ev.set<rs_child_cb> ();
102 rs_child_ev ();
103 }
104}
105
106//////////////////////////////////////////////////////////////////////////////
107
51struct crypto_ctx 108struct crypto_ctx
52{ 109{
53 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
54 HMAC_CTX hctx; 111 HMAC_CTX hctx;
55 112
… …
75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
76{ 133{
77 EVP_MD_CTX ctx; 134 EVP_MD_CTX ctx;
78 135
79 EVP_MD_CTX_init (&ctx); 136 EVP_MD_CTX_init (&ctx);
80 require (EVP_DigestInit (&ctx, RSA_HASH)); 137 require (EVP_DigestInit (&ctx, RSA_HASH));
81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg)); 138 require (EVP_DigestUpdate (&ctx, &chg, sizeof chg));
82 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate (&ctx, &id, sizeof id));
83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
84 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
85} 142}
86 143
87struct rsa_entry 144struct rsa_entry
88{ 145{
… …
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);
697
600 keepalive.start (::conf.keepalive); 698 keepalive.start (::conf.keepalive);
601 699
602 // send queued packets 700 // send queued packets
603 if (ictx && octx) 701 if (ictx && octx)
604 { 702 {
605 while (tap_packet *p = (tap_packet *)data_queue.get ()) 703 while (tap_packet *p = (tap_packet *)data_queue.get ())
606 { 704 {
607 send_data_packet (p); 705 if (p->len) send_data_packet (p);
608 delete p; 706 delete p;
609 } 707 }
610 708
611 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 709 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
612 { 710 {
613 send_vpn_packet (p, si, IPTOS_RELIABILITY); 711 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
614 delete p; 712 delete p;
615 } 713 }
616 } 714 }
715
716 vpn->connection_established (this);
617 } 717 }
618 else 718 else
619 { 719 {
620 retry_cnt = 0; 720 retry_cnt = 0;
621 establish_connection.start (5); 721 establish_connection.start (5);
… …
625} 725}
626 726
627void 727void
628connection::reset_si () 728connection::reset_si ()
629{ 729{
730 if (vpn->can_direct (THISNODE, conf))
630 protocol = best_protocol (THISNODE->protocols & conf->protocols); 731 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
631 732 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 { 733 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 734 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
642 protocol = 0; 735 protocol = 0;
643 } 736 }
644 737
645 si.set (conf, protocol); 738 si.set (conf, protocol);
739
740 is_direct = si.valid ();
646} 741}
647 742
648// ensure sockinfo is valid, forward if necessary 743// ensure sockinfo is valid, forward if necessary
649const sockinfo & 744const sockinfo &
650connection::forward_si (const sockinfo &si) const 745connection::forward_si (const sockinfo &si) const
651{ 746{
652 if (!si.valid ()) 747 if (!si.valid ())
653 { 748 {
654 connection *r = vpn->find_router (); 749 connection *r = vpn->find_router_for (this);
655 750
656 if (r) 751 if (r)
657 { 752 {
658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 753 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
659 conf->nodename, r->conf->nodename, (const char *)r->si); 754 conf->nodename, r->conf->nodename);
660 return r->si; 755 return r->si;
661 } 756 }
662 else 757 else
663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 758 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
664 conf->nodename); 759 conf->nodename);
665 } 760 }
666 761
667 return si; 762 return si;
668} 763}
… …
678connection::send_ping (const sockinfo &si, u8 pong) 773connection::send_ping (const sockinfo &si, u8 pong)
679{ 774{
680 ping_packet *pkt = new ping_packet; 775 ping_packet *pkt = new ping_packet;
681 776
682 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 777 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
778
779 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
780
683 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 781 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
684 782
685 delete pkt; 783 delete pkt;
686} 784}
687 785
… …
706 804
707 rsachallenge chg; 805 rsachallenge chg;
708 rsa_cache.gen (pkt->id, chg); 806 rsa_cache.gen (pkt->id, chg);
709 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 807 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
710 808
711 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 809 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
712 810
713 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 811 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
714 812
715 delete pkt; 813 delete pkt;
716} 814}
… …
724 822
725 rsa_hash (id, chg, pkt->response); 823 rsa_hash (id, chg, pkt->response);
726 824
727 pkt->hmac_set (octx); 825 pkt->hmac_set (octx);
728 826
729 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 827 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
730 828
731 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 829 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
732 830
733 delete pkt; 831 delete pkt;
734} 832}
735 833
736void 834void
737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 835connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
738{ 836{
739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 837 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
740 conf->id, rid, (const char *)rsi); 838 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
839 conf->protocols);
741 840
742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 841 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
743 842
744 r->hmac_set (octx); 843 r->hmac_set (octx);
745 send_vpn_packet (r, si); 844 send_vpn_packet (r, si);
746 845
747 delete r; 846 delete r;
748} 847}
749 848
750void 849inline void
751connection::establish_connection_cb (ev::timer &w, int revents) 850connection::establish_connection_cb (ev::timer &w, int revents)
752{ 851{
753 if (!ictx 852 if (!(ictx && octx)
754 && conf != THISNODE 853 && conf != THISNODE
755 && connectmode != conf_node::C_NEVER 854 && connectmode != conf_node::C_NEVER
756 && connectmode != conf_node::C_DISABLED 855 && connectmode != conf_node::C_DISABLED
757 && !w.is_active ()) 856 && !w.is_active ())
758 { 857 {
858 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
859 // and stop trying. should probably be handled by a per-connection expire handler.
860 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
861 {
862 reset_connection ();
863 return;
864 }
865
866 last_establish_attempt = ev_now ();
867
759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 868 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
760 ? (retry_cnt & 3) + 1 869 ? (retry_cnt & 3) + 1
761 : 1 << (retry_cnt >> 2)); 870 : 1 << (retry_cnt >> 2));
762 871
763 reset_si (); 872 reset_si ();
764 873
765 bool slow = si.prot & PROT_SLOW; 874 bool slow = si.prot & PROT_SLOW;
766 875
767 if (si.prot && !si.host) 876 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
768 { 877 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */ 878 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1); 879 w.start (1);
772 vpn->send_connect_request (conf->id); 880 vpn->send_connect_request (this);
773 } 881 }
774 else 882 else
775 { 883 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx); 884 if (si.valid ())
885 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
886 conf->nodename, (const char *)si);
777 887
778 const sockinfo &dsi = forward_si (si); 888 const sockinfo &dsi = forward_si (si);
779 889
780 slow = slow || (dsi.prot & PROT_SLOW); 890 slow = slow || (dsi.prot & PROT_SLOW);
781 891
… …
786 else 896 else
787 send_ping (dsi, 0); 897 send_ping (dsi, 0);
788 } 898 }
789 } 899 }
790 900
791 retry_int *= slow ? 8. : 0.7; 901 retry_int *= slow ? 8. : 0.9;
792 902
793 if (retry_int < conf->max_retry) 903 if (retry_int < conf->max_retry)
794 retry_cnt++; 904 retry_cnt++;
795 else 905 else
796 retry_int = conf->max_retry; 906 retry_int = conf->max_retry;
… …
807 slog (L_INFO, _("%s(%s): connection lost"), 917 slog (L_INFO, _("%s(%s): connection lost"),
808 conf->nodename, (const char *)si); 918 conf->nodename, (const char *)si);
809 919
810 if (::conf.script_node_down) 920 if (::conf.script_node_down)
811 { 921 {
812 run_script_cb cb; 922 run_script_cb *cb = new run_script_cb;
813 cb.set<connection, &connection::script_node_down> (this); 923 cb->set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing.")); 924 run_script_queued (cb, _("node-down command execution failed, continuing."));
816 } 925 }
817 } 926 }
818 927
819 delete ictx; ictx = 0; 928 delete ictx; ictx = 0;
820 delete octx; octx = 0; 929 delete octx; octx = 0;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
824 930
825 si.host = 0; 931 si.host = 0;
826 932
827 last_activity = 0; 933 last_activity = 0.;
934 //last_si_change = 0.;
828 retry_cnt = 0; 935 retry_cnt = 0;
829 936
830 rekey.stop (); 937 rekey.stop ();
831 keepalive.stop (); 938 keepalive.stop ();
832 establish_connection.stop (); 939 establish_connection.stop ();
… …
839 send_reset (si); 946 send_reset (si);
840 947
841 reset_connection (); 948 reset_connection ();
842} 949}
843 950
844void 951// poor-man's rekeying
952inline void
845connection::rekey_cb (ev::timer &w, int revents) 953connection::rekey_cb (ev::timer &w, int revents)
846{ 954{
847 reset_connection (); 955 reset_connection ();
848 establish_connection (); 956 establish_connection ();
849} 957}
… …
866 if (oseqno > MAX_SEQNO) 974 if (oseqno > MAX_SEQNO)
867 rekey (); 975 rekey ();
868} 976}
869 977
870void 978void
979connection::post_inject_queue ()
980{
981 // force a connection every now and when when packets are sent (max 1/s)
982 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
983 establish_connection.stop ();
984
985 establish_connection ();
986}
987
988void
871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 989connection::inject_data_packet (tap_packet *pkt)
872{ 990{
873 if (ictx && octx) 991 if (ictx && octx)
874 send_data_packet (pkt); 992 send_data_packet (pkt);
875 else 993 else
876 { 994 {
877 if (!broadcast)
878 data_queue.put (new tap_packet (*pkt)); 995 data_queue.put (new tap_packet (*pkt));
879 996 post_inject_queue ();
880 establish_connection ();
881 } 997 }
882} 998}
883 999
1000void
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1001connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{ 1002{
886 if (ictx && octx) 1003 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos); 1004 send_vpn_packet (pkt, si, tos);
888 else 1005 else
889 { 1006 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1007 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891 1008 post_inject_queue ();
892 establish_connection ();
893 } 1009 }
894} 1010}
895 1011
896void 1012void
897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1013connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
898{ 1014{
899 last_activity = ev_now (); 1015 last_activity = ev_now ();
900 1016
901 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1017 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
902 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1018 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
903 1019
904 if (connectmode == conf_node::C_DISABLED) 1020 if (connectmode == conf_node::C_DISABLED)
905 return; 1021 return;
906 1022
907 switch (pkt->typ ()) 1023 switch (pkt->typ ())
908 { 1024 {
909 case vpn_packet::PT_PING: 1025 case vpn_packet::PT_PING:
1026 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1027
910 // we send pings instead of auth packets after some retries, 1028 // we send pings instead of auth packets after some retries,
911 // so reset the retry counter and establish a connection 1029 // so reset the retry counter and establish a connection
912 // when we receive a ping. 1030 // when we receive a ping.
913 if (!ictx) 1031 if (!ictx)
914 { 1032 {
915 if (auth_rate_limiter.can (rsi)) 1033 if (auth_rate_limiter.can (rsi))
916 send_auth_request (rsi, true); 1034 send_auth_request (rsi, true);
917 } 1035 }
918 else 1036 else
1037 // we would love to change the socket address here, but ping's aren't
1038 // authenticated, so we best ignore it.
919 send_ping (rsi, 1); // pong 1039 send_ping (rsi, 1); // pong
920 1040
921 break; 1041 break;
922 1042
923 case vpn_packet::PT_PONG: 1043 case vpn_packet::PT_PONG:
1044 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1045
1046 // a PONG might mean that the other side doesn't really know
1047 // about our desire for communication.
1048 establish_connection ();
924 break; 1049 break;
925 1050
926 case vpn_packet::PT_RESET: 1051 case vpn_packet::PT_RESET:
927 { 1052 {
928 reset_connection (); 1053 reset_connection ();
929 1054
930 config_packet *p = (config_packet *) pkt; 1055 config_packet *p = (config_packet *) pkt;
931 1056
932 if (!p->chk_config ()) 1057 if (!p->chk_config ())
933 { 1058 {
934 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1059 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
935 conf->nodename, (const char *)rsi); 1060 conf->nodename, (const char *)rsi);
936 connectmode = conf_node::C_DISABLED; 1061 connectmode = conf_node::C_DISABLED;
937 } 1062 }
938 else if (connectmode == conf_node::C_ALWAYS) 1063 else if (connectmode == conf_node::C_ALWAYS)
939 establish_connection (); 1064 establish_connection ();
… …
941 break; 1066 break;
942 1067
943 case vpn_packet::PT_AUTH_REQ: 1068 case vpn_packet::PT_AUTH_REQ:
944 if (auth_rate_limiter.can (rsi)) 1069 if (auth_rate_limiter.can (rsi))
945 { 1070 {
946 auth_req_packet *p = (auth_req_packet *) pkt; 1071 auth_req_packet *p = (auth_req_packet *)pkt;
947 1072
948 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1073 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1074 conf->nodename, p->initiate ? "initiate" : "reply",
1075 p->protocols, p->features);
949 1076
950 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1077 if (p->chk_config ()
1078 && (!memcmp (p->magic, MAGIC_OLD, 8) || !memcmp (p->magic, MAGIC, 8)))
951 { 1079 {
952 if (p->prot_minor != PROTOCOL_MINOR) 1080 if (p->prot_minor != PROTOCOL_MINOR)
953 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1081 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
954 conf->nodename, (const char *)rsi, 1082 conf->nodename, (const char *)rsi,
955 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1083 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
981 1109
982 break; 1110 break;
983 } 1111 }
984 } 1112 }
985 else 1113 else
986 slog (L_WARN, _("%s(%s): protocol mismatch"), 1114 slog (L_WARN, _("%s(%s): protocol mismatch."),
987 conf->nodename, (const char *)rsi); 1115 conf->nodename, (const char *)rsi);
988 1116
989 send_reset (rsi); 1117 send_reset (rsi);
990 } 1118 }
991 1119
992 break; 1120 break;
993 1121
994 case vpn_packet::PT_AUTH_RES: 1122 case vpn_packet::PT_AUTH_RES:
995 { 1123 {
996 auth_res_packet *p = (auth_res_packet *) pkt; 1124 auth_res_packet *p = (auth_res_packet *)pkt;
997 1125
998 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1126 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
999 1127
1000 if (p->chk_config ()) 1128 if (p->chk_config ())
1001 { 1129 {
1002 if (p->prot_minor != PROTOCOL_MINOR) 1130 if (p->prot_minor != PROTOCOL_MINOR)
1003 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1131 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
1006 1134
1007 rsachallenge chg; 1135 rsachallenge chg;
1008 1136
1009 if (!rsa_cache.find (p->id, chg)) 1137 if (!rsa_cache.find (p->id, chg))
1010 { 1138 {
1011 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1139 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1012 conf->nodename, (const char *)rsi); 1140 conf->nodename, (const char *)rsi);
1013 break; 1141 break;
1014 } 1142 }
1015 else 1143 else
1016 { 1144 {
1017 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1145 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1018 1146
1019 if (!p->hmac_chk (cctx)) 1147 if (!p->hmac_chk (cctx))
1020 { 1148 {
1021 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1149 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1022 "could be an attack, or just corruption or a synchronization error"), 1150 "could be an attack, or just corruption or a synchronization error."),
1023 conf->nodename, (const char *)rsi); 1151 conf->nodename, (const char *)rsi);
1024 break; 1152 break;
1025 } 1153 }
1026 else 1154 else
1027 { 1155 {
… …
1038 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1166 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1039 1167
1040 si = rsi; 1168 si = rsi;
1041 protocol = rsi.prot; 1169 protocol = rsi.prot;
1042 1170
1171 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1172 conf->nodename, (const char *)rsi,
1173 is_direct ? "direct" : "forwarded",
1174 p->prot_major, p->prot_minor);
1175
1043 connection_established (); 1176 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 1177
1049 if (::conf.script_node_up) 1178 if (::conf.script_node_up)
1050 { 1179 {
1051 run_script_cb cb; 1180 run_script_cb *cb = new run_script_cb;
1052 cb.set<connection, &connection::script_node_up> (this); 1181 cb->set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing.")); 1182 run_script_queued (cb, _("node-up command execution failed, continuing."));
1055 } 1183 }
1056 1184
1057 break; 1185 break;
1058 } 1186 }
1059 else 1187 else
1060 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1188 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1061 conf->nodename, (const char *)rsi); 1189 conf->nodename, (const char *)rsi);
1062 } 1190 }
1063 1191
1064 delete cctx; 1192 delete cctx;
1065 } 1193 }
… …
1081 { 1209 {
1082 vpndata_packet *p = (vpndata_packet *)pkt; 1210 vpndata_packet *p = (vpndata_packet *)pkt;
1083 1211
1084 if (!p->hmac_chk (ictx)) 1212 if (!p->hmac_chk (ictx))
1085 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1213 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1086 "could be an attack, or just corruption or a synchronization error"), 1214 "could be an attack, or just corruption or a synchronization error."),
1087 conf->nodename, (const char *)rsi); 1215 conf->nodename, (const char *)rsi);
1088 else 1216 else
1089 { 1217 {
1090 u32 seqno; 1218 u32 seqno;
1091 tap_packet *d = p->unpack (this, seqno); 1219 tap_packet *d = p->unpack (this, seqno);
1220 int seqclass = iseqno.seqno_classify (seqno);
1092 1221
1093 if (iseqno.recv_ok (seqno)) 1222 if (seqclass == 0) // ok
1094 { 1223 {
1095 vpn->tap->send (d); 1224 vpn->tap->send (d);
1096 1225
1097 if (si != rsi) 1226 if (si != rsi)
1098 { 1227 {
1099 // fast re-sync on source address changes, useful especially for tcp/ip 1228 // fast re-sync on source address changes, useful especially for tcp/ip
1229 //if (last_si_change < ev_now () + 5.)
1100 si = rsi; 1230 // {
1101
1102 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1231 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1103 conf->nodename, (const char *)si, (const char *)rsi); 1232 conf->nodename, (const char *)si, (const char *)rsi);
1233
1234 si = rsi;
1235
1236 if (::conf.script_node_change)
1237 {
1238 run_script_cb *cb = new run_script_cb;
1239 cb->set<connection, &connection::script_node_change> (this);
1240 run_script_queued (cb, _("node-change command execution failed, continuing."));
1241 }
1242
1243 // }
1244 //else
1245 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1246 // conf->nodename, (const char *)si, (const char *)rsi);
1104 } 1247 }
1248 }
1249 else if (seqclass == 1) // far history
1250 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1251 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1252 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1253 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1254 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1255 else if (seqclass == 3) // reset
1256 {
1257 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1258 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1259 send_reset (rsi);
1105 } 1260 }
1106 1261
1107 delete d; 1262 delete d;
1108 break; 1263 break;
1109 } 1264 }
… …
1113 break; 1268 break;
1114 1269
1115 case vpn_packet::PT_CONNECT_REQ: 1270 case vpn_packet::PT_CONNECT_REQ:
1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1271 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1117 { 1272 {
1118 connect_req_packet *p = (connect_req_packet *) pkt; 1273 connect_req_packet *p = (connect_req_packet *)pkt;
1119 1274
1120 if (p->id > 0 && p->id <= vpn->conns.size ()) 1275 if (p->id > 0 && p->id <= vpn->conns.size ())
1121 { 1276 {
1122 connection *c = vpn->conns[p->id - 1]; 1277 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols; 1278 conf->protocols = p->protocols;
1124 1279
1125 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1280 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1281 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1282 p->protocols,
1126 conf->id, p->id, c->ictx && c->octx); 1283 c->ictx && c->octx);
1127 1284
1128 if (c->ictx && c->octx) 1285 if (c->ictx && c->octx)
1129 { 1286 {
1130 // send connect_info packets to both sides, in case one is 1287 // send connect_info packets to both sides, in case one is
1131 // behind a nat firewall (or both ;) 1288 // behind a nat firewall (or both ;)
… …
1154 1311
1155 c->conf->protocols = p->protocols; 1312 c->conf->protocols = p->protocols;
1156 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1313 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1157 p->si.upgrade_protocol (protocol, c->conf); 1314 p->si.upgrade_protocol (protocol, c->conf);
1158 1315
1159 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1316 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1160 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1317 conf->nodename,
1318 vpn->conns[p->id - 1]->conf->nodename,
1319 (const char *)p->si,
1320 p->protocols,
1321 protocol,
1322 p->si.supported_protocols (c->conf),
1323 !c->ictx && !c->octx);
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);
1329 else
1330 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1331 vpn->conns[p->id - 1]->conf->nodename,
1332 (const char *)p->si);
1166 } 1333 }
1167 else 1334 else
1168 slog (L_WARN, 1335 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1336 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id); 1337 p->id);
… …
1176 send_reset (rsi); 1343 send_reset (rsi);
1177 break; 1344 break;
1178 } 1345 }
1179} 1346}
1180 1347
1348inline void
1181void connection::keepalive_cb (ev::timer &w, int revents) 1349connection::keepalive_cb (ev::timer &w, int revents)
1182{ 1350{
1183 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1351 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1352
1353 if (when >= 0)
1354 w.start (when);
1355 else if (when < -15)
1184 { 1356 {
1185 reset_connection (); 1357 reset_connection ();
1186 establish_connection (); 1358 establish_connection ();
1187 } 1359 }
1188 else if (ev_now () < last_activity + ::conf.keepalive)
1189 w.start (last_activity + ::conf.keepalive - ev::now ());
1190 else if (conf->connectmode != conf_node::C_ONDEMAND 1360 else if (conf->connectmode != conf_node::C_ONDEMAND
1191 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1361 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1192 { 1362 {
1363 w.start (3);
1193 send_ping (si); 1364 send_ping (si);
1194 w.start (5);
1195 } 1365 }
1196 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1366 else if (when >= -10)
1197 // hold ondemand connections implicitly a few seconds longer 1367 // hold ondemand connections implicitly a few seconds longer
1198 // should delete octx, though, or something like that ;) 1368 // should delete octx, though, or something like that ;)
1199 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1369 w.start (when + 10);
1200 else 1370 else
1201 reset_connection (); 1371 reset_connection ();
1202} 1372}
1203 1373
1374void
1204void connection::send_connect_request (int id) 1375connection::send_connect_request (int id)
1205{ 1376{
1206 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1377 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1207 1378
1208 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1379 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1380 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1381 THISNODE->protocols);
1209 p->hmac_set (octx); 1382 p->hmac_set (octx);
1210 send_vpn_packet (p, si); 1383 send_vpn_packet (p, si);
1211 1384
1212 delete p; 1385 delete p;
1213} 1386}
1214 1387
1388void
1215void connection::script_init_env (const char *ext) 1389connection::script_init_env (const char *ext)
1216{ 1390{
1217 char *env; 1391 char *env;
1218 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1392 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1219 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1393 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1220 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1394 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1221 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1395 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1222 conf->id & 0xff); putenv (env); 1396 conf->id & 0xff); putenv (env);
1223} 1397}
1224 1398
1399void
1225void connection::script_init_connect_env () 1400connection::script_init_connect_env ()
1226{ 1401{
1227 vpn->script_init_env (); 1402 vpn->script_init_env ();
1228 1403
1229 char *env; 1404 char *env;
1230 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1405 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1406 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1231 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1407 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1232 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1408 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1233 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1409 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1234} 1410}
1235 1411
1412inline const char *
1236const char *connection::script_node_up () 1413connection::script_node_up ()
1237{ 1414{
1238 script_init_connect_env (); 1415 script_init_connect_env ();
1239 1416
1240 putenv ((char *)"STATE=up"); 1417 putenv ((char *)"STATE=up");
1241 1418
… …
1246 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1423 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1247 1424
1248 return filename; 1425 return filename;
1249} 1426}
1250 1427
1428inline const char *
1429connection::script_node_change ()
1430{
1431 script_init_connect_env ();
1432
1433 putenv ((char *)"STATE=change");
1434
1435 char *filename;
1436 asprintf (&filename,
1437 "%s/%s",
1438 confbase,
1439 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1440
1441 return filename;
1442}
1443
1444inline const char *
1251const char *connection::script_node_down () 1445connection::script_node_down ()
1252{ 1446{
1253 script_init_connect_env (); 1447 script_init_connect_env ();
1254 1448
1255 putenv ((char *)"STATE=down"); 1449 putenv ((char *)"STATE=down");
1256 1450
… …
1262 1456
1263 return filename; 1457 return filename;
1264} 1458}
1265 1459
1266connection::connection (struct vpn *vpn, conf_node *conf) 1460connection::connection (struct vpn *vpn, conf_node *conf)
1267: vpn(vpn), conf(conf) 1461: vpn(vpn), conf(conf),
1268#if ENABLE_DNS 1462#if ENABLE_DNS
1269, dns (0) 1463 dns (0),
1270#endif 1464#endif
1465 data_queue(conf->max_ttl, conf->max_queue + 1),
1466 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1271{ 1467{
1272 rekey .set<connection, &connection::rekey_cb > (this); 1468 rekey .set<connection, &connection::rekey_cb > (this);
1273 keepalive .set<connection, &connection::keepalive_cb > (this); 1469 keepalive .set<connection, &connection::keepalive_cb > (this);
1274 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1470 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1275 1471
1472 last_establish_attempt = 0.;
1276 octx = ictx = 0; 1473 octx = ictx = 0;
1277 retry_cnt = 0;
1278 1474
1279 if (!conf->protocols) // make sure some protocol is enabled 1475 connectmode = conf->connectmode;
1280 conf->protocols = PROT_UDPv4;
1281 1476
1282 connectmode = conf_node::C_ALWAYS; // initial setting 1477 // queue a dummy packet to force an initial connection attempt
1478 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1479 vpn_queue.put (new net_packet);
1480
1283 reset_connection (); 1481 reset_connection ();
1284} 1482}
1285 1483
1286connection::~connection () 1484connection::~connection ()
1287{ 1485{
1288 shutdown (); 1486 shutdown ();
1289} 1487}
1290 1488
1489void
1291void connection_init () 1490connection_init ()
1292{ 1491{
1293 auth_rate_limiter.clear (); 1492 auth_rate_limiter.clear ();
1294 reset_rate_limiter.clear (); 1493 reset_rate_limiter.clear ();
1295} 1494}
1296 1495

Diff Legend

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