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.24 by pcg, Wed Oct 22 01:05:23 2003 UTC vs.
Revision 1.91 by root, Tue Feb 8 23:13:48 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 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
22extern "C" {
23# include "lzf/lzf.h"
24}
25
26#include <list> 34#include <list>
35#include <queue>
36#include <utility>
27 37
28#include <openssl/rand.h> 38#include <openssl/rand.h>
29#include <openssl/evp.h> 39#include <openssl/evp.h>
30#include <openssl/rsa.h> 40#include <openssl/rsa.h>
31#include <openssl/err.h> 41#include <openssl/err.h>
32
33#include "gettext.h"
34 42
35#include "conf.h" 43#include "conf.h"
36#include "slog.h" 44#include "slog.h"
37#include "device.h" 45#include "device.h"
38#include "vpn.h" 46#include "vpn.h"
… …
42 50
43#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
44# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
45#endif 53#endif
46 54
47#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//////////////////////////////////////////////////////////////////////////////
48 107
49struct crypto_ctx 108struct crypto_ctx
50{ 109{
51 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
52 HMAC_CTX hctx; 111 HMAC_CTX hctx;
… …
56}; 115};
57 116
58crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 117crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59{ 118{
60 EVP_CIPHER_CTX_init (&cctx); 119 EVP_CIPHER_CTX_init (&cctx);
61 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));
62 HMAC_CTX_init (&hctx); 121 HMAC_CTX_init (&hctx);
63 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);
64} 123}
65 124
66crypto_ctx::~crypto_ctx () 125crypto_ctx::~crypto_ctx ()
67{ 126{
68 EVP_CIPHER_CTX_cleanup (&cctx); 127 require (EVP_CIPHER_CTX_cleanup (&cctx));
69 HMAC_CTX_cleanup (&hctx); 128 HMAC_CTX_cleanup (&hctx);
70} 129}
71 130
72static void 131static void
73rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74{ 133{
75 EVP_MD_CTX ctx; 134 EVP_MD_CTX ctx;
76 135
77 EVP_MD_CTX_init (&ctx); 136 EVP_MD_CTX_init (&ctx);
78 EVP_DigestInit (&ctx, RSA_HASH); 137 require (EVP_DigestInit (&ctx, RSA_HASH));
79 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 138 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80 EVP_DigestUpdate(&ctx, &id, sizeof id); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
83} 142}
84 143
85struct rsa_entry { 144struct rsa_entry
145{
86 tstamp expire; 146 tstamp expire;
87 rsaid id; 147 rsaid id;
88 rsachallenge chg; 148 rsachallenge chg;
89}; 149};
90 150
91struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
92{ 152{
93 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
94 154
95 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
96 { 156 {
97 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
98 { 158 {
99 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
100 { 160 {
101 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
102 162
103 erase (i); 163 erase (i);
104 return true; 164 return true;
105 } 165 }
106 } 166 }
107 167
108 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
109 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
110 170
111 return false; 171 return false;
112 } 172 }
113 173
114 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
115 { 175 {
116 rsa_entry e; 176 rsa_entry e;
117 177
118 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
119 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
120 180
121 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
122 e.id = id; 182 e.id = id;
123 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
124 184
125 push_back (e); 185 push_back (e);
126 186
127 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
128 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
129 } 189 }
130 190
131 rsa_cache () 191 rsa_cache ()
132 : cleaner (this, &rsa_cache::cleaner_cb) 192 {
133 { } 193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
134 196
135} rsa_cache; 197} rsa_cache;
136 198
137void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
138{ 201{
139 if (empty ()) 202 if (empty ())
140 w.at = TSTAMP_CANCEL; 203 w.stop ();
141 else 204 else
142 { 205 {
143 w.at = 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
… …
310} 411}
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)))
… …
504 618
505struct auth_req_packet : config_packet 619struct auth_req_packet : config_packet
506{ 620{
507 char magic[8]; 621 char magic[8];
508 u8 initiate; // false if this is just an automatic reply 622 u8 initiate; // false if this is just an automatic reply
509 u8 protocols; // supported protocols (will get patches on forward) 623 u8 protocols; // supported protocols (will be patched on forward)
510 u8 pad2, pad3; 624 u8 pad2, pad3;
511 rsaid id; 625 rsaid id;
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.reset (); 721 keepalive.stop ();
604 rekey.reset (); 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)", conf->nodename,
712 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
713 838
714 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);
715 840
716 r->hmac_set (octx); 841 r->hmac_set (octx);
717 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
718 843
719 delete r; 844 delete r;
720} 845}
721 846
722void 847inline void
723connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
724{ 849{
725 if (ictx || conf == THISNODE 850 if (!ictx
851 && conf != THISNODE
726 || connectmode == conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
727 || connectmode == conf_node::C_DISABLED) 853 && connectmode != conf_node::C_DISABLED
728 w.at = TSTAMP_CANCEL; 854 && !w.is_active ())
729 else if (w.at <= NOW)
730 { 855 {
731 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
732 857 // and stop trying. should probably be handled by a per-connection expire handler.
733 if (retry_int < 3600 * 8) 858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
734 retry_cnt++; 861 return;
862 }
735 863
736 w.at = 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));
737 869
738 reset_si (); 870 reset_si ();
739 871
740 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);
741 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
742 else 880 else
743 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
744 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
887
888 slow = slow || (dsi.prot & PROT_SLOW);
745 889
746 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
747 { 891 {
748 if (retry_cnt < 4) 892 if (retry_cnt < 4)
749 send_auth_request (dsi, true); 893 send_auth_request (dsi, true);
750 else 894 else
751 send_ping (dsi, 0); 895 send_ping (dsi, 0);
752 } 896 }
753 } 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);
754 } 907 }
755} 908}
756 909
757void 910void
758connection::reset_connection () 911connection::reset_connection ()
… …
761 { 914 {
762 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
763 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
764 917
765 if (::conf.script_node_down) 918 if (::conf.script_node_down)
766 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 }
767 } 924 }
768 925
769 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
770 delete octx; octx = 0; 927 delete octx; octx = 0;
928#if ENABLE_DNS
929 dnsv4_reset_connection ();
930#endif
771 931
772 si.host= 0; 932 si.host = 0;
773 933
774 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
775 retry_cnt = 0; 936 retry_cnt = 0;
776 937
777 rekey.reset (); 938 rekey.stop ();
778 keepalive.reset (); 939 keepalive.stop ();
779 establish_connection.reset (); 940 establish_connection.stop ();
780} 941}
781 942
782void 943void
783connection::shutdown () 944connection::shutdown ()
784{ 945{
… …
786 send_reset (si); 947 send_reset (si);
787 948
788 reset_connection (); 949 reset_connection ();
789} 950}
790 951
791void 952// poor-man's rekeying
792connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
793{ 955{
794 w.at = TSTAMP_CANCEL;
795
796 reset_connection (); 956 reset_connection ();
797 establish_connection (); 957 establish_connection ();
798} 958}
799 959
800void 960void
… …
815 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
816 rekey (); 976 rekey ();
817} 977}
818 978
819void 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
820connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
821{ 991{
822 if (ictx && octx) 992 if (ictx && octx)
823 send_data_packet (pkt); 993 send_data_packet (pkt);
824 else 994 else
825 { 995 {
826 if (!broadcast)//DDDD
827 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
828 997 post_inject_queue ();
829 establish_connection ();
830 } 998 }
831} 999}
832 1000
1001void
833void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
834{ 1003{
835 if (ictx && octx) 1004 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
837 else 1006 else
838 { 1007 {
839 vpn_queue.put (new vpn_packet (*pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 1009 post_inject_queue ();
841 establish_connection ();
842 } 1010 }
843} 1011}
844 1012
845void 1013void
846connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
847{ 1015{
848 last_activity = NOW; 1016 last_activity = ev_now ();
849 1017
850 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.",
851 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;
852 1023
853 switch (pkt->typ ()) 1024 switch (pkt->typ ())
854 { 1025 {
855 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
856 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
857 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
858 // when we receive a ping. 1031 // when we receive a ping.
859 if (!ictx) 1032 if (!ictx)
860 { 1033 {
861 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
862 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
863 } 1036 }
864 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.
865 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
866 1041
867 break; 1042 break;
868 1043
869 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 ();
870 break; 1050 break;
871 1051
872 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
873 { 1053 {
874 reset_connection (); 1054 reset_connection ();
875 1055
876 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
877 1057
878 if (!p->chk_config ()) 1058 if (!p->chk_config ())
879 { 1059 {
880 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
881 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
882 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
883 } 1063 }
884 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
885 establish_connection (); 1065 establish_connection ();
… …
889 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
890 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
891 { 1071 {
892 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
893 1073
894 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");
895 1075
896 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)))
897 { 1078 {
898 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
899 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."),
900 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
901 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
917 1098
918 octx = new crypto_ctx (k, 1); 1099 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1100 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 1101
921 conf->protocols = p->protocols; 1102 conf->protocols = p->protocols;
1103 features = p->features & config_packet::get_features ();
922 1104
923 send_auth_response (rsi, p->id, k); 1105 send_auth_response (rsi, p->id, k);
924 1106
925 connection_established (); 1107 connection_established ();
926 1108
927 break; 1109 break;
928 } 1110 }
929 } 1111 }
930 else 1112 else
931 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
932 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
933 1115
934 send_reset (rsi); 1116 send_reset (rsi);
935 } 1117 }
936 1118
937 break; 1119 break;
938 1120
939 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
940 { 1122 {
941 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
942 1124
943 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
944 1126
945 if (p->chk_config ()) 1127 if (p->chk_config ())
946 { 1128 {
947 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
948 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."),
… …
951 1133
952 rsachallenge chg; 1134 rsachallenge chg;
953 1135
954 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
955 { 1137 {
956 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
957 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
958 break; 1140 break;
959 } 1141 }
960 else 1142 else
961 { 1143 {
962 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
963 1145
964 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
965 { 1147 {
966 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"
967 "could be an attack, or just corruption or an synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
968 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
969 break; 1151 break;
970 } 1152 }
971 else 1153 else
972 { 1154 {
… …
983 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
984 1166
985 si = rsi; 1167 si = rsi;
986 protocol = rsi.prot; 1168 protocol = rsi.prot;
987 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
988 connection_established (); 1175 connection_established ();
989 1176
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor);
993
994 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
995 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 }
996 1183
997 break; 1184 break;
998 } 1185 }
999 else 1186 else
1000 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."),
1001 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1002 } 1189 }
1003 1190
1004 delete cctx; 1191 delete cctx;
1005 } 1192 }
… …
1021 { 1208 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1210
1024 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1025 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"
1026 "could be an attack, or just corruption or an synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1027 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1028 else 1215 else
1029 { 1216 {
1030 u32 seqno; 1217 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1032 1220
1033 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1034 { 1222 {
1035 vpn->tap->send (d); 1223 vpn->tap->send (d);
1036 1224
1037 if (si != rsi) 1225 if (si != rsi)
1038 { 1226 {
1039 // 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.)
1040 si = rsi; 1229 // {
1041
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1043 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);
1044 } 1246 }
1045
1046 delete d;
1047
1048 break;
1049 } 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;
1050 } 1263 }
1051 } 1264 }
1052 1265
1053 send_reset (rsi); 1266 send_reset (rsi);
1054 break; 1267 break;
1055 1268
1056 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1271 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1060 1273
1061 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 ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 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 {
1070 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1286 c->send_connect_info (conf->id, si, conf->protocols);
1073 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 ();
1074 } 1291 }
1075 else 1292 else
1076 c->establish_connection (); 1293 slog (L_WARN,
1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1295 p->id);
1077 } 1296 }
1078 1297
1079 break; 1298 break;
1080 1299
1081 case vpn_packet::PT_CONNECT_INFO: 1300 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1301 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1302 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1303 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1304
1086 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 ())
1087 1306 {
1088 connection *c = vpn->conns[p->id - 1]; 1307 connection *c = vpn->conns[p->id - 1];
1089 1308
1090 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1091 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));
1092 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1093 1312
1094 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,
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1096 1316
1097 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1098 1318
1099 if (dsi.valid ()) 1319 if (dsi.valid ())
1100 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);
1101 } 1326 }
1102 1327
1103 break; 1328 break;
1104 1329
1105 default: 1330 default:
1106 send_reset (rsi); 1331 send_reset (rsi);
1107 break; 1332 break;
1108 } 1333 }
1109} 1334}
1110 1335
1111void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1112{ 1338{
1113 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1114 { 1340 {
1115 reset_connection (); 1341 reset_connection ();
1116 establish_connection (); 1342 establish_connection ();
1117 } 1343 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1119 w.at = last_activity + ::conf.keepalive; 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1348 {
1123 send_ping (si); 1349 send_ping (si);
1124 w.at = NOW + 5; 1350 w.start (3);
1125 } 1351 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1129 w.at = last_activity + ::conf.keepalive + 10; 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1130 else 1356 else
1131 reset_connection (); 1357 reset_connection ();
1132} 1358}
1133 1359
1360void
1134void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1135{ 1362{
1136 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);
1137 1364
1138 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);
1139 p->hmac_set (octx); 1367 p->hmac_set (octx);
1140 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1141 1369
1142 delete p; 1370 delete p;
1143} 1371}
1144 1372
1145void connection::script_node () 1373void
1374connection::script_init_env (const char *ext)
1146{ 1375{
1147 vpn->script_if_up ();
1148
1149 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;
1150 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);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1395}
1155 1396
1397inline const char *
1156const char *connection::script_node_up () 1398connection::script_node_up ()
1157{ 1399{
1158 script_node (); 1400 script_init_connect_env ();
1159 1401
1160 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1161 1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1163}
1164 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 *
1165const char *connection::script_node_down () 1430connection::script_node_down ()
1166{ 1431{
1167 script_node (); 1432 script_init_connect_env ();
1168 1433
1169 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1170 1435
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1436 char *filename;
1172} 1437 asprintf (&filename,
1438 "%s/%s",
1439 confbase,
1440 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1441
1442 return filename;
1443}
1444
1174connection::connection(struct vpn *vpn_) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1446: vpn(vpn), conf(conf),
1176, rekey (this, &connection::rekey_cb) 1447#if ENABLE_DNS
1177, 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);
1178, establish_connection (this, &connection::establish_connection_cb) 1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1179{ 1456
1457 last_establish_attempt = 0.;
1180 octx = ictx = 0; 1458 octx = ictx = 0;
1181 retry_cnt = 0;
1182 1459
1183 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
1184 reset_connection (); 1469 reset_connection ();
1185} 1470}
1186 1471
1187connection::~connection () 1472connection::~connection ()
1188{ 1473{
1189 shutdown (); 1474 shutdown ();
1190} 1475}
1191 1476
1477void
1192void connection_init () 1478connection_init ()
1193{ 1479{
1194 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1195 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1196} 1482}
1197 1483

Diff Legend

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