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.57 by pcg, Thu Jul 7 14:41:51 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 {
… …
464 f |= FEATURE_COMPRESSION; 565 f |= FEATURE_COMPRESSION;
465#endif 566#endif
466#if ENABLE_ROHC 567#if ENABLE_ROHC
467 f |= FEATURE_ROHC; 568 f |= FEATURE_ROHC;
468#endif 569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
469 return f; 573 return f;
470 } 574 }
471}; 575};
472 576
577void
473void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
474{ 579{
475 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
476 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
477 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
478 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
486 591
487 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
488 set_hdr (type, dst); 593 set_hdr (type, dst);
489} 594}
490 595
596bool
491bool config_packet::chk_config () const 597config_packet::chk_config () const
492{ 598{
493 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
494 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);
495 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
496 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);
… …
520 rsaencrdata encr; 626 rsaencrdata encr;
521 627
522 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
523 { 629 {
524 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
525 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
526 initiate = !!initiate_; 632 initiate = !!initiate_;
527 protocols = protocols_; 633 protocols = protocols_;
528 634
529 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
530 } 636 }
… …
579///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
580 686
581void 687void
582connection::connection_established () 688connection::connection_established ()
583{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
584 if (ictx && octx) 692 if (ictx && octx)
585 { 693 {
586 connectmode = conf->connectmode;
587
588 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
589 rekey.start (NOW + ::conf.rekey 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
590 + (conf->id > THISNODE->id ? 10 : 0)); 696 rekey.start (rekey_interval, rekey_interval);
697
591 keepalive.start (NOW + ::conf.keepalive); 698 keepalive.start (::conf.keepalive);
592 699
593 // send queued packets 700 // send queued packets
594 if (ictx && octx) 701 if (ictx && octx)
595 { 702 {
596 while (tap_packet *p = (tap_packet *)data_queue.get ()) 703 while (tap_packet *p = (tap_packet *)data_queue.get ())
597 { 704 {
598 send_data_packet (p); 705 if (p->len) send_data_packet (p);
599 delete p; 706 delete p;
600 } 707 }
601 708
602 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 709 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
603 { 710 {
604 send_vpn_packet (p, si, IPTOS_RELIABILITY); 711 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
605 delete p; 712 delete p;
606 } 713 }
607 } 714 }
715
716 vpn->connection_established (this);
608 } 717 }
609 else 718 else
610 { 719 {
611 retry_cnt = 0; 720 retry_cnt = 0;
612 establish_connection.start (NOW + 5); 721 establish_connection.start (5);
613 keepalive.stop (); 722 keepalive.stop ();
614 rekey.stop (); 723 rekey.stop ();
615 } 724 }
616} 725}
617 726
618void 727void
619connection::reset_si () 728connection::reset_si ()
620{ 729{
730 if (vpn->can_direct (THISNODE, conf))
621 protocol = best_protocol (THISNODE->protocols & conf->protocols); 731 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
622 732 else
623 // mask out protocols we cannot establish 733 {
624 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 734 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 735 protocol = 0;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 736 }
627 737
628 si.set (conf, protocol); 738 si.set (conf, protocol);
739
740 is_direct = si.valid ();
629} 741}
630 742
631// ensure sockinfo is valid, forward if necessary 743// ensure sockinfo is valid, forward if necessary
632const sockinfo & 744const sockinfo &
633connection::forward_si (const sockinfo &si) const 745connection::forward_si (const sockinfo &si) const
634{ 746{
635 if (!si.valid ()) 747 if (!si.valid ())
636 { 748 {
637 connection *r = vpn->find_router (); 749 connection *r = vpn->find_router_for (this);
638 750
639 if (r) 751 if (r)
640 { 752 {
641 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."),
642 conf->nodename, r->conf->nodename, (const char *)r->si); 754 conf->nodename, r->conf->nodename);
643 return r->si; 755 return r->si;
644 } 756 }
645 else 757 else
646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 758 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
647 conf->nodename); 759 conf->nodename);
648 } 760 }
649 761
650 return si; 762 return si;
651} 763}
… …
661connection::send_ping (const sockinfo &si, u8 pong) 773connection::send_ping (const sockinfo &si, u8 pong)
662{ 774{
663 ping_packet *pkt = new ping_packet; 775 ping_packet *pkt = new ping_packet;
664 776
665 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
666 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 781 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
667 782
668 delete pkt; 783 delete pkt;
669} 784}
670 785
… …
689 804
690 rsachallenge chg; 805 rsachallenge chg;
691 rsa_cache.gen (pkt->id, chg); 806 rsa_cache.gen (pkt->id, chg);
692 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 807 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
693 808
694 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);
695 810
696 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
697 812
698 delete pkt; 813 delete pkt;
699} 814}
… …
707 822
708 rsa_hash (id, chg, pkt->response); 823 rsa_hash (id, chg, pkt->response);
709 824
710 pkt->hmac_set (octx); 825 pkt->hmac_set (octx);
711 826
712 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);
713 828
714 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
715 830
716 delete pkt; 831 delete pkt;
717} 832}
718 833
719void 834void
720connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 835connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
721{ 836{
722 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 837 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
723 conf->id, rid, (const char *)rsi); 838 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
839 conf->protocols);
724 840
725 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);
726 842
727 r->hmac_set (octx); 843 r->hmac_set (octx);
728 send_vpn_packet (r, si); 844 send_vpn_packet (r, si);
729 845
730 delete r; 846 delete r;
731} 847}
732 848
733void 849inline void
734connection::establish_connection_cb (time_watcher &w) 850connection::establish_connection_cb (ev::timer &w, int revents)
735{ 851{
736 if (!ictx 852 if (!(ictx && octx)
737 && conf != THISNODE 853 && conf != THISNODE
738 && connectmode != conf_node::C_NEVER 854 && connectmode != conf_node::C_NEVER
739 && connectmode != conf_node::C_DISABLED 855 && connectmode != conf_node::C_DISABLED
740 && NOW > w.at) 856 && !w.is_active ())
741 { 857 {
742 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 }
743 865
744 double retry_int = double (retry_cnt & 3 866 last_establish_attempt = ev_now ();
867
868 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
745 ? (retry_cnt & 3) + 1 869 ? (retry_cnt & 3) + 1
746 : 1 << (retry_cnt >> 2)); 870 : 1 << (retry_cnt >> 2));
747 871
748 reset_si (); 872 reset_si ();
749 873
750 bool slow = si.prot & PROT_SLOW; 874 bool slow = si.prot & PROT_SLOW;
751 875
752 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);
753 vpn->send_connect_request (conf->id); 880 vpn->send_connect_request (this);
881 }
754 else 882 else
755 { 883 {
884 if (si.valid ())
885 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
886 conf->nodename, (const char *)si);
887
756 const sockinfo &dsi = forward_si (si); 888 const sockinfo &dsi = forward_si (si);
757 889
758 slow = slow || (dsi.prot & PROT_SLOW); 890 slow = slow || (dsi.prot & PROT_SLOW);
759 891
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 892 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
764 else 896 else
765 send_ping (dsi, 0); 897 send_ping (dsi, 0);
766 } 898 }
767 } 899 }
768 900
769 retry_int *= slow ? 8. : 0.7; 901 retry_int *= slow ? 8. : 0.9;
770 902
771 if (retry_int < conf->max_retry) 903 if (retry_int < conf->max_retry)
772 retry_cnt++; 904 retry_cnt++;
773 else 905 else
774 retry_int = conf->max_retry; 906 retry_int = conf->max_retry;
775 907
776 w.start (NOW + retry_int); 908 w.start (retry_int);
777 } 909 }
778} 910}
779 911
780void 912void
781connection::reset_connection () 913connection::reset_connection ()
… …
784 { 916 {
785 slog (L_INFO, _("%s(%s): connection lost"), 917 slog (L_INFO, _("%s(%s): connection lost"),
786 conf->nodename, (const char *)si); 918 conf->nodename, (const char *)si);
787 919
788 if (::conf.script_node_down) 920 if (::conf.script_node_down)
789 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);
790 slog (L_WARN, _("node-down command execution failed, continuing.")); 924 run_script_queued (cb, _("node-down command execution failed, continuing."));
925 }
791 } 926 }
792 927
793 delete ictx; ictx = 0; 928 delete ictx; ictx = 0;
794 delete octx; octx = 0; 929 delete octx; octx = 0;
795#if ENABLE_DNS
796 dnsv4_reset_connection ();
797#endif
798 930
799 si.host = 0; 931 si.host = 0;
800 932
801 last_activity = 0; 933 last_activity = 0.;
934 //last_si_change = 0.;
802 retry_cnt = 0; 935 retry_cnt = 0;
803 936
804 rekey.stop (); 937 rekey.stop ();
805 keepalive.stop (); 938 keepalive.stop ();
806 establish_connection.stop (); 939 establish_connection.stop ();
… …
813 send_reset (si); 946 send_reset (si);
814 947
815 reset_connection (); 948 reset_connection ();
816} 949}
817 950
818void 951// poor-man's rekeying
819connection::rekey_cb (time_watcher &w) 952inline void
953connection::rekey_cb (ev::timer &w, int revents)
820{ 954{
821 reset_connection (); 955 reset_connection ();
822 establish_connection (); 956 establish_connection ();
823} 957}
824 958
… …
840 if (oseqno > MAX_SEQNO) 974 if (oseqno > MAX_SEQNO)
841 rekey (); 975 rekey ();
842} 976}
843 977
844void 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
845connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 989connection::inject_data_packet (tap_packet *pkt)
846{ 990{
847 if (ictx && octx) 991 if (ictx && octx)
848 send_data_packet (pkt); 992 send_data_packet (pkt);
849 else 993 else
850 { 994 {
851 if (!broadcast)
852 data_queue.put (new tap_packet (*pkt)); 995 data_queue.put (new tap_packet (*pkt));
853 996 post_inject_queue ();
854 establish_connection ();
855 } 997 }
856} 998}
857 999
1000void
858void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1001connection::inject_vpn_packet (vpn_packet *pkt, int tos)
859{ 1002{
860 if (ictx && octx) 1003 if (ictx && octx)
861 send_vpn_packet (pkt, si, tos); 1004 send_vpn_packet (pkt, si, tos);
862 else 1005 else
863 { 1006 {
864 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1007 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
865 1008 post_inject_queue ();
866 establish_connection ();
867 } 1009 }
868} 1010}
869 1011
870void 1012void
871connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1013connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
872{ 1014{
873 last_activity = NOW; 1015 last_activity = ev_now ();
874 1016
875 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.",
876 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;
877 1022
878 switch (pkt->typ ()) 1023 switch (pkt->typ ())
879 { 1024 {
880 case vpn_packet::PT_PING: 1025 case vpn_packet::PT_PING:
1026 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1027
881 // we send pings instead of auth packets after some retries, 1028 // we send pings instead of auth packets after some retries,
882 // so reset the retry counter and establish a connection 1029 // so reset the retry counter and establish a connection
883 // when we receive a ping. 1030 // when we receive a ping.
884 if (!ictx) 1031 if (!ictx)
885 { 1032 {
886 if (auth_rate_limiter.can (rsi)) 1033 if (auth_rate_limiter.can (rsi))
887 send_auth_request (rsi, true); 1034 send_auth_request (rsi, true);
888 } 1035 }
889 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.
890 send_ping (rsi, 1); // pong 1039 send_ping (rsi, 1); // pong
891 1040
892 break; 1041 break;
893 1042
894 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 ();
895 break; 1049 break;
896 1050
897 case vpn_packet::PT_RESET: 1051 case vpn_packet::PT_RESET:
898 { 1052 {
899 reset_connection (); 1053 reset_connection ();
900 1054
901 config_packet *p = (config_packet *) pkt; 1055 config_packet *p = (config_packet *) pkt;
902 1056
903 if (!p->chk_config ()) 1057 if (!p->chk_config ())
904 { 1058 {
905 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1059 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
906 conf->nodename, (const char *)rsi); 1060 conf->nodename, (const char *)rsi);
907 connectmode = conf_node::C_DISABLED; 1061 connectmode = conf_node::C_DISABLED;
908 } 1062 }
909 else if (connectmode == conf_node::C_ALWAYS) 1063 else if (connectmode == conf_node::C_ALWAYS)
910 establish_connection (); 1064 establish_connection ();
… …
912 break; 1066 break;
913 1067
914 case vpn_packet::PT_AUTH_REQ: 1068 case vpn_packet::PT_AUTH_REQ:
915 if (auth_rate_limiter.can (rsi)) 1069 if (auth_rate_limiter.can (rsi))
916 { 1070 {
917 auth_req_packet *p = (auth_req_packet *) pkt; 1071 auth_req_packet *p = (auth_req_packet *)pkt;
918 1072
919 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);
920 1076
921 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)))
922 { 1079 {
923 if (p->prot_minor != PROTOCOL_MINOR) 1080 if (p->prot_minor != PROTOCOL_MINOR)
924 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."),
925 conf->nodename, (const char *)rsi, 1082 conf->nodename, (const char *)rsi,
926 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1083 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
952 1109
953 break; 1110 break;
954 } 1111 }
955 } 1112 }
956 else 1113 else
957 slog (L_WARN, _("%s(%s): protocol mismatch"), 1114 slog (L_WARN, _("%s(%s): protocol mismatch."),
958 conf->nodename, (const char *)rsi); 1115 conf->nodename, (const char *)rsi);
959 1116
960 send_reset (rsi); 1117 send_reset (rsi);
961 } 1118 }
962 1119
963 break; 1120 break;
964 1121
965 case vpn_packet::PT_AUTH_RES: 1122 case vpn_packet::PT_AUTH_RES:
966 { 1123 {
967 auth_res_packet *p = (auth_res_packet *) pkt; 1124 auth_res_packet *p = (auth_res_packet *)pkt;
968 1125
969 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1126 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
970 1127
971 if (p->chk_config ()) 1128 if (p->chk_config ())
972 { 1129 {
973 if (p->prot_minor != PROTOCOL_MINOR) 1130 if (p->prot_minor != PROTOCOL_MINOR)
974 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."),
… …
977 1134
978 rsachallenge chg; 1135 rsachallenge chg;
979 1136
980 if (!rsa_cache.find (p->id, chg)) 1137 if (!rsa_cache.find (p->id, chg))
981 { 1138 {
982 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1139 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
983 conf->nodename, (const char *)rsi); 1140 conf->nodename, (const char *)rsi);
984 break; 1141 break;
985 } 1142 }
986 else 1143 else
987 { 1144 {
988 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1145 crypto_ctx *cctx = new crypto_ctx (chg, 0);
989 1146
990 if (!p->hmac_chk (cctx)) 1147 if (!p->hmac_chk (cctx))
991 { 1148 {
992 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"
993 "could be an attack, or just corruption or a synchronization error"), 1150 "could be an attack, or just corruption or a synchronization error."),
994 conf->nodename, (const char *)rsi); 1151 conf->nodename, (const char *)rsi);
995 break; 1152 break;
996 } 1153 }
997 else 1154 else
998 { 1155 {
… …
1009 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
1010 1167
1011 si = rsi; 1168 si = rsi;
1012 protocol = rsi.prot; 1169 protocol = rsi.prot;
1013 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
1014 connection_established (); 1176 connection_established ();
1015 1177
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1017 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor);
1019
1020 if (::conf.script_node_up) 1178 if (::conf.script_node_up)
1021 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);
1022 slog (L_WARN, _("node-up command execution failed, continuing.")); 1182 run_script_queued (cb, _("node-up command execution failed, continuing."));
1183 }
1023 1184
1024 break; 1185 break;
1025 } 1186 }
1026 else 1187 else
1027 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."),
1028 conf->nodename, (const char *)rsi); 1189 conf->nodename, (const char *)rsi);
1029 } 1190 }
1030 1191
1031 delete cctx; 1192 delete cctx;
1032 } 1193 }
… …
1048 { 1209 {
1049 vpndata_packet *p = (vpndata_packet *)pkt; 1210 vpndata_packet *p = (vpndata_packet *)pkt;
1050 1211
1051 if (!p->hmac_chk (ictx)) 1212 if (!p->hmac_chk (ictx))
1052 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"
1053 "could be an attack, or just corruption or a synchronization error"), 1214 "could be an attack, or just corruption or a synchronization error."),
1054 conf->nodename, (const char *)rsi); 1215 conf->nodename, (const char *)rsi);
1055 else 1216 else
1056 { 1217 {
1057 u32 seqno; 1218 u32 seqno;
1058 tap_packet *d = p->unpack (this, seqno); 1219 tap_packet *d = p->unpack (this, seqno);
1220 int seqclass = iseqno.seqno_classify (seqno);
1059 1221
1060 if (iseqno.recv_ok (seqno)) 1222 if (seqclass == 0) // ok
1061 { 1223 {
1062 vpn->tap->send (d); 1224 vpn->tap->send (d);
1063 1225
1064 if (si != rsi) 1226 if (si != rsi)
1065 { 1227 {
1066 // 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.)
1067 si = rsi; 1230 // {
1068
1069 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1231 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1070 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);
1071 } 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);
1072 } 1260 }
1073 1261
1074 delete d; 1262 delete d;
1075 break; 1263 break;
1076 } 1264 }
… …
1080 break; 1268 break;
1081 1269
1082 case vpn_packet::PT_CONNECT_REQ: 1270 case vpn_packet::PT_CONNECT_REQ:
1083 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1271 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1084 { 1272 {
1085 connect_req_packet *p = (connect_req_packet *) pkt; 1273 connect_req_packet *p = (connect_req_packet *)pkt;
1086 1274
1087 if (p->id > 0 && p->id <= vpn->conns.size ()) 1275 if (p->id > 0 && p->id <= vpn->conns.size ())
1088 { 1276 {
1089 connection *c = vpn->conns[p->id - 1]; 1277 connection *c = vpn->conns[p->id - 1];
1090 conf->protocols = p->protocols; 1278 conf->protocols = p->protocols;
1091 1279
1092 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n", 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,
1093 conf->id, p->id, c->ictx && c->octx); 1283 c->ictx && c->octx);
1094 1284
1095 if (c->ictx && c->octx) 1285 if (c->ictx && c->octx)
1096 { 1286 {
1097 // send connect_info packets to both sides, in case one is 1287 // send connect_info packets to both sides, in case one is
1098 // behind a nat firewall (or both ;) 1288 // behind a nat firewall (or both ;)
… …
1121 1311
1122 c->conf->protocols = p->protocols; 1312 c->conf->protocols = p->protocols;
1123 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));
1124 p->si.upgrade_protocol (protocol, c->conf); 1314 p->si.upgrade_protocol (protocol, c->conf);
1125 1315
1126 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]",
1127 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);
1128 1324
1129 const sockinfo &dsi = forward_si (p->si); 1325 const sockinfo &dsi = forward_si (p->si);
1130 1326
1131 if (dsi.valid ()) 1327 if (dsi.valid ())
1132 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);
1133 } 1333 }
1134 else 1334 else
1135 slog (L_WARN, 1335 slog (L_WARN,
1136 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1336 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1137 p->id); 1337 p->id);
… …
1143 send_reset (rsi); 1343 send_reset (rsi);
1144 break; 1344 break;
1145 } 1345 }
1146} 1346}
1147 1347
1148void connection::keepalive_cb (time_watcher &w) 1348inline void
1349connection::keepalive_cb (ev::timer &w, int revents)
1149{ 1350{
1150 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)
1151 { 1356 {
1152 reset_connection (); 1357 reset_connection ();
1153 establish_connection (); 1358 establish_connection ();
1154 } 1359 }
1155 else if (NOW < last_activity + ::conf.keepalive)
1156 w.start (last_activity + ::conf.keepalive);
1157 else if (conf->connectmode != conf_node::C_ONDEMAND 1360 else if (conf->connectmode != conf_node::C_ONDEMAND
1158 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1361 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1159 { 1362 {
1363 w.start (3);
1160 send_ping (si); 1364 send_ping (si);
1161 w.start (NOW + 5);
1162 } 1365 }
1163 else if (NOW < last_activity + ::conf.keepalive + 10) 1366 else if (when >= -10)
1164 // hold ondemand connections implicitly a few seconds longer 1367 // hold ondemand connections implicitly a few seconds longer
1165 // should delete octx, though, or something like that ;) 1368 // should delete octx, though, or something like that ;)
1166 w.start (last_activity + ::conf.keepalive + 10); 1369 w.start (when + 10);
1167 else 1370 else
1168 reset_connection (); 1371 reset_connection ();
1169} 1372}
1170 1373
1374void
1171void connection::send_connect_request (int id) 1375connection::send_connect_request (int id)
1172{ 1376{
1173 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);
1174 1378
1175 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);
1176 p->hmac_set (octx); 1382 p->hmac_set (octx);
1177 send_vpn_packet (p, si); 1383 send_vpn_packet (p, si);
1178 1384
1179 delete p; 1385 delete p;
1180} 1386}
1181 1387
1388void
1182void connection::script_init_env (const char *ext) 1389connection::script_init_env (const char *ext)
1183{ 1390{
1184 char *env; 1391 char *env;
1185 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);
1186 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1393 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1187 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1394 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1188 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1395 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1189 conf->id & 0xff); putenv (env); 1396 conf->id & 0xff); putenv (env);
1190} 1397}
1191 1398
1399void
1192void connection::script_init_connect_env () 1400connection::script_init_connect_env ()
1193{ 1401{
1194 vpn->script_init_env (); 1402 vpn->script_init_env ();
1195 1403
1196 char *env; 1404 char *env;
1197 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);
1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1407 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1408 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1409 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1201} 1410}
1202 1411
1412inline const char *
1203const char *connection::script_node_up () 1413connection::script_node_up ()
1204{ 1414{
1205 script_init_connect_env (); 1415 script_init_connect_env ();
1206 1416
1207 putenv ("STATE=up"); 1417 putenv ((char *)"STATE=up");
1208 1418
1209 char *filename; 1419 char *filename;
1210 asprintf (&filename, 1420 asprintf (&filename,
1211 "%s/%s", 1421 "%s/%s",
1212 confbase, 1422 confbase,
1213 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1423 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1214 1424
1215 return filename; 1425 return filename;
1216} 1426}
1217 1427
1218const char *connection::script_node_down () 1428inline const char *
1429connection::script_node_change ()
1219{ 1430{
1220 script_init_connect_env (); 1431 script_init_connect_env ();
1221 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
1222 putenv ("STATE=down"); 1449 putenv ((char *)"STATE=down");
1223 1450
1224 char *filename; 1451 char *filename;
1225 asprintf (&filename, 1452 asprintf (&filename,
1226 "%s/%s", 1453 "%s/%s",
1227 confbase, 1454 confbase,
… …
1229 1456
1230 return filename; 1457 return filename;
1231} 1458}
1232 1459
1233connection::connection (struct vpn *vpn, conf_node *conf) 1460connection::connection (struct vpn *vpn, conf_node *conf)
1234: vpn(vpn), conf(conf) 1461: vpn(vpn), conf(conf),
1235, rekey (this, &connection::rekey_cb)
1236, keepalive (this, &connection::keepalive_cb)
1237, establish_connection (this, &connection::establish_connection_cb)
1238#if ENABLE_DNS 1462#if ENABLE_DNS
1239, dns (0) 1463 dns (0),
1240#endif 1464#endif
1465 data_queue(conf->max_ttl, conf->max_queue + 1),
1466 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1241{ 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.;
1242 octx = ictx = 0; 1473 octx = ictx = 0;
1243 retry_cnt = 0;
1244 1474
1245 if (!conf->protocols) // make sure some protocol is enabled 1475 connectmode = conf->connectmode;
1246 conf->protocols = PROT_UDPv4;
1247 1476
1248 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
1249 reset_connection (); 1481 reset_connection ();
1250} 1482}
1251 1483
1252connection::~connection () 1484connection::~connection ()
1253{ 1485{
1254 shutdown (); 1486 shutdown ();
1255} 1487}
1256 1488
1489void
1257void connection_init () 1490connection_init ()
1258{ 1491{
1259 auth_rate_limiter.clear (); 1492 auth_rate_limiter.clear ();
1260 reset_rate_limiter.clear (); 1493 reset_rate_limiter.clear ();
1261} 1494}
1262 1495

Diff Legend

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