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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines