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.9 by pcg, Sun Apr 6 04:31:51 2003 UTC vs.
Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 UTC

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

Diff Legend

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