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.62 by pcg, Sat Dec 1 23:35:31 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
145{
88 tstamp expire; 146 tstamp expire;
89 rsaid id; 147 rsaid id;
90 rsachallenge chg; 148 rsachallenge chg;
91}; 149};
92 150
93struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
94{ 152{
95 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
96 154
97 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
98 { 156 {
99 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
100 { 158 {
… …
129 if (!cleaner.is_active ()) 187 if (!cleaner.is_active ())
130 cleaner.again (); 188 cleaner.again ();
131 } 189 }
132 190
133 rsa_cache () 191 rsa_cache ()
134 : cleaner (this, &rsa_cache::cleaner_cb)
135 { 192 {
193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
136 cleaner.set (RSA_TTL, RSA_TTL); 194 cleaner.set (RSA_TTL, RSA_TTL);
137 } 195 }
138 196
139} rsa_cache; 197} rsa_cache;
140 198
199void
141void rsa_cache::cleaner_cb (ev::timer &w, int revents) 200rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 201{
143 if (empty ()) 202 if (empty ())
144 w.stop (); 203 w.stop ();
145 else 204 else
146 { 205 {
… …
152 } 211 }
153} 212}
154 213
155////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
156 215
157void 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)
158{ 218{
159 if (queue[i]) 219 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 220
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 221 i = 0;
187 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 225}
189 226
190pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
191{ 228{
192 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
193 delete queue[i]; 232 delete [] queue;
194} 233}
195 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;
289}
290
196struct net_rateinfo { 291struct net_rateinfo
292{
197 u32 host; 293 u32 host;
198 double pcnt, diff; 294 double pcnt, diff;
199 tstamp last; 295 tstamp last;
200}; 296};
201 297
… …
211 307
212 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 309 bool can (u32 host);
214}; 310};
215 311
216net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
217 313
314bool
218bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
219{ 316{
220 iterator i; 317 iterator i;
221 318
222 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
223 if (i->host == host) 320 if (i->host == host)
… …
270 367
271///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
272 369
273unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
274 371
372void
275void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
276{ 374{
277 unsigned int xlen; 375 unsigned int xlen;
278 376
279 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
280 378
… …
298 hmac_gen (ctx); 396 hmac_gen (ctx);
299 397
300 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
301} 399}
302 400
401void
303void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
304{ 403{
305 type = type_; 404 type = type_;
306 405
307 int src = THISNODE->id; 406 int src = THISNODE->id;
308 407
… …
313 412
314#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
315#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
316 415
317struct 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
318 { 425 {
319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
320
321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
322 tap_packet *unpack (connection *conn, u32 &seqno);
323private:
324
325 const u32 data_hdr_size () const
326 {
327 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
328 }
329 }; 427 }
428};
330 429
331void 430void
332vpndata_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)
333{ 432{
334 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
336 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
337 436
338#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
340 439
341 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
342 { 441 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 443
345 if (cl) 444 if (cl)
346 { 445 {
… …
473#endif 572#endif
474 return f; 573 return f;
475 } 574 }
476}; 575};
477 576
577void
478void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
479{ 579{
480 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
491 591
492 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
493 set_hdr (type, dst); 593 set_hdr (type, dst);
494} 594}
495 595
596bool
496bool config_packet::chk_config () const 597config_packet::chk_config () const
497{ 598{
498 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
499 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);
500 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
501 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);
… …
525 rsaencrdata encr; 626 rsaencrdata encr;
526 627
527 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
528 { 629 {
529 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
530 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
531 initiate = !!initiate_; 632 initiate = !!initiate_;
532 protocols = protocols_; 633 protocols = protocols_;
533 634
534 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
535 } 636 }
… …
584///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
585 686
586void 687void
587connection::connection_established () 688connection::connection_established ()
588{ 689{
589 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);
590 691
591 if (ictx && octx) 692 if (ictx && octx)
592 { 693 {
593 connectmode = conf->connectmode;
594
595 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
596 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);
597 rekey.start (rekey_interval, rekey_interval); 696 rekey.start (rekey_interval, rekey_interval);
598 keepalive.start (::conf.keepalive); 697 keepalive.start (::conf.keepalive);
599 698
600 // send queued packets 699 // send queued packets
601 if (ictx && octx) 700 if (ictx && octx)
602 { 701 {
603 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
604 { 703 {
605 send_data_packet (p); 704 if (p->len) send_data_packet (p);
606 delete p; 705 delete p;
607 } 706 }
608 707
609 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
610 { 709 {
611 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
612 delete p; 711 delete p;
613 } 712 }
614 } 713 }
714
715 vpn->connection_established (this);
615 } 716 }
616 else 717 else
617 { 718 {
618 retry_cnt = 0; 719 retry_cnt = 0;
619 establish_connection.start (5); 720 establish_connection.start (5);
… …
623} 724}
624 725
625void 726void
626connection::reset_si () 727connection::reset_si ()
627{ 728{
729 if (vpn->can_direct (THISNODE, conf))
628 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
629 731 else
630 // mask out protocols we cannot establish
631 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
632 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
633 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
634
635 if (protocol
636 && (!conf->can_direct (THISNODE)
637 || !THISNODE->can_direct (conf)))
638 { 732 {
639 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
640 protocol = 0; 734 protocol = 0;
641 } 735 }
642 736
643 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
644} 740}
645 741
646// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
647const sockinfo & 743const sockinfo &
648connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
649{ 745{
650 if (!si.valid ()) 746 if (!si.valid ())
651 { 747 {
652 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
653 749
654 if (r) 750 if (r)
655 { 751 {
656 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."),
657 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
658 return r->si; 754 return r->si;
659 } 755 }
660 else 756 else
661 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
662 conf->nodename); 758 conf->nodename);
663 } 759 }
664 760
665 return si; 761 return si;
666} 762}
… …
676connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
677{ 773{
678 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
679 775
680 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
681 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
682 781
683 delete pkt; 782 delete pkt;
684} 783}
685 784
… …
704 803
705 rsachallenge chg; 804 rsachallenge chg;
706 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
707 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
708 807
709 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);
710 809
711 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
712 811
713 delete pkt; 812 delete pkt;
714} 813}
… …
722 821
723 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
724 823
725 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
726 825
727 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);
728 827
729 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
730 829
731 delete pkt; 830 delete pkt;
732} 831}
733 832
734void 833void
735connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
736{ 835{
737 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
738 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
838 conf->protocols);
739 839
740 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);
741 841
742 r->hmac_set (octx); 842 r->hmac_set (octx);
743 send_vpn_packet (r, si); 843 send_vpn_packet (r, si);
744 844
745 delete r; 845 delete r;
746} 846}
747 847
748void 848inline void
749connection::establish_connection_cb (ev::timer &w, int revents) 849connection::establish_connection_cb (ev::timer &w, int revents)
750{ 850{
751 if (!ictx 851 if (!(ictx && octx)
752 && conf != THISNODE 852 && conf != THISNODE
753 && connectmode != conf_node::C_NEVER 853 && connectmode != conf_node::C_NEVER
754 && connectmode != conf_node::C_DISABLED 854 && connectmode != conf_node::C_DISABLED
755 && !w.is_active ()) 855 && !w.is_active ())
756 { 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
757 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 867 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
758 ? (retry_cnt & 3) + 1 868 ? (retry_cnt & 3) + 1
759 : 1 << (retry_cnt >> 2)); 869 : 1 << (retry_cnt >> 2));
760 870
761 reset_si (); 871 reset_si ();
762 872
763 bool slow = si.prot & PROT_SLOW; 873 bool slow = si.prot & PROT_SLOW;
764 874
765 if (si.prot && !si.host) 875 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
766 { 876 {
767 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
768 /*TODO*/ /* start the timer so we don't recurse endlessly */ 877 /*TODO*/ /* start the timer so we don't recurse endlessly */
769 w.start (1); 878 w.start (1);
770 vpn->send_connect_request (conf->id); 879 vpn->send_connect_request (this);
771 } 880 }
772 else 881 else
773 { 882 {
774 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);
775 886
776 const sockinfo &dsi = forward_si (si); 887 const sockinfo &dsi = forward_si (si);
777 888
778 slow = slow || (dsi.prot & PROT_SLOW); 889 slow = slow || (dsi.prot & PROT_SLOW);
779 890
… …
784 else 895 else
785 send_ping (dsi, 0); 896 send_ping (dsi, 0);
786 } 897 }
787 } 898 }
788 899
789 retry_int *= slow ? 8. : 0.7; 900 retry_int *= slow ? 8. : 0.9;
790 901
791 if (retry_int < conf->max_retry) 902 if (retry_int < conf->max_retry)
792 retry_cnt++; 903 retry_cnt++;
793 else 904 else
794 retry_int = conf->max_retry; 905 retry_int = conf->max_retry;
… …
804 { 915 {
805 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost"),
806 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si);
807 918
808 if (::conf.script_node_down) 919 if (::conf.script_node_down)
809 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);
810 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
924 }
811 } 925 }
812 926
813 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
814 delete octx; octx = 0; 928 delete octx; octx = 0;
815#if ENABLE_DNS
816 dnsv4_reset_connection ();
817#endif
818 929
819 si.host = 0; 930 si.host = 0;
820 931
821 last_activity = 0; 932 last_activity = 0.;
933 //last_si_change = 0.;
822 retry_cnt = 0; 934 retry_cnt = 0;
823 935
824 rekey.stop (); 936 rekey.stop ();
825 keepalive.stop (); 937 keepalive.stop ();
826 establish_connection.stop (); 938 establish_connection.stop ();
… …
833 send_reset (si); 945 send_reset (si);
834 946
835 reset_connection (); 947 reset_connection ();
836} 948}
837 949
838void 950// poor-man's rekeying
951inline void
839connection::rekey_cb (ev::timer &w, int revents) 952connection::rekey_cb (ev::timer &w, int revents)
840{ 953{
841 reset_connection (); 954 reset_connection ();
842 establish_connection (); 955 establish_connection ();
843} 956}
… …
860 if (oseqno > MAX_SEQNO) 973 if (oseqno > MAX_SEQNO)
861 rekey (); 974 rekey ();
862} 975}
863 976
864void 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
865connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 988connection::inject_data_packet (tap_packet *pkt)
866{ 989{
867 if (ictx && octx) 990 if (ictx && octx)
868 send_data_packet (pkt); 991 send_data_packet (pkt);
869 else 992 else
870 { 993 {
871 if (!broadcast)
872 data_queue.put (new tap_packet (*pkt)); 994 data_queue.put (new tap_packet (*pkt));
873 995 post_inject_queue ();
874 establish_connection ();
875 } 996 }
876} 997}
877 998
999void
878void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1000connection::inject_vpn_packet (vpn_packet *pkt, int tos)
879{ 1001{
880 if (ictx && octx) 1002 if (ictx && octx)
881 send_vpn_packet (pkt, si, tos); 1003 send_vpn_packet (pkt, si, tos);
882 else 1004 else
883 { 1005 {
884 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1006 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
885 1007 post_inject_queue ();
886 establish_connection ();
887 } 1008 }
888} 1009}
889 1010
890void 1011void
891connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1012connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
892{ 1013{
893 last_activity = ev_now (); 1014 last_activity = ev_now ();
894 1015
895 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.",
896 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1017 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
897 1018
898 if (connectmode == conf_node::C_DISABLED) 1019 if (connectmode == conf_node::C_DISABLED)
899 return; 1020 return;
900 1021
901 switch (pkt->typ ()) 1022 switch (pkt->typ ())
902 { 1023 {
903 case vpn_packet::PT_PING: 1024 case vpn_packet::PT_PING:
1025 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1026
904 // we send pings instead of auth packets after some retries, 1027 // we send pings instead of auth packets after some retries,
905 // so reset the retry counter and establish a connection 1028 // so reset the retry counter and establish a connection
906 // when we receive a ping. 1029 // when we receive a ping.
907 if (!ictx) 1030 if (!ictx)
908 { 1031 {
909 if (auth_rate_limiter.can (rsi)) 1032 if (auth_rate_limiter.can (rsi))
910 send_auth_request (rsi, true); 1033 send_auth_request (rsi, true);
911 } 1034 }
912 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.
913 send_ping (rsi, 1); // pong 1038 send_ping (rsi, 1); // pong
914 1039
915 break; 1040 break;
916 1041
917 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 ();
918 break; 1048 break;
919 1049
920 case vpn_packet::PT_RESET: 1050 case vpn_packet::PT_RESET:
921 { 1051 {
922 reset_connection (); 1052 reset_connection ();
923 1053
924 config_packet *p = (config_packet *) pkt; 1054 config_packet *p = (config_packet *) pkt;
925 1055
926 if (!p->chk_config ()) 1056 if (!p->chk_config ())
927 { 1057 {
928 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1058 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
929 conf->nodename, (const char *)rsi); 1059 conf->nodename, (const char *)rsi);
930 connectmode = conf_node::C_DISABLED; 1060 connectmode = conf_node::C_DISABLED;
931 } 1061 }
932 else if (connectmode == conf_node::C_ALWAYS) 1062 else if (connectmode == conf_node::C_ALWAYS)
933 establish_connection (); 1063 establish_connection ();
… …
935 break; 1065 break;
936 1066
937 case vpn_packet::PT_AUTH_REQ: 1067 case vpn_packet::PT_AUTH_REQ:
938 if (auth_rate_limiter.can (rsi)) 1068 if (auth_rate_limiter.can (rsi))
939 { 1069 {
940 auth_req_packet *p = (auth_req_packet *) pkt; 1070 auth_req_packet *p = (auth_req_packet *)pkt;
941 1071
942 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);
943 1075
944 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)))
945 { 1078 {
946 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
947 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."),
948 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
949 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
975 1108
976 break; 1109 break;
977 } 1110 }
978 } 1111 }
979 else 1112 else
980 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
981 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
982 1115
983 send_reset (rsi); 1116 send_reset (rsi);
984 } 1117 }
985 1118
986 break; 1119 break;
987 1120
988 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
989 { 1122 {
990 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
991 1124
992 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
993 1126
994 if (p->chk_config ()) 1127 if (p->chk_config ())
995 { 1128 {
996 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
997 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."),
… …
1000 1133
1001 rsachallenge chg; 1134 rsachallenge chg;
1002 1135
1003 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
1004 { 1137 {
1005 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
1006 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
1007 break; 1140 break;
1008 } 1141 }
1009 else 1142 else
1010 { 1143 {
1011 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
1012 1145
1013 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
1014 { 1147 {
1015 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"
1016 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
1017 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
1018 break; 1151 break;
1019 } 1152 }
1020 else 1153 else
1021 { 1154 {
… …
1032 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
1033 1166
1034 si = rsi; 1167 si = rsi;
1035 protocol = rsi.prot; 1168 protocol = rsi.prot;
1036 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
1037 connection_established (); 1175 connection_established ();
1038 1176
1039 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1040 conf->nodename, (const char *)rsi,
1041 p->prot_major, p->prot_minor);
1042
1043 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1044 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);
1045 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1046 1183
1047 break; 1184 break;
1048 } 1185 }
1049 else 1186 else
1050 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."),
1051 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1052 } 1189 }
1053 1190
1054 delete cctx; 1191 delete cctx;
1055 } 1192 }
… …
1071 { 1208 {
1072 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1073 1210
1074 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1075 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"
1076 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1077 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1078 else 1215 else
1079 { 1216 {
1080 u32 seqno; 1217 u32 seqno;
1081 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1082 1220
1083 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1084 { 1222 {
1085 vpn->tap->send (d); 1223 vpn->tap->send (d);
1086 1224
1087 if (si != rsi) 1225 if (si != rsi)
1088 { 1226 {
1089 // 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.)
1090 si = rsi; 1229 // {
1091
1092 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1093 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);
1094 } 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);
1095 } 1259 }
1096 1260
1097 delete d; 1261 delete d;
1098 break; 1262 break;
1099 } 1263 }
… …
1103 break; 1267 break;
1104 1268
1105 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1106 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1107 { 1271 {
1108 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1109 1273
1110 if (p->id > 0 && p->id <= vpn->conns.size ()) 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1111 { 1275 {
1112 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1113 conf->protocols = p->protocols; 1277 conf->protocols = p->protocols;
1114 1278
1115 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,
1116 conf->id, p->id, c->ictx && c->octx); 1282 c->ictx && c->octx);
1117 1283
1118 if (c->ictx && c->octx) 1284 if (c->ictx && c->octx)
1119 { 1285 {
1120 // send connect_info packets to both sides, in case one is 1286 // send connect_info packets to both sides, in case one is
1121 // behind a nat firewall (or both ;) 1287 // behind a nat firewall (or both ;)
… …
1144 1310
1145 c->conf->protocols = p->protocols; 1311 c->conf->protocols = p->protocols;
1146 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));
1147 p->si.upgrade_protocol (protocol, c->conf); 1313 p->si.upgrade_protocol (protocol, c->conf);
1148 1314
1149 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1315 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,p%02x) [%d]",
1150 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);
1151 1321
1152 const sockinfo &dsi = forward_si (p->si); 1322 const sockinfo &dsi = forward_si (p->si);
1153 1323
1154 if (dsi.valid ()) 1324 if (dsi.valid ())
1155 c->send_auth_request (dsi, true); 1325 c->send_auth_request (dsi, true);
… …
1166 send_reset (rsi); 1336 send_reset (rsi);
1167 break; 1337 break;
1168 } 1338 }
1169} 1339}
1170 1340
1341inline void
1171void connection::keepalive_cb (ev::timer &w, int revents) 1342connection::keepalive_cb (ev::timer &w, int revents)
1172{ 1343{
1173 if (ev_now () >= last_activity + ::conf.keepalive + 30) 1344 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1174 { 1345 {
1175 reset_connection (); 1346 reset_connection ();
1176 establish_connection (); 1347 establish_connection ();
1177 } 1348 }
1178 else if (ev_now () < last_activity + ::conf.keepalive) 1349 else if (ev_now () < last_activity + ::conf.keepalive)
1179 w.start (last_activity + ::conf.keepalive - ev::now ()); 1350 w.start (last_activity + ::conf.keepalive - ev::now ());
1180 else if (conf->connectmode != conf_node::C_ONDEMAND 1351 else if (conf->connectmode != conf_node::C_ONDEMAND
1181 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1352 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1182 { 1353 {
1183 send_ping (si); 1354 send_ping (si);
1184 w.start (5); 1355 w.start (3);
1185 } 1356 }
1186 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1357 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1187 // hold ondemand connections implicitly a few seconds longer 1358 // hold ondemand connections implicitly a few seconds longer
1188 // should delete octx, though, or something like that ;) 1359 // should delete octx, though, or something like that ;)
1189 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1360 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1190 else 1361 else
1191 reset_connection (); 1362 reset_connection ();
1192} 1363}
1193 1364
1365void
1194void connection::send_connect_request (int id) 1366connection::send_connect_request (int id)
1195{ 1367{
1196 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);
1197 1369
1198 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);
1199 p->hmac_set (octx); 1373 p->hmac_set (octx);
1200 send_vpn_packet (p, si); 1374 send_vpn_packet (p, si);
1201 1375
1202 delete p; 1376 delete p;
1203} 1377}
1204 1378
1379void
1205void connection::script_init_env (const char *ext) 1380connection::script_init_env (const char *ext)
1206{ 1381{
1207 char *env; 1382 char *env;
1208 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);
1209 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1384 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1210 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1385 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1211 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1386 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1212 conf->id & 0xff); putenv (env); 1387 conf->id & 0xff); putenv (env);
1213} 1388}
1214 1389
1390void
1215void connection::script_init_connect_env () 1391connection::script_init_connect_env ()
1216{ 1392{
1217 vpn->script_init_env (); 1393 vpn->script_init_env ();
1218 1394
1219 char *env; 1395 char *env;
1220 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);
1221 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1398 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1222 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1399 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1223 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1400 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1224} 1401}
1225 1402
1403inline const char *
1226const char *connection::script_node_up () 1404connection::script_node_up ()
1227{ 1405{
1228 script_init_connect_env (); 1406 script_init_connect_env ();
1229 1407
1230 putenv ((char *)"STATE=up"); 1408 putenv ((char *)"STATE=up");
1231 1409
… …
1236 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1414 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1237 1415
1238 return filename; 1416 return filename;
1239} 1417}
1240 1418
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 *
1241const char *connection::script_node_down () 1436connection::script_node_down ()
1242{ 1437{
1243 script_init_connect_env (); 1438 script_init_connect_env ();
1244 1439
1245 putenv ((char *)"STATE=down"); 1440 putenv ((char *)"STATE=down");
1246 1441
… …
1252 1447
1253 return filename; 1448 return filename;
1254} 1449}
1255 1450
1256connection::connection (struct vpn *vpn, conf_node *conf) 1451connection::connection (struct vpn *vpn, conf_node *conf)
1257: vpn(vpn), conf(conf) 1452: vpn(vpn), conf(conf),
1258, rekey (this, &connection::rekey_cb)
1259, keepalive (this, &connection::keepalive_cb)
1260, establish_connection (this, &connection::establish_connection_cb)
1261#if ENABLE_DNS 1453#if ENABLE_DNS
1262, dns (0) 1454 dns (0),
1263#endif 1455#endif
1456 data_queue(conf->max_ttl, conf->max_queue + 1),
1457 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1264{ 1458{
1459 rekey .set<connection, &connection::rekey_cb > (this);
1460 keepalive .set<connection, &connection::keepalive_cb > (this);
1461 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1462
1463 last_establish_attempt = 0.;
1265 octx = ictx = 0; 1464 octx = ictx = 0;
1266 retry_cnt = 0;
1267 1465
1268 if (!conf->protocols) // make sure some protocol is enabled 1466 connectmode = conf->connectmode;
1269 conf->protocols = PROT_UDPv4;
1270 1467
1271 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
1272 reset_connection (); 1472 reset_connection ();
1273} 1473}
1274 1474
1275connection::~connection () 1475connection::~connection ()
1276{ 1476{
1277 shutdown (); 1477 shutdown ();
1278} 1478}
1279 1479
1480void
1280void connection_init () 1481connection_init ()
1281{ 1482{
1282 auth_rate_limiter.clear (); 1483 auth_rate_limiter.clear ();
1283 reset_rate_limiter.clear (); 1484 reset_rate_limiter.clear ();
1284} 1485}
1285 1486

Diff Legend

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