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.58 by pcg, Sat Jul 9 02:35:42 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. 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"
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//////////////////////////////////////////////////////////////////////////////
50 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;
… …
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);
591 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
592 698
593 // send queued packets 699 // send queued packets
594 if (ictx && octx) 700 if (ictx && octx)
595 { 701 {
596 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
597 { 703 {
598 send_data_packet (p); 704 if (p->len) send_data_packet (p);
599 delete p; 705 delete p;
600 } 706 }
601 707
602 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
603 { 709 {
604 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
605 delete p; 711 delete p;
606 } 712 }
607 } 713 }
714
715 vpn->connection_established (this);
608 } 716 }
609 else 717 else
610 { 718 {
611 retry_cnt = 0; 719 retry_cnt = 0;
612 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
613 keepalive.stop (); 721 keepalive.stop ();
614 rekey.stop (); 722 rekey.stop ();
615 } 723 }
616} 724}
617 725
618void 726void
619connection::reset_si () 727connection::reset_si ()
620{ 728{
729 if (vpn->can_direct (THISNODE, conf))
621 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
622 731 else
623 // mask out protocols we cannot establish 732 {
624 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
625 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
626 if (!conf->dns_port) protocol &= ~PROT_DNSv4; 735 }
627 736
628 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
629} 740}
630 741
631// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
632const sockinfo & 743const sockinfo &
633connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
634{ 745{
635 if (!si.valid ()) 746 if (!si.valid ())
636 { 747 {
637 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
638 749
639 if (r) 750 if (r)
640 { 751 {
641 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."),
642 conf->nodename, r->conf->nodename, (const char *)r->si); 753 conf->nodename, r->conf->nodename);
643 return r->si; 754 return r->si;
644 } 755 }
645 else 756 else
646 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
647 conf->nodename); 758 conf->nodename);
648 } 759 }
649 760
650 return si; 761 return si;
651} 762}
… …
661connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
662{ 773{
663 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
664 775
665 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
666 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
667 781
668 delete pkt; 782 delete pkt;
669} 783}
670 784
… …
689 803
690 rsachallenge chg; 804 rsachallenge chg;
691 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
692 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
693 807
694 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);
695 809
696 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
697 811
698 delete pkt; 812 delete pkt;
699} 813}
… …
707 821
708 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
709 823
710 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
711 825
712 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);
713 827
714 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
715 829
716 delete pkt; 830 delete pkt;
717} 831}
718 832
719void 833void
720connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
721{ 835{
722 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
723 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
724 838
725 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);
726 840
727 r->hmac_set (octx); 841 r->hmac_set (octx);
728 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
729 843
730 delete r; 844 delete r;
731} 845}
732 846
733void 847inline void
734connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
735{ 849{
736 if (!ictx 850 if (!ictx
737 && conf != THISNODE 851 && conf != THISNODE
738 && connectmode != conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
739 && connectmode != conf_node::C_DISABLED 853 && connectmode != conf_node::C_DISABLED
740 && NOW > w.at) 854 && !w.is_active ())
741 { 855 {
742 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 }
743 863
744 double retry_int = double (retry_cnt & 3 864 last_establish_attempt = ev_now ();
865
866 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
745 ? (retry_cnt & 3) + 1 867 ? (retry_cnt & 3) + 1
746 : 1 << (retry_cnt >> 2)); 868 : 1 << (retry_cnt >> 2));
747 869
748 reset_si (); 870 reset_si ();
749 871
750 bool slow = si.prot & PROT_SLOW; 872 bool slow = si.prot & PROT_SLOW;
751 873
752 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);
753 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
754 else 880 else
755 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
756 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
757 887
758 slow = slow || (dsi.prot & PROT_SLOW); 888 slow = slow || (dsi.prot & PROT_SLOW);
759 889
760 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
… …
764 else 894 else
765 send_ping (dsi, 0); 895 send_ping (dsi, 0);
766 } 896 }
767 } 897 }
768 898
769 retry_int *= slow ? 8. : 0.7; 899 retry_int *= slow ? 8. : 0.9;
770 900
771 if (retry_int < conf->max_retry) 901 if (retry_int < conf->max_retry)
772 retry_cnt++; 902 retry_cnt++;
773 else 903 else
774 retry_int = conf->max_retry; 904 retry_int = conf->max_retry;
775 905
776 w.start (NOW + retry_int); 906 w.start (retry_int);
777 } 907 }
778} 908}
779 909
780void 910void
781connection::reset_connection () 911connection::reset_connection ()
… …
784 { 914 {
785 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
786 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
787 917
788 if (::conf.script_node_down) 918 if (::conf.script_node_down)
789 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);
790 slog (L_WARN, _("node-down command execution failed, continuing.")); 922 run_script_queued (cb, _("node-down command execution failed, continuing."));
923 }
791 } 924 }
792 925
793 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
794 delete octx; octx = 0; 927 delete octx; octx = 0;
795#if ENABLE_DNS 928#if ENABLE_DNS
796 dnsv4_reset_connection (); 929 dnsv4_reset_connection ();
797#endif 930#endif
798 931
799 si.host = 0; 932 si.host = 0;
800 933
801 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
802 retry_cnt = 0; 936 retry_cnt = 0;
803 937
804 rekey.stop (); 938 rekey.stop ();
805 keepalive.stop (); 939 keepalive.stop ();
806 establish_connection.stop (); 940 establish_connection.stop ();
… …
813 send_reset (si); 947 send_reset (si);
814 948
815 reset_connection (); 949 reset_connection ();
816} 950}
817 951
818void 952// poor-man's rekeying
819connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
820{ 955{
821 reset_connection (); 956 reset_connection ();
822 establish_connection (); 957 establish_connection ();
823} 958}
824 959
… …
840 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
841 rekey (); 976 rekey ();
842} 977}
843 978
844void 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
845connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
846{ 991{
847 if (ictx && octx) 992 if (ictx && octx)
848 send_data_packet (pkt); 993 send_data_packet (pkt);
849 else 994 else
850 { 995 {
851 if (!broadcast)
852 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
853 997 post_inject_queue ();
854 establish_connection ();
855 } 998 }
856} 999}
857 1000
1001void
858void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
859{ 1003{
860 if (ictx && octx) 1004 if (ictx && octx)
861 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
862 else 1006 else
863 { 1007 {
864 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
865 1009 post_inject_queue ();
866 establish_connection ();
867 } 1010 }
868} 1011}
869 1012
870void 1013void
871connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
872{ 1015{
873 last_activity = NOW; 1016 last_activity = ev_now ();
874 1017
875 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.",
876 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;
877 1023
878 switch (pkt->typ ()) 1024 switch (pkt->typ ())
879 { 1025 {
880 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
881 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
882 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
883 // when we receive a ping. 1031 // when we receive a ping.
884 if (!ictx) 1032 if (!ictx)
885 { 1033 {
886 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
887 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
888 } 1036 }
889 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.
890 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
891 1041
892 break; 1042 break;
893 1043
894 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 ();
895 break; 1050 break;
896 1051
897 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
898 { 1053 {
899 reset_connection (); 1054 reset_connection ();
900 1055
901 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
902 1057
903 if (!p->chk_config ()) 1058 if (!p->chk_config ())
904 { 1059 {
905 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
906 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
907 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
908 } 1063 }
909 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
910 establish_connection (); 1065 establish_connection ();
… …
914 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
915 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
916 { 1071 {
917 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
918 1073
919 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");
920 1075
921 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)))
922 { 1078 {
923 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
924 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."),
925 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
926 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
952 1108
953 break; 1109 break;
954 } 1110 }
955 } 1111 }
956 else 1112 else
957 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
958 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
959 1115
960 send_reset (rsi); 1116 send_reset (rsi);
961 } 1117 }
962 1118
963 break; 1119 break;
964 1120
965 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
966 { 1122 {
967 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
968 1124
969 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
970 1126
971 if (p->chk_config ()) 1127 if (p->chk_config ())
972 { 1128 {
973 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
974 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."),
… …
977 1133
978 rsachallenge chg; 1134 rsachallenge chg;
979 1135
980 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
981 { 1137 {
982 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
983 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
984 break; 1140 break;
985 } 1141 }
986 else 1142 else
987 { 1143 {
988 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
989 1145
990 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
991 { 1147 {
992 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"
993 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
994 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
995 break; 1151 break;
996 } 1152 }
997 else 1153 else
998 { 1154 {
… …
1009 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
1010 1166
1011 si = rsi; 1167 si = rsi;
1012 protocol = rsi.prot; 1168 protocol = rsi.prot;
1013 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
1014 connection_established (); 1175 connection_established ();
1015 1176
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) 1177 if (::conf.script_node_up)
1021 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);
1022 slog (L_WARN, _("node-up command execution failed, continuing.")); 1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1023 1183
1024 break; 1184 break;
1025 } 1185 }
1026 else 1186 else
1027 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."),
1028 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1029 } 1189 }
1030 1190
1031 delete cctx; 1191 delete cctx;
1032 } 1192 }
… …
1048 { 1208 {
1049 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1050 1210
1051 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1052 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"
1053 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1054 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1055 else 1215 else
1056 { 1216 {
1057 u32 seqno; 1217 u32 seqno;
1058 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1059 1220
1060 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1061 { 1222 {
1062 vpn->tap->send (d); 1223 vpn->tap->send (d);
1063 1224
1064 if (si != rsi) 1225 if (si != rsi)
1065 { 1226 {
1066 // fast re-sync on source address changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1067 si = rsi; 1229 // {
1068
1069 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1070 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);
1071 } 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);
1072 } 1259 }
1073 1260
1074 delete d; 1261 delete d;
1075 break; 1262 break;
1076 } 1263 }
… …
1080 break; 1267 break;
1081 1268
1082 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1083 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1084 { 1271 {
1085 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1086 1273
1087 if (p->id > 0 && p->id <= vpn->conns.size ()) 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1088 { 1275 {
1089 connection *c = vpn->conns[p->id - 1]; 1276 connection *c = vpn->conns[p->id - 1];
1090 conf->protocols = p->protocols; 1277 conf->protocols = p->protocols;
1091 1278
1092 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]", 1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1093 conf->id, p->id, c->ictx && c->octx); 1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1094 1281
1095 if (c->ictx && c->octx) 1282 if (c->ictx && c->octx)
1096 { 1283 {
1097 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1098 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
… …
1121 1308
1122 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1123 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));
1124 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1125 1312
1126 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,
1127 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1128 1316
1129 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1130 1318
1131 if (dsi.valid ()) 1319 if (dsi.valid ())
1132 c->send_auth_request (dsi, true); 1320 c->send_auth_request (dsi, true);
… …
1143 send_reset (rsi); 1331 send_reset (rsi);
1144 break; 1332 break;
1145 } 1333 }
1146} 1334}
1147 1335
1148void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1149{ 1338{
1150 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1151 { 1340 {
1152 reset_connection (); 1341 reset_connection ();
1153 establish_connection (); 1342 establish_connection ();
1154 } 1343 }
1155 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1156 w.start (last_activity + ::conf.keepalive); 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1157 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1158 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1159 { 1348 {
1160 send_ping (si); 1349 send_ping (si);
1161 w.start (NOW + 5); 1350 w.start (3);
1162 } 1351 }
1163 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1164 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1165 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1166 w.start (last_activity + ::conf.keepalive + 10); 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1167 else 1356 else
1168 reset_connection (); 1357 reset_connection ();
1169} 1358}
1170 1359
1360void
1171void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1172{ 1362{
1173 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);
1174 1364
1175 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);
1176 p->hmac_set (octx); 1367 p->hmac_set (octx);
1177 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1178 1369
1179 delete p; 1370 delete p;
1180} 1371}
1181 1372
1373void
1182void connection::script_init_env (const char *ext) 1374connection::script_init_env (const char *ext)
1183{ 1375{
1184 char *env; 1376 char *env;
1185 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env); 1377 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1186 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1378 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1187 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1379 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1188 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1380 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1189 conf->id & 0xff); putenv (env); 1381 conf->id & 0xff); putenv (env);
1190} 1382}
1191 1383
1384void
1192void connection::script_init_connect_env () 1385connection::script_init_connect_env ()
1193{ 1386{
1194 vpn->script_init_env (); 1387 vpn->script_init_env ();
1195 1388
1196 char *env; 1389 char *env;
1197 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);
1198 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1199 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1200 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1201} 1395}
1202 1396
1397inline const char *
1203const char *connection::script_node_up () 1398connection::script_node_up ()
1204{ 1399{
1205 script_init_connect_env (); 1400 script_init_connect_env ();
1206 1401
1207 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1208 1403
1209 char *filename; 1404 char *filename;
1210 asprintf (&filename, 1405 asprintf (&filename,
1211 "%s/%s", 1406 "%s/%s",
1212 confbase, 1407 confbase,
1213 ::conf.script_node_up ? ::conf.script_node_up : "node-up"); 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1214 1409
1215 return filename; 1410 return filename;
1216} 1411}
1217 1412
1218const char *connection::script_node_down () 1413inline const char *
1414connection::script_node_change ()
1219{ 1415{
1220 script_init_connect_env (); 1416 script_init_connect_env ();
1221 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
1222 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1223 1435
1224 char *filename; 1436 char *filename;
1225 asprintf (&filename, 1437 asprintf (&filename,
1226 "%s/%s", 1438 "%s/%s",
1227 confbase, 1439 confbase,
… …
1229 1441
1230 return filename; 1442 return filename;
1231} 1443}
1232 1444
1233connection::connection (struct vpn *vpn, conf_node *conf) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1234: vpn(vpn), conf(conf) 1446: 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 1447#if ENABLE_DNS
1239, dns (0) 1448 dns (0),
1240#endif 1449#endif
1450 data_queue(conf->max_ttl, conf->max_queue + 1),
1451 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1241{ 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.;
1242 octx = ictx = 0; 1458 octx = ictx = 0;
1243 retry_cnt = 0;
1244 1459
1245 if (!conf->protocols) // make sure some protocol is enabled 1460 if (!conf->protocols) // make sure some protocol is enabled
1246 conf->protocols = PROT_UDPv4; 1461 conf->protocols = PROT_UDPv4;
1247 1462
1248 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
1249 reset_connection (); 1469 reset_connection ();
1250} 1470}
1251 1471
1252connection::~connection () 1472connection::~connection ()
1253{ 1473{
1254 shutdown (); 1474 shutdown ();
1255} 1475}
1256 1476
1477void
1257void connection_init () 1478connection_init ()
1258{ 1479{
1259 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1260 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1261} 1482}
1262 1483

Diff Legend

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