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

Diff Legend

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