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.74 by pcg, Sun Aug 10 02:49:21 2008 UTC

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

Diff Legend

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