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

Diff Legend

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