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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines