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.31 by pcg, Sun Feb 8 07:24:25 2004 UTC vs.
Revision 1.92 by root, Thu Feb 10 03:59:51 2011 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,2010 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
69namespace
70{
71 void // c++ requires external linkage here, apparently :(
72 rs_child_cb (ev::child &w, int revents)
73 {
74 w.stop ();
75
76 if (rs_queue.empty ())
77 return;
78
79 pid_t pid = run_script (*rs_queue.front ().first, false);
80 if (pid)
81 {
82 w.set (pid);
83 w.start ();
84 }
85 else
86 slog (L_WARN, rs_queue.front ().second);
87
88 delete rs_queue.front ().first;
89 rs_queue.pop ();
90 }
91};
92
93// despite the fancy name, this is quite a hack
94static void
95run_script_queued (run_script_cb *cb, const char *warnmsg)
96{
97 rs_queue.push (std::make_pair (cb, warnmsg));
98
99 if (!rs_child_ev.is_active ())
100 {
101 rs_child_ev.set<rs_child_cb> ();
102 rs_child_ev ();
103 }
104}
105
106//////////////////////////////////////////////////////////////////////////////
52 107
53struct crypto_ctx 108struct crypto_ctx
54{ 109{
55 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 111 HMAC_CTX hctx;
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id)); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0)); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
87} 142}
88 143
89struct rsa_entry { 144struct rsa_entry
145{
90 tstamp expire; 146 tstamp expire;
91 rsaid id; 147 rsaid id;
92 rsachallenge chg; 148 rsachallenge chg;
93}; 149};
94 150
95struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
96{ 152{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
98 154
99 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
100 { 156 {
101 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
102 { 158 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
104 { 160 {
105 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
106 162
107 erase (i); 163 erase (i);
108 return true; 164 return true;
109 } 165 }
110 } 166 }
111 167
112 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
113 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
114 170
115 return false; 171 return false;
116 } 172 }
117 173
118 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
119 { 175 {
120 rsa_entry e; 176 rsa_entry e;
121 177
122 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124 180
125 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
126 e.id = id; 182 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
128 184
129 push_back (e); 185 push_back (e);
130 186
131 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
132 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
133 } 189 }
134 190
135 rsa_cache () 191 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb) 192 {
137 { } 193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
138 196
139} rsa_cache; 197} rsa_cache;
140 198
141void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
142{ 201{
143 if (!empty ()) 202 if (empty ())
203 w.stop ();
204 else
144 { 205 {
145 w.start (NOW + RSA_TTL);
146
147 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
148 if (i->expire <= NOW) 207 if (i->expire <= ev_now ())
149 i = erase (i); 208 i = erase (i);
150 else 209 else
151 ++i; 210 ++i;
152 } 211 }
153} 212}
154 213
155////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
156 215
157void pkt_queue::put (net_packet *p) 216pkt_queue::pkt_queue (double max_ttl, int max_queue)
217: max_ttl (max_ttl), max_queue (max_queue)
158{ 218{
159 if (queue[i]) 219 queue = new pkt [max_queue];
160 {
161 delete queue[i];
162 j = (j + 1) % QUEUEDEPTH;
163 }
164 220
165 queue[i] = p;
166
167 i = (i + 1) % QUEUEDEPTH;
168}
169
170net_packet *pkt_queue::get ()
171{
172 net_packet *p = queue[j];
173
174 if (p)
175 {
176 queue[j] = 0;
177 j = (j + 1) % QUEUEDEPTH;
178 }
179
180 return p;
181}
182
183pkt_queue::pkt_queue ()
184{
185 memset (queue, 0, sizeof (queue));
186 i = 0; 221 i = 0;
187 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
188} 225}
189 226
190pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
191{ 228{
192 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
193 delete queue[i]; 232 delete [] queue;
194} 233}
195 234
235void
236pkt_queue::expire_cb (ev::timer &w, int revents)
237{
238 ev_tstamp expire = ev_now () - max_ttl;
239
240 for (;;)
241 {
242 if (empty ())
243 break;
244
245 double diff = queue[j].tstamp - expire;
246
247 if (diff >= 0.)
248 {
249 w.start (diff > 0.5 ? diff : 0.5);
250 break;
251 }
252
253 delete get ();
254 }
255}
256
257void
258pkt_queue::put (net_packet *p)
259{
260 ev_tstamp now = ev_now ();
261
262 // start expiry timer
263 if (empty ())
264 expire.start (max_ttl);
265
266 int ni = i + 1 == max_queue ? 0 : i + 1;
267
268 if (ni == j)
269 delete get ();
270
271 queue[i].pkt = p;
272 queue[i].tstamp = now;
273
274 i = ni;
275}
276
277net_packet *
278pkt_queue::get ()
279{
280 if (empty ())
281 return 0;
282
283 net_packet *p = queue[j].pkt;
284 queue[j].pkt = 0;
285
286 j = j + 1 == max_queue ? 0 : j + 1;
287
288 return p;
289}
290
196struct net_rateinfo { 291struct net_rateinfo
292{
197 u32 host; 293 u32 host;
198 double pcnt, diff; 294 double pcnt, diff;
199 tstamp last; 295 tstamp last;
200}; 296};
201 297
202// only do action once every x seconds per host whole allowing bursts. 298// only do action once every x seconds per host whole allowing bursts.
203// this implementation ("splay list" ;) is inefficient, 299// this implementation ("splay list" ;) is inefficient,
204// but low on resources. 300// but low on resources.
205struct net_rate_limiter : list<net_rateinfo> 301struct net_rate_limiter : list<net_rateinfo>
206{ 302{
207 static const double ALPHA = 1. - 1. / 600.; // allow bursts 303# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
208 static const double CUTOFF = 10.; // one event every CUTOFF seconds 304# define NRL_CUTOFF 10. // one event every CUTOFF seconds
209 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 305# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
210 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 306# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
211 307
212 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
213 bool can (u32 host); 309 bool can (u32 host);
214}; 310};
215 311
216net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
217 313
314bool
218bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
219{ 316{
220 iterator i; 317 iterator i;
221 318
222 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
223 if (i->host == host) 320 if (i->host == host)
224 break; 321 break;
225 else if (i->last < NOW - EXPIRE) 322 else if (i->last < ev_now () - NRL_EXPIRE)
226 i = erase (i); 323 i = erase (i);
227 else 324 else
228 i++; 325 i++;
229 326
230 if (i == end ()) 327 if (i == end ())
231 { 328 {
232 net_rateinfo ri; 329 net_rateinfo ri;
233 330
234 ri.host = host; 331 ri.host = host;
235 ri.pcnt = 1.; 332 ri.pcnt = 1.;
236 ri.diff = MAXDIF; 333 ri.diff = NRL_MAXDIF;
237 ri.last = NOW; 334 ri.last = ev_now ();
238 335
239 push_front (ri); 336 push_front (ri);
240 337
241 return true; 338 return true;
242 } 339 }
243 else 340 else
244 { 341 {
245 net_rateinfo ri (*i); 342 net_rateinfo ri (*i);
246 erase (i); 343 erase (i);
247 344
248 ri.pcnt = ri.pcnt * ALPHA; 345 ri.pcnt = ri.pcnt * NRL_ALPHA;
249 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 347
251 ri.last = NOW; 348 ri.last = ev_now ();
252 349
253 double dif = ri.diff / ri.pcnt; 350 double dif = ri.diff / ri.pcnt;
254 351
255 bool send = dif > CUTOFF; 352 bool send = dif > NRL_CUTOFF;
256 353
257 if (dif > MAXDIF) 354 if (dif > NRL_MAXDIF)
258 { 355 {
259 ri.pcnt = 1.; 356 ri.pcnt = 1.;
260 ri.diff = MAXDIF; 357 ri.diff = NRL_MAXDIF;
261 } 358 }
262 else if (send) 359 else if (send)
263 ri.pcnt++; 360 ri.pcnt++;
264 361
265 push_front (ri); 362 push_front (ri);
270 367
271///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
272 369
273unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
274 371
372void
275void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
276{ 374{
277 unsigned int xlen; 375 unsigned int xlen;
278 376
279 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
280 378
298 hmac_gen (ctx); 396 hmac_gen (ctx);
299 397
300 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
301} 399}
302 400
401void
303void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
304{ 403{
305 type = type_; 404 type = type_;
306 405
307 int src = THISNODE->id; 406 int src = THISNODE->id;
308 407
313 412
314#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
315#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
316 415
317struct vpndata_packet : vpn_packet 416struct vpndata_packet : vpn_packet
417{
418 u8 data[MAXVPNDATA + DATAHDR]; // seqno
419
420 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
421 tap_packet *unpack (connection *conn, u32 &seqno);
422
423private:
424 const u32 data_hdr_size () const
318 { 425 {
319 u8 data[MAXVPNDATA + DATAHDR]; // seqno
320
321 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
322 tap_packet *unpack (connection *conn, u32 &seqno);
323private:
324
325 const u32 data_hdr_size () const
326 {
327 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
328 }
329 }; 427 }
428};
330 429
331void 430void
332vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 431vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
333{ 432{
334 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
336 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
337 436
338#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
339 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
340 439
341 if (conn->features & ENABLE_COMPRESSION) 440 if (conn->features & FEATURE_COMPRESSION)
342 { 441 {
343 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
344 443
345 if (cl) 444 if (cl)
346 { 445 {
456 u8 flags, challengelen, features, pad3; 555 u8 flags, challengelen, features, pad3;
457 u32 cipher_nid, digest_nid, hmac_nid; 556 u32 cipher_nid, digest_nid, hmac_nid;
458 557
459 void setup (ptype type, int dst); 558 void setup (ptype type, int dst);
460 bool chk_config () const; 559 bool chk_config () const;
560
561 static u8 get_features ()
562 {
563 u8 f = 0;
564#if ENABLE_COMPRESSION
565 f |= FEATURE_COMPRESSION;
566#endif
567#if ENABLE_ROHC
568 f |= FEATURE_ROHC;
569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
573 return f;
574 }
461}; 575};
462 576
463#define FEATURES ((ENABLE_COMPRESSION ? FEATURE_COMPRESSION : 0) \ 577void
464 | (ENABLE_ROHC ? FEATURE_ROHC : 0))
465
466void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
467{ 579{
468 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
469 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
470 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
471 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
472 flags = ENABLE_COMPRESSION ? 0x81 : 0x80; 584 flags = 0;
473 challengelen = sizeof (rsachallenge); 585 challengelen = sizeof (rsachallenge);
474 features = FEATURES; 586 features = get_features ();
475 587
476 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
477 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
478 hmac_nid = htonl (EVP_MD_type (DIGEST)); 590 hmac_nid = htonl (EVP_MD_type (DIGEST));
479 591
480 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
481 set_hdr (type, dst); 593 set_hdr (type, dst);
482} 594}
483 595
596bool
484bool config_packet::chk_config () const 597config_packet::chk_config () const
485{ 598{
486 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
487 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);
488 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
489 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);
490 else if (hmaclen != HMACLENGTH) 603 else if (hmaclen != HMACLENGTH)
491 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 604 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
492#if 0 // this implementation should handle all flag settings
493 else if (flags != curflags ())
494 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
495#endif
496 else if (challengelen != sizeof (rsachallenge)) 605 else if (challengelen != sizeof (rsachallenge))
497 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 606 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
498 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
499 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 608 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
500 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
517 rsaencrdata encr; 626 rsaencrdata encr;
518 627
519 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
520 { 629 {
521 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
522 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
523 initiate = !!initiate_; 632 initiate = !!initiate_;
524 protocols = protocols_; 633 protocols = protocols_;
525 634
526 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
527 } 636 }
576///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
577 686
578void 687void
579connection::connection_established () 688connection::connection_established ()
580{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
581 if (ictx && octx) 692 if (ictx && octx)
582 { 693 {
583 connectmode = conf->connectmode; 694 // make sure rekeying timeouts are slightly asymmetric
584 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
585 rekey.start (NOW + ::conf.rekey); 696 rekey.start (rekey_interval, rekey_interval);
586 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
587 698
588 // send queued packets 699 // send queued packets
589 if (ictx && octx) 700 if (ictx && octx)
590 { 701 {
591 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
592 { 703 {
593 send_data_packet (p); 704 if (p->len) send_data_packet (p);
594 delete p; 705 delete p;
595 } 706 }
596 707
597 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
598 { 709 {
599 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
600 delete p; 711 delete p;
601 } 712 }
602 } 713 }
714
715 vpn->connection_established (this);
603 } 716 }
604 else 717 else
605 { 718 {
606 retry_cnt = 0; 719 retry_cnt = 0;
607 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
608 keepalive.stop (); 721 keepalive.stop ();
609 rekey.stop (); 722 rekey.stop ();
610 } 723 }
611} 724}
612 725
613void 726void
614connection::reset_si () 727connection::reset_si ()
615{ 728{
729 if (vpn->can_direct (THISNODE, conf))
616 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
617 731 else
618 // mask out protocols we cannot establish 732 {
619 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
620 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
735 }
621 736
622 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
623} 740}
624 741
625// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
626const sockinfo & 743const sockinfo &
627connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
628{ 745{
629 if (!si.valid ()) 746 if (!si.valid ())
630 { 747 {
631 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
632 749
633 if (r) 750 if (r)
634 { 751 {
635 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
636 conf->nodename, r->conf->nodename); 753 conf->nodename, r->conf->nodename);
637 return r->si; 754 return r->si;
638 } 755 }
639 else 756 else
640 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
641 conf->nodename); 758 conf->nodename);
642 } 759 }
643 760
644 return si; 761 return si;
645} 762}
655connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
656{ 773{
657 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
658 775
659 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
660 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
661 781
662 delete pkt; 782 delete pkt;
663} 783}
664 784
683 803
684 rsachallenge chg; 804 rsachallenge chg;
685 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
686 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
687 807
688 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);
689 809
690 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
691 811
692 delete pkt; 812 delete pkt;
693} 813}
701 821
702 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
703 823
704 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
705 825
706 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);
707 827
708 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
709 829
710 delete pkt; 830 delete pkt;
711} 831}
712 832
713void 833void
714connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
715{ 835{
716 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
717 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
718 838
719 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);
720 840
721 r->hmac_set (octx); 841 r->hmac_set (octx);
722 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
723 843
724 delete r; 844 delete r;
725} 845}
726 846
727void 847inline void
728connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
729{ 849{
730 if (!ictx 850 if (!(ictx && octx)
731 && conf != THISNODE 851 && conf != THISNODE
732 && connectmode != conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
733 && connectmode != conf_node::C_DISABLED 853 && connectmode != conf_node::C_DISABLED
734 && NOW > w.at) 854 && !w.is_active ())
735 { 855 {
736 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 856 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
737 857 // and stop trying. should probably be handled by a per-connection expire handler.
738 if (retry_int < 3600 * 8) 858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
739 retry_cnt++; 861 return;
862 }
740 863
741 w.start (NOW + retry_int); 864 last_establish_attempt = ev_now ();
865
866 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
867 ? (retry_cnt & 3) + 1
868 : 1 << (retry_cnt >> 2));
742 869
743 reset_si (); 870 reset_si ();
744 871
745 if (si.prot && !si.host) 872 bool slow = si.prot & PROT_SLOW;
873
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);
746 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
747 else 880 else
748 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
749 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
887
888 slow = slow || (dsi.prot & PROT_SLOW);
750 889
751 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
752 { 891 {
753 if (retry_cnt < 4) 892 if (retry_cnt < 4)
754 send_auth_request (dsi, true); 893 send_auth_request (dsi, true);
755 else 894 else
756 send_ping (dsi, 0); 895 send_ping (dsi, 0);
757 } 896 }
758 } 897 }
898
899 retry_int *= slow ? 8. : 0.9;
900
901 if (retry_int < conf->max_retry)
902 retry_cnt++;
903 else
904 retry_int = conf->max_retry;
905
906 w.start (retry_int);
759 } 907 }
760} 908}
761 909
762void 910void
763connection::reset_connection () 911connection::reset_connection ()
766 { 914 {
767 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
768 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
769 917
770 if (::conf.script_node_down) 918 if (::conf.script_node_down)
771 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);
922 run_script_queued (cb, _("node-down command execution failed, continuing."));
923 }
772 } 924 }
773 925
774 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
775 delete octx; octx = 0; 927 delete octx; octx = 0;
928#if ENABLE_DNS
929 dnsv4_reset_connection ();
930#endif
776 931
777 si.host= 0; 932 si.host = 0;
778 933
779 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
780 retry_cnt = 0; 936 retry_cnt = 0;
781 937
782 rekey.stop (); 938 rekey.stop ();
783 keepalive.stop (); 939 keepalive.stop ();
784 establish_connection.stop (); 940 establish_connection.stop ();
791 send_reset (si); 947 send_reset (si);
792 948
793 reset_connection (); 949 reset_connection ();
794} 950}
795 951
796void 952// poor-man's rekeying
797connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
798{ 955{
799 reset_connection (); 956 reset_connection ();
800 establish_connection (); 957 establish_connection ();
801} 958}
802 959
818 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
819 rekey (); 976 rekey ();
820} 977}
821 978
822void 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
823connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
824{ 991{
825 if (ictx && octx) 992 if (ictx && octx)
826 send_data_packet (pkt); 993 send_data_packet (pkt);
827 else 994 else
828 { 995 {
829 if (!broadcast)//DDDD
830 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
831 997 post_inject_queue ();
832 establish_connection ();
833 } 998 }
834} 999}
835 1000
1001void
836void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
837{ 1003{
838 if (ictx && octx) 1004 if (ictx && octx)
839 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
840 else 1006 else
841 { 1007 {
842 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
843 1009 post_inject_queue ();
844 establish_connection ();
845 } 1010 }
846} 1011}
847 1012
848void 1013void
849connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
850{ 1015{
851 last_activity = NOW; 1016 last_activity = ev_now ();
852 1017
853 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.",
854 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;
855 1023
856 switch (pkt->typ ()) 1024 switch (pkt->typ ())
857 { 1025 {
858 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
859 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
860 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
861 // when we receive a ping. 1031 // when we receive a ping.
862 if (!ictx) 1032 if (!ictx)
863 { 1033 {
864 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
865 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
866 } 1036 }
867 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.
868 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
869 1041
870 break; 1042 break;
871 1043
872 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 ();
873 break; 1050 break;
874 1051
875 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
876 { 1053 {
877 reset_connection (); 1054 reset_connection ();
878 1055
879 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
880 1057
881 if (!p->chk_config ()) 1058 if (!p->chk_config ())
882 { 1059 {
883 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
884 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
885 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
886 } 1063 }
887 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
888 establish_connection (); 1065 establish_connection ();
892 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
893 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
894 { 1071 {
895 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
896 1073
897 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");
898 1075
899 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)))
900 { 1078 {
901 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
902 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."),
903 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
904 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
919 delete octx; 1097 delete octx;
920 1098
921 octx = new crypto_ctx (k, 1); 1099 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1100 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 1101
924 // compatibility code, remove when no longer required
925 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
926
927 conf->protocols = p->protocols; 1102 conf->protocols = p->protocols;
928 features = p->features & FEATURES; 1103 features = p->features & config_packet::get_features ();
929 1104
930 send_auth_response (rsi, p->id, k); 1105 send_auth_response (rsi, p->id, k);
931 1106
932 connection_established (); 1107 connection_established ();
933 1108
934 break; 1109 break;
935 } 1110 }
936 } 1111 }
937 else 1112 else
938 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
939 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
940 1115
941 send_reset (rsi); 1116 send_reset (rsi);
942 } 1117 }
943 1118
944 break; 1119 break;
945 1120
946 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
947 { 1122 {
948 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
949 1124
950 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
951 1126
952 if (p->chk_config ()) 1127 if (p->chk_config ())
953 { 1128 {
954 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
955 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."),
958 1133
959 rsachallenge chg; 1134 rsachallenge chg;
960 1135
961 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
962 { 1137 {
963 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
964 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
965 break; 1140 break;
966 } 1141 }
967 else 1142 else
968 { 1143 {
969 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
970 1145
971 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
972 { 1147 {
973 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"
974 "could be an attack, or just corruption or a synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
975 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
976 break; 1151 break;
977 } 1152 }
978 else 1153 else
979 { 1154 {
990 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
991 1166
992 si = rsi; 1167 si = rsi;
993 protocol = rsi.prot; 1168 protocol = rsi.prot;
994 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
995 connection_established (); 1175 connection_established ();
996 1176
997 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
998 conf->nodename, (const char *)rsi,
999 p->prot_major, p->prot_minor);
1000
1001 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
1002 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);
1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
1003 1183
1004 break; 1184 break;
1005 } 1185 }
1006 else 1186 else
1007 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."),
1008 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1009 } 1189 }
1010 1190
1011 delete cctx; 1191 delete cctx;
1012 } 1192 }
1028 { 1208 {
1029 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1030 1210
1031 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1032 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"
1033 "could be an attack, or just corruption or a synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1034 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1035 else 1215 else
1036 { 1216 {
1037 u32 seqno; 1217 u32 seqno;
1038 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1039 1220
1040 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1041 { 1222 {
1042 vpn->tap->send (d); 1223 vpn->tap->send (d);
1043 1224
1044 if (si != rsi) 1225 if (si != rsi)
1045 { 1226 {
1046 // fast re-sync on connection changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1047 si = rsi; 1229 // {
1048
1049 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1050 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);
1051 } 1246 }
1052
1053 delete d;
1054
1055 break;
1056 } 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);
1259 }
1260
1261 delete d;
1262 break;
1057 } 1263 }
1058 } 1264 }
1059 1265
1060 send_reset (rsi); 1266 send_reset (rsi);
1061 break; 1267 break;
1062 1268
1063 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1064 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1065 { 1271 {
1066 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1067 1273
1068 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1069 connection *c = vpn->conns[p->id - 1];
1070 conf->protocols = p->protocols;
1071
1072 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1073 conf->id, p->id, c->ictx && c->octx);
1074
1075 if (c->ictx && c->octx)
1076 { 1275 {
1276 connection *c = vpn->conns[p->id - 1];
1277 conf->protocols = p->protocols;
1278
1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1281
1282 if (c->ictx && c->octx)
1283 {
1077 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1078 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1079 c->send_connect_info (conf->id, si, conf->protocols); 1286 c->send_connect_info (conf->id, si, conf->protocols);
1080 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1287 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1288 }
1289 else
1290 c->establish_connection ();
1081 } 1291 }
1082 else 1292 else
1083 c->establish_connection (); 1293 slog (L_WARN,
1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1295 p->id);
1084 } 1296 }
1085 1297
1086 break; 1298 break;
1087 1299
1088 case vpn_packet::PT_CONNECT_INFO: 1300 case vpn_packet::PT_CONNECT_INFO:
1089 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1301 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1090 { 1302 {
1091 connect_info_packet *p = (connect_info_packet *) pkt; 1303 connect_info_packet *p = (connect_info_packet *)pkt;
1092 1304
1093 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1305 if (p->id > 0 && p->id <= vpn->conns.size ())
1094 1306 {
1095 connection *c = vpn->conns[p->id - 1]; 1307 connection *c = vpn->conns[p->id - 1];
1096 1308
1097 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1098 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));
1099 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1100 1312
1101 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,
1102 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1103 1316
1104 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1105 1318
1106 if (dsi.valid ()) 1319 if (dsi.valid ())
1107 c->send_auth_request (dsi, true); 1320 c->send_auth_request (dsi, true);
1321 }
1322 else
1323 slog (L_WARN,
1324 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1325 p->id);
1108 } 1326 }
1109 1327
1110 break; 1328 break;
1111 1329
1112 default: 1330 default:
1113 send_reset (rsi); 1331 send_reset (rsi);
1114 break; 1332 break;
1115 } 1333 }
1116} 1334}
1117 1335
1118void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1119{ 1338{
1120 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1121 { 1340 {
1122 reset_connection (); 1341 reset_connection ();
1123 establish_connection (); 1342 establish_connection ();
1124 } 1343 }
1125 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1126 w.start (last_activity + ::conf.keepalive); 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1127 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1128 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1129 { 1348 {
1130 send_ping (si); 1349 send_ping (si);
1131 w.start (NOW + 5); 1350 w.start (3);
1132 } 1351 }
1133 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1134 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1135 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1136 w.start (last_activity + ::conf.keepalive + 10); 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1137 else 1356 else
1138 reset_connection (); 1357 reset_connection ();
1139} 1358}
1140 1359
1360void
1141void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1142{ 1362{
1143 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);
1144 1364
1145 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);
1146 p->hmac_set (octx); 1367 p->hmac_set (octx);
1147 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1148 1369
1149 delete p; 1370 delete p;
1150} 1371}
1151 1372
1152void connection::script_node () 1373void
1374connection::script_init_env (const char *ext)
1153{ 1375{
1154 vpn->script_if_up ();
1155
1156 char *env; 1376 char *env;
1377 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1378 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1379 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1380 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1381 conf->id & 0xff); putenv (env);
1382}
1383
1384void
1385connection::script_init_connect_env ()
1386{
1387 vpn->script_init_env ();
1388
1389 char *env;
1157 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);
1158 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1159 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1160 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1161} 1395}
1162 1396
1397inline const char *
1163const char *connection::script_node_up () 1398connection::script_node_up ()
1164{ 1399{
1165 script_node (); 1400 script_init_connect_env ();
1166 1401
1167 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1168 1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1169 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1170}
1171 1409
1410 return filename;
1411}
1412
1413inline const char *
1414connection::script_node_change ()
1415{
1416 script_init_connect_env ();
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 *
1172const char *connection::script_node_down () 1430connection::script_node_down ()
1173{ 1431{
1174 script_node (); 1432 script_init_connect_env ();
1175 1433
1176 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1177 1435
1178 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1436 char *filename;
1179} 1437 asprintf (&filename,
1438 "%s/%s",
1439 confbase,
1440 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1180 1441
1442 return filename;
1443}
1444
1181connection::connection(struct vpn *vpn_) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1182: vpn(vpn_) 1446: vpn(vpn), conf(conf),
1183, rekey (this, &connection::rekey_cb) 1447#if ENABLE_DNS
1184, keepalive (this, &connection::keepalive_cb) 1448 dns (0),
1449#endif
1450 data_queue(conf->max_ttl, conf->max_queue + 1),
1451 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1452{
1453 rekey .set<connection, &connection::rekey_cb > (this);
1454 keepalive .set<connection, &connection::keepalive_cb > (this);
1185, establish_connection (this, &connection::establish_connection_cb) 1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1186{ 1456
1457 last_establish_attempt = 0.;
1187 octx = ictx = 0; 1458 octx = ictx = 0;
1188 retry_cnt = 0;
1189 1459
1190 connectmode = conf_node::C_ALWAYS; // initial setting 1460 if (!conf->protocols) // make sure some protocol is enabled
1461 conf->protocols = PROT_UDPv4;
1462
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
1191 reset_connection (); 1469 reset_connection ();
1192} 1470}
1193 1471
1194connection::~connection () 1472connection::~connection ()
1195{ 1473{
1196 shutdown (); 1474 shutdown ();
1197} 1475}
1198 1476
1477void
1199void connection_init () 1478connection_init ()
1200{ 1479{
1201 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1202 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1203} 1482}
1204 1483

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines