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.63 by pcg, Sun Dec 2 00:45:41 2007 UTC vs.
Revision 1.96 by root, Thu Mar 24 21:52:48 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{
… …
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 {
… …
130 if (!cleaner.is_active ()) 187 if (!cleaner.is_active ())
131 cleaner.again (); 188 cleaner.again ();
132 } 189 }
133 190
134 rsa_cache () 191 rsa_cache ()
135 : cleaner (this, &rsa_cache::cleaner_cb)
136 { 192 {
193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
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;
… …
806 { 915 {
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 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 920 {
921 run_script_cb *cb = new run_script_cb;
922 cb->set<connection, &connection::script_node_down> (this);
812 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
924 }
813 } 925 }
814 926
815 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
816 delete octx; octx = 0; 928 delete octx; octx = 0;
817#if ENABLE_DNS
818 dnsv4_reset_connection ();
819#endif
820 929
821 si.host = 0; 930 si.host = 0;
822 931
823 last_activity = 0; 932 last_activity = 0.;
933 //last_si_change = 0.;
824 retry_cnt = 0; 934 retry_cnt = 0;
825 935
826 rekey.stop (); 936 rekey.stop ();
827 keepalive.stop (); 937 keepalive.stop ();
828 establish_connection.stop (); 938 establish_connection.stop ();
… …
835 send_reset (si); 945 send_reset (si);
836 946
837 reset_connection (); 947 reset_connection ();
838} 948}
839 949
840void 950// poor-man's rekeying
951inline void
841connection::rekey_cb (ev::timer &w, int revents) 952connection::rekey_cb (ev::timer &w, int revents)
842{ 953{
843 reset_connection (); 954 reset_connection ();
844 establish_connection (); 955 establish_connection ();
845} 956}
… …
862 if (oseqno > MAX_SEQNO) 973 if (oseqno > MAX_SEQNO)
863 rekey (); 974 rekey ();
864} 975}
865 976
866void 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
867connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 988connection::inject_data_packet (tap_packet *pkt)
868{ 989{
869 if (ictx && octx) 990 if (ictx && octx)
870 send_data_packet (pkt); 991 send_data_packet (pkt);
871 else 992 else
872 { 993 {
873 if (!broadcast)
874 data_queue.put (new tap_packet (*pkt)); 994 data_queue.put (new tap_packet (*pkt));
875 995 post_inject_queue ();
876 establish_connection ();
877 } 996 }
878} 997}
879 998
999void
880void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1000connection::inject_vpn_packet (vpn_packet *pkt, int tos)
881{ 1001{
882 if (ictx && octx) 1002 if (ictx && octx)
883 send_vpn_packet (pkt, si, tos); 1003 send_vpn_packet (pkt, si, tos);
884 else 1004 else
885 { 1005 {
886 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1006 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
887 1007 post_inject_queue ();
888 establish_connection ();
889 } 1008 }
890} 1009}
891 1010
892void 1011void
893connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1012connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
894{ 1013{
895 last_activity = ev_now (); 1014 last_activity = ev_now ();
896 1015
897 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.",
898 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1017 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
899 1018
900 if (connectmode == conf_node::C_DISABLED) 1019 if (connectmode == conf_node::C_DISABLED)
901 return; 1020 return;
902 1021
903 switch (pkt->typ ()) 1022 switch (pkt->typ ())
904 { 1023 {
905 case vpn_packet::PT_PING: 1024 case vpn_packet::PT_PING:
1025 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1026
906 // we send pings instead of auth packets after some retries, 1027 // we send pings instead of auth packets after some retries,
907 // so reset the retry counter and establish a connection 1028 // so reset the retry counter and establish a connection
908 // when we receive a ping. 1029 // when we receive a ping.
909 if (!ictx) 1030 if (!ictx)
910 { 1031 {
911 if (auth_rate_limiter.can (rsi)) 1032 if (auth_rate_limiter.can (rsi))
912 send_auth_request (rsi, true); 1033 send_auth_request (rsi, true);
913 } 1034 }
914 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.
915 send_ping (rsi, 1); // pong 1038 send_ping (rsi, 1); // pong
916 1039
917 break; 1040 break;
918 1041
919 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 ();
920 break; 1048 break;
921 1049
922 case vpn_packet::PT_RESET: 1050 case vpn_packet::PT_RESET:
923 { 1051 {
924 reset_connection (); 1052 reset_connection ();
925 1053
926 config_packet *p = (config_packet *) pkt; 1054 config_packet *p = (config_packet *) pkt;
927 1055
928 if (!p->chk_config ()) 1056 if (!p->chk_config ())
929 { 1057 {
930 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1058 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
931 conf->nodename, (const char *)rsi); 1059 conf->nodename, (const char *)rsi);
932 connectmode = conf_node::C_DISABLED; 1060 connectmode = conf_node::C_DISABLED;
933 } 1061 }
934 else if (connectmode == conf_node::C_ALWAYS) 1062 else if (connectmode == conf_node::C_ALWAYS)
935 establish_connection (); 1063 establish_connection ();
… …
937 break; 1065 break;
938 1066
939 case vpn_packet::PT_AUTH_REQ: 1067 case vpn_packet::PT_AUTH_REQ:
940 if (auth_rate_limiter.can (rsi)) 1068 if (auth_rate_limiter.can (rsi))
941 { 1069 {
942 auth_req_packet *p = (auth_req_packet *) pkt; 1070 auth_req_packet *p = (auth_req_packet *)pkt;
943 1071
944 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);
945 1075
946 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)))
947 { 1078 {
948 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
949 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."),
950 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
951 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
977 1108
978 break; 1109 break;
979 } 1110 }
980 } 1111 }
981 else 1112 else
982 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
983 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
984 1115
985 send_reset (rsi); 1116 send_reset (rsi);
986 } 1117 }
987 1118
988 break; 1119 break;
989 1120
990 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
991 { 1122 {
992 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
993 1124
994 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
995 1126
996 if (p->chk_config ()) 1127 if (p->chk_config ())
997 { 1128 {
998 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
999 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."),
… …
1002 1133
1003 rsachallenge chg; 1134 rsachallenge chg;
1004 1135
1005 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
1006 { 1137 {
1007 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1008 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
1009 break; 1140 break;
1010 } 1141 }
1011 else 1142 else
1012 { 1143 {
1013 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1014 1145
1015 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
1016 { 1147 {
1017 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"
1018 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
1019 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
1020 break; 1151 break;
1021 } 1152 }
1022 else 1153 else
1023 { 1154 {
… …
1034 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
1035 1166
1036 si = rsi; 1167 si = rsi;
1037 protocol = rsi.prot; 1168 protocol = rsi.prot;
1038 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
1039 connection_established (); 1175 connection_established ();
1040 1176
1041 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1042 conf->nodename, (const char *)rsi,
1043 p->prot_major, p->prot_minor);
1044
1045 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1046 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1047 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1048 1183
1049 break; 1184 break;
1050 } 1185 }
1051 else 1186 else
1052 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."),
1053 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1054 } 1189 }
1055 1190
1056 delete cctx; 1191 delete cctx;
1057 } 1192 }
… …
1073 { 1208 {
1074 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1075 1210
1076 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1077 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"
1078 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1079 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1080 else 1215 else
1081 { 1216 {
1082 u32 seqno; 1217 u32 seqno;
1083 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1084 1220
1085 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1086 { 1222 {
1087 vpn->tap->send (d); 1223 vpn->tap->send (d);
1088 1224
1089 if (si != rsi) 1225 if (si != rsi)
1090 { 1226 {
1091 // 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.)
1092 si = rsi; 1229 // {
1093
1094 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1095 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);
1096 } 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);
1097 } 1259 }
1098 1260
1099 delete d; 1261 delete d;
1100 break; 1262 break;
1101 } 1263 }
… …
1105 break; 1267 break;
1106 1268
1107 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1109 { 1271 {
1110 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1111 1273
1112 if (p->id > 0 && p->id <= vpn->conns.size ()) 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1113 { 1275 {
1114 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1115 conf->protocols = p->protocols; 1277 conf->protocols = p->protocols;
1116 1278
1117 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,
1118 conf->id, p->id, c->ictx && c->octx); 1282 c->ictx && c->octx);
1119 1283
1120 if (c->ictx && c->octx) 1284 if (c->ictx && c->octx)
1121 { 1285 {
1122 // send connect_info packets to both sides, in case one is 1286 // send connect_info packets to both sides, in case one is
1123 // behind a nat firewall (or both ;) 1287 // behind a nat firewall (or both ;)
… …
1146 1310
1147 c->conf->protocols = p->protocols; 1311 c->conf->protocols = p->protocols;
1148 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));
1149 p->si.upgrade_protocol (protocol, c->conf); 1313 p->si.upgrade_protocol (protocol, c->conf);
1150 1314
1151 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1315 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1152 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 protocol,
1321 p->si.supported_protocols (c->conf),
1322 !c->ictx && !c->octx);
1153 1323
1154 const sockinfo &dsi = forward_si (p->si); 1324 const sockinfo &dsi = forward_si (p->si);
1155 1325
1156 if (dsi.valid ()) 1326 if (dsi.valid ())
1157 c->send_auth_request (dsi, true); 1327 c->send_auth_request (dsi, true);
1328 else
1329 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1330 vpn->conns[p->id - 1]->conf->nodename,
1331 (const char *)p->si);
1158 } 1332 }
1159 else 1333 else
1160 slog (L_WARN, 1334 slog (L_WARN,
1161 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1335 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1162 p->id); 1336 p->id);
… …
1168 send_reset (rsi); 1342 send_reset (rsi);
1169 break; 1343 break;
1170 } 1344 }
1171} 1345}
1172 1346
1347inline void
1173void connection::keepalive_cb (ev::timer &w, int revents) 1348connection::keepalive_cb (ev::timer &w, int revents)
1174{ 1349{
1175 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1350 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1176 { 1351 {
1177 reset_connection (); 1352 reset_connection ();
1178 establish_connection (); 1353 establish_connection ();
1179 } 1354 }
1180 else if (ev_now () < last_activity + ::conf.keepalive) 1355 else if (ev_now () < last_activity + ::conf.keepalive)
1181 w.start (last_activity + ::conf.keepalive - ev::now ()); 1356 w.start (last_activity + ::conf.keepalive - ev::now ());
1182 else if (conf->connectmode != conf_node::C_ONDEMAND 1357 else if (conf->connectmode != conf_node::C_ONDEMAND
1183 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1358 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1184 { 1359 {
1185 send_ping (si); 1360 send_ping (si);
1186 w.start (5); 1361 w.start (3);
1187 } 1362 }
1188 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1363 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1189 // hold ondemand connections implicitly a few seconds longer 1364 // hold ondemand connections implicitly a few seconds longer
1190 // should delete octx, though, or something like that ;) 1365 // should delete octx, though, or something like that ;)
1191 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1366 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1192 else 1367 else
1193 reset_connection (); 1368 reset_connection ();
1194} 1369}
1195 1370
1371void
1196void connection::send_connect_request (int id) 1372connection::send_connect_request (int id)
1197{ 1373{
1198 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1374 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1199 1375
1200 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1376 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1377 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1378 THISNODE->protocols);
1201 p->hmac_set (octx); 1379 p->hmac_set (octx);
1202 send_vpn_packet (p, si); 1380 send_vpn_packet (p, si);
1203 1381
1204 delete p; 1382 delete p;
1205} 1383}
1206 1384
1385void
1207void connection::script_init_env (const char *ext) 1386connection::script_init_env (const char *ext)
1208{ 1387{
1209 char *env; 1388 char *env;
1210 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1389 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1211 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1390 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1212 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1391 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1213 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1392 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1214 conf->id & 0xff); putenv (env); 1393 conf->id & 0xff); putenv (env);
1215} 1394}
1216 1395
1396void
1217void connection::script_init_connect_env () 1397connection::script_init_connect_env ()
1218{ 1398{
1219 vpn->script_init_env (); 1399 vpn->script_init_env ();
1220 1400
1221 char *env; 1401 char *env;
1222 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1402 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1403 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1223 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1404 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1224 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1405 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1225 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1406 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1226} 1407}
1227 1408
1409inline const char *
1228const char *connection::script_node_up () 1410connection::script_node_up ()
1229{ 1411{
1230 script_init_connect_env (); 1412 script_init_connect_env ();
1231 1413
1232 putenv ((char *)"STATE=up"); 1414 putenv ((char *)"STATE=up");
1233 1415
… …
1238 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1420 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1239 1421
1240 return filename; 1422 return filename;
1241} 1423}
1242 1424
1425inline const char *
1426connection::script_node_change ()
1427{
1428 script_init_connect_env ();
1429
1430 putenv ((char *)"STATE=change");
1431
1432 char *filename;
1433 asprintf (&filename,
1434 "%s/%s",
1435 confbase,
1436 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1437
1438 return filename;
1439}
1440
1441inline const char *
1243const char *connection::script_node_down () 1442connection::script_node_down ()
1244{ 1443{
1245 script_init_connect_env (); 1444 script_init_connect_env ();
1246 1445
1247 putenv ((char *)"STATE=down"); 1446 putenv ((char *)"STATE=down");
1248 1447
… …
1254 1453
1255 return filename; 1454 return filename;
1256} 1455}
1257 1456
1258connection::connection (struct vpn *vpn, conf_node *conf) 1457connection::connection (struct vpn *vpn, conf_node *conf)
1259: vpn(vpn), conf(conf) 1458: vpn(vpn), conf(conf),
1260, rekey (this, &connection::rekey_cb)
1261, keepalive (this, &connection::keepalive_cb)
1262, establish_connection (this, &connection::establish_connection_cb)
1263#if ENABLE_DNS 1459#if ENABLE_DNS
1264, dns (0) 1460 dns (0),
1265#endif 1461#endif
1462 data_queue(conf->max_ttl, conf->max_queue + 1),
1463 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1266{ 1464{
1465 rekey .set<connection, &connection::rekey_cb > (this);
1466 keepalive .set<connection, &connection::keepalive_cb > (this);
1467 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1468
1469 last_establish_attempt = 0.;
1267 octx = ictx = 0; 1470 octx = ictx = 0;
1268 retry_cnt = 0;
1269 1471
1270 if (!conf->protocols) // make sure some protocol is enabled 1472 connectmode = conf->connectmode;
1271 conf->protocols = PROT_UDPv4;
1272 1473
1273 connectmode = conf_node::C_ALWAYS; // initial setting 1474 // queue a dummy packet to force an initial connection attempt
1475 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1476 vpn_queue.put (new net_packet);
1477
1274 reset_connection (); 1478 reset_connection ();
1275} 1479}
1276 1480
1277connection::~connection () 1481connection::~connection ()
1278{ 1482{
1279 shutdown (); 1483 shutdown ();
1280} 1484}
1281 1485
1486void
1282void connection_init () 1487connection_init ()
1283{ 1488{
1284 auth_rate_limiter.clear (); 1489 auth_rate_limiter.clear ();
1285 reset_rate_limiter.clear (); 1490 reset_rate_limiter.clear ();
1286} 1491}
1287 1492

Diff Legend

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