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.21 by pcg, Thu Oct 16 02:28:36 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-2008,2010 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 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
5 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
6 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
7 (at your option) any later version. 10 option) any later version.
8 11
9 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
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
12 GNU General Public License for more details. 15 Public License for more details.
13 16
14 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
15 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
16 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.
17*/ 30*/
18 31
19#include "config.h" 32#include "config.h"
20 33
21extern "C" {
22# include "lzf/lzf.h"
23}
24
25#include <list> 34#include <list>
35#include <queue>
36#include <utility>
26 37
27#include <openssl/rand.h> 38#include <openssl/rand.h>
28#include <openssl/evp.h> 39#include <openssl/evp.h>
29#include <openssl/rsa.h> 40#include <openssl/rsa.h>
30#include <openssl/err.h> 41#include <openssl/err.h>
31
32#include "gettext.h"
33 42
34#include "conf.h" 43#include "conf.h"
35#include "slog.h" 44#include "slog.h"
36#include "device.h" 45#include "device.h"
37#include "vpn.h" 46#include "vpn.h"
… …
41 50
42#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
43# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
44#endif 53#endif
45 54
46#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//////////////////////////////////////////////////////////////////////////////
47 107
48struct crypto_ctx 108struct crypto_ctx
49{ 109{
50 EVP_CIPHER_CTX cctx; 110 EVP_CIPHER_CTX cctx;
51 HMAC_CTX hctx; 111 HMAC_CTX hctx;
… …
55}; 115};
56 116
57crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 117crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
58{ 118{
59 EVP_CIPHER_CTX_init (&cctx); 119 EVP_CIPHER_CTX_init (&cctx);
60 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));
61 HMAC_CTX_init (&hctx); 121 HMAC_CTX_init (&hctx);
62 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);
63} 123}
64 124
65crypto_ctx::~crypto_ctx () 125crypto_ctx::~crypto_ctx ()
66{ 126{
67 EVP_CIPHER_CTX_cleanup (&cctx); 127 require (EVP_CIPHER_CTX_cleanup (&cctx));
68 HMAC_CTX_cleanup (&hctx); 128 HMAC_CTX_cleanup (&hctx);
69} 129}
70 130
71static void 131static void
72rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 132rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
73{ 133{
74 EVP_MD_CTX ctx; 134 EVP_MD_CTX ctx;
75 135
76 EVP_MD_CTX_init (&ctx); 136 EVP_MD_CTX_init (&ctx);
77 EVP_DigestInit (&ctx, RSA_HASH); 137 require (EVP_DigestInit (&ctx, RSA_HASH));
78 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 138 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
79 EVP_DigestUpdate(&ctx, &id, sizeof id); 139 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
80 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 140 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
81 EVP_MD_CTX_cleanup (&ctx); 141 EVP_MD_CTX_cleanup (&ctx);
82} 142}
83 143
84struct rsa_entry { 144struct rsa_entry
145{
85 tstamp expire; 146 tstamp expire;
86 rsaid id; 147 rsaid id;
87 rsachallenge chg; 148 rsachallenge chg;
88}; 149};
89 150
90struct rsa_cache : list<rsa_entry> 151struct rsa_cache : list<rsa_entry>
91{ 152{
92 void cleaner_cb (time_watcher &w); time_watcher cleaner; 153 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
93 154
94 bool find (const rsaid &id, rsachallenge &chg) 155 bool find (const rsaid &id, rsachallenge &chg)
95 { 156 {
96 for (iterator i = begin (); i != end (); ++i) 157 for (iterator i = begin (); i != end (); ++i)
97 { 158 {
98 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 159 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
99 { 160 {
100 memcpy (&chg, &i->chg, sizeof chg); 161 memcpy (&chg, &i->chg, sizeof chg);
101 162
102 erase (i); 163 erase (i);
103 return true; 164 return true;
104 } 165 }
105 } 166 }
106 167
107 if (cleaner.at < NOW) 168 if (!cleaner.is_active ())
108 cleaner.start (NOW + RSA_TTL); 169 cleaner.again ();
109 170
110 return false; 171 return false;
111 } 172 }
112 173
113 void gen (rsaid &id, rsachallenge &chg) 174 void gen (rsaid &id, rsachallenge &chg)
114 { 175 {
115 rsa_entry e; 176 rsa_entry e;
116 177
117 RAND_bytes ((unsigned char *)&id, sizeof id); 178 RAND_bytes ((unsigned char *)&id, sizeof id);
118 RAND_bytes ((unsigned char *)&chg, sizeof chg); 179 RAND_bytes ((unsigned char *)&chg, sizeof chg);
119 180
120 e.expire = NOW + RSA_TTL; 181 e.expire = ev_now () + RSA_TTL;
121 e.id = id; 182 e.id = id;
122 memcpy (&e.chg, &chg, sizeof chg); 183 memcpy (&e.chg, &chg, sizeof chg);
123 184
124 push_back (e); 185 push_back (e);
125 186
126 if (cleaner.at < NOW) 187 if (!cleaner.is_active ())
127 cleaner.start (NOW + RSA_TTL); 188 cleaner.again ();
128 } 189 }
129 190
130 rsa_cache () 191 rsa_cache ()
131 : cleaner (this, &rsa_cache::cleaner_cb) 192 {
132 { } 193 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
194 cleaner.set (RSA_TTL, RSA_TTL);
195 }
133 196
134} rsa_cache; 197} rsa_cache;
135 198
136void rsa_cache::cleaner_cb (time_watcher &w) 199void
200rsa_cache::cleaner_cb (ev::timer &w, int revents)
137{ 201{
138 if (empty ()) 202 if (empty ())
139 w.at = TSTAMP_CANCEL; 203 w.stop ();
140 else 204 else
141 { 205 {
142 w.at = NOW + RSA_TTL;
143
144 for (iterator i = begin (); i != end (); ) 206 for (iterator i = begin (); i != end (); )
145 if (i->expire <= NOW) 207 if (i->expire <= ev_now ())
146 i = erase (i); 208 i = erase (i);
147 else 209 else
148 ++i; 210 ++i;
149 } 211 }
150} 212}
151 213
152////////////////////////////////////////////////////////////////////////////// 214//////////////////////////////////////////////////////////////////////////////
153 215
154void 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)
155{ 218{
156 if (queue[i]) 219 queue = new pkt [max_queue];
157 {
158 delete queue[i];
159 j = (j + 1) % QUEUEDEPTH;
160 }
161 220
162 queue[i] = p;
163
164 i = (i + 1) % QUEUEDEPTH;
165}
166
167net_packet *pkt_queue::get ()
168{
169 net_packet *p = queue[j];
170
171 if (p)
172 {
173 queue[j] = 0;
174 j = (j + 1) % QUEUEDEPTH;
175 }
176
177 return p;
178}
179
180pkt_queue::pkt_queue ()
181{
182 memset (queue, 0, sizeof (queue));
183 i = 0; 221 i = 0;
184 j = 0; 222 j = 0;
223
224 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
185} 225}
186 226
187pkt_queue::~pkt_queue () 227pkt_queue::~pkt_queue ()
188{ 228{
189 for (i = QUEUEDEPTH; --i > 0; ) 229 while (net_packet *p = get ())
230 delete p;
231
190 delete queue[i]; 232 delete [] queue;
191} 233}
192 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
193struct net_rateinfo { 291struct net_rateinfo
292{
194 u32 host; 293 u32 host;
195 double pcnt, diff; 294 double pcnt, diff;
196 tstamp last; 295 tstamp last;
197}; 296};
198 297
199// 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.
200// this implementation ("splay list" ;) is inefficient, 299// this implementation ("splay list" ;) is inefficient,
201// but low on resources. 300// but low on resources.
202struct net_rate_limiter : list<net_rateinfo> 301struct net_rate_limiter : list<net_rateinfo>
203{ 302{
204 static const double ALPHA = 1. - 1. / 600.; // allow bursts 303# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
205 static const double CUTOFF = 10.; // one event every CUTOFF seconds 304# define NRL_CUTOFF 10. // one event every CUTOFF seconds
206 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 305# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
207 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
208 307
209 bool can (const sockinfo &si) { return can((u32)si.host); } 308 bool can (const sockinfo &si) { return can((u32)si.host); }
210 bool can (u32 host); 309 bool can (u32 host);
211}; 310};
212 311
213net_rate_limiter auth_rate_limiter, reset_rate_limiter; 312static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
214 313
314bool
215bool net_rate_limiter::can (u32 host) 315net_rate_limiter::can (u32 host)
216{ 316{
217 iterator i; 317 iterator i;
218 318
219 for (i = begin (); i != end (); ) 319 for (i = begin (); i != end (); )
220 if (i->host == host) 320 if (i->host == host)
221 break; 321 break;
222 else if (i->last < NOW - EXPIRE) 322 else if (i->last < ev_now () - NRL_EXPIRE)
223 i = erase (i); 323 i = erase (i);
224 else 324 else
225 i++; 325 i++;
226 326
227 if (i == end ()) 327 if (i == end ())
228 { 328 {
229 net_rateinfo ri; 329 net_rateinfo ri;
230 330
231 ri.host = host; 331 ri.host = host;
232 ri.pcnt = 1.; 332 ri.pcnt = 1.;
233 ri.diff = MAXDIF; 333 ri.diff = NRL_MAXDIF;
234 ri.last = NOW; 334 ri.last = ev_now ();
235 335
236 push_front (ri); 336 push_front (ri);
237 337
238 return true; 338 return true;
239 } 339 }
240 else 340 else
241 { 341 {
242 net_rateinfo ri (*i); 342 net_rateinfo ri (*i);
243 erase (i); 343 erase (i);
244 344
245 ri.pcnt = ri.pcnt * ALPHA; 345 ri.pcnt = ri.pcnt * NRL_ALPHA;
246 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 346 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
247 347
248 ri.last = NOW; 348 ri.last = ev_now ();
249 349
250 double dif = ri.diff / ri.pcnt; 350 double dif = ri.diff / ri.pcnt;
251 351
252 bool send = dif > CUTOFF; 352 bool send = dif > NRL_CUTOFF;
253 353
254 if (dif > MAXDIF) 354 if (dif > NRL_MAXDIF)
255 { 355 {
256 ri.pcnt = 1.; 356 ri.pcnt = 1.;
257 ri.diff = MAXDIF; 357 ri.diff = NRL_MAXDIF;
258 } 358 }
259 else if (send) 359 else if (send)
260 ri.pcnt++; 360 ri.pcnt++;
261 361
262 push_front (ri); 362 push_front (ri);
… …
267 367
268///////////////////////////////////////////////////////////////////////////// 368/////////////////////////////////////////////////////////////////////////////
269 369
270unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 370unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE];
271 371
372void
272void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx)
273{ 374{
274 unsigned int xlen; 375 unsigned int xlen;
275 376
276 HMAC_CTX *hctx = &ctx->hctx; 377 HMAC_CTX *hctx = &ctx->hctx;
277 378
… …
295 hmac_gen (ctx); 396 hmac_gen (ctx);
296 397
297 return !memcmp (hmac, hmac_digest, HMACLENGTH); 398 return !memcmp (hmac, hmac_digest, HMACLENGTH);
298} 399}
299 400
401void
300void vpn_packet::set_hdr (ptype type_, unsigned int dst) 402vpn_packet::set_hdr (ptype type_, unsigned int dst)
301{ 403{
302 type = type_; 404 type = type_;
303 405
304 int src = THISNODE->id; 406 int src = THISNODE->id;
305 407
… …
309} 411}
310 412
311#define MAXVPNDATA (MAX_MTU - 6 - 6) 413#define MAXVPNDATA (MAX_MTU - 6 - 6)
312#define DATAHDR (sizeof (u32) + RAND_SIZE) 414#define DATAHDR (sizeof (u32) + RAND_SIZE)
313 415
314struct 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
315 { 425 {
316 u8 data[MAXVPNDATA + DATAHDR]; // seqno
317
318 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
319 tap_packet *unpack (connection *conn, u32 &seqno);
320private:
321
322 const u32 data_hdr_size () const
323 {
324 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 426 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
325 }
326 }; 427 }
428};
327 429
328void 430void
329vpndata_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)
330{ 432{
331 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 433 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
332 int outl = 0, outl2; 434 int outl = 0, outl2;
333 ptype type = PT_DATA_UNCOMPRESSED; 435 ptype type = PT_DATA_UNCOMPRESSED;
334 436
335#if ENABLE_COMPRESSION 437#if ENABLE_COMPRESSION
336 u8 cdata[MAX_MTU]; 438 u8 cdata[MAX_MTU];
337 u32 cl;
338 439
440 if (conn->features & FEATURE_COMPRESSION)
441 {
339 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 442 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
443
340 if (cl) 444 if (cl)
341 { 445 {
342 type = PT_DATA_COMPRESSED; 446 type = PT_DATA_COMPRESSED;
343 d = cdata; 447 d = cdata;
344 l = cl + 2; 448 l = cl + 2;
345 449
346 d[0] = cl >> 8; 450 d[0] = cl >> 8;
347 d[1] = cl; 451 d[1] = cl;
452 }
348 } 453 }
349#endif 454#endif
350 455
351 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 456 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
352 457
353 struct { 458 struct {
354#if RAND_SIZE 459#if RAND_SIZE
355 u8 rnd[RAND_SIZE]; 460 u8 rnd[RAND_SIZE];
356#endif 461#endif
… …
360 datahdr.seqno = ntohl (seqno); 465 datahdr.seqno = ntohl (seqno);
361#if RAND_SIZE 466#if RAND_SIZE
362 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 467 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
363#endif 468#endif
364 469
365 EVP_EncryptUpdate (cctx, 470 require (EVP_EncryptUpdate (cctx,
366 (unsigned char *) data + outl, &outl2, 471 (unsigned char *) data + outl, &outl2,
367 (unsigned char *) &datahdr, DATAHDR); 472 (unsigned char *) &datahdr, DATAHDR));
368 outl += outl2; 473 outl += outl2;
369 474
370 EVP_EncryptUpdate (cctx, 475 require (EVP_EncryptUpdate (cctx,
371 (unsigned char *) data + outl, &outl2, 476 (unsigned char *) data + outl, &outl2,
372 (unsigned char *) d, l); 477 (unsigned char *) d, l));
373 outl += outl2; 478 outl += outl2;
374 479
375 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 480 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
376 outl += outl2; 481 outl += outl2;
377 482
378 len = outl + data_hdr_size (); 483 len = outl + data_hdr_size ();
379 484
380 set_hdr (type, dst); 485 set_hdr (type, dst);
… …
389 int outl = 0, outl2; 494 int outl = 0, outl2;
390 tap_packet *p = new tap_packet; 495 tap_packet *p = new tap_packet;
391 u8 *d; 496 u8 *d;
392 u32 l = len - data_hdr_size (); 497 u32 l = len - data_hdr_size ();
393 498
394 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 499 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
395 500
396#if ENABLE_COMPRESSION 501#if ENABLE_COMPRESSION
397 u8 cdata[MAX_MTU]; 502 u8 cdata[MAX_MTU];
398 503
399 if (type == PT_DATA_COMPRESSED) 504 if (type == PT_DATA_COMPRESSED)
… …
401 else 506 else
402#endif 507#endif
403 d = &(*p)[6 + 6 - DATAHDR]; 508 d = &(*p)[6 + 6 - DATAHDR];
404 509
405 /* 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 */
406 EVP_DecryptUpdate (cctx, 511 require (EVP_DecryptUpdate (cctx,
407 d, &outl2, 512 d, &outl2,
408 (unsigned char *)&data, len - data_hdr_size ()); 513 (unsigned char *)&data, len - data_hdr_size ()));
409 outl += outl2; 514 outl += outl2;
410 515
411 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 516 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
412 outl += outl2; 517 outl += outl2;
413 518
414 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 519 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
415 520
416 id2mac (dst () ? dst() : THISNODE->id, p->dst); 521 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
445{ 550{
446 // actually, hmaclen cannot be checked because the hmac 551 // actually, hmaclen cannot be checked because the hmac
447 // field comes before this data, so peers with other 552 // field comes before this data, so peers with other
448 // hmacs simply will not work. 553 // hmacs simply will not work.
449 u8 prot_major, prot_minor, randsize, hmaclen; 554 u8 prot_major, prot_minor, randsize, hmaclen;
450 u8 flags, challengelen, pad2, pad3; 555 u8 flags, challengelen, features, pad3;
451 u32 cipher_nid, digest_nid, hmac_nid; 556 u32 cipher_nid, digest_nid, hmac_nid;
452
453 const u8 curflags () const
454 {
455 return 0x80
456 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
457 }
458 557
459 void setup (ptype type, int dst); 558 void setup (ptype type, int dst);
460 bool chk_config () const; 559 bool chk_config () const;
560
561 static u8 get_features ()
562 {
563 u8 f = 0;
564#if ENABLE_COMPRESSION
565 f |= FEATURE_COMPRESSION;
566#endif
567#if ENABLE_ROHC
568 f |= FEATURE_ROHC;
569#endif
570#if ENABLE_BRIDGING
571 f |= FEATURE_BRIDGING;
572#endif
573 return f;
574 }
461}; 575};
462 576
577void
463void config_packet::setup (ptype type, int dst) 578config_packet::setup (ptype type, int dst)
464{ 579{
465 prot_major = PROTOCOL_MAJOR; 580 prot_major = PROTOCOL_MAJOR;
466 prot_minor = PROTOCOL_MINOR; 581 prot_minor = PROTOCOL_MINOR;
467 randsize = RAND_SIZE; 582 randsize = RAND_SIZE;
468 hmaclen = HMACLENGTH; 583 hmaclen = HMACLENGTH;
469 flags = curflags (); 584 flags = 0;
470 challengelen = sizeof (rsachallenge); 585 challengelen = sizeof (rsachallenge);
586 features = get_features ();
471 587
472 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 588 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
473 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 589 digest_nid = htonl (EVP_MD_type (RSA_HASH));
474 hmac_nid = htonl (EVP_MD_type (DIGEST)); 590 hmac_nid = htonl (EVP_MD_type (DIGEST));
475 591
476 len = sizeof (*this) - sizeof (net_packet); 592 len = sizeof (*this) - sizeof (net_packet);
477 set_hdr (type, dst); 593 set_hdr (type, dst);
478} 594}
479 595
596bool
480bool config_packet::chk_config () const 597config_packet::chk_config () const
481{ 598{
482 if (prot_major != PROTOCOL_MAJOR) 599 if (prot_major != PROTOCOL_MAJOR)
483 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 600 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
484 else if (randsize != RAND_SIZE) 601 else if (randsize != RAND_SIZE)
485 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 602 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
486 else if (hmaclen != HMACLENGTH) 603 else if (hmaclen != HMACLENGTH)
487 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 604 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
488 else if (flags != curflags ())
489 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
490 else if (challengelen != sizeof (rsachallenge)) 605 else if (challengelen != sizeof (rsachallenge))
491 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 606 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
492 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
493 slog (L_WARN, _("cipher mismatch (%x <=> %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));
494 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
495 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 610 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
496 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 611 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
497 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 612 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
498 else 613 else
499 return true; 614 return true;
500 615
501 return false; 616 return false;
502} 617}
503 618
504struct auth_req_packet : config_packet 619struct auth_req_packet : config_packet
505{ 620{
506 char magic[8]; 621 char magic[8];
507 u8 initiate; // false if this is just an automatic reply 622 u8 initiate; // false if this is just an automatic reply
508 u8 protocols; // supported protocols (will get patches on forward) 623 u8 protocols; // supported protocols (will be patched on forward)
509 u8 pad2, pad3; 624 u8 pad2, pad3;
510 rsaid id; 625 rsaid id;
511 rsaencrdata encr; 626 rsaencrdata encr;
512 627
513 auth_req_packet (int dst, bool initiate_, u8 protocols_) 628 auth_req_packet (int dst, bool initiate_, u8 protocols_)
514 { 629 {
515 config_packet::setup (PT_AUTH_REQ, dst); 630 config_packet::setup (PT_AUTH_REQ, dst);
516 strncpy (magic, MAGIC, 8); 631 strncpy (magic, MAGIC_OLD, 8);
517 initiate = !!initiate_; 632 initiate = !!initiate_;
518 protocols = protocols_; 633 protocols = protocols_;
519 634
520 len = sizeof (*this) - sizeof (net_packet); 635 len = sizeof (*this) - sizeof (net_packet);
521 } 636 }
… …
570///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
571 686
572void 687void
573connection::connection_established () 688connection::connection_established ()
574{ 689{
690 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
691
575 if (ictx && octx) 692 if (ictx && octx)
576 { 693 {
577 connectmode = conf->connectmode; 694 // make sure rekeying timeouts are slightly asymmetric
578 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
579 rekey.start (NOW + ::conf.rekey); 696 rekey.start (rekey_interval, rekey_interval);
580 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
581 698
582 // send queued packets 699 // send queued packets
583 if (ictx && octx) 700 if (ictx && octx)
584 { 701 {
585 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
586 { 703 {
587 send_data_packet (p); 704 if (p->len) send_data_packet (p);
588 delete p; 705 delete p;
589 } 706 }
590 707
591 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
592 { 709 {
593 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
594 delete p; 711 delete p;
595 } 712 }
596 } 713 }
714
715 vpn->connection_established (this);
597 } 716 }
598 else 717 else
599 { 718 {
600 retry_cnt = 0; 719 retry_cnt = 0;
601 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
602 keepalive.reset (); 721 keepalive.stop ();
603 rekey.reset (); 722 rekey.stop ();
604 } 723 }
605} 724}
606 725
607void 726void
608connection::reset_si () 727connection::reset_si ()
609{ 728{
729 if (vpn->can_direct (THISNODE, conf))
610 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
611 731 else
612 // mask out protocols we cannot establish 732 {
613 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
614 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
735 }
615 736
616 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
617} 740}
618 741
619// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
620const sockinfo & 743const sockinfo &
621connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
622{ 745{
623 if (!si.valid ()) 746 if (!si.valid ())
624 { 747 {
625 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
626 749
627 if (r) 750 if (r)
628 { 751 {
629 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
630 conf->nodename, r->conf->nodename); 753 conf->nodename, r->conf->nodename);
631 return r->si; 754 return r->si;
632 } 755 }
633 else 756 else
634 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
635 conf->nodename); 758 conf->nodename);
636 } 759 }
637 760
638 return si; 761 return si;
639} 762}
… …
649connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
650{ 773{
651 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
652 775
653 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
654 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
655 781
656 delete pkt; 782 delete pkt;
657} 783}
658 784
… …
674connection::send_auth_request (const sockinfo &si, bool initiate) 800connection::send_auth_request (const sockinfo &si, bool initiate)
675{ 801{
676 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 802 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
677 803
678 rsachallenge chg; 804 rsachallenge chg;
679
680 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
681 807
682 if (0 > RSA_public_encrypt (sizeof chg,
683 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
684 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
685 fatal ("RSA_public_encrypt error");
686
687 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);
688 809
689 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
690 811
691 delete pkt; 812 delete pkt;
692} 813}
… …
700 821
701 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
702 823
703 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
704 825
705 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);
706 827
707 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
708 829
709 delete pkt; 830 delete pkt;
710} 831}
711 832
712void 833void
713connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
714{ 835{
715 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
716 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
717 838
718 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);
719 840
720 r->hmac_set (octx); 841 r->hmac_set (octx);
721 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
722 843
723 delete r; 844 delete r;
724} 845}
725 846
726void 847inline void
727connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
728{ 849{
729 if (ictx || conf == THISNODE 850 if (!ictx
851 && conf != THISNODE
730 || connectmode == conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
731 || connectmode == conf_node::C_DISABLED) 853 && connectmode != conf_node::C_DISABLED
732 w.at = TSTAMP_CANCEL; 854 && !w.is_active ())
733 else if (w.at <= NOW)
734 { 855 {
735 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
736 857 // and stop trying. should probably be handled by a per-connection expire handler.
737 if (retry_int < 3600 * 8) 858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
738 retry_cnt++; 861 return;
862 }
739 863
740 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));
741 869
742 reset_si (); 870 reset_si ();
743 871
744 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);
745 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
746 else 880 else
747 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
748 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
887
888 slow = slow || (dsi.prot & PROT_SLOW);
749 889
750 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
751 { 891 {
752 if (retry_cnt < 4) 892 if (retry_cnt < 4)
753 send_auth_request (dsi, true); 893 send_auth_request (dsi, true);
754 else 894 else
755 send_ping (dsi, 0); 895 send_ping (dsi, 0);
756 } 896 }
757 } 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);
758 } 907 }
759} 908}
760 909
761void 910void
762connection::reset_connection () 911connection::reset_connection ()
… …
765 { 914 {
766 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
767 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
768 917
769 if (::conf.script_node_down) 918 if (::conf.script_node_down)
770 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 }
771 } 924 }
772 925
773 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
774 delete octx; octx = 0; 927 delete octx; octx = 0;
928#if ENABLE_DNS
929 dnsv4_reset_connection ();
930#endif
775 931
776 si.host= 0; 932 si.host = 0;
777 933
778 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
779 retry_cnt = 0; 936 retry_cnt = 0;
780 937
781 rekey.reset (); 938 rekey.stop ();
782 keepalive.reset (); 939 keepalive.stop ();
783 establish_connection.reset (); 940 establish_connection.stop ();
784} 941}
785 942
786void 943void
787connection::shutdown () 944connection::shutdown ()
788{ 945{
… …
790 send_reset (si); 947 send_reset (si);
791 948
792 reset_connection (); 949 reset_connection ();
793} 950}
794 951
795void 952// poor-man's rekeying
796connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
797{ 955{
798 w.at = TSTAMP_CANCEL;
799
800 reset_connection (); 956 reset_connection ();
801 establish_connection (); 957 establish_connection ();
802} 958}
803 959
804void 960void
… …
819 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
820 rekey (); 976 rekey ();
821} 977}
822 978
823void 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
824connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 990connection::inject_data_packet (tap_packet *pkt)
825{ 991{
826 if (ictx && octx) 992 if (ictx && octx)
827 send_data_packet (pkt); 993 send_data_packet (pkt);
828 else 994 else
829 { 995 {
830 if (!broadcast)//DDDD
831 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
832 997 post_inject_queue ();
833 establish_connection ();
834 } 998 }
835} 999}
836 1000
1001void
837void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
838{ 1003{
839 if (ictx && octx) 1004 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
841 else 1006 else
842 { 1007 {
843 vpn_queue.put (new vpn_packet (*pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
844 1009 post_inject_queue ();
845 establish_connection ();
846 } 1010 }
847} 1011}
848 1012
849void 1013void
850connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
851{ 1015{
852 last_activity = NOW; 1016 last_activity = ev_now ();
853 1017
854 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.",
855 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;
856 1023
857 switch (pkt->typ ()) 1024 switch (pkt->typ ())
858 { 1025 {
859 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
860 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
861 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
862 // when we receive a ping. 1031 // when we receive a ping.
863 if (!ictx) 1032 if (!ictx)
864 { 1033 {
865 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
866 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
867 } 1036 }
868 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.
869 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
870 1041
871 break; 1042 break;
872 1043
873 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 ();
874 break; 1050 break;
875 1051
876 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
877 { 1053 {
878 reset_connection (); 1054 reset_connection ();
879 1055
880 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
881 1057
882 if (!p->chk_config ()) 1058 if (!p->chk_config ())
883 { 1059 {
884 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
885 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
886 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
887 } 1063 }
888 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
889 establish_connection (); 1065 establish_connection ();
… …
893 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
894 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
895 { 1071 {
896 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
897 1073
898 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");
899 1075
900 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)))
901 { 1078 {
902 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
903 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."),
904 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
905 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
907 if (p->initiate) 1084 if (p->initiate)
908 send_auth_request (rsi, false); 1085 send_auth_request (rsi, false);
909 1086
910 rsachallenge k; 1087 rsachallenge k;
911 1088
912 if (0 > RSA_private_decrypt (sizeof (p->encr), 1089 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913 (unsigned char *)&p->encr, (unsigned char *)&k, 1090 {
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1091 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1092 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1093 break;
1094 }
917 else 1095 else
918 { 1096 {
919 delete octx; 1097 delete octx;
920 1098
921 octx = new crypto_ctx (k, 1); 1099 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1100 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 1101
924 conf->protocols = p->protocols; 1102 conf->protocols = p->protocols;
1103 features = p->features & config_packet::get_features ();
925 1104
926 send_auth_response (rsi, p->id, k); 1105 send_auth_response (rsi, p->id, k);
927 1106
928 connection_established (); 1107 connection_established ();
929 1108
930 break; 1109 break;
931 } 1110 }
932 } 1111 }
933 else 1112 else
934 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
935 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
936 1115
937 send_reset (rsi); 1116 send_reset (rsi);
938 } 1117 }
939 1118
940 break; 1119 break;
941 1120
942 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
943 { 1122 {
944 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
945 1124
946 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
947 1126
948 if (p->chk_config ()) 1127 if (p->chk_config ())
949 { 1128 {
950 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
951 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."),
… …
954 1133
955 rsachallenge chg; 1134 rsachallenge chg;
956 1135
957 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
958 { 1137 {
959 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
960 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
961 break; 1140 break;
962 } 1141 }
963 else 1142 else
964 { 1143 {
965 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
966 1145
967 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
968 { 1147 {
969 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"
970 "could be an attack, or just corruption or an synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
971 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
972 break; 1151 break;
973 } 1152 }
974 else 1153 else
975 { 1154 {
… …
986 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
987 1166
988 si = rsi; 1167 si = rsi;
989 protocol = rsi.prot; 1168 protocol = rsi.prot;
990 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
991 connection_established (); 1175 connection_established ();
992 1176
993 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
994 conf->nodename, (const char *)rsi,
995 p->prot_major, p->prot_minor);
996
997 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
998 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 }
999 1183
1000 break; 1184 break;
1001 } 1185 }
1002 else 1186 else
1003 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."),
1004 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1005 } 1189 }
1006 1190
1007 delete cctx; 1191 delete cctx;
1008 } 1192 }
… …
1024 { 1208 {
1025 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1026 1210
1027 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1028 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"
1029 "could be an attack, or just corruption or an synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1030 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1031 else 1215 else
1032 { 1216 {
1033 u32 seqno; 1217 u32 seqno;
1034 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1035 1220
1036 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1037 { 1222 {
1038 vpn->tap->send (d); 1223 vpn->tap->send (d);
1039 1224
1040 if (si != rsi) 1225 if (si != rsi)
1041 { 1226 {
1042 // 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.)
1043 si = rsi; 1229 // {
1044
1045 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1046 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);
1047 } 1246 }
1048
1049 delete d;
1050
1051 break;
1052 } 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;
1053 } 1263 }
1054 } 1264 }
1055 1265
1056 send_reset (rsi); 1266 send_reset (rsi);
1057 break; 1267 break;
1058 1268
1059 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1060 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1061 { 1271 {
1062 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1063 1273
1064 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 ())
1065 connection *c = vpn->conns[p->id - 1];
1066 conf->protocols = p->protocols;
1067
1068 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1069 conf->id, p->id, c->ictx && c->octx);
1070
1071 if (c->ictx && c->octx)
1072 { 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 {
1073 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1074 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1075 c->send_connect_info (conf->id, si, conf->protocols); 1286 c->send_connect_info (conf->id, si, conf->protocols);
1076 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 ();
1077 } 1291 }
1078 else 1292 else
1079 c->establish_connection (); 1293 slog (L_WARN,
1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1295 p->id);
1080 } 1296 }
1081 1297
1082 break; 1298 break;
1083 1299
1084 case vpn_packet::PT_CONNECT_INFO: 1300 case vpn_packet::PT_CONNECT_INFO:
1085 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1301 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1086 { 1302 {
1087 connect_info_packet *p = (connect_info_packet *) pkt; 1303 connect_info_packet *p = (connect_info_packet *)pkt;
1088 1304
1089 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 ())
1090 1306 {
1091 connection *c = vpn->conns[p->id - 1]; 1307 connection *c = vpn->conns[p->id - 1];
1092 1308
1093 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1094 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));
1095 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1096 1312
1097 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,
1098 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1099 1316
1100 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1101 1318
1102 if (dsi.valid ()) 1319 if (dsi.valid ())
1103 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);
1104 } 1326 }
1105 1327
1106 break; 1328 break;
1107 1329
1108 default: 1330 default:
1109 send_reset (rsi); 1331 send_reset (rsi);
1110 break; 1332 break;
1111 } 1333 }
1112} 1334}
1113 1335
1114void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1115{ 1338{
1116 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1117 { 1340 {
1118 reset_connection (); 1341 reset_connection ();
1119 establish_connection (); 1342 establish_connection ();
1120 } 1343 }
1121 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1122 w.at = last_activity + ::conf.keepalive; 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1123 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1124 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1125 { 1348 {
1126 send_ping (si); 1349 send_ping (si);
1127 w.at = NOW + 5; 1350 w.start (3);
1128 } 1351 }
1129 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1130 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1131 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1132 w.at = last_activity + ::conf.keepalive + 10; 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1133 else 1356 else
1134 reset_connection (); 1357 reset_connection ();
1135} 1358}
1136 1359
1360void
1137void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1138{ 1362{
1139 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);
1140 1364
1141 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);
1142 p->hmac_set (octx); 1367 p->hmac_set (octx);
1143 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1144 1369
1145 delete p; 1370 delete p;
1146} 1371}
1147 1372
1148void connection::script_node () 1373void
1374connection::script_init_env (const char *ext)
1149{ 1375{
1150 vpn->script_if_up ();
1151
1152 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;
1153 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);
1154 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1155 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1156 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1157} 1395}
1158 1396
1397inline const char *
1159const char *connection::script_node_up () 1398connection::script_node_up ()
1160{ 1399{
1161 script_node (); 1400 script_init_connect_env ();
1162 1401
1163 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1164 1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1165 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1166}
1167 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 *
1168const char *connection::script_node_down () 1430connection::script_node_down ()
1169{ 1431{
1170 script_node (); 1432 script_init_connect_env ();
1171 1433
1172 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1173 1435
1174 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1436 char *filename;
1175} 1437 asprintf (&filename,
1438 "%s/%s",
1439 confbase,
1440 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1176 1441
1442 return filename;
1443}
1444
1177connection::connection(struct vpn *vpn_) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1178: vpn(vpn_) 1446: vpn(vpn), conf(conf),
1179, rekey (this, &connection::rekey_cb) 1447#if ENABLE_DNS
1180, 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);
1181, establish_connection (this, &connection::establish_connection_cb) 1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1182{ 1456
1457 last_establish_attempt = 0.;
1183 octx = ictx = 0; 1458 octx = ictx = 0;
1184 retry_cnt = 0;
1185 1459
1186 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
1187 reset_connection (); 1469 reset_connection ();
1188} 1470}
1189 1471
1190connection::~connection () 1472connection::~connection ()
1191{ 1473{
1192 shutdown (); 1474 shutdown ();
1193} 1475}
1194 1476
1477void
1195void connection_init () 1478connection_init ()
1196{ 1479{
1197 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1198 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1199} 1482}
1200 1483

Diff Legend

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