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.52 by pcg, Wed Mar 23 21:55:39 2005 UTC vs.
Revision 1.90 by root, Tue Feb 8 23:11:35 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2005 Marc Lehmann <gvpe@schmorp.de> 3 Copyright (C) 2003-2008,2010 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. 59 Temple Place, Suite 330, Boston, MA 02111-1307 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 <cassert>
25
26#include <list> 34#include <list>
35#include <queue>
36#include <utility>
27 37
28#include <openssl/rand.h> 38#include <openssl/rand.h>
29#include <openssl/evp.h> 39#include <openssl/evp.h>
30#include <openssl/rsa.h> 40#include <openssl/rsa.h>
31#include <openssl/err.h> 41#include <openssl/err.h>
… …
40 50
41#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
42# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
43#endif 53#endif
44 54
45#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)
46 57
47#define ULTRA_FAST 1 58#define ULTRA_FAST 1
48#define HLOG 15 59#define HLOG 15
49#include "lzf/lzf.h" 60#include "lzf/lzf.h"
50#include "lzf/lzf_c.c" 61#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c" 62#include "lzf/lzf_d.c"
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//////////////////////////////////////////////////////////////////////////////
52 107
53struct crypto_ctx 108struct crypto_ctx
54{ 109{
55 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 111 HMAC_CTX hctx;
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
87} 142}
88 143
89struct rsa_entry { 144struct rsa_entry
145{
90 tstamp expire; 146 tstamp expire;
91 rsaid id; 147 rsaid id;
92 rsachallenge chg; 148 rsachallenge chg;
93}; 149};
94 150
95struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
96{ 152{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 154
99 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
100 { 156 {
101 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
102 { 158 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 160 {
105 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
106 162
107 erase (i); 163 erase (i);
108 return true; 164 return true;
109 } 165 }
110 } 166 }
111 167
112 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
114 170
115 return false; 171 return false;
116 } 172 }
117 173
118 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
… …
120 rsa_entry e; 176 rsa_entry e;
121 177
122 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 180
125 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 182 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
128 184
129 push_back (e); 185 push_back (e);
130 186
131 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
133 } 189 }
134 190
135 rsa_cache () 191 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb)
137 { } 192 {
193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
138 196
139} rsa_cache; 197} rsa_cache;
140 198
141void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 201{
143 if (!empty ()) 202 if (empty ())
203 w.stop ();
204 else
144 { 205 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 207 if (i->expire <= ev_now ())
149 i = erase (i); 208 i = erase (i);
150 else 209 else
151 ++i; 210 ++i;
152 } 211 }
153} 212}
154 213
155////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
156 215
157void pkt_queue::put (net_packet *p) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
217: max_ttl (max_ttl), max_queue (max_queue)
158{ 218{
159 if (queue[i]) 219 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 220
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 221 i = 0;
187 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 225}
189 226
190pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
191{ 228{
192 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
193 delete queue[i]; 232 delete [] queue;
194} 233}
195 234
235void
236pkt_queue::expire_cb (ev::timer &w, int revents)
237{
238 ev_tstamp expire = ev_now () - max_ttl;
239
240 for (;;)
241 {
242 if (empty ())
243 break;
244
245 double diff = queue[j].tstamp - expire;
246
247 if (diff >= 0.)
248 {
249 w.start (diff > 0.5 ? diff : 0.5);
250 break;
251 }
252
253 delete get ();
254 }
255}
256
257void
258pkt_queue::put (net_packet *p)
259{
260 ev_tstamp now = ev_now ();
261
262 // start expiry timer
263 if (empty ())
264 expire.start (max_ttl);
265
266 int ni = i + 1 == max_queue ? 0 : i + 1;
267
268 if (ni == j)
269 delete get ();
270
271 queue[i].pkt = p;
272 queue[i].tstamp = now;
273
274 i = ni;
275}
276
277net_packet *
278pkt_queue::get ()
279{
280 if (empty ())
281 return 0;
282
283 net_packet *p = queue[j].pkt;
284 queue[j].pkt = 0;
285
286 j = j + 1 == max_queue ? 0 : j + 1;
287
288 return p;
289}
290
196struct net_rateinfo { 291struct net_rateinfo
292{
197 u32 host; 293 u32 host;
198 double pcnt, diff; 294 double pcnt, diff;
199 tstamp last; 295 tstamp last;
200}; 296};
201 297
… …
211 307
212 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 309 bool can (u32 host);
214}; 310};
215 311
216net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
217 313
314bool
218bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
219{ 316{
220 iterator i; 317 iterator i;
221 318
222 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
223 if (i->host == host) 320 if (i->host == host)
224 break; 321 break;
225 else if (i->last < NOW - NRL_EXPIRE) 322 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 323 i = erase (i);
227 else 324 else
228 i++; 325 i++;
229 326
230 if (i == end ()) 327 if (i == end ())
… …
232 net_rateinfo ri; 329 net_rateinfo ri;
233 330
234 ri.host = host; 331 ri.host = host;
235 ri.pcnt = 1.; 332 ri.pcnt = 1.;
236 ri.diff = NRL_MAXDIF; 333 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 334 ri.last = ev_now ();
238 335
239 push_front (ri); 336 push_front (ri);
240 337
241 return true; 338 return true;
242 } 339 }
… …
244 { 341 {
245 net_rateinfo ri (*i); 342 net_rateinfo ri (*i);
246 erase (i); 343 erase (i);
247 344
248 ri.pcnt = ri.pcnt * NRL_ALPHA; 345 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 347
251 ri.last = NOW; 348 ri.last = ev_now ();
252 349
253 double dif = ri.diff / ri.pcnt; 350 double dif = ri.diff / ri.pcnt;
254 351
255 bool send = dif > NRL_CUTOFF; 352 bool send = dif > NRL_CUTOFF;
256 353
… …
270 367
271///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
272 369
273unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
274 371
372void
275void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
276{ 374{
277 unsigned int xlen; 375 unsigned int xlen;
278 376
279 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
280 378
… …
298 hmac_gen (ctx); 396 hmac_gen (ctx);
299 397
300 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
301} 399}
302 400
401void
303void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
304{ 403{
305 type = type_; 404 type = type_;
306 405
307 int src = THISNODE->id; 406 int src = THISNODE->id;
308 407
… …
313 412
314#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
315#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
316 415
317struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
318 { 425 {
319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
320
321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
322 tap_packet *unpack (connection *conn, u32 &seqno);
323private:
324
325 const u32 data_hdr_size () const
326 {
327 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
328 }
329 }; 427 }
428};
330 429
331void 430void
332vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
333{ 432{
334 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
… …
336 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
337 436
338#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
340 439
341 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
342 { 441 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 443
345 if (cl) 444 if (cl)
346 { 445 {
… …
466 f |= FEATURE_COMPRESSION; 565 f |= FEATURE_COMPRESSION;
467#endif 566#endif
468#if ENABLE_ROHC 567#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 568 f |= FEATURE_ROHC;
470#endif 569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
471 return f; 573 return f;
472 } 574 }
473}; 575};
474 576
577void
475void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
476{ 579{
477 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
… …
488 591
489 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
490 set_hdr (type, dst); 593 set_hdr (type, dst);
491} 594}
492 595
596bool
493bool config_packet::chk_config () const 597config_packet::chk_config () const
494{ 598{
495 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
496 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);
497 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
498 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);
… …
522 rsaencrdata encr; 626 rsaencrdata encr;
523 627
524 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
525 { 629 {
526 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
527 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
528 initiate = !!initiate_; 632 initiate = !!initiate_;
529 protocols = protocols_; 633 protocols = protocols_;
530 634
531 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
532 } 636 }
… …
581///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
582 686
583void 687void
584connection::connection_established () 688connection::connection_established ()
585{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
586 if (ictx && octx) 692 if (ictx && octx)
587 { 693 {
588 connectmode = conf->connectmode;
589
590 // make sure rekeying timeouts are slightly asymmetric 694 // make sure rekeying timeouts are slightly asymmetric
591 rekey.start (NOW + ::conf.rekey 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
592 + (conf->id > THISNODE->id ? 10 : 0)); 696 rekey.start (rekey_interval, rekey_interval);
593 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
594 698
595 // send queued packets 699 // send queued packets
596 if (ictx && octx) 700 if (ictx && octx)
597 { 701 {
598 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
599 { 703 {
600 send_data_packet (p); 704 if (p->len) send_data_packet (p);
601 delete p; 705 delete p;
602 } 706 }
603 707
604 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
605 { 709 {
606 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
607 delete p; 711 delete p;
608 } 712 }
609 } 713 }
714
715 vpn->connection_established (this);
610 } 716 }
611 else 717 else
612 { 718 {
613 retry_cnt = 0; 719 retry_cnt = 0;
614 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
615 keepalive.stop (); 721 keepalive.stop ();
616 rekey.stop (); 722 rekey.stop ();
617 } 723 }
618} 724}
619 725
620void 726void
621connection::reset_si () 727connection::reset_si ()
622{ 728{
729 if (vpn->can_direct (THISNODE, conf))
623 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
624 731 else
625 // mask out protocols we cannot establish 732 {
626 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
627 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
628 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 735 }
629 736
630 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
631} 740}
632 741
633// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
634const sockinfo & 743const sockinfo &
635connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
636{ 745{
637 if (!si.valid ()) 746 if (!si.valid ())
638 { 747 {
639 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
640 749
641 if (r) 750 if (r)
642 { 751 {
643 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
644 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
645 return r->si; 754 return r->si;
646 } 755 }
647 else 756 else
648 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
649 conf->nodename); 758 conf->nodename);
650 } 759 }
651 760
652 return si; 761 return si;
653} 762}
… …
663connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
664{ 773{
665 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
666 775
667 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
668 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
669 781
670 delete pkt; 782 delete pkt;
671} 783}
672 784
… …
691 803
692 rsachallenge chg; 804 rsachallenge chg;
693 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
694 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
695 807
696 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
697 809
698 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
699 811
700 delete pkt; 812 delete pkt;
701} 813}
… …
709 821
710 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
711 823
712 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
713 825
714 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
715 827
716 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
717 829
718 delete pkt; 830 delete pkt;
719} 831}
720 832
721void 833void
722connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
723{ 835{
724 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
725 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
726 838
727 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 839 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
728 840
729 r->hmac_set (octx); 841 r->hmac_set (octx);
730 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
731 843
732 delete r; 844 delete r;
733} 845}
734 846
735void 847inline void
736connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
737{ 849{
738 if (!ictx 850 if (!ictx
739 && conf != THISNODE 851 && conf != THISNODE
740 && connectmode != conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
741 && connectmode != conf_node::C_DISABLED 853 && connectmode != conf_node::C_DISABLED
742 && NOW > w.at) 854 && !w.is_active ())
743 { 855 {
744 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 856 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
857 // and stop trying. should probably be handled by a per-connection expire handler.
858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
861 return;
862 }
745 863
746 double retry_int = double (retry_cnt & 3 864 last_establish_attempt = ev_now ();
865
866 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
747 ? (retry_cnt & 3) + 1 867 ? (retry_cnt & 3) + 1
748 : 1 << (retry_cnt >> 2)); 868 : 1 << (retry_cnt >> 2));
749 869
750 reset_si (); 870 reset_si ();
751 871
752 bool slow = si.prot & PROT_SLOW; 872 bool slow = si.prot & PROT_SLOW;
753 873
754 if (si.prot && !si.host) 874 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
875 {
876 /*TODO*/ /* start the timer so we don't recurse endlessly */
877 w.start (1);
755 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
756 else 880 else
757 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
758 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
759 887
760 slow = slow || (dsi.prot & PROT_SLOW); 888 slow = slow || (dsi.prot & PROT_SLOW);
761 889
762 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
766 else 894 else
767 send_ping (dsi, 0); 895 send_ping (dsi, 0);
768 } 896 }
769 } 897 }
770 898
771 retry_int *= slow ? 8. : 0.7; 899 retry_int *= slow ? 8. : 0.9;
772 900
773 if (retry_int < conf->max_retry) 901 if (retry_int < conf->max_retry)
774 retry_cnt++; 902 retry_cnt++;
775 else 903 else
776 retry_int = conf->max_retry; 904 retry_int = conf->max_retry;
777 905
778 w.start (NOW + retry_int); 906 w.start (retry_int);
779 } 907 }
780} 908}
781 909
782void 910void
783connection::reset_connection () 911connection::reset_connection ()
… …
786 { 914 {
787 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
788 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
789 917
790 if (::conf.script_node_down) 918 if (::conf.script_node_down)
791 if (!run_script (run_script_cb (this, &connection::script_node_down), false)) 919 {
920 run_script_cb *cb = new run_script_cb;
921 cb->set<connection, &connection::script_node_down> (this);
792 slog (L_WARN, _("node-down command execution failed, continuing.")); 922 run_script_queued (cb, _("node-down command execution failed, continuing."));
923 }
793 } 924 }
794 925
795 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
796 delete octx; octx = 0; 927 delete octx; octx = 0;
797#if ENABLE_DNS 928#if ENABLE_DNS
798 dnsv4_reset_connection (); 929 dnsv4_reset_connection ();
799#endif 930#endif
800 931
801 si.host = 0; 932 si.host = 0;
802 933
803 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
804 retry_cnt = 0; 936 retry_cnt = 0;
805 937
806 rekey.stop (); 938 rekey.stop ();
807 keepalive.stop (); 939 keepalive.stop ();
808 establish_connection.stop (); 940 establish_connection.stop ();
… …
815 send_reset (si); 947 send_reset (si);
816 948
817 reset_connection (); 949 reset_connection ();
818} 950}
819 951
820void 952// poor-man's rekeying
821connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
822{ 955{
823 reset_connection (); 956 reset_connection ();
824 establish_connection (); 957 establish_connection ();
825} 958}
826 959
… …
842 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
843 rekey (); 976 rekey ();
844} 977}
845 978
846void 979void
980connection::post_inject_queue ()
981{
982 // force a connection every now and when when packets are sent (max 1/s)
983 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
984 establish_connection.stop ();
985
986 establish_connection ();
987}
988
989void
847connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
848{ 991{
849 if (ictx && octx) 992 if (ictx && octx)
850 send_data_packet (pkt); 993 send_data_packet (pkt);
851 else 994 else
852 { 995 {
853 if (!broadcast)//DDDD
854 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
855 997 post_inject_queue ();
856 establish_connection ();
857 } 998 }
858} 999}
859 1000
1001void
860void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
861{ 1003{
862 if (ictx && octx) 1004 if (ictx && octx)
863 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
864 else 1006 else
865 { 1007 {
866 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
867 1009 post_inject_queue ();
868 establish_connection ();
869 } 1010 }
870} 1011}
871 1012
872void 1013void
873connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
874{ 1015{
875 last_activity = NOW; 1016 last_activity = ev_now ();
876 1017
877 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1018 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
878 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1019 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1020
1021 if (connectmode == conf_node::C_DISABLED)
1022 return;
879 1023
880 switch (pkt->typ ()) 1024 switch (pkt->typ ())
881 { 1025 {
882 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
883 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
884 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
885 // when we receive a ping. 1031 // when we receive a ping.
886 if (!ictx) 1032 if (!ictx)
887 { 1033 {
888 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
889 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
890 } 1036 }
891 else 1037 else
1038 // we would love to change the socket address here, but ping's aren't
1039 // authenticated, so we best ignore it.
892 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
893 1041
894 break; 1042 break;
895 1043
896 case vpn_packet::PT_PONG: 1044 case vpn_packet::PT_PONG:
1045 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1046
1047 // a PONG might mean that the other side doesn't really know
1048 // about our desire for communication.
1049 establish_connection ();
897 break; 1050 break;
898 1051
899 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
900 { 1053 {
901 reset_connection (); 1054 reset_connection ();
902 1055
903 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
904 1057
905 if (!p->chk_config ()) 1058 if (!p->chk_config ())
906 { 1059 {
907 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
908 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
909 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
910 } 1063 }
911 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
912 establish_connection (); 1065 establish_connection ();
… …
916 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
917 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
918 { 1071 {
919 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
920 1073
921 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1074 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
922 1075
923 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1076 if (p->chk_config ()
1077 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
924 { 1078 {
925 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
926 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
927 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
928 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
954 1108
955 break; 1109 break;
956 } 1110 }
957 } 1111 }
958 else 1112 else
959 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
960 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
961 1115
962 send_reset (rsi); 1116 send_reset (rsi);
963 } 1117 }
964 1118
965 break; 1119 break;
966 1120
967 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
968 { 1122 {
969 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
970 1124
971 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
972 1126
973 if (p->chk_config ()) 1127 if (p->chk_config ())
974 { 1128 {
975 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
976 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
979 1133
980 rsachallenge chg; 1134 rsachallenge chg;
981 1135
982 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
983 { 1137 {
984 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
985 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
986 break; 1140 break;
987 } 1141 }
988 else 1142 else
989 { 1143 {
990 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
991 1145
992 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
993 { 1147 {
994 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1148 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
995 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
996 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
997 break; 1151 break;
998 } 1152 }
999 else 1153 else
1000 { 1154 {
… …
1011 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1012 1166
1013 si = rsi; 1167 si = rsi;
1014 protocol = rsi.prot; 1168 protocol = rsi.prot;
1015 1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
1016 connection_established (); 1175 connection_established ();
1017 1176
1018 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1019 conf->nodename, (const char *)rsi,
1020 p->prot_major, p->prot_minor);
1021
1022 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1023 if (!run_script (run_script_cb (this, &connection::script_node_up), false)) 1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1024 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1025 1183
1026 break; 1184 break;
1027 } 1185 }
1028 else 1186 else
1029 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1030 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1031 } 1189 }
1032 1190
1033 delete cctx; 1191 delete cctx;
1034 } 1192 }
… …
1050 { 1208 {
1051 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1052 1210
1053 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1054 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1212 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1055 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1056 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1057 else 1215 else
1058 { 1216 {
1059 u32 seqno; 1217 u32 seqno;
1060 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1061 1220
1062 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1063 { 1222 {
1064 vpn->tap->send (d); 1223 vpn->tap->send (d);
1065 1224
1066 if (si != rsi) 1225 if (si != rsi)
1067 { 1226 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1069 si = rsi; 1229 // {
1070
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1231 conf->nodename, (const char *)si, (const char *)rsi);
1232
1233 si = rsi;
1234
1235 if (::conf.script_node_change)
1236 {
1237 run_script_cb *cb = new run_script_cb;
1238 cb->set<connection, &connection::script_node_change> (this);
1239 run_script_queued (cb, _("node-change command execution failed, continuing."));
1240 }
1241
1242 // }
1243 //else
1244 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1245 // conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1246 }
1247 }
1248 else if (seqclass == 1) // far history
1249 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1250 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1251 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1252 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 3) // reset
1255 {
1256 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1257 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1258 send_reset (rsi);
1074 } 1259 }
1075 1260
1076 delete d; 1261 delete d;
1077 break; 1262 break;
1078 } 1263 }
… …
1082 break; 1267 break;
1083 1268
1084 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1085 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086 { 1271 {
1087 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1088 1273
1089 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1090 connection *c = vpn->conns[p->id - 1];
1091 conf->protocols = p->protocols;
1092
1093 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1094 conf->id, p->id, c->ictx && c->octx);
1095
1096 if (c->ictx && c->octx)
1097 { 1275 {
1276 connection *c = vpn->conns[p->id - 1];
1277 conf->protocols = p->protocols;
1278
1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1281
1282 if (c->ictx && c->octx)
1283 {
1098 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1099 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1100 c->send_connect_info (conf->id, si, conf->protocols); 1286 c->send_connect_info (conf->id, si, conf->protocols);
1101 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1287 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1288 }
1289 else
1290 c->establish_connection ();
1102 } 1291 }
1103 else 1292 else
1104 c->establish_connection (); 1293 slog (L_WARN,
1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1295 p->id);
1105 } 1296 }
1106 1297
1107 break; 1298 break;
1108 1299
1109 case vpn_packet::PT_CONNECT_INFO: 1300 case vpn_packet::PT_CONNECT_INFO:
1110 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1301 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1111 { 1302 {
1112 connect_info_packet *p = (connect_info_packet *)pkt; 1303 connect_info_packet *p = (connect_info_packet *)pkt;
1113 1304
1114 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1305 if (p->id > 0 && p->id <= vpn->conns.size ())
1115 { 1306 {
1116 connection *c = vpn->conns[p->id - 1]; 1307 connection *c = vpn->conns[p->id - 1];
1117 1308
1118 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1119 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1310 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1120 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1121 1312
1122 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1313 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1314 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1123 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1124 1316
1125 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1126 1318
1127 if (dsi.valid ()) 1319 if (dsi.valid ())
1128 c->send_auth_request (dsi, true); 1320 c->send_auth_request (dsi, true);
1129 } 1321 }
1322 else
1323 slog (L_WARN,
1324 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1325 p->id);
1130 } 1326 }
1131 1327
1132 break; 1328 break;
1133 1329
1134 default: 1330 default:
1135 send_reset (rsi); 1331 send_reset (rsi);
1136 break; 1332 break;
1137 } 1333 }
1138} 1334}
1139 1335
1140void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1338{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1143 { 1340 {
1144 reset_connection (); 1341 reset_connection ();
1145 establish_connection (); 1342 establish_connection ();
1146 } 1343 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1148 w.start (last_activity + ::conf.keepalive); 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1348 {
1152 send_ping (si); 1349 send_ping (si);
1153 w.start (NOW + 5); 1350 w.start (3);
1154 } 1351 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1158 w.start (last_activity + ::conf.keepalive + 10); 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1356 else
1160 reset_connection (); 1357 reset_connection ();
1161} 1358}
1162 1359
1360void
1163void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1164{ 1362{
1165 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1363 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1166 1364
1167 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1365 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1366 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1168 p->hmac_set (octx); 1367 p->hmac_set (octx);
1169 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1170 1369
1171 delete p; 1370 delete p;
1172} 1371}
1173 1372
1373void
1374connection::script_init_env (const char *ext)
1375{
1376 char *env;
1377 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1378 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1379 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1380 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1381 conf->id & 0xff); putenv (env);
1382}
1383
1384void
1174void connection::script_init_env () 1385connection::script_init_connect_env ()
1175{ 1386{
1176 vpn->script_init_env (); 1387 vpn->script_init_env ();
1177 1388
1178 char *env; 1389 char *env;
1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1390 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1391 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1183} 1395}
1184 1396
1397inline const char *
1185const char *connection::script_node_up () 1398connection::script_node_up ()
1186{ 1399{
1187 script_init_env (); 1400 script_init_connect_env ();
1188 1401
1189 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1190 1403
1191 char *filename; 1404 char *filename;
1192 asprintf (&filename, 1405 asprintf (&filename,
1193 "%s/%s", 1406 "%s/%s",
1194 confbase, 1407 confbase,
1195 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1196}
1197 1409
1198const char *connection::script_node_down () 1410 return filename;
1411}
1412
1413inline const char *
1414connection::script_node_change ()
1199{ 1415{
1200 script_init_env (); 1416 script_init_connect_env ();
1201 1417
1418 putenv ((char *)"STATE=change");
1419
1420 char *filename;
1421 asprintf (&filename,
1422 "%s/%s",
1423 confbase,
1424 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1425
1426 return filename;
1427}
1428
1429inline const char *
1430connection::script_node_down ()
1431{
1432 script_init_connect_env ();
1433
1202 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1203 1435
1204 char *filename; 1436 char *filename;
1205 asprintf (&filename, 1437 asprintf (&filename,
1206 "%s/%s", 1438 "%s/%s",
1207 confbase, 1439 confbase,
1208 ::conf.script_node_down ? ::conf.script_node_down : "node-down"); 1440 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1441
1442 return filename;
1209} 1443}
1210 1444
1211connection::connection (struct vpn *vpn, conf_node *conf) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1212: vpn(vpn), conf(conf) 1446: vpn(vpn), conf(conf),
1213, rekey (this, &connection::rekey_cb)
1214, keepalive (this, &connection::keepalive_cb)
1215, establish_connection (this, &connection::establish_connection_cb)
1216#if ENABLE_DNS 1447#if ENABLE_DNS
1217, dns (0) 1448 dns (0),
1218#endif 1449#endif
1450 data_queue(conf->max_ttl, conf->max_queue + 1),
1451 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1219{ 1452{
1453 rekey .set<connection, &connection::rekey_cb > (this);
1454 keepalive .set<connection, &connection::keepalive_cb > (this);
1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1456
1457 last_establish_attempt = 0.;
1220 octx = ictx = 0; 1458 octx = ictx = 0;
1221 retry_cnt = 0;
1222 1459
1223 if (!conf->protocols) // make sure some protocol is enabled 1460 if (!conf->protocols) // make sure some protocol is enabled
1224 conf->protocols = PROT_UDPv4; 1461 conf->protocols = PROT_UDPv4;
1225 1462
1226 connectmode = conf_node::C_ALWAYS; // initial setting 1463 connectmode = conf->connectmode;
1464
1465 // queue a dummy packet to force an initial connection attempt
1466 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1467 vpn_queue.put (new net_packet);
1468
1227 reset_connection (); 1469 reset_connection ();
1228} 1470}
1229 1471
1230connection::~connection () 1472connection::~connection ()
1231{ 1473{
1232 shutdown (); 1474 shutdown ();
1233} 1475}
1234 1476
1477void
1235void connection_init () 1478connection_init ()
1236{ 1479{
1237 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1238 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1239} 1482}
1240 1483

Diff Legend

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