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.30 by pcg, Thu Jan 29 19:22:05 2004 UTC vs.
Revision 1.85 by pcg, Tue Jul 28 00:42:14 2009 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 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.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cassert>
23
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>
30
31#include "gettext.h"
32 42
33#include "conf.h" 43#include "conf.h"
34#include "slog.h" 44#include "slog.h"
35#include "device.h" 45#include "device.h"
36#include "vpn.h" 46#include "vpn.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
69void // c++ requires external linkage here, apparently :(
70rs_child_cb (ev::child &w, int revents)
71{
72 w.stop ();
73
74 if (rs_queue.empty ())
75 return;
76
77 pid_t pid = run_script (*rs_queue.front ().first, false);
78 if (pid)
79 {
80 w.set (pid);
81 w.start ();
82 }
83 else
84 slog (L_WARN, rs_queue.front ().second);
85
86 delete rs_queue.front ().first;
87 rs_queue.pop ();
88}
89
90// despite the fancy name, this is quite a hack
91static void
92run_script_queued (run_script_cb *cb, const char *warnmsg)
93{
94 rs_queue.push (std::make_pair (cb, warnmsg));
95
96 if (!rs_child_ev.is_active ())
97 {
98 rs_child_ev.set<rs_child_cb> ();
99 rs_child_ev ();
100 }
101}
102
103//////////////////////////////////////////////////////////////////////////////
52 104
53struct crypto_ctx 105struct crypto_ctx
54{ 106{
55 EVP_CIPHER_CTX cctx; 107 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 108 HMAC_CTX hctx;
… …
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 136 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 137 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 138 EVP_MD_CTX_cleanup (&ctx);
87} 139}
88 140
89struct rsa_entry { 141struct rsa_entry
142{
90 tstamp expire; 143 tstamp expire;
91 rsaid id; 144 rsaid id;
92 rsachallenge chg; 145 rsachallenge chg;
93}; 146};
94 147
95struct rsa_cache : list<rsa_entry> 148struct rsa_cache : list<rsa_entry>
96{ 149{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 150 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 151
99 bool find (const rsaid &id, rsachallenge &chg) 152 bool find (const rsaid &id, rsachallenge &chg)
100 { 153 {
101 for (iterator i = begin (); i != end (); ++i) 154 for (iterator i = begin (); i != end (); ++i)
102 { 155 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 156 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 157 {
105 memcpy (&chg, &i->chg, sizeof chg); 158 memcpy (&chg, &i->chg, sizeof chg);
106 159
107 erase (i); 160 erase (i);
108 return true; 161 return true;
109 } 162 }
110 } 163 }
111 164
112 if (cleaner.at < NOW) 165 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 166 cleaner.again ();
114 167
115 return false; 168 return false;
116 } 169 }
117 170
118 void gen (rsaid &id, rsachallenge &chg) 171 void gen (rsaid &id, rsachallenge &chg)
119 { 172 {
120 rsa_entry e; 173 rsa_entry e;
121 174
122 RAND_bytes ((unsigned char *)&id, sizeof id); 175 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 176 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 177
125 e.expire = NOW + RSA_TTL; 178 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 179 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 180 memcpy (&e.chg, &chg, sizeof chg);
128 181
129 push_back (e); 182 push_back (e);
130 183
131 if (cleaner.at < NOW) 184 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 185 cleaner.again ();
133 } 186 }
134 187
135 rsa_cache () 188 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 189 {
137 { } 190 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
191 cleaner.set (RSA_TTL, RSA_TTL);
192 }
138 193
139} rsa_cache; 194} rsa_cache;
140 195
141void rsa_cache::cleaner_cb (time_watcher &w) 196void rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 197{
143 if (!empty ()) 198 if (empty ())
199 w.stop ();
200 else
144 { 201 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 202 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 203 if (i->expire <= ev_now ())
149 i = erase (i); 204 i = erase (i);
150 else 205 else
151 ++i; 206 ++i;
152 } 207 }
153} 208}
154 209
155////////////////////////////////////////////////////////////////////////////// 210//////////////////////////////////////////////////////////////////////////////
156 211
157void pkt_queue::put (net_packet *p) 212pkt_queue::pkt_queue (double max_ttl, int max_queue)
213: max_ttl (max_ttl), max_queue (max_queue)
158{ 214{
159 if (queue[i]) 215 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 216
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; 217 i = 0;
187 j = 0; 218 j = 0;
219
220 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 221}
189 222
190pkt_queue::~pkt_queue () 223pkt_queue::~pkt_queue ()
191{ 224{
192 for (i = QUEUEDEPTH; --i > 0; ) 225 while (net_packet *p = get ())
226 delete p;
227
193 delete queue[i]; 228 delete [] queue;
194} 229}
195 230
231void pkt_queue::expire_cb (ev::timer &w, int revents)
232{
233 ev_tstamp expire = ev_now () - max_ttl;
234
235 for (;;)
236 {
237 if (empty ())
238 break;
239
240 double diff = queue[j].tstamp - expire;
241
242 if (diff >= 0.)
243 {
244 w.start (diff > 0.5 ? diff : 0.5);
245 break;
246 }
247
248 delete get ();
249 }
250}
251
252void pkt_queue::put (net_packet *p)
253{
254 ev_tstamp now = ev_now ();
255
256 // start expiry timer
257 if (empty ())
258 expire.start (max_ttl);
259
260 int ni = i + 1 == max_queue ? 0 : i + 1;
261
262 if (ni == j)
263 delete get ();
264
265 queue[i].pkt = p;
266 queue[i].tstamp = now;
267
268 i = ni;
269}
270
271net_packet *pkt_queue::get ()
272{
273 if (empty ())
274 return 0;
275
276 net_packet *p = queue[j].pkt;
277 queue[j].pkt = 0;
278
279 j = j + 1 == max_queue ? 0 : j + 1;
280
281 return p;
282}
283
196struct net_rateinfo { 284struct net_rateinfo
285{
197 u32 host; 286 u32 host;
198 double pcnt, diff; 287 double pcnt, diff;
199 tstamp last; 288 tstamp last;
200}; 289};
201 290
202// only do action once every x seconds per host whole allowing bursts. 291// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 292// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 293// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 294struct net_rate_limiter : list<net_rateinfo>
206{ 295{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 296# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 297# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 298# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 299# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 300
212 bool can (const sockinfo &si) { return can((u32)si.host); } 301 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 302 bool can (u32 host);
214}; 303};
215 304
… …
220 iterator i; 309 iterator i;
221 310
222 for (i = begin (); i != end (); ) 311 for (i = begin (); i != end (); )
223 if (i->host == host) 312 if (i->host == host)
224 break; 313 break;
225 else if (i->last < NOW - EXPIRE) 314 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 315 i = erase (i);
227 else 316 else
228 i++; 317 i++;
229 318
230 if (i == end ()) 319 if (i == end ())
231 { 320 {
232 net_rateinfo ri; 321 net_rateinfo ri;
233 322
234 ri.host = host; 323 ri.host = host;
235 ri.pcnt = 1.; 324 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 325 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 326 ri.last = ev_now ();
238 327
239 push_front (ri); 328 push_front (ri);
240 329
241 return true; 330 return true;
242 } 331 }
243 else 332 else
244 { 333 {
245 net_rateinfo ri (*i); 334 net_rateinfo ri (*i);
246 erase (i); 335 erase (i);
247 336
248 ri.pcnt = ri.pcnt * ALPHA; 337 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 338 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 339
251 ri.last = NOW; 340 ri.last = ev_now ();
252 341
253 double dif = ri.diff / ri.pcnt; 342 double dif = ri.diff / ri.pcnt;
254 343
255 bool send = dif > CUTOFF; 344 bool send = dif > NRL_CUTOFF;
256 345
257 if (dif > MAXDIF) 346 if (dif > NRL_MAXDIF)
258 { 347 {
259 ri.pcnt = 1.; 348 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 349 ri.diff = NRL_MAXDIF;
261 } 350 }
262 else if (send) 351 else if (send)
263 ri.pcnt++; 352 ri.pcnt++;
264 353
265 push_front (ri); 354 push_front (ri);
… …
335 int outl = 0, outl2; 424 int outl = 0, outl2;
336 ptype type = PT_DATA_UNCOMPRESSED; 425 ptype type = PT_DATA_UNCOMPRESSED;
337 426
338#if ENABLE_COMPRESSION 427#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 428 u8 cdata[MAX_MTU];
340 u32 cl;
341 429
430 if (conn->features & ENABLE_COMPRESSION)
431 {
342 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 432 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
433
343 if (cl) 434 if (cl)
344 { 435 {
345 type = PT_DATA_COMPRESSED; 436 type = PT_DATA_COMPRESSED;
346 d = cdata; 437 d = cdata;
347 l = cl + 2; 438 l = cl + 2;
348 439
349 d[0] = cl >> 8; 440 d[0] = cl >> 8;
350 d[1] = cl; 441 d[1] = cl;
442 }
351 } 443 }
352#endif 444#endif
353 445
354 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 446 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
355 447
… …
448{ 540{
449 // actually, hmaclen cannot be checked because the hmac 541 // actually, hmaclen cannot be checked because the hmac
450 // field comes before this data, so peers with other 542 // field comes before this data, so peers with other
451 // hmacs simply will not work. 543 // hmacs simply will not work.
452 u8 prot_major, prot_minor, randsize, hmaclen; 544 u8 prot_major, prot_minor, randsize, hmaclen;
453 u8 flags, challengelen, pad2, pad3; 545 u8 flags, challengelen, features, pad3;
454 u32 cipher_nid, digest_nid, hmac_nid; 546 u32 cipher_nid, digest_nid, hmac_nid;
455
456 const u8 curflags () const
457 {
458 return 0x80
459 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
460 }
461 547
462 void setup (ptype type, int dst); 548 void setup (ptype type, int dst);
463 bool chk_config () const; 549 bool chk_config () const;
550
551 static u8 get_features ()
552 {
553 u8 f = 0;
554#if ENABLE_COMPRESSION
555 f |= FEATURE_COMPRESSION;
556#endif
557#if ENABLE_ROHC
558 f |= FEATURE_ROHC;
559#endif
560#if ENABLE_BRIDGING
561 f |= FEATURE_BRIDGING;
562#endif
563 return f;
564 }
464}; 565};
465 566
466void config_packet::setup (ptype type, int dst) 567void config_packet::setup (ptype type, int dst)
467{ 568{
468 prot_major = PROTOCOL_MAJOR; 569 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 570 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 571 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 572 hmaclen = HMACLENGTH;
472 flags = curflags (); 573 flags = 0;
473 challengelen = sizeof (rsachallenge); 574 challengelen = sizeof (rsachallenge);
575 features = get_features ();
474 576
475 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 577 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
476 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 578 digest_nid = htonl (EVP_MD_type (RSA_HASH));
477 hmac_nid = htonl (EVP_MD_type (DIGEST)); 579 hmac_nid = htonl (EVP_MD_type (DIGEST));
478 580
… …
486 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 588 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
487 else if (randsize != RAND_SIZE) 589 else if (randsize != RAND_SIZE)
488 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 590 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
489 else if (hmaclen != HMACLENGTH) 591 else if (hmaclen != HMACLENGTH)
490 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 592 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
491 else if (flags != curflags ())
492 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
493 else if (challengelen != sizeof (rsachallenge)) 593 else if (challengelen != sizeof (rsachallenge))
494 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 594 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
495 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 595 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
496 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 596 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
497 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 597 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
514 rsaencrdata encr; 614 rsaencrdata encr;
515 615
516 auth_req_packet (int dst, bool initiate_, u8 protocols_) 616 auth_req_packet (int dst, bool initiate_, u8 protocols_)
517 { 617 {
518 config_packet::setup (PT_AUTH_REQ, dst); 618 config_packet::setup (PT_AUTH_REQ, dst);
519 strncpy (magic, MAGIC, 8); 619 strncpy (magic, MAGIC_OLD, 8);
520 initiate = !!initiate_; 620 initiate = !!initiate_;
521 protocols = protocols_; 621 protocols = protocols_;
522 622
523 len = sizeof (*this) - sizeof (net_packet); 623 len = sizeof (*this) - sizeof (net_packet);
524 } 624 }
… …
573///////////////////////////////////////////////////////////////////////////// 673/////////////////////////////////////////////////////////////////////////////
574 674
575void 675void
576connection::connection_established () 676connection::connection_established ()
577{ 677{
678 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
679
578 if (ictx && octx) 680 if (ictx && octx)
579 { 681 {
580 connectmode = conf->connectmode; 682 // make sure rekeying timeouts are slightly asymmetric
581 683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
582 rekey.start (NOW + ::conf.rekey); 684 rekey.start (rekey_interval, rekey_interval);
583 keepalive.start (NOW + ::conf.keepalive); 685 keepalive.start (::conf.keepalive);
584 686
585 // send queued packets 687 // send queued packets
586 if (ictx && octx) 688 if (ictx && octx)
587 { 689 {
588 while (tap_packet *p = (tap_packet *)data_queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
589 { 691 {
590 send_data_packet (p); 692 if (p->len) send_data_packet (p);
591 delete p; 693 delete p;
592 } 694 }
593 695
594 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
595 { 697 {
596 send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
597 delete p; 699 delete p;
598 } 700 }
599 } 701 }
702
703 vpn->connection_established (this);
600 } 704 }
601 else 705 else
602 { 706 {
603 retry_cnt = 0; 707 retry_cnt = 0;
604 establish_connection.start (NOW + 5); 708 establish_connection.start (5);
605 keepalive.stop (); 709 keepalive.stop ();
606 rekey.stop (); 710 rekey.stop ();
607 } 711 }
608} 712}
609 713
610void 714void
611connection::reset_si () 715connection::reset_si ()
612{ 716{
717 if (vpn->can_direct (THISNODE, conf))
613 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
614 719 else
615 // mask out protocols we cannot establish 720 {
616 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
617 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 722 protocol = 0;
723 }
618 724
619 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
620} 728}
621 729
622// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
623const sockinfo & 731const sockinfo &
624connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
625{ 733{
626 if (!si.valid ()) 734 if (!si.valid ())
627 { 735 {
628 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
629 737
630 if (r) 738 if (r)
631 { 739 {
632 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 740 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
633 conf->nodename, r->conf->nodename); 741 conf->nodename, r->conf->nodename);
634 return r->si; 742 return r->si;
635 } 743 }
636 else 744 else
637 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
638 conf->nodename); 746 conf->nodename);
639 } 747 }
640 748
641 return si; 749 return si;
642} 750}
… …
652connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
653{ 761{
654 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
655 763
656 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 764 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
765
766 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
767
657 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
658 769
659 delete pkt; 770 delete pkt;
660} 771}
661 772
… …
680 791
681 rsachallenge chg; 792 rsachallenge chg;
682 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
683 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
684 795
685 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 796 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
686 797
687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 798 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
688 799
689 delete pkt; 800 delete pkt;
690} 801}
… …
698 809
699 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
700 811
701 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
702 813
703 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 814 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
704 815
705 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 816 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
706 817
707 delete pkt; 818 delete pkt;
708} 819}
709 820
710void 821void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 823{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
714 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
715 826
716 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 827 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
717 828
718 r->hmac_set (octx); 829 r->hmac_set (octx);
719 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
720 831
721 delete r; 832 delete r;
722} 833}
723 834
724void 835inline void
725connection::establish_connection_cb (time_watcher &w) 836connection::establish_connection_cb (ev::timer &w, int revents)
726{ 837{
727 if (!ictx 838 if (!ictx
728 && conf != THISNODE 839 && conf != THISNODE
729 && connectmode != conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
730 && connectmode != conf_node::C_DISABLED 841 && connectmode != conf_node::C_DISABLED
731 && NOW > w.at) 842 && !w.is_active ())
732 { 843 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 844 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
734 845 // and stop trying. should probably be handled by a per-connection expire handler.
735 if (retry_int < 3600 * 8) 846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 {
848 reset_connection ();
736 retry_cnt++; 849 return;
850 }
737 851
738 w.start (NOW + retry_int); 852 last_establish_attempt = ev_now ();
853
854 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
855 ? (retry_cnt & 3) + 1
856 : 1 << (retry_cnt >> 2));
739 857
740 reset_si (); 858 reset_si ();
741 859
742 if (si.prot && !si.host) 860 bool slow = si.prot & PROT_SLOW;
861
862 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
863 {
864 /*TODO*/ /* start the timer so we don't recurse endlessly */
865 w.start (1);
743 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
867 }
744 else 868 else
745 { 869 {
870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
873
746 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
875
876 slow = slow || (dsi.prot & PROT_SLOW);
747 877
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 878 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 879 {
750 if (retry_cnt < 4) 880 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 881 send_auth_request (dsi, true);
752 else 882 else
753 send_ping (dsi, 0); 883 send_ping (dsi, 0);
754 } 884 }
755 } 885 }
886
887 retry_int *= slow ? 8. : 0.9;
888
889 if (retry_int < conf->max_retry)
890 retry_cnt++;
891 else
892 retry_int = conf->max_retry;
893
894 w.start (retry_int);
756 } 895 }
757} 896}
758 897
759void 898void
760connection::reset_connection () 899connection::reset_connection ()
… …
763 { 902 {
764 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
766 905
767 if (::conf.script_node_down) 906 if (::conf.script_node_down)
768 run_script (run_script_cb (this, &connection::script_node_down), false); 907 {
908 run_script_cb *cb = new run_script_cb;
909 cb->set<connection, &connection::script_node_down> (this);
910 run_script_queued (cb, _("node-down command execution failed, continuing."));
911 }
769 } 912 }
770 913
771 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
772 delete octx; octx = 0; 915 delete octx; octx = 0;
916#if ENABLE_DNS
917 dnsv4_reset_connection ();
918#endif
773 919
774 si.host= 0; 920 si.host = 0;
775 921
776 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
777 retry_cnt = 0; 924 retry_cnt = 0;
778 925
779 rekey.stop (); 926 rekey.stop ();
780 keepalive.stop (); 927 keepalive.stop ();
781 establish_connection.stop (); 928 establish_connection.stop ();
… …
788 send_reset (si); 935 send_reset (si);
789 936
790 reset_connection (); 937 reset_connection ();
791} 938}
792 939
793void 940// poor-man's rekeying
794connection::rekey_cb (time_watcher &w) 941inline void
942connection::rekey_cb (ev::timer &w, int revents)
795{ 943{
796 reset_connection (); 944 reset_connection ();
797 establish_connection (); 945 establish_connection ();
798} 946}
799 947
… …
815 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
816 rekey (); 964 rekey ();
817} 965}
818 966
819void 967void
968connection::post_inject_queue ()
969{
970 // force a connection every now and when when packets are sent (max 1/s)
971 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
972 establish_connection.stop ();
973
974 establish_connection ();
975}
976
977void
820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 978connection::inject_data_packet (tap_packet *pkt)
821{ 979{
822 if (ictx && octx) 980 if (ictx && octx)
823 send_data_packet (pkt); 981 send_data_packet (pkt);
824 else 982 else
825 { 983 {
826 if (!broadcast)//DDDD
827 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
828 985 post_inject_queue ();
829 establish_connection ();
830 } 986 }
831} 987}
832 988
833void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
834{ 990{
835 if (ictx && octx) 991 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
837 else 993 else
838 { 994 {
839 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 996 post_inject_queue ();
841 establish_connection ();
842 } 997 }
843} 998}
844 999
845void 1000void
846connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
847{ 1002{
848 last_activity = NOW; 1003 last_activity = ev_now ();
849 1004
850 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1005 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
851 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1006 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1007
1008 if (connectmode == conf_node::C_DISABLED)
1009 return;
852 1010
853 switch (pkt->typ ()) 1011 switch (pkt->typ ())
854 { 1012 {
855 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
856 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
857 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
858 // when we receive a ping. 1018 // when we receive a ping.
859 if (!ictx) 1019 if (!ictx)
860 { 1020 {
861 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
862 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
863 } 1023 }
864 else 1024 else
1025 // we would love to change thre socket address here, but ping's aren't
1026 // authenticated, so we best ignore it.
865 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
866 1028
867 break; 1029 break;
868 1030
869 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
870 break; 1033 break;
871 1034
872 case vpn_packet::PT_RESET: 1035 case vpn_packet::PT_RESET:
873 { 1036 {
874 reset_connection (); 1037 reset_connection ();
875 1038
876 config_packet *p = (config_packet *) pkt; 1039 config_packet *p = (config_packet *) pkt;
877 1040
878 if (!p->chk_config ()) 1041 if (!p->chk_config ())
879 { 1042 {
880 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
881 conf->nodename, (const char *)rsi); 1044 conf->nodename, (const char *)rsi);
882 connectmode = conf_node::C_DISABLED; 1045 connectmode = conf_node::C_DISABLED;
883 } 1046 }
884 else if (connectmode == conf_node::C_ALWAYS) 1047 else if (connectmode == conf_node::C_ALWAYS)
885 establish_connection (); 1048 establish_connection ();
… …
889 case vpn_packet::PT_AUTH_REQ: 1052 case vpn_packet::PT_AUTH_REQ:
890 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
891 { 1054 {
892 auth_req_packet *p = (auth_req_packet *) pkt; 1055 auth_req_packet *p = (auth_req_packet *) pkt;
893 1056
894 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1057 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
895 1058
896 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1059 if (p->chk_config ()
1060 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
897 { 1061 {
898 if (p->prot_minor != PROTOCOL_MINOR) 1062 if (p->prot_minor != PROTOCOL_MINOR)
899 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1063 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
900 conf->nodename, (const char *)rsi, 1064 conf->nodename, (const char *)rsi,
901 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
917 1081
918 octx = new crypto_ctx (k, 1); 1082 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1083 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 1084
921 conf->protocols = p->protocols; 1085 conf->protocols = p->protocols;
1086 features = p->features & config_packet::get_features ();
922 1087
923 send_auth_response (rsi, p->id, k); 1088 send_auth_response (rsi, p->id, k);
924 1089
925 connection_established (); 1090 connection_established ();
926 1091
927 break; 1092 break;
928 } 1093 }
929 } 1094 }
930 else 1095 else
931 slog (L_WARN, _("%s(%s): protocol mismatch"), 1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
932 conf->nodename, (const char *)rsi); 1097 conf->nodename, (const char *)rsi);
933 1098
934 send_reset (rsi); 1099 send_reset (rsi);
935 } 1100 }
936 1101
937 break; 1102 break;
938 1103
939 case vpn_packet::PT_AUTH_RES: 1104 case vpn_packet::PT_AUTH_RES:
940 { 1105 {
941 auth_res_packet *p = (auth_res_packet *) pkt; 1106 auth_res_packet *p = (auth_res_packet *)pkt;
942 1107
943 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
944 1109
945 if (p->chk_config ()) 1110 if (p->chk_config ())
946 { 1111 {
947 if (p->prot_minor != PROTOCOL_MINOR) 1112 if (p->prot_minor != PROTOCOL_MINOR)
948 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1113 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
951 1116
952 rsachallenge chg; 1117 rsachallenge chg;
953 1118
954 if (!rsa_cache.find (p->id, chg)) 1119 if (!rsa_cache.find (p->id, chg))
955 { 1120 {
956 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
957 conf->nodename, (const char *)rsi); 1122 conf->nodename, (const char *)rsi);
958 break; 1123 break;
959 } 1124 }
960 else 1125 else
961 { 1126 {
962 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1127 crypto_ctx *cctx = new crypto_ctx (chg, 0);
963 1128
964 if (!p->hmac_chk (cctx)) 1129 if (!p->hmac_chk (cctx))
965 { 1130 {
966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1131 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
967 "could be an attack, or just corruption or a synchronization error"), 1132 "could be an attack, or just corruption or a synchronization error."),
968 conf->nodename, (const char *)rsi); 1133 conf->nodename, (const char *)rsi);
969 break; 1134 break;
970 } 1135 }
971 else 1136 else
972 { 1137 {
… …
983 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1148 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
984 1149
985 si = rsi; 1150 si = rsi;
986 protocol = rsi.prot; 1151 protocol = rsi.prot;
987 1152
1153 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1154 conf->nodename, (const char *)rsi,
1155 is_direct ? "direct" : "forwarded",
1156 p->prot_major, p->prot_minor);
1157
988 connection_established (); 1158 connection_established ();
989 1159
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor);
993
994 if (::conf.script_node_up) 1160 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false); 1161 {
1162 run_script_cb *cb = new run_script_cb;
1163 cb->set<connection, &connection::script_node_up> (this);
1164 run_script_queued (cb, _("node-up command execution failed, continuing."));
1165 }
996 1166
997 break; 1167 break;
998 } 1168 }
999 else 1169 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1170 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1001 conf->nodename, (const char *)rsi); 1171 conf->nodename, (const char *)rsi);
1002 } 1172 }
1003 1173
1004 delete cctx; 1174 delete cctx;
1005 } 1175 }
… …
1021 { 1191 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1192 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1193
1024 if (!p->hmac_chk (ictx)) 1194 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1195 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or a synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1027 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1028 else 1198 else
1029 { 1199 {
1030 u32 seqno; 1200 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1201 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno);
1032 1203
1033 if (iseqno.recv_ok (seqno)) 1204 if (seqclass == 0) // ok
1034 { 1205 {
1035 vpn->tap->send (d); 1206 vpn->tap->send (d);
1036 1207
1037 if (si != rsi) 1208 if (si != rsi)
1038 { 1209 {
1039 // fast re-sync on connection changes, useful especially for tcp/ip 1210 // fast re-sync on source address changes, useful especially for tcp/ip
1211 //if (last_si_change < ev_now () + 5.)
1040 si = rsi; 1212 // {
1041
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1213 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1214 conf->nodename, (const char *)si, (const char *)rsi);
1215
1216 si = rsi;
1217
1218 if (::conf.script_node_change)
1219 {
1220 run_script_cb *cb = new run_script_cb;
1221 cb->set<connection, &connection::script_node_change> (this);
1222 run_script_queued (cb, _("node-change command execution failed, continuing."));
1223 }
1224
1225 // }
1226 //else
1227 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1228 // conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1229 }
1045
1046 delete d;
1047
1048 break;
1049 } 1230 }
1231 else if (seqclass == 1) // far history
1232 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1233 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1234 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1235 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1236 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1237 else if (seqclass == 3) // reset
1238 {
1239 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1240 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1241 send_reset (rsi);
1242 }
1243
1244 delete d;
1245 break;
1050 } 1246 }
1051 } 1247 }
1052 1248
1053 send_reset (rsi); 1249 send_reset (rsi);
1054 break; 1250 break;
1055 1251
1056 case vpn_packet::PT_CONNECT_REQ: 1252 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1253 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1254 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1255 connect_req_packet *p = (connect_req_packet *)pkt;
1060 1256
1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1257 if (p->id > 0 && p->id <= vpn->conns.size ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 1258 {
1259 connection *c = vpn->conns[p->id - 1];
1260 conf->protocols = p->protocols;
1261
1262 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1263 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1264
1265 if (c->ictx && c->octx)
1266 {
1070 // send connect_info packets to both sides, in case one is 1267 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1268 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1269 c->send_connect_info (conf->id, si, conf->protocols);
1073 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1270 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1271 }
1272 else
1273 c->establish_connection ();
1074 } 1274 }
1075 else 1275 else
1076 c->establish_connection (); 1276 slog (L_WARN,
1277 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1278 p->id);
1077 } 1279 }
1078 1280
1079 break; 1281 break;
1080 1282
1081 case vpn_packet::PT_CONNECT_INFO: 1283 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1284 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1285 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1286 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1287
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1288 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 1289 {
1088 connection *c = vpn->conns[p->id - 1]; 1290 connection *c = vpn->conns[p->id - 1];
1089 1291
1090 c->conf->protocols = p->protocols; 1292 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1293 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1294 p->si.upgrade_protocol (protocol, c->conf);
1093 1295
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1296 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1297 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1298 (const char *)p->si, !c->ictx && !c->octx);
1096 1299
1097 const sockinfo &dsi = forward_si (p->si); 1300 const sockinfo &dsi = forward_si (p->si);
1098 1301
1099 if (dsi.valid ()) 1302 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1303 c->send_auth_request (dsi, true);
1304 }
1305 else
1306 slog (L_WARN,
1307 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1308 p->id);
1101 } 1309 }
1102 1310
1103 break; 1311 break;
1104 1312
1105 default: 1313 default:
1106 send_reset (rsi); 1314 send_reset (rsi);
1107 break; 1315 break;
1108 } 1316 }
1109} 1317}
1110 1318
1111void connection::keepalive_cb (time_watcher &w) 1319inline void
1320connection::keepalive_cb (ev::timer &w, int revents)
1112{ 1321{
1113 if (NOW >= last_activity + ::conf.keepalive + 30) 1322 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1114 { 1323 {
1115 reset_connection (); 1324 reset_connection ();
1116 establish_connection (); 1325 establish_connection ();
1117 } 1326 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1327 else if (ev_now () < last_activity + ::conf.keepalive)
1119 w.start (last_activity + ::conf.keepalive); 1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1329 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1330 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1331 {
1123 send_ping (si); 1332 send_ping (si);
1124 w.start (NOW + 5); 1333 w.start (3);
1125 } 1334 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1335 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1336 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1337 // should delete octx, though, or something like that ;)
1129 w.start (last_activity + ::conf.keepalive + 10); 1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1130 else 1339 else
1131 reset_connection (); 1340 reset_connection ();
1132} 1341}
1133 1342
1134void connection::send_connect_request (int id) 1343void connection::send_connect_request (int id)
1135{ 1344{
1136 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1345 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1137 1346
1138 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1347 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1348 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1139 p->hmac_set (octx); 1349 p->hmac_set (octx);
1140 send_vpn_packet (p, si); 1350 send_vpn_packet (p, si);
1141 1351
1142 delete p; 1352 delete p;
1143} 1353}
1144 1354
1145void connection::script_node () 1355void connection::script_init_env (const char *ext)
1146{ 1356{
1147 vpn->script_if_up ();
1148
1149 char *env; 1357 char *env;
1358 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1359 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1360 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1361 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1362 conf->id & 0xff); putenv (env);
1363}
1364
1365void connection::script_init_connect_env ()
1366{
1367 vpn->script_init_env ();
1368
1369 char *env;
1150 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1370 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1371 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1372 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1373 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1374 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1375}
1155 1376
1377inline const char *
1156const char *connection::script_node_up () 1378connection::script_node_up ()
1157{ 1379{
1158 script_node (); 1380 script_init_connect_env ();
1159 1381
1160 putenv ("STATE=up"); 1382 putenv ((char *)"STATE=up");
1161 1383
1384 char *filename;
1385 asprintf (&filename,
1386 "%s/%s",
1387 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1388 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1163}
1164 1389
1390 return filename;
1391}
1392
1393inline const char *
1394connection::script_node_change ()
1395{
1396 script_init_connect_env ();
1397
1398 putenv ((char *)"STATE=change");
1399
1400 char *filename;
1401 asprintf (&filename,
1402 "%s/%s",
1403 confbase,
1404 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1405
1406 return filename;
1407}
1408
1409inline const char *
1165const char *connection::script_node_down () 1410connection::script_node_down ()
1166{ 1411{
1167 script_node (); 1412 script_init_connect_env ();
1168 1413
1169 putenv ("STATE=down"); 1414 putenv ((char *)"STATE=down");
1170 1415
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1416 char *filename;
1172} 1417 asprintf (&filename,
1418 "%s/%s",
1419 confbase,
1420 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1421
1422 return filename;
1423}
1424
1174connection::connection(struct vpn *vpn_) 1425connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1426: vpn(vpn), conf(conf),
1176, rekey (this, &connection::rekey_cb) 1427#if ENABLE_DNS
1177, keepalive (this, &connection::keepalive_cb) 1428 dns (0),
1429#endif
1430 data_queue(conf->max_ttl, conf->max_queue + 1),
1431 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1432{
1433 rekey .set<connection, &connection::rekey_cb > (this);
1434 keepalive .set<connection, &connection::keepalive_cb > (this);
1178, establish_connection (this, &connection::establish_connection_cb) 1435 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1179{ 1436
1437 last_establish_attempt = 0.;
1180 octx = ictx = 0; 1438 octx = ictx = 0;
1181 retry_cnt = 0;
1182 1439
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1440 if (!conf->protocols) // make sure some protocol is enabled
1441 conf->protocols = PROT_UDPv4;
1442
1443 connectmode = conf->connectmode;
1444
1445 // queue a dummy packet to force an initial connection attempt
1446 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1447 vpn_queue.put (new net_packet);
1448
1184 reset_connection (); 1449 reset_connection ();
1185} 1450}
1186 1451
1187connection::~connection () 1452connection::~connection ()
1188{ 1453{

Diff Legend

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