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.15 by pcg, Fri Aug 8 10:58:28 2003 UTC vs.
Revision 1.73 by pcg, Sun Aug 10 01:34:36 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"
38#include "connection.h" 47#include "connection.h"
39 48
49#include "netcompat.h"
50
40#if !HAVE_RAND_PSEUDO_BYTES 51#if !HAVE_RAND_PSEUDO_BYTES
41# define RAND_pseudo_bytes RAND_bytes 52# define RAND_pseudo_bytes RAND_bytes
42#endif 53#endif
43 54
44#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 55#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
45 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
46struct crypto_ctx 104struct crypto_ctx
47{ 105{
48 EVP_CIPHER_CTX cctx; 106 EVP_CIPHER_CTX cctx;
49 HMAC_CTX hctx; 107 HMAC_CTX hctx;
50 108
… …
53}; 111};
54 112
55crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 113crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
56{ 114{
57 EVP_CIPHER_CTX_init (&cctx); 115 EVP_CIPHER_CTX_init (&cctx);
58 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));
59 HMAC_CTX_init (&hctx); 117 HMAC_CTX_init (&hctx);
60 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);
61} 119}
62 120
63crypto_ctx::~crypto_ctx () 121crypto_ctx::~crypto_ctx ()
64{ 122{
65 EVP_CIPHER_CTX_cleanup (&cctx); 123 require (EVP_CIPHER_CTX_cleanup (&cctx));
66 HMAC_CTX_cleanup (&hctx); 124 HMAC_CTX_cleanup (&hctx);
67} 125}
68 126
69static void 127static void
70rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 128rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
71{ 129{
72 EVP_MD_CTX ctx; 130 EVP_MD_CTX ctx;
73 131
74 EVP_MD_CTX_init (&ctx); 132 EVP_MD_CTX_init (&ctx);
75 EVP_DigestInit (&ctx, RSA_HASH); 133 require (EVP_DigestInit (&ctx, RSA_HASH));
76 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 134 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
77 EVP_DigestUpdate(&ctx, &id, sizeof id); 135 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
78 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 136 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
79 EVP_MD_CTX_cleanup (&ctx); 137 EVP_MD_CTX_cleanup (&ctx);
80} 138}
81 139
82struct rsa_entry { 140struct rsa_entry
141{
83 tstamp expire; 142 tstamp expire;
84 rsaid id; 143 rsaid id;
85 rsachallenge chg; 144 rsachallenge chg;
86}; 145};
87 146
88struct rsa_cache : list<rsa_entry> 147struct rsa_cache : list<rsa_entry>
89{ 148{
90 void cleaner_cb (time_watcher &w); time_watcher cleaner; 149 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
91 150
92 bool find (const rsaid &id, rsachallenge &chg) 151 bool find (const rsaid &id, rsachallenge &chg)
93 { 152 {
94 for (iterator i = begin (); i != end (); ++i) 153 for (iterator i = begin (); i != end (); ++i)
95 { 154 {
96 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 155 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
97 { 156 {
98 memcpy (&chg, &i->chg, sizeof chg); 157 memcpy (&chg, &i->chg, sizeof chg);
99 158
100 erase (i); 159 erase (i);
101 return true; 160 return true;
102 } 161 }
103 } 162 }
104 163
105 if (cleaner.at < NOW) 164 if (!cleaner.is_active ())
106 cleaner.start (NOW + RSA_TTL); 165 cleaner.again ();
107 166
108 return false; 167 return false;
109 } 168 }
110 169
111 void gen (rsaid &id, rsachallenge &chg) 170 void gen (rsaid &id, rsachallenge &chg)
112 { 171 {
113 rsa_entry e; 172 rsa_entry e;
114 173
115 RAND_bytes ((unsigned char *)&id, sizeof id); 174 RAND_bytes ((unsigned char *)&id, sizeof id);
116 RAND_bytes ((unsigned char *)&chg, sizeof chg); 175 RAND_bytes ((unsigned char *)&chg, sizeof chg);
117 176
118 e.expire = NOW + RSA_TTL; 177 e.expire = ev_now () + RSA_TTL;
119 e.id = id; 178 e.id = id;
120 memcpy (&e.chg, &chg, sizeof chg); 179 memcpy (&e.chg, &chg, sizeof chg);
121 180
122 push_back (e); 181 push_back (e);
123 182
124 if (cleaner.at < NOW) 183 if (!cleaner.is_active ())
125 cleaner.start (NOW + RSA_TTL); 184 cleaner.again ();
126 } 185 }
127 186
128 rsa_cache () 187 rsa_cache ()
129 : cleaner (this, &rsa_cache::cleaner_cb) 188 {
130 { } 189 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
190 cleaner.set (RSA_TTL, RSA_TTL);
191 }
131 192
132} rsa_cache; 193} rsa_cache;
133 194
134void rsa_cache::cleaner_cb (time_watcher &w) 195void rsa_cache::cleaner_cb (ev::timer &w, int revents)
135{ 196{
136 if (empty ()) 197 if (empty ())
137 w.at = TSTAMP_CANCEL; 198 w.stop ();
138 else 199 else
139 { 200 {
140 w.at = NOW + RSA_TTL;
141
142 for (iterator i = begin (); i != end (); ) 201 for (iterator i = begin (); i != end (); )
143 if (i->expire <= NOW) 202 if (i->expire <= ev_now ())
144 i = erase (i); 203 i = erase (i);
145 else 204 else
146 ++i; 205 ++i;
147 } 206 }
148} 207}
149 208
150////////////////////////////////////////////////////////////////////////////// 209//////////////////////////////////////////////////////////////////////////////
151 210
152void 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)
153{ 213{
154 if (queue[i]) 214 queue = new pkt [max_queue];
155 {
156 delete queue[i];
157 j = (j + 1) % QUEUEDEPTH;
158 }
159 215
160 queue[i] = p;
161
162 i = (i + 1) % QUEUEDEPTH;
163}
164
165net_packet *pkt_queue::get ()
166{
167 net_packet *p = queue[j];
168
169 if (p)
170 {
171 queue[j] = 0;
172 j = (j + 1) % QUEUEDEPTH;
173 }
174
175 return p;
176}
177
178pkt_queue::pkt_queue ()
179{
180 memset (queue, 0, sizeof (queue));
181 i = 0; 216 i = 0;
182 j = 0; 217 j = 0;
218
219 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
183} 220}
184 221
185pkt_queue::~pkt_queue () 222pkt_queue::~pkt_queue ()
186{ 223{
187 for (i = QUEUEDEPTH; --i > 0; ) 224 while (net_packet *p = get ())
225 delete p;
226
188 delete queue[i]; 227 delete [] queue;
189} 228}
190 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
191struct net_rateinfo { 283struct net_rateinfo
284{
192 u32 host; 285 u32 host;
193 double pcnt, diff; 286 double pcnt, diff;
194 tstamp last; 287 tstamp last;
195}; 288};
196 289
197// 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.
198// this implementation ("splay list" ;) is inefficient, 291// this implementation ("splay list" ;) is inefficient,
199// but low on resources. 292// but low on resources.
200struct net_rate_limiter : list<net_rateinfo> 293struct net_rate_limiter : list<net_rateinfo>
201{ 294{
202 static const double ALPHA = 1. - 1. / 180.; // allow bursts 295# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 10.; // one event every CUTOFF seconds 296# define NRL_CUTOFF 10. // one event every CUTOFF seconds
204 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 297# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
205 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
206 299
207 bool can (const sockinfo &si) { return can((u32)si.host); } 300 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 301 bool can (u32 host);
209}; 302};
210 303
211net_rate_limiter auth_rate_limiter, reset_rate_limiter; 304net_rate_limiter auth_rate_limiter, reset_rate_limiter;
212 305
… …
215 iterator i; 308 iterator i;
216 309
217 for (i = begin (); i != end (); ) 310 for (i = begin (); i != end (); )
218 if (i->host == host) 311 if (i->host == host)
219 break; 312 break;
220 else if (i->last < NOW - EXPIRE) 313 else if (i->last < ev_now () - NRL_EXPIRE)
221 i = erase (i); 314 i = erase (i);
222 else 315 else
223 i++; 316 i++;
224 317
225 if (i == end ()) 318 if (i == end ())
226 { 319 {
227 net_rateinfo ri; 320 net_rateinfo ri;
228 321
229 ri.host = host; 322 ri.host = host;
230 ri.pcnt = 1.; 323 ri.pcnt = 1.;
231 ri.diff = MAXDIF; 324 ri.diff = NRL_MAXDIF;
232 ri.last = NOW; 325 ri.last = ev_now ();
233 326
234 push_front (ri); 327 push_front (ri);
235 328
236 return true; 329 return true;
237 } 330 }
238 else 331 else
239 { 332 {
240 net_rateinfo ri (*i); 333 net_rateinfo ri (*i);
241 erase (i); 334 erase (i);
242 335
243 ri.pcnt = ri.pcnt * ALPHA; 336 ri.pcnt = ri.pcnt * NRL_ALPHA;
244 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
245 338
246 ri.last = NOW; 339 ri.last = ev_now ();
247 340
248 double dif = ri.diff / ri.pcnt; 341 double dif = ri.diff / ri.pcnt;
249 342
250 bool send = dif > CUTOFF; 343 bool send = dif > NRL_CUTOFF;
251 344
252 if (dif > MAXDIF) 345 if (dif > NRL_MAXDIF)
253 { 346 {
254 ri.pcnt = 1.; 347 ri.pcnt = 1.;
255 ri.diff = MAXDIF; 348 ri.diff = NRL_MAXDIF;
256 } 349 }
257 else if (send) 350 else if (send)
258 ri.pcnt++; 351 ri.pcnt++;
259 352
260 push_front (ri); 353 push_front (ri);
… …
307} 400}
308 401
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 402#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 403#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 404
312struct vpndata_packet:vpn_packet 405struct vpndata_packet : vpn_packet
313 { 406 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 407 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 408
316 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);
317 tap_packet *unpack (connection *conn, u32 &seqno); 410 tap_packet *unpack (connection *conn, u32 &seqno);
… …
330 int outl = 0, outl2; 423 int outl = 0, outl2;
331 ptype type = PT_DATA_UNCOMPRESSED; 424 ptype type = PT_DATA_UNCOMPRESSED;
332 425
333#if ENABLE_COMPRESSION 426#if ENABLE_COMPRESSION
334 u8 cdata[MAX_MTU]; 427 u8 cdata[MAX_MTU];
335 u32 cl;
336 428
429 if (conn->features & ENABLE_COMPRESSION)
430 {
337 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 431 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
432
338 if (cl) 433 if (cl)
339 { 434 {
340 type = PT_DATA_COMPRESSED; 435 type = PT_DATA_COMPRESSED;
341 d = cdata; 436 d = cdata;
342 l = cl + 2; 437 l = cl + 2;
343 438
344 d[0] = cl >> 8; 439 d[0] = cl >> 8;
345 d[1] = cl; 440 d[1] = cl;
441 }
346 } 442 }
347#endif 443#endif
348 444
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 445 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 446
351 struct { 447 struct {
352#if RAND_SIZE 448#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 449 u8 rnd[RAND_SIZE];
354#endif 450#endif
… …
358 datahdr.seqno = ntohl (seqno); 454 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 455#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 456 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 457#endif
362 458
363 EVP_EncryptUpdate (cctx, 459 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 460 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 461 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 462 outl += outl2;
367 463
368 EVP_EncryptUpdate (cctx, 464 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 465 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 466 (unsigned char *) d, l));
371 outl += outl2; 467 outl += outl2;
372 468
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 469 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 470 outl += outl2;
375 471
376 len = outl + data_hdr_size (); 472 len = outl + data_hdr_size ();
377 473
378 set_hdr (type, dst); 474 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 483 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 484 tap_packet *p = new tap_packet;
389 u8 *d; 485 u8 *d;
390 u32 l = len - data_hdr_size (); 486 u32 l = len - data_hdr_size ();
391 487
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 488 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 489
394#if ENABLE_COMPRESSION 490#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 491 u8 cdata[MAX_MTU];
396 492
397 if (type == PT_DATA_COMPRESSED) 493 if (type == PT_DATA_COMPRESSED)
… …
399 else 495 else
400#endif 496#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 497 d = &(*p)[6 + 6 - DATAHDR];
402 498
403 /* 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 */
404 EVP_DecryptUpdate (cctx, 500 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 501 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 502 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 503 outl += outl2;
408 504
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 505 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 506 outl += outl2;
411 507
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 508 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 509
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 510 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
443{ 539{
444 // actually, hmaclen cannot be checked because the hmac 540 // actually, hmaclen cannot be checked because the hmac
445 // field comes before this data, so peers with other 541 // field comes before this data, so peers with other
446 // hmacs simply will not work. 542 // hmacs simply will not work.
447 u8 prot_major, prot_minor, randsize, hmaclen; 543 u8 prot_major, prot_minor, randsize, hmaclen;
448 u8 flags, challengelen, pad2, pad3; 544 u8 flags, challengelen, features, pad3;
449 u32 cipher_nid, digest_nid, hmac_nid; 545 u32 cipher_nid, digest_nid, hmac_nid;
450
451 const u8 curflags () const
452 {
453 return 0x80
454 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
455 }
456 546
457 void setup (ptype type, int dst); 547 void setup (ptype type, int dst);
458 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 }
459}; 564};
460 565
461void config_packet::setup (ptype type, int dst) 566void config_packet::setup (ptype type, int dst)
462{ 567{
463 prot_major = PROTOCOL_MAJOR; 568 prot_major = PROTOCOL_MAJOR;
464 prot_minor = PROTOCOL_MINOR; 569 prot_minor = PROTOCOL_MINOR;
465 randsize = RAND_SIZE; 570 randsize = RAND_SIZE;
466 hmaclen = HMACLENGTH; 571 hmaclen = HMACLENGTH;
467 flags = curflags (); 572 flags = 0;
468 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
574 features = get_features ();
469 575
470 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
472 hmac_nid = htonl (EVP_MD_type (DIGEST)); 578 hmac_nid = htonl (EVP_MD_type (DIGEST));
473 579
… …
476} 582}
477 583
478bool config_packet::chk_config () const 584bool config_packet::chk_config () const
479{ 585{
480 if (prot_major != PROTOCOL_MAJOR) 586 if (prot_major != PROTOCOL_MAJOR)
481 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);
482 else if (randsize != RAND_SIZE) 588 else if (randsize != RAND_SIZE)
483 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);
484 else if (hmaclen != HMACLENGTH) 590 else if (hmaclen != HMACLENGTH)
485 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 591 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
486 else if (flags != curflags ())
487 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
488 else if (challengelen != sizeof (rsachallenge)) 592 else if (challengelen != sizeof (rsachallenge))
489 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));
490 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
491 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));
492 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
493 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));
494 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 598 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
495 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));
496 else 600 else
497 return true; 601 return true;
498 602
499 return false; 603 return false;
500} 604}
501 605
502struct auth_req_packet : config_packet 606struct auth_req_packet : config_packet
503{ 607{
504 char magic[8]; 608 char magic[8];
505 u8 initiate; // false if this is just an automatic reply 609 u8 initiate; // false if this is just an automatic reply
506 u8 protocols; // supported protocols (will get patches on forward) 610 u8 protocols; // supported protocols (will be patched on forward)
507 u8 pad2, pad3; 611 u8 pad2, pad3;
508 rsaid id; 612 rsaid id;
509 rsaencrdata encr; 613 rsaencrdata encr;
510 614
511 auth_req_packet (int dst, bool initiate_, u8 protocols_) 615 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
568///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
569 673
570void 674void
571connection::connection_established () 675connection::connection_established ()
572{ 676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
573 if (ictx && octx) 679 if (ictx && octx)
574 { 680 {
575 connectmode = conf->connectmode; 681 // make sure rekeying timeouts are slightly asymmetric
576 682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
577 rekey.start (NOW + ::conf.rekey); 683 rekey.start (rekey_interval, rekey_interval);
578 keepalive.start (NOW + ::conf.keepalive); 684 keepalive.start (::conf.keepalive);
579 685
580 // send queued packets 686 // send queued packets
581 if (ictx && octx) 687 if (ictx && octx)
582 { 688 {
583 while (tap_packet *p = (tap_packet *)data_queue.get ()) 689 while (tap_packet *p = (tap_packet *)data_queue.get ())
584 { 690 {
585 send_data_packet (p); 691 if (p->len) send_data_packet (p);
586 delete p; 692 delete p;
587 } 693 }
588 694
589 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
590 { 696 {
591 send_vpn_packet (p, si, IPTOS_RELIABILITY); 697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
592 delete p; 698 delete p;
593 } 699 }
594 } 700 }
701
702 vpn->connection_established (this);
595 } 703 }
596 else 704 else
597 { 705 {
598 retry_cnt = 0; 706 retry_cnt = 0;
599 establish_connection.start (NOW + 5); 707 establish_connection.start (5);
600 keepalive.reset (); 708 keepalive.stop ();
601 rekey.reset (); 709 rekey.stop ();
602 } 710 }
603} 711}
604 712
605void 713void
606connection::reset_si () 714connection::reset_si ()
607{ 715{
716 if (vpn->can_direct (THISNODE, conf))
608 protocol = best_protocol (THISNODE->protocols & conf->protocols); 717 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
609 718 else
610 // mask out protocols we cannot establish 719 {
611 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 720 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
612 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 721 protocol = 0;
722 }
613 723
614 si.set (conf, protocol); 724 si.set (conf, protocol);
725
726 is_direct = si.valid ();
615} 727}
616 728
617// ensure sockinfo is valid, forward if necessary 729// ensure sockinfo is valid, forward if necessary
618const sockinfo & 730const sockinfo &
619connection::forward_si (const sockinfo &si) const 731connection::forward_si (const sockinfo &si) const
620{ 732{
621 if (!si.valid ()) 733 if (!si.valid ())
622 { 734 {
623 connection *r = vpn->find_router (); 735 connection *r = vpn->find_router_for (this);
624 736
625 if (r) 737 if (r)
626 { 738 {
627 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 739 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
628 conf->nodename, r->conf->nodename); 740 conf->nodename, r->conf->nodename);
629 return r->si; 741 return r->si;
630 } 742 }
631 else 743 else
632 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 744 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
633 conf->nodename); 745 conf->nodename);
634 } 746 }
635 747
636 return si; 748 return si;
637} 749}
… …
647connection::send_ping (const sockinfo &si, u8 pong) 759connection::send_ping (const sockinfo &si, u8 pong)
648{ 760{
649 ping_packet *pkt = new ping_packet; 761 ping_packet *pkt = new ping_packet;
650 762
651 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
652 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
653 768
654 delete pkt; 769 delete pkt;
655} 770}
656 771
… …
672connection::send_auth_request (const sockinfo &si, bool initiate) 787connection::send_auth_request (const sockinfo &si, bool initiate)
673{ 788{
674 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);
675 790
676 rsachallenge chg; 791 rsachallenge chg;
677
678 rsa_cache.gen (pkt->id, chg); 792 rsa_cache.gen (pkt->id, chg);
679 793 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
680 if (0 > RSA_public_encrypt (sizeof chg,
681 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
682 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
683 fatal ("RSA_public_encrypt error");
684 794
685 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);
686 796
687 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
688 798
… …
708} 818}
709 819
710void 820void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 822{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
714 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
715 825
716 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);
717 827
718 r->hmac_set (octx); 828 r->hmac_set (octx);
719 send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
720 830
721 delete r; 831 delete r;
722} 832}
723 833
724void 834inline void
725connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
726{ 836{
727 if (ictx || conf == THISNODE 837 if (!ictx
838 && conf != THISNODE
728 || connectmode == conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
729 || connectmode == conf_node::C_DISABLED) 840 && connectmode != conf_node::C_DISABLED
730 w.at = TSTAMP_CANCEL; 841 && !w.is_active ())
731 else if (w.at <= NOW)
732 { 842 {
733 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
734 844 // and stop trying. should probably be handled by a per-connection expire handler.
735 if (retry_int < 3600 * 8) 845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
736 retry_cnt++; 848 return;
849 }
737 850
738 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));
739 856
740 reset_si (); 857 reset_si ();
741 858
742 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);
743 vpn->send_connect_request (conf->id); 865 vpn->send_connect_request (conf->id);
866 }
744 else 867 else
745 { 868 {
869 if (si.valid ())
870 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
871 conf->nodename, (const char *)si);
872
746 const sockinfo &dsi = forward_si (si); 873 const sockinfo &dsi = forward_si (si);
874
875 slow = slow || (dsi.prot & PROT_SLOW);
747 876
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 877 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 878 {
750 if (retry_cnt < 4) 879 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 880 send_auth_request (dsi, true);
752 else 881 else
753 send_ping (dsi, 0); 882 send_ping (dsi, 0);
754 } 883 }
755 } 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);
756 } 894 }
757} 895}
758 896
759void 897void
760connection::reset_connection () 898connection::reset_connection ()
… …
763 { 901 {
764 slog (L_INFO, _("%s(%s): connection lost"), 902 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 903 conf->nodename, (const char *)si);
766 904
767 if (::conf.script_node_down) 905 if (::conf.script_node_down)
768 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 }
769 } 911 }
770 912
771 delete ictx; ictx = 0; 913 delete ictx; ictx = 0;
772 delete octx; octx = 0; 914 delete octx; octx = 0;
915#if ENABLE_DNS
916 dnsv4_reset_connection ();
917#endif
773 918
774 si.host= 0; 919 si.host = 0;
775 920
776 last_activity = 0; 921 last_activity = 0.;
922 //last_si_change = 0.;
777 retry_cnt = 0; 923 retry_cnt = 0;
778 924
779 rekey.reset (); 925 rekey.stop ();
780 keepalive.reset (); 926 keepalive.stop ();
781 establish_connection.reset (); 927 establish_connection.stop ();
782} 928}
783 929
784void 930void
785connection::shutdown () 931connection::shutdown ()
786{ 932{
… …
788 send_reset (si); 934 send_reset (si);
789 935
790 reset_connection (); 936 reset_connection ();
791} 937}
792 938
793void 939// poor-man's rekeying
794connection::rekey_cb (time_watcher &w) 940inline void
941connection::rekey_cb (ev::timer &w, int revents)
795{ 942{
796 w.at = TSTAMP_CANCEL;
797
798 reset_connection (); 943 reset_connection ();
799 establish_connection (); 944 establish_connection ();
800} 945}
801 946
802void 947void
803connection::send_data_packet (tap_packet *pkt, bool broadcast) 948connection::send_data_packet (tap_packet *pkt)
804{ 949{
805 vpndata_packet *p = new vpndata_packet; 950 vpndata_packet *p = new vpndata_packet;
806 int tos = 0; 951 int tos = 0;
807 952
808 // I am not hilarious about peeking into packets, but so be it. 953 // I am not hilarious about peeking into packets, but so be it.
809 if (conf->inherit_tos 954 if (conf->inherit_tos && pkt->is_ipv4 ())
810 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
811 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
812 tos = (*pkt)[15] & IPTOS_TOS_MASK; 955 tos = (*pkt)[15] & IPTOS_TOS_MASK;
813 956
814 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 957 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815 send_vpn_packet (p, si, tos); 958 send_vpn_packet (p, si, tos);
816 959
817 delete p; 960 delete p;
818 961
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) 977connection::inject_data_packet (tap_packet *pkt)
825{ 978{
826 if (ictx && octx) 979 if (ictx && octx)
827 send_data_packet (pkt, broadcast); 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"), 1069 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi); 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"), 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))
1125 {
968 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"
969 "could be an attack, or just corruption or an synchronization error"), 1127 "could be an attack, or just corruption or a synchronization error."),
970 conf->nodename, (const char *)rsi); 1128 conf->nodename, (const char *)rsi);
1129 break;
1130 }
971 else 1131 else
972 { 1132 {
973 rsaresponse h; 1133 rsaresponse h;
974 1134
975 rsa_hash (p->id, chg, h); 1135 rsa_hash (p->id, chg, h);
… …
983 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
984 1144
985 si = rsi; 1145 si = rsi;
986 protocol = rsi.prot; 1146 protocol = rsi.prot;
987 1147
988 connection_established ();
989
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1148 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d."),
991 conf->nodename, (const char *)rsi, 1149 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor); 1150 p->prot_major, p->prot_minor);
993 1151
1152 connection_established ();
1153
994 if (::conf.script_node_up) 1154 if (::conf.script_node_up)
995 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 }
996 1160
997 break; 1161 break;
998 } 1162 }
999 else 1163 else
1000 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."),
1001 conf->nodename, (const char *)rsi); 1165 conf->nodename, (const char *)rsi);
1002 } 1166 }
1003 1167
1004 delete cctx; 1168 delete cctx;
1005 } 1169 }
… …
1021 { 1185 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1186 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1187
1024 if (!p->hmac_chk (ictx)) 1188 if (!p->hmac_chk (ictx))
1025 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"
1026 "could be an attack, or just corruption or an synchronization error"), 1190 "could be an attack, or just corruption or a synchronization error."),
1027 conf->nodename, (const char *)rsi); 1191 conf->nodename, (const char *)rsi);
1028 else 1192 else
1029 { 1193 {
1030 u32 seqno; 1194 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1195 tap_packet *d = p->unpack (this, seqno);
1196 int seqclass = iseqno.seqno_classify (seqno);
1032 1197
1033 if (iseqno.recv_ok (seqno)) 1198 if (seqclass == 0) // ok
1034 { 1199 {
1035 vpn->tap->send (d); 1200 vpn->tap->send (d);
1036 1201
1037 if (p->dst () == 0) // re-broadcast
1038 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1039 {
1040 connection *c = *i;
1041
1042 if (c->conf != THISNODE && c->conf != conf)
1043 c->inject_data_packet (d);
1044 }
1045
1046 if (si != rsi) 1202 if (si != rsi)
1047 { 1203 {
1048 // 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 // {
1049 si = rsi; 1207 si = rsi;
1050 1208
1051 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1209 slog (L_INFO, _("%s(%s): socket address changed to %s."),
1052 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);
1053 } 1215 }
1054
1055 delete d;
1056
1057 break;
1058 } 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;
1059 } 1229 }
1060 } 1230 }
1061 1231
1062 send_reset (rsi); 1232 send_reset (rsi);
1063 break; 1233 break;
… …
1065 case vpn_packet::PT_CONNECT_REQ: 1235 case vpn_packet::PT_CONNECT_REQ:
1066 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1236 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1067 { 1237 {
1068 connect_req_packet *p = (connect_req_packet *) pkt; 1238 connect_req_packet *p = (connect_req_packet *) pkt;
1069 1239
1070 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 ())
1071 connection *c = vpn->conns[p->id - 1];
1072 conf->protocols = p->protocols;
1073
1074 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1075 conf->id, p->id, c->ictx && c->octx);
1076
1077 if (c->ictx && c->octx)
1078 { 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 {
1079 // send connect_info packets to both sides, in case one is 1250 // send connect_info packets to both sides, in case one is
1080 // behind a nat firewall (or both ;) 1251 // behind a nat firewall (or both ;)
1081 c->send_connect_info (conf->id, si, conf->protocols); 1252 c->send_connect_info (conf->id, si, conf->protocols);
1082 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 ();
1083 } 1257 }
1084 else 1258 else
1085 c->establish_connection (); 1259 slog (L_WARN,
1260 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1261 p->id);
1086 } 1262 }
1087 1263
1088 break; 1264 break;
1089 1265
1090 case vpn_packet::PT_CONNECT_INFO: 1266 case vpn_packet::PT_CONNECT_INFO:
1091 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1267 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1092 { 1268 {
1093 connect_info_packet *p = (connect_info_packet *) pkt; 1269 connect_info_packet *p = (connect_info_packet *)pkt;
1094 1270
1095 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 ())
1096 1272 {
1097 connection *c = vpn->conns[p->id - 1]; 1273 connection *c = vpn->conns[p->id - 1];
1098 1274
1099 c->conf->protocols = p->protocols; 1275 c->conf->protocols = p->protocols;
1100 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));
1101 p->si.upgrade_protocol (protocol, c->conf); 1277 p->si.upgrade_protocol (protocol, c->conf);
1102 1278
1103 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1279 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1104 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);
1105 1281
1106 const sockinfo &dsi = forward_si (p->si); 1282 const sockinfo &dsi = forward_si (p->si);
1107 1283
1108 if (dsi.valid ()) 1284 if (dsi.valid ())
1109 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);
1110 } 1291 }
1111 1292
1112 break; 1293 break;
1113 1294
1114 default: 1295 default:
1115 send_reset (rsi); 1296 send_reset (rsi);
1116 break; 1297 break;
1117 } 1298 }
1118} 1299}
1119 1300
1120void connection::keepalive_cb (time_watcher &w) 1301inline void
1302connection::keepalive_cb (ev::timer &w, int revents)
1121{ 1303{
1122 if (NOW >= last_activity + ::conf.keepalive + 30) 1304 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1123 { 1305 {
1124 reset_connection (); 1306 reset_connection ();
1125 establish_connection (); 1307 establish_connection ();
1126 } 1308 }
1127 else if (NOW < last_activity + ::conf.keepalive) 1309 else if (ev_now () < last_activity + ::conf.keepalive)
1128 w.at = last_activity + ::conf.keepalive; 1310 w.start (last_activity + ::conf.keepalive - ev::now ());
1129 else if (conf->connectmode != conf_node::C_ONDEMAND 1311 else if (conf->connectmode != conf_node::C_ONDEMAND
1130 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1312 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1131 { 1313 {
1132 send_ping (si); 1314 send_ping (si);
1133 w.at = NOW + 5; 1315 w.start (5);
1134 } 1316 }
1135 else if (NOW < last_activity + ::conf.keepalive + 10) 1317 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1136 // hold ondemand connections implicitly a few seconds longer 1318 // hold ondemand connections implicitly a few seconds longer
1137 // should delete octx, though, or something like that ;) 1319 // should delete octx, though, or something like that ;)
1138 w.at = last_activity + ::conf.keepalive + 10; 1320 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1139 else 1321 else
1140 reset_connection (); 1322 reset_connection ();
1141} 1323}
1142 1324
1143void connection::send_connect_request (int id) 1325void connection::send_connect_request (int id)
… …
1149 send_vpn_packet (p, si); 1331 send_vpn_packet (p, si);
1150 1332
1151 delete p; 1333 delete p;
1152} 1334}
1153 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
1154void connection::script_node () 1346void connection::script_init_connect_env ()
1155{ 1347{
1156 vpn->script_if_up (); 1348 vpn->script_init_env ();
1157 1349
1158 char *env; 1350 char *env;
1159 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1351 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1160 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1352 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1161 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1353 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1162 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1354 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1163} 1355}
1164 1356
1357inline const char *
1165const char *connection::script_node_up () 1358connection::script_node_up ()
1166{ 1359{
1167 script_node (); 1360 script_init_connect_env ();
1168 1361
1169 putenv ("STATE=up"); 1362 putenv ((char *)"STATE=up");
1170 1363
1364 char *filename;
1365 asprintf (&filename,
1366 "%s/%s",
1367 confbase,
1171 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1368 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1172}
1173 1369
1370 return filename;
1371}
1372
1373inline const char *
1174const char *connection::script_node_down () 1374connection::script_node_down ()
1175{ 1375{
1176 script_node (); 1376 script_init_connect_env ();
1177 1377
1178 putenv ("STATE=down"); 1378 putenv ((char *)"STATE=down");
1179 1379
1180 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1380 char *filename;
1181} 1381 asprintf (&filename,
1382 "%s/%s",
1383 confbase,
1384 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1182 1385
1386 return filename;
1387}
1388
1183connection::connection(struct vpn *vpn_) 1389connection::connection (struct vpn *vpn, conf_node *conf)
1184: vpn(vpn_) 1390: vpn(vpn), conf(conf),
1185, rekey (this, &connection::rekey_cb) 1391#if ENABLE_DNS
1186, 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);
1187, establish_connection (this, &connection::establish_connection_cb) 1399 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1188{ 1400
1401 last_establish_attempt = 0.;
1189 octx = ictx = 0; 1402 octx = ictx = 0;
1190 retry_cnt = 0;
1191 1403
1192 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
1193 reset_connection (); 1413 reset_connection ();
1194} 1414}
1195 1415
1196connection::~connection () 1416connection::~connection ()
1197{ 1417{

Diff Legend

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