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.7 by pcg, Sat Apr 5 17:54:22 2003 UTC vs.
Revision 1.60 by pcg, Sat Nov 10 05:14:22 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;
… …
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 if (ictx && octx)
590 {
591 connectmode = conf->connectmode;
592
593 // make sure rekeying timeouts are slightly asymmetric
594 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
595 rekey.start (rekey_interval, rekey_interval);
596 keepalive.start (::conf.keepalive);
597
598 // send queued packets
599 if (ictx && octx)
600 {
601 while (tap_packet *p = (tap_packet *)data_queue.get ())
602 {
603 send_data_packet (p);
604 delete p;
605 }
606
607 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
608 {
609 send_vpn_packet (p, si, IPTOS_RELIABILITY);
610 delete p;
611 }
612 }
613 }
614 else
615 {
616 retry_cnt = 0;
617 establish_connection.start (5);
618 keepalive.stop ();
619 rekey.stop ();
620 }
621}
622
623void
551connection::reset_dstaddr () 624connection::reset_si ()
552{ 625{
553 protocol = best_protocol (THISNODE->protocols & conf->protocols); 626 protocol = best_protocol (THISNODE->protocols & conf->protocols);
554 627
555 // mask out protocols we cannot establish 628 // mask out protocols we cannot establish
556 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 629 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
557 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 630 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
631 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
632
633 if (protocol
634 && (!conf->can_direct (THISNODE)
635 || !THISNODE->can_direct (conf)))
636 {
637 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
638 protocol = 0;
639 }
558 640
559 si.set (conf, protocol); 641 si.set (conf, protocol);
560} 642}
561 643
562void 644// ensure sockinfo is valid, forward if necessary
563connection::send_ping (const sockinfo &si, u8 pong) 645const sockinfo &
564{
565 ping_packet *pkt = new ping_packet;
566
567 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
568 vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
569
570 delete pkt;
571}
572
573void
574connection::send_reset (const sockinfo &si) 646connection::forward_si (const sockinfo &si) const
575{ 647{
576 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) 648 if (!si.valid ())
577 {
578 config_packet *pkt = new config_packet;
579
580 pkt->setup (vpn_packet::PT_RESET, conf->id);
581 vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST);
582
583 delete pkt;
584 } 649 {
585} 650 connection *r = vpn->find_router ();
586 651
587void 652 if (r)
588connection::send_auth_request (const sockinfo &si, bool initiate)
589{
590 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
591
592 rsachallenge chg;
593
594 rsa_cache.gen (pkt->id, chg);
595
596 if (0 > RSA_public_encrypt (sizeof chg,
597 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
598 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
599 fatal ("RSA_public_encrypt error");
600
601 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
602
603 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
604
605 delete pkt;
606}
607
608void
609connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
610{
611 auth_res_packet *pkt = new auth_res_packet (conf->id);
612
613 pkt->id = id;
614
615 rsa_hash (id, chg, pkt->response);
616
617 pkt->hmac_set (octx);
618
619 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
620
621 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
622
623 delete pkt;
624}
625
626void
627connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
628{
629 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n",
630 conf->id, rid, (const char *)rsi);
631
632 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
633
634 r->hmac_set (octx);
635 vpn->send_vpn_packet (r, si);
636
637 delete r;
638}
639
640void
641connection::establish_connection_cb (time_watcher &w)
642{
643 if (ictx || conf == THISNODE
644 || connectmode == conf_node::C_NEVER
645 || connectmode == conf_node::C_DISABLED)
646 w.at = TSTAMP_CANCEL;
647 else if (w.at <= NOW)
648 {
649 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6;
650
651 if (retry_int < 3600 * 8)
652 retry_cnt++;
653
654 w.at = NOW + retry_int;
655
656 if (conf->hostname)
657 { 653 {
658 reset_dstaddr (); 654 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
659 655 conf->nodename, r->conf->nodename, (const char *)r->si);
660 if (si.valid () && auth_rate_limiter.can (si)) 656 return r->si;
661 {
662 if (retry_cnt < 4)
663 send_auth_request (si, true);
664 else
665 send_ping (si, 0);
666 }
667 } 657 }
668 else 658 else
659 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
660 conf->nodename);
661 }
662
663 return si;
664}
665
666void
667connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
668{
669 if (!vpn->send_vpn_packet (pkt, si, tos))
670 reset_connection ();
671}
672
673void
674connection::send_ping (const sockinfo &si, u8 pong)
675{
676 ping_packet *pkt = new ping_packet;
677
678 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
679 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
680
681 delete pkt;
682}
683
684void
685connection::send_reset (const sockinfo &si)
686{
687 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
688 {
689 config_packet *pkt = new config_packet;
690
691 pkt->setup (vpn_packet::PT_RESET, conf->id);
692 send_vpn_packet (pkt, si, IPTOS_MINCOST);
693
694 delete pkt;
695 }
696}
697
698void
699connection::send_auth_request (const sockinfo &si, bool initiate)
700{
701 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
702
703 rsachallenge chg;
704 rsa_cache.gen (pkt->id, chg);
705 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
706
707 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
708
709 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
710
711 delete pkt;
712}
713
714void
715connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg)
716{
717 auth_res_packet *pkt = new auth_res_packet (conf->id);
718
719 pkt->id = id;
720
721 rsa_hash (id, chg, pkt->response);
722
723 pkt->hmac_set (octx);
724
725 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
726
727 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
728
729 delete pkt;
730}
731
732void
733connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
734{
735 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
736 conf->id, rid, (const char *)rsi);
737
738 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
739
740 r->hmac_set (octx);
741 send_vpn_packet (r, si);
742
743 delete r;
744}
745
746void
747connection::establish_connection_cb (ev::timer &w, int revents)
748{
749 if (!ictx
750 && conf != THISNODE
751 && connectmode != conf_node::C_NEVER
752 && connectmode != conf_node::C_DISABLED
753 && !w.is_active ())
754 {
755 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
756 ? (retry_cnt & 3) + 1
757 : 1 << (retry_cnt >> 2));
758
759 reset_si ();
760
761 bool slow = si.prot & PROT_SLOW;
762
763 if (si.prot && !si.host)
764 {
765 /*TODO*/ /* start the timer so we don't recurse endlessly */
766 w.start (1);
669 vpn->connect_request (conf->id); 767 vpn->send_connect_request (conf->id);
768 }
769 else
770 {
771 const sockinfo &dsi = forward_si (si);
772
773 slow = slow || (dsi.prot & PROT_SLOW);
774
775 if (dsi.valid () && auth_rate_limiter.can (dsi))
776 {
777 if (retry_cnt < 4)
778 send_auth_request (dsi, true);
779 else
780 send_ping (dsi, 0);
781 }
782 }
783
784 retry_int *= slow ? 8. : 0.7;
785
786 if (retry_int < conf->max_retry)
787 retry_cnt++;
788 else
789 retry_int = conf->max_retry;
790
791 w.start (retry_int);
670 } 792 }
671} 793}
672 794
673void 795void
674connection::reset_connection () 796connection::reset_connection ()
… …
677 { 799 {
678 slog (L_INFO, _("%s(%s): connection lost"), 800 slog (L_INFO, _("%s(%s): connection lost"),
679 conf->nodename, (const char *)si); 801 conf->nodename, (const char *)si);
680 802
681 if (::conf.script_node_down) 803 if (::conf.script_node_down)
682 run_script (run_script_cb (this, &connection::script_node_down), false); 804 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
805 slog (L_WARN, _("node-down command execution failed, continuing."));
683 } 806 }
684 807
685 delete ictx; ictx = 0; 808 delete ictx; ictx = 0;
686 delete octx; octx = 0; 809 delete octx; octx = 0;
810#if ENABLE_DNS
811 dnsv4_reset_connection ();
812#endif
687 813
688 si.host= 0; 814 si.host = 0;
689 815
690 last_activity = 0; 816 last_activity = 0;
691 retry_cnt = 0; 817 retry_cnt = 0;
692 818
693 rekey.reset (); 819 rekey.stop ();
694 keepalive.reset (); 820 keepalive.stop ();
695 establish_connection.reset (); 821 establish_connection.stop ();
696} 822}
697 823
698void 824void
699connection::shutdown () 825connection::shutdown ()
700{ 826{
… …
703 829
704 reset_connection (); 830 reset_connection ();
705} 831}
706 832
707void 833void
708connection::rekey_cb (time_watcher &w) 834connection::rekey_cb (ev::timer &w, int revents)
709{ 835{
710 w.at = TSTAMP_CANCEL;
711
712 reset_connection (); 836 reset_connection ();
713 establish_connection (); 837 establish_connection ();
714} 838}
715 839
716void 840void
717connection::send_data_packet (tap_packet *pkt, bool broadcast) 841connection::send_data_packet (tap_packet *pkt)
718{ 842{
719 vpndata_packet *p = new vpndata_packet; 843 vpndata_packet *p = new vpndata_packet;
720 int tos = 0; 844 int tos = 0;
721 845
722 if (conf->inherit_tos 846 // I am not hilarious about peeking into packets, but so be it.
723 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 847 if (conf->inherit_tos && pkt->is_ipv4 ())
724 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
725 tos = (*pkt)[15] & IPTOS_TOS_MASK; 848 tos = (*pkt)[15] & IPTOS_TOS_MASK;
726 849
727 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 850 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
728 vpn->send_vpn_packet (p, si, tos); 851 send_vpn_packet (p, si, tos);
729 852
730 delete p; 853 delete p;
731 854
732 if (oseqno > MAX_SEQNO) 855 if (oseqno > MAX_SEQNO)
733 rekey (); 856 rekey ();
734} 857}
735 858
736void 859void
737connection::inject_data_packet (tap_packet *pkt, bool broadcast) 860connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
738{ 861{
739 if (ictx && octx) 862 if (ictx && octx)
740 send_data_packet (pkt, broadcast); 863 send_data_packet (pkt);
741 else 864 else
742 { 865 {
743 if (!broadcast)//DDDD 866 if (!broadcast)
744 queue.put (new tap_packet (*pkt)); 867 data_queue.put (new tap_packet (*pkt));
745 868
746 establish_connection (); 869 establish_connection ();
747 } 870 }
748} 871}
749 872
873void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
874{
875 if (ictx && octx)
876 send_vpn_packet (pkt, si, tos);
877 else
878 {
879 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
880
881 establish_connection ();
882 }
883}
884
750void 885void
751connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 886connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
752{ 887{
753 last_activity = NOW; 888 last_activity = ev::ev_now ();
754 889
755 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 890 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
756 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 891 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
757 892
758 switch (pkt->typ ()) 893 switch (pkt->typ ())
… …
808 if (p->initiate) 943 if (p->initiate)
809 send_auth_request (rsi, false); 944 send_auth_request (rsi, false);
810 945
811 rsachallenge k; 946 rsachallenge k;
812 947
813 if (0 > RSA_private_decrypt (sizeof (p->encr), 948 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
814 (unsigned char *)&p->encr, (unsigned char *)&k, 949 {
815 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
816 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 950 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
817 conf->nodename, (const char *)rsi); 951 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
952 break;
953 }
818 else 954 else
819 { 955 {
820 retry_cnt = 0;
821 establish_connection.start (NOW + 8); //? ;)
822 keepalive.reset ();
823 rekey.reset ();
824
825 delete ictx;
826 ictx = 0;
827
828 delete octx; 956 delete octx;
829 957
830 octx = new crypto_ctx (k, 1); 958 octx = new crypto_ctx (k, 1);
831 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 959 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
832 960
833 conf->protocols = p->protocols; 961 conf->protocols = p->protocols;
962 features = p->features & config_packet::get_features ();
963
834 send_auth_response (rsi, p->id, k); 964 send_auth_response (rsi, p->id, k);
965
966 connection_established ();
835 967
836 break; 968 break;
837 } 969 }
838 } 970 }
971 else
972 slog (L_WARN, _("%s(%s): protocol mismatch"),
973 conf->nodename, (const char *)rsi);
839 974
840 send_reset (rsi); 975 send_reset (rsi);
841 } 976 }
842 977
843 break; 978 break;
… …
856 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 991 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
857 992
858 rsachallenge chg; 993 rsachallenge chg;
859 994
860 if (!rsa_cache.find (p->id, chg)) 995 if (!rsa_cache.find (p->id, chg))
996 {
861 slog (L_ERR, _("%s(%s): unrequested auth response"), 997 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
862 conf->nodename, (const char *)rsi); 998 conf->nodename, (const char *)rsi);
999 break;
1000 }
863 else 1001 else
864 { 1002 {
865 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1003 crypto_ctx *cctx = new crypto_ctx (chg, 0);
866 1004
867 if (!p->hmac_chk (cctx)) 1005 if (!p->hmac_chk (cctx))
1006 {
868 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1007 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
869 "could be an attack, or just corruption or an synchronization error"), 1008 "could be an attack, or just corruption or a synchronization error"),
870 conf->nodename, (const char *)rsi); 1009 conf->nodename, (const char *)rsi);
1010 break;
1011 }
871 else 1012 else
872 { 1013 {
873 rsaresponse h; 1014 rsaresponse h;
874 1015
875 rsa_hash (p->id, chg, h); 1016 rsa_hash (p->id, chg, h);
… …
883 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1024 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
884 1025
885 si = rsi; 1026 si = rsi;
886 protocol = rsi.prot; 1027 protocol = rsi.prot;
887 1028
888 rekey.start (NOW + ::conf.rekey); 1029 connection_established ();
889 keepalive.start (NOW + ::conf.keepalive);
890
891 // send queued packets
892 while (tap_packet *p = queue.get ())
893 {
894 send_data_packet (p);
895 delete p;
896 }
897
898 connectmode = conf->connectmode;
899 1030
900 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1031 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
901 conf->nodename, (const char *)rsi, 1032 conf->nodename, (const char *)rsi,
902 p->prot_major, p->prot_minor); 1033 p->prot_major, p->prot_minor);
903 1034
904 if (::conf.script_node_up) 1035 if (::conf.script_node_up)
905 run_script (run_script_cb (this, &connection::script_node_up), false); 1036 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1037 slog (L_WARN, _("node-up command execution failed, continuing."));
906 1038
907 break; 1039 break;
908 } 1040 }
909 else 1041 else
910 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1042 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
929 1061
930 if (ictx && octx) 1062 if (ictx && octx)
931 { 1063 {
932 vpndata_packet *p = (vpndata_packet *)pkt; 1064 vpndata_packet *p = (vpndata_packet *)pkt;
933 1065
934 if (rsi == si) 1066 if (!p->hmac_chk (ictx))
1067 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1068 "could be an attack, or just corruption or a synchronization error"),
1069 conf->nodename, (const char *)rsi);
1070 else
935 { 1071 {
936 if (!p->hmac_chk (ictx))
937 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
938 "could be an attack, or just corruption or an synchronization error"),
939 conf->nodename, (const char *)rsi);
940 else 1072 u32 seqno;
1073 tap_packet *d = p->unpack (this, seqno);
1074
1075 if (iseqno.recv_ok (seqno))
941 { 1076 {
942 u32 seqno; 1077 vpn->tap->send (d);
943 tap_packet *d = p->unpack (this, seqno);
944 1078
945 if (iseqno.recv_ok (seqno)) 1079 if (si != rsi)
946 { 1080 {
947 vpn->tap->send (d); 1081 // fast re-sync on source address changes, useful especially for tcp/ip
948
949 if (p->dst () == 0) // re-broadcast
950 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
951 {
952 connection *c = *i;
953
954 if (c->conf != THISNODE && c->conf != conf)
955 c->inject_data_packet (d);
956 }
957
958 delete d;
959
960 break; 1082 si = rsi;
1083
1084 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1085 conf->nodename, (const char *)si, (const char *)rsi);
961 } 1086 }
962 } 1087 }
1088
1089 delete d;
1090 break;
963 } 1091 }
964 else
965 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
966 } 1092 }
967 1093
968 send_reset (rsi); 1094 send_reset (rsi);
969 break; 1095 break;
970 1096
971 case vpn_packet::PT_CONNECT_REQ: 1097 case vpn_packet::PT_CONNECT_REQ:
972 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1098 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
973 { 1099 {
974 connect_req_packet *p = (connect_req_packet *) pkt; 1100 connect_req_packet *p = (connect_req_packet *) pkt;
975 1101
976 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1102 if (p->id > 0 && p->id <= vpn->conns.size ())
977 connection *c = vpn->conns[p->id - 1];
978 conf->protocols = p->protocols;
979
980 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
981 conf->id, p->id, c->ictx && c->octx);
982
983 if (c->ictx && c->octx)
984 { 1103 {
1104 connection *c = vpn->conns[p->id - 1];
1105 conf->protocols = p->protocols;
1106
1107 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1108 conf->id, p->id, c->ictx && c->octx);
1109
1110 if (c->ictx && c->octx)
1111 {
985 // send connect_info packets to both sides, in case one is 1112 // send connect_info packets to both sides, in case one is
986 // behind a nat firewall (or both ;) 1113 // behind a nat firewall (or both ;)
987 c->send_connect_info (conf->id, si, conf->protocols); 1114 c->send_connect_info (conf->id, si, conf->protocols);
988 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1115 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1116 }
1117 else
1118 c->establish_connection ();
989 } 1119 }
1120 else
1121 slog (L_WARN,
1122 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1123 p->id);
990 } 1124 }
991 1125
992 break; 1126 break;
993 1127
994 case vpn_packet::PT_CONNECT_INFO: 1128 case vpn_packet::PT_CONNECT_INFO:
995 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1129 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
996 { 1130 {
997 connect_info_packet *p = (connect_info_packet *) pkt; 1131 connect_info_packet *p = (connect_info_packet *)pkt;
998 1132
999 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1133 if (p->id > 0 && p->id <= vpn->conns.size ())
1000 1134 {
1001 connection *c = vpn->conns[p->id - 1]; 1135 connection *c = vpn->conns[p->id - 1];
1002 1136
1003 c->conf->protocols = p->protocols; 1137 c->conf->protocols = p->protocols;
1004 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1138 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1005 p->si.upgrade_protocol (protocol, c->conf); 1139 p->si.upgrade_protocol (protocol, c->conf);
1006 1140
1007 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1141 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1008 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1142 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1009 //slog (L_ERR, "%d PROTOCL(C%x,T%x,0S%x,S%x,P%x,SP%x)",
1010 // p->id, c->conf->protocols, THISNODE->protocols, p->si.supported_protocols(0), p->si.supported_protocols (c->conf),
1011 // protocol, p->si.prot);
1012 1143
1144 const sockinfo &dsi = forward_si (p->si);
1145
1146 if (dsi.valid ())
1013 c->send_auth_request (p->si, true); 1147 c->send_auth_request (dsi, true);
1148 }
1149 else
1150 slog (L_WARN,
1151 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1152 p->id);
1014 } 1153 }
1015 1154
1016 break; 1155 break;
1017 1156
1018 default: 1157 default:
1019 send_reset (rsi); 1158 send_reset (rsi);
1020 break; 1159 break;
1021 } 1160 }
1022} 1161}
1023 1162
1024void connection::keepalive_cb (time_watcher &w) 1163void connection::keepalive_cb (ev::timer &w, int revents)
1025{ 1164{
1026 if (NOW >= last_activity + ::conf.keepalive + 30) 1165 if (ev::ev_now () >= last_activity + ::conf.keepalive + 30)
1027 { 1166 {
1028 reset_connection (); 1167 reset_connection ();
1029 establish_connection (); 1168 establish_connection ();
1030 } 1169 }
1031 else if (NOW < last_activity + ::conf.keepalive) 1170 else if (ev::ev_now () < last_activity + ::conf.keepalive)
1032 w.at = last_activity + ::conf.keepalive; 1171 w.start (last_activity + ::conf.keepalive - ev::now ());
1033 else if (conf->connectmode != conf_node::C_ONDEMAND 1172 else if (conf->connectmode != conf_node::C_ONDEMAND
1034 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1173 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1035 { 1174 {
1036 send_ping (si); 1175 send_ping (si);
1037 w.at = NOW + 5; 1176 w.start (5);
1038 } 1177 }
1178 else if (ev::ev_now () < last_activity + ::conf.keepalive + 10)
1179 // hold ondemand connections implicitly a few seconds longer
1180 // should delete octx, though, or something like that ;)
1181 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1039 else 1182 else
1040 reset_connection (); 1183 reset_connection ();
1041} 1184}
1042 1185
1043void connection::connect_request (int id) 1186void connection::send_connect_request (int id)
1044{ 1187{
1045 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1188 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1046 1189
1047 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1190 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1048 p->hmac_set (octx); 1191 p->hmac_set (octx);
1049 vpn->send_vpn_packet (p, si); 1192 send_vpn_packet (p, si);
1050 1193
1051 delete p; 1194 delete p;
1052} 1195}
1053 1196
1197void connection::script_init_env (const char *ext)
1198{
1199 char *env;
1200 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1201 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1202 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1203 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1204 conf->id & 0xff); putenv (env);
1205}
1206
1054void connection::script_node () 1207void connection::script_init_connect_env ()
1055{ 1208{
1056 vpn->script_if_up (); 1209 vpn->script_init_env ();
1057 1210
1058 char *env; 1211 char *env;
1059 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1212 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1060 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1213 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1061 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1214 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1062 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1215 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1063} 1216}
1064 1217
1065const char *connection::script_node_up () 1218const char *connection::script_node_up ()
1066{ 1219{
1067 script_node (); 1220 script_init_connect_env ();
1068 1221
1069 putenv ("STATE=up"); 1222 putenv ((char *)"STATE=up");
1070 1223
1224 char *filename;
1225 asprintf (&filename,
1226 "%s/%s",
1227 confbase,
1071 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1228 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1229
1230 return filename;
1072} 1231}
1073 1232
1074const char *connection::script_node_down () 1233const char *connection::script_node_down ()
1075{ 1234{
1076 script_node (); 1235 script_init_connect_env ();
1077 1236
1078 putenv ("STATE=down"); 1237 putenv ((char *)"STATE=down");
1079 1238
1080 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1239 char *filename;
1081} 1240 asprintf (&filename,
1241 "%s/%s",
1242 confbase,
1243 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1082 1244
1245 return filename;
1246}
1247
1083connection::connection(struct vpn *vpn_) 1248connection::connection (struct vpn *vpn, conf_node *conf)
1084: vpn(vpn_) 1249: vpn(vpn), conf(conf)
1085, rekey (this, &connection::rekey_cb) 1250, rekey (this, &connection::rekey_cb)
1086, keepalive (this, &connection::keepalive_cb) 1251, keepalive (this, &connection::keepalive_cb)
1087, establish_connection (this, &connection::establish_connection_cb) 1252, establish_connection (this, &connection::establish_connection_cb)
1253#if ENABLE_DNS
1254, dns (0)
1255#endif
1088{ 1256{
1089 octx = ictx = 0; 1257 octx = ictx = 0;
1090 retry_cnt = 0; 1258 retry_cnt = 0;
1091 1259
1260 if (!conf->protocols) // make sure some protocol is enabled
1261 conf->protocols = PROT_UDPv4;
1262
1092 connectmode = conf_node::C_ALWAYS; // initial setting 1263 connectmode = conf_node::C_ALWAYS; // initial setting
1093 reset_connection (); 1264 reset_connection ();
1094} 1265}
1095 1266
1096connection::~connection () 1267connection::~connection ()

Diff Legend

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