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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.66 by pcg, Thu Dec 6 00:35:29 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
40#include <sys/socket.h> 37#include "netcompat.h"
41#ifdef HAVE_NETINET_IN_H
42# include <netinet/in.h>
43#endif
44#include <arpa/inet.h>
45#include <net/if.h>
46#ifdef HAVE_NETINET_IN_SYSTM_H
47# include <netinet/in_systm.h>
48#endif
49#ifdef HAVE_NETINET_IP_H
50# include <netinet/ip.h>
51#endif
52
53#ifndef IPTOS_TOS_MASK
54# define IPTOS_TOS_MASK (IPTOS_LOWDELAY | IPTOS_THROUGHPUT | IPTOS_RELIABILITY | IPTOS_MINCOST)
55#endif
56 38
57#if !HAVE_RAND_PSEUDO_BYTES 39#if !HAVE_RAND_PSEUDO_BYTES
58# define RAND_pseudo_bytes RAND_bytes 40# define RAND_pseudo_bytes RAND_bytes
59#endif 41#endif
60 42
61#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
62 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
63struct crypto_ctx 51struct crypto_ctx
64{ 52{
65 EVP_CIPHER_CTX cctx; 53 EVP_CIPHER_CTX cctx;
66 HMAC_CTX hctx; 54 HMAC_CTX hctx;
67 55
… …
70}; 58};
71 59
72crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
73{ 61{
74 EVP_CIPHER_CTX_init (&cctx); 62 EVP_CIPHER_CTX_init (&cctx);
75 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));
76 HMAC_CTX_init (&hctx); 64 HMAC_CTX_init (&hctx);
77 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);
78} 66}
79 67
80crypto_ctx::~crypto_ctx () 68crypto_ctx::~crypto_ctx ()
81{ 69{
82 EVP_CIPHER_CTX_cleanup (&cctx); 70 require (EVP_CIPHER_CTX_cleanup (&cctx));
83 HMAC_CTX_cleanup (&hctx); 71 HMAC_CTX_cleanup (&hctx);
84} 72}
85 73
86static void 74static void
87rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
88{ 76{
89 EVP_MD_CTX ctx; 77 EVP_MD_CTX ctx;
90 78
91 EVP_MD_CTX_init (&ctx); 79 EVP_MD_CTX_init (&ctx);
92 EVP_DigestInit (&ctx, RSA_HASH); 80 require (EVP_DigestInit (&ctx, RSA_HASH));
93 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
94 EVP_DigestUpdate(&ctx, &id, sizeof id); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
95 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
96 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
97} 85}
98 86
99struct rsa_entry { 87struct rsa_entry
88{
100 tstamp expire; 89 tstamp expire;
101 rsaid id; 90 rsaid id;
102 rsachallenge chg; 91 rsachallenge chg;
103}; 92};
104 93
105struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
106{ 95{
107 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
108 97
109 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
110 { 99 {
111 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
112 { 101 {
113 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
114 { 103 {
115 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
116 105
117 erase (i); 106 erase (i);
118 return true; 107 return true;
119 } 108 }
120 } 109 }
121 110
122 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
123 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
124 113
125 return false; 114 return false;
126 } 115 }
127 116
128 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
129 { 118 {
130 rsa_entry e; 119 rsa_entry e;
131 120
132 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
133 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
134 123
135 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
136 e.id = id; 125 e.id = id;
137 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
138 127
139 push_back (e); 128 push_back (e);
140 129
141 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
142 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
143 } 132 }
144 133
145 rsa_cache () 134 rsa_cache ()
146 : cleaner (this, &rsa_cache::cleaner_cb) 135 {
147 { } 136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
148 139
149} rsa_cache; 140} rsa_cache;
150 141
151void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
152{ 143{
153 if (empty ()) 144 if (empty ())
154 w.at = TSTAMP_CANCEL; 145 w.stop ();
155 else 146 else
156 { 147 {
157 w.at = NOW + RSA_TTL;
158
159 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
160 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
161 i = erase (i); 150 i = erase (i);
162 else 151 else
163 ++i; 152 ++i;
164 } 153 }
165} 154}
… …
203{ 192{
204 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
205 delete queue[i]; 194 delete queue[i];
206} 195}
207 196
208struct net_rateinfo { 197struct net_rateinfo
198{
209 u32 host; 199 u32 host;
210 double pcnt, diff; 200 double pcnt, diff;
211 tstamp last; 201 tstamp last;
212}; 202};
213 203
214// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
215// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
216// but low on resources. 206// but low on resources.
217struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
218{ 208{
219 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
220 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
221 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
222 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
223 213
224 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
225 bool can (u32 host); 215 bool can (u32 host);
226}; 216};
227 217
… …
232 iterator i; 222 iterator i;
233 223
234 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
235 if (i->host == host) 225 if (i->host == host)
236 break; 226 break;
237 else if (i->last < NOW - EXPIRE) 227 else if (i->last < ev_now () - NRL_EXPIRE)
238 i = erase (i); 228 i = erase (i);
239 else 229 else
240 i++; 230 i++;
241 231
242 if (i == end ()) 232 if (i == end ())
243 { 233 {
244 net_rateinfo ri; 234 net_rateinfo ri;
245 235
246 ri.host = host; 236 ri.host = host;
247 ri.pcnt = 1.; 237 ri.pcnt = 1.;
248 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
249 ri.last = NOW; 239 ri.last = ev_now ();
250 240
251 push_front (ri); 241 push_front (ri);
252 242
253 return true; 243 return true;
254 } 244 }
255 else 245 else
256 { 246 {
257 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
258 erase (i); 248 erase (i);
259 249
260 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
261 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
262 252
263 ri.last = NOW; 253 ri.last = ev_now ();
264 254
265 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
266 256
267 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
268 258
269 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
270 { 260 {
271 ri.pcnt = 1.; 261 ri.pcnt = 1.;
272 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
273 } 263 }
274 else if (send) 264 else if (send)
275 ri.pcnt++; 265 ri.pcnt++;
276 266
277 push_front (ri); 267 push_front (ri);
… …
324} 314}
325 315
326#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
327#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
328 318
329struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
330 { 320 {
331 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
332 322
333 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
334 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
347 int outl = 0, outl2; 337 int outl = 0, outl2;
348 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
349 339
350#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
351 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
352 u32 cl;
353 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
354 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
355 if (cl) 347 if (cl)
356 { 348 {
357 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
358 d = cdata; 350 d = cdata;
359 l = cl + 2; 351 l = cl + 2;
360 352
361 d[0] = cl >> 8; 353 d[0] = cl >> 8;
362 d[1] = cl; 354 d[1] = cl;
355 }
363 } 356 }
364#endif 357#endif
365 358
366 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
367 360
368 struct { 361 struct {
369#if RAND_SIZE 362#if RAND_SIZE
370 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
371#endif 364#endif
… …
375 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
376#if RAND_SIZE 369#if RAND_SIZE
377 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
378#endif 371#endif
379 372
380 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
381 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
382 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
383 outl += outl2; 376 outl += outl2;
384 377
385 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
386 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
387 (unsigned char *) d, l); 380 (unsigned char *) d, l));
388 outl += outl2; 381 outl += outl2;
389 382
390 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
391 outl += outl2; 384 outl += outl2;
392 385
393 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
394 387
395 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
404 int outl = 0, outl2; 397 int outl = 0, outl2;
405 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
406 u8 *d; 399 u8 *d;
407 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
408 401
409 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
410 403
411#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
412 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
413 406
414 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
416 else 409 else
417#endif 410#endif
418 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
419 412
420 /* this overwrites part of the src mac, but we fix that later */ 413 /* this overwrites part of the src mac, but we fix that later */
421 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
422 d, &outl2, 415 d, &outl2,
423 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
424 outl += outl2; 417 outl += outl2;
425 418
426 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
427 outl += outl2; 420 outl += outl2;
428 421
429 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
430 423
431 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
460{ 453{
461 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
462 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
463 // hmacs simply will not work. 456 // hmacs simply will not work.
464 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
465 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
466 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
467
468 const u8 curflags () const
469 {
470 return 0x80
471 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
472 }
473 460
474 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
475 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
475#endif
476 return f;
477 }
476}; 478};
477 479
478void config_packet::setup (ptype type, int dst) 480void config_packet::setup (ptype type, int dst)
479{ 481{
480 prot_major = PROTOCOL_MAJOR; 482 prot_major = PROTOCOL_MAJOR;
481 prot_minor = PROTOCOL_MINOR; 483 prot_minor = PROTOCOL_MINOR;
482 randsize = RAND_SIZE; 484 randsize = RAND_SIZE;
483 hmaclen = HMACLENGTH; 485 hmaclen = HMACLENGTH;
484 flags = curflags (); 486 flags = 0;
485 challengelen = sizeof (rsachallenge); 487 challengelen = sizeof (rsachallenge);
488 features = get_features ();
486 489
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
489 hmac_nid = htonl (EVP_MD_type (DIGEST)); 492 hmac_nid = htonl (EVP_MD_type (DIGEST));
490 493
… …
493} 496}
494 497
495bool config_packet::chk_config () const 498bool config_packet::chk_config () const
496{ 499{
497 if (prot_major != PROTOCOL_MAJOR) 500 if (prot_major != PROTOCOL_MAJOR)
498 slog (L_WARN, _("major version mismatch (%d <=> %d)"), prot_major, PROTOCOL_MAJOR); 501 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 502 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 503 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
501 else if (hmaclen != HMACLENGTH) 504 else if (hmaclen != HMACLENGTH)
502 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH); 505 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503 else if (flags != curflags ())
504 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
505 else if (challengelen != sizeof (rsachallenge)) 506 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge)); 507 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 508 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
508 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 509 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
510 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH)); 511 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 512 else if (hmac_nid != htonl (EVP_MD_type (DIGEST)))
512 slog (L_WARN, _("hmac mismatch (%x <=> %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 513 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST));
513 else 514 else
514 return true; 515 return true;
515 516
516 return false; 517 return false;
517} 518}
518 519
519struct auth_req_packet : config_packet 520struct auth_req_packet : config_packet
520{ 521{
521 char magic[8]; 522 char magic[8];
522 u8 initiate; // false if this is just an automatic reply 523 u8 initiate; // false if this is just an automatic reply
523 u8 protocols; // supported protocols (will get patches on forward) 524 u8 protocols; // supported protocols (will be patched on forward)
524 u8 pad2, pad3; 525 u8 pad2, pad3;
525 rsaid id; 526 rsaid id;
526 rsaencrdata encr; 527 rsaencrdata encr;
527 528
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 529 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
585///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
586 587
587void 588void
588connection::connection_established () 589connection::connection_established ()
589{ 590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
590 if (ictx && octx) 593 if (ictx && octx)
591 { 594 {
592 connectmode = conf->connectmode; 595 connectmode = conf->connectmode;
593 596
594 rekey.start (NOW + ::conf.rekey); 597 // make sure rekeying timeouts are slightly asymmetric
598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
599 rekey.start (rekey_interval, rekey_interval);
595 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
596 601
597 // send queued packets 602 // send queued packets
598 if (ictx && octx) 603 if (ictx && octx)
599 { 604 {
600 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
611 } 616 }
612 } 617 }
613 else 618 else
614 { 619 {
615 retry_cnt = 0; 620 retry_cnt = 0;
616 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
617 keepalive.reset (); 622 keepalive.stop ();
618 rekey.reset (); 623 rekey.stop ();
619 } 624 }
620} 625}
621 626
622void 627void
623connection::reset_si () 628connection::reset_si ()
… …
625 protocol = best_protocol (THISNODE->protocols & conf->protocols); 630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
626 631
627 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
628 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
629 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
642 protocol = 0;
643 }
630 644
631 si.set (conf, protocol); 645 si.set (conf, protocol);
632} 646}
633 647
634// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
… …
639 { 653 {
640 connection *r = vpn->find_router (); 654 connection *r = vpn->find_router ();
641 655
642 if (r) 656 if (r)
643 { 657 {
644 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
645 conf->nodename, r->conf->nodename); 659 conf->nodename, r->conf->nodename, (const char *)r->si);
646 return r->si; 660 return r->si;
647 } 661 }
648 else 662 else
649 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
650 conf->nodename); 664 conf->nodename);
… …
689connection::send_auth_request (const sockinfo &si, bool initiate) 703connection::send_auth_request (const sockinfo &si, bool initiate)
690{ 704{
691 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 705 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
692 706
693 rsachallenge chg; 707 rsachallenge chg;
694
695 rsa_cache.gen (pkt->id, chg); 708 rsa_cache.gen (pkt->id, chg);
696 709 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
697 if (0 > RSA_public_encrypt (sizeof chg,
698 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
699 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
700 fatal ("RSA_public_encrypt error");
701 710
702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 711 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si);
703 712
704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 713 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
705 714
… …
725} 734}
726 735
727void 736void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 738{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
731 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
732 741
733 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
734 743
735 r->hmac_set (octx); 744 r->hmac_set (octx);
736 send_vpn_packet (r, si); 745 send_vpn_packet (r, si);
737 746
738 delete r; 747 delete r;
739} 748}
740 749
741void 750inline void
742connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
743{ 752{
744 if (ictx || conf == THISNODE 753 if (!ictx
754 && conf != THISNODE
745 || connectmode == conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
746 || connectmode == conf_node::C_DISABLED) 756 && connectmode != conf_node::C_DISABLED
747 w.at = TSTAMP_CANCEL; 757 && !w.is_active ())
748 else if (w.at <= NOW)
749 { 758 {
750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
751 760 ? (retry_cnt & 3) + 1
752 if (retry_int < 3600 * 8) 761 : 1 << (retry_cnt >> 2));
753 retry_cnt++;
754
755 w.at = NOW + retry_int;
756 762
757 reset_si (); 763 reset_si ();
758 764
765 bool slow = si.prot & PROT_SLOW;
766
759 if (si.prot && !si.host) 767 if (si.prot && !si.host)
768 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1);
760 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
761 else 774 else
762 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
763 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
764 781
765 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
766 { 783 {
767 if (retry_cnt < 4) 784 if (retry_cnt < 4)
768 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
769 else 786 else
770 send_ping (dsi, 0); 787 send_ping (dsi, 0);
771 } 788 }
772 } 789 }
790
791 retry_int *= slow ? 8. : 0.7;
792
793 if (retry_int < conf->max_retry)
794 retry_cnt++;
795 else
796 retry_int = conf->max_retry;
797
798 w.start (retry_int);
773 } 799 }
774} 800}
775 801
776void 802void
777connection::reset_connection () 803connection::reset_connection ()
… …
780 { 806 {
781 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
782 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
783 809
784 if (::conf.script_node_down) 810 if (::conf.script_node_down)
785 run_script (run_script_cb (this, &connection::script_node_down), false); 811 {
812 run_script_cb cb;
813 cb.set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing."));
816 }
786 } 817 }
787 818
788 delete ictx; ictx = 0; 819 delete ictx; ictx = 0;
789 delete octx; octx = 0; 820 delete octx; octx = 0;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
790 824
791 si.host= 0; 825 si.host = 0;
792 826
793 last_activity = 0; 827 last_activity = 0;
794 retry_cnt = 0; 828 retry_cnt = 0;
795 829
796 rekey.reset (); 830 rekey.stop ();
797 keepalive.reset (); 831 keepalive.stop ();
798 establish_connection.reset (); 832 establish_connection.stop ();
799} 833}
800 834
801void 835void
802connection::shutdown () 836connection::shutdown ()
803{ 837{
… …
805 send_reset (si); 839 send_reset (si);
806 840
807 reset_connection (); 841 reset_connection ();
808} 842}
809 843
810void 844inline void
811connection::rekey_cb (time_watcher &w) 845connection::rekey_cb (ev::timer &w, int revents)
812{ 846{
813 w.at = TSTAMP_CANCEL;
814
815 reset_connection (); 847 reset_connection ();
816 establish_connection (); 848 establish_connection ();
817} 849}
818 850
819void 851void
820connection::send_data_packet (tap_packet *pkt, bool broadcast) 852connection::send_data_packet (tap_packet *pkt)
821{ 853{
822 vpndata_packet *p = new vpndata_packet; 854 vpndata_packet *p = new vpndata_packet;
823 int tos = 0; 855 int tos = 0;
824 856
825 // I am not hilarious about peeking into packets, but so be it. 857 // I am not hilarious about peeking into packets, but so be it.
826 if (conf->inherit_tos 858 if (conf->inherit_tos && pkt->is_ipv4 ())
827 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
828 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
829 tos = (*pkt)[15] & IPTOS_TOS_MASK; 859 tos = (*pkt)[15] & IPTOS_TOS_MASK;
830 860
831 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 861 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
832 send_vpn_packet (p, si, tos); 862 send_vpn_packet (p, si, tos);
833 863
834 delete p; 864 delete p;
835 865
836 if (oseqno > MAX_SEQNO) 866 if (oseqno > MAX_SEQNO)
837 rekey (); 867 rekey ();
838} 868}
839 869
840void 870void
841connection::inject_data_packet (tap_packet *pkt, bool broadcast) 871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/)
842{ 872{
843 if (ictx && octx) 873 if (ictx && octx)
844 send_data_packet (pkt, broadcast); 874 send_data_packet (pkt);
845 else 875 else
846 { 876 {
847 if (!broadcast)//DDDD 877 if (!broadcast)
848 data_queue.put (new tap_packet (*pkt)); 878 data_queue.put (new tap_packet (*pkt));
849 879
850 establish_connection (); 880 establish_connection ();
851 } 881 }
852} 882}
… …
855{ 885{
856 if (ictx && octx) 886 if (ictx && octx)
857 send_vpn_packet (pkt, si, tos); 887 send_vpn_packet (pkt, si, tos);
858 else 888 else
859 { 889 {
860 vpn_queue.put (new vpn_packet (*pkt)); 890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
861 891
862 establish_connection (); 892 establish_connection ();
863 } 893 }
864} 894}
865 895
866void 896void
867connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
868{ 898{
869 last_activity = NOW; 899 last_activity = ev_now ();
870 900
871 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 901 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
872 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 902 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
903
904 if (connectmode == conf_node::C_DISABLED)
905 return;
873 906
874 switch (pkt->typ ()) 907 switch (pkt->typ ())
875 { 908 {
876 case vpn_packet::PT_PING: 909 case vpn_packet::PT_PING:
877 // we send pings instead of auth packets after some retries, 910 // we send pings instead of auth packets after some retries,
… …
924 if (p->initiate) 957 if (p->initiate)
925 send_auth_request (rsi, false); 958 send_auth_request (rsi, false);
926 959
927 rsachallenge k; 960 rsachallenge k;
928 961
929 if (0 > RSA_private_decrypt (sizeof (p->encr), 962 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
930 (unsigned char *)&p->encr, (unsigned char *)&k, 963 {
931 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
932 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 964 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
933 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 965 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
966 break;
967 }
934 else 968 else
935 { 969 {
936 delete octx; 970 delete octx;
937 971
938 octx = new crypto_ctx (k, 1); 972 octx = new crypto_ctx (k, 1);
939 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 973 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
940 974
941 conf->protocols = p->protocols; 975 conf->protocols = p->protocols;
976 features = p->features & config_packet::get_features ();
942 977
943 send_auth_response (rsi, p->id, k); 978 send_auth_response (rsi, p->id, k);
944 979
945 connection_established (); 980 connection_established ();
946 981
… …
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1017 crypto_ctx *cctx = new crypto_ctx (chg, 0);
983 1018
984 if (!p->hmac_chk (cctx)) 1019 if (!p->hmac_chk (cctx))
985 { 1020 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1021 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or an synchronization error"), 1022 "could be an attack, or just corruption or a synchronization error"),
988 conf->nodename, (const char *)rsi); 1023 conf->nodename, (const char *)rsi);
989 break; 1024 break;
990 } 1025 }
991 else 1026 else
992 { 1027 {
… …
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi, 1046 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor); 1047 p->prot_major, p->prot_minor);
1013 1048
1014 if (::conf.script_node_up) 1049 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false); 1050 {
1051 run_script_cb cb;
1052 cb.set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing."));
1055 }
1016 1056
1017 break; 1057 break;
1018 } 1058 }
1019 else 1059 else
1020 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1060 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1041 { 1081 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1082 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1083
1044 if (!p->hmac_chk (ictx)) 1084 if (!p->hmac_chk (ictx))
1045 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1085 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1046 "could be an attack, or just corruption or an synchronization error"), 1086 "could be an attack, or just corruption or a synchronization error"),
1047 conf->nodename, (const char *)rsi); 1087 conf->nodename, (const char *)rsi);
1048 else 1088 else
1049 { 1089 {
1050 u32 seqno; 1090 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1091 tap_packet *d = p->unpack (this, seqno);
1052 1092
1053 if (iseqno.recv_ok (seqno)) 1093 if (iseqno.recv_ok (seqno))
1054 { 1094 {
1055 vpn->tap->send (d); 1095 vpn->tap->send (d);
1056 1096
1057 if (p->dst () == 0) // re-broadcast
1058 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1059 {
1060 connection *c = *i;
1061
1062 if (c->conf != THISNODE && c->conf != conf)
1063 c->inject_data_packet (d);
1064 }
1065
1066 if (si != rsi) 1097 if (si != rsi)
1067 { 1098 {
1068 // fast re-sync on connection changes, useful especially for tcp/ip 1099 // fast re-sync on source address changes, useful especially for tcp/ip
1069 si = rsi; 1100 si = rsi;
1070 1101
1071 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1102 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1072 conf->nodename, (const char *)si, (const char *)rsi); 1103 conf->nodename, (const char *)si, (const char *)rsi);
1073 } 1104 }
1074
1075 delete d;
1076
1077 break;
1078 } 1105 }
1106
1107 delete d;
1108 break;
1079 } 1109 }
1080 } 1110 }
1081 1111
1082 send_reset (rsi); 1112 send_reset (rsi);
1083 break; 1113 break;
… …
1085 case vpn_packet::PT_CONNECT_REQ: 1115 case vpn_packet::PT_CONNECT_REQ:
1086 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1087 { 1117 {
1088 connect_req_packet *p = (connect_req_packet *) pkt; 1118 connect_req_packet *p = (connect_req_packet *) pkt;
1089 1119
1090 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1120 if (p->id > 0 && p->id <= vpn->conns.size ())
1091 connection *c = vpn->conns[p->id - 1];
1092 conf->protocols = p->protocols;
1093
1094 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1095 conf->id, p->id, c->ictx && c->octx);
1096
1097 if (c->ictx && c->octx)
1098 { 1121 {
1122 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols;
1124
1125 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1126 conf->id, p->id, c->ictx && c->octx);
1127
1128 if (c->ictx && c->octx)
1129 {
1099 // send connect_info packets to both sides, in case one is 1130 // send connect_info packets to both sides, in case one is
1100 // behind a nat firewall (or both ;) 1131 // behind a nat firewall (or both ;)
1101 c->send_connect_info (conf->id, si, conf->protocols); 1132 c->send_connect_info (conf->id, si, conf->protocols);
1102 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1133 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1134 }
1135 else
1136 c->establish_connection ();
1103 } 1137 }
1104 else 1138 else
1105 c->establish_connection (); 1139 slog (L_WARN,
1140 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1141 p->id);
1106 } 1142 }
1107 1143
1108 break; 1144 break;
1109 1145
1110 case vpn_packet::PT_CONNECT_INFO: 1146 case vpn_packet::PT_CONNECT_INFO:
1111 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1147 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1112 { 1148 {
1113 connect_info_packet *p = (connect_info_packet *) pkt; 1149 connect_info_packet *p = (connect_info_packet *)pkt;
1114 1150
1115 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1151 if (p->id > 0 && p->id <= vpn->conns.size ())
1116 1152 {
1117 connection *c = vpn->conns[p->id - 1]; 1153 connection *c = vpn->conns[p->id - 1];
1118 1154
1119 c->conf->protocols = p->protocols; 1155 c->conf->protocols = p->protocols;
1120 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1156 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1121 p->si.upgrade_protocol (protocol, c->conf); 1157 p->si.upgrade_protocol (protocol, c->conf);
1122 1158
1123 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1159 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1124 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1160 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1125 1161
1126 const sockinfo &dsi = forward_si (p->si); 1162 const sockinfo &dsi = forward_si (p->si);
1127 1163
1128 if (dsi.valid ()) 1164 if (dsi.valid ())
1129 c->send_auth_request (dsi, true); 1165 c->send_auth_request (dsi, true);
1166 }
1167 else
1168 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id);
1130 } 1171 }
1131 1172
1132 break; 1173 break;
1133 1174
1134 default: 1175 default:
1135 send_reset (rsi); 1176 send_reset (rsi);
1136 break; 1177 break;
1137 } 1178 }
1138} 1179}
1139 1180
1140void connection::keepalive_cb (time_watcher &w) 1181inline void
1182connection::keepalive_cb (ev::timer &w, int revents)
1141{ 1183{
1142 if (NOW >= last_activity + ::conf.keepalive + 30) 1184 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1143 { 1185 {
1144 reset_connection (); 1186 reset_connection ();
1145 establish_connection (); 1187 establish_connection ();
1146 } 1188 }
1147 else if (NOW < last_activity + ::conf.keepalive) 1189 else if (ev_now () < last_activity + ::conf.keepalive)
1148 w.at = last_activity + ::conf.keepalive; 1190 w.start (last_activity + ::conf.keepalive - ev::now ());
1149 else if (conf->connectmode != conf_node::C_ONDEMAND 1191 else if (conf->connectmode != conf_node::C_ONDEMAND
1150 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1192 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1151 { 1193 {
1152 send_ping (si); 1194 send_ping (si);
1153 w.at = NOW + 5; 1195 w.start (5);
1154 } 1196 }
1155 else if (NOW < last_activity + ::conf.keepalive + 10) 1197 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1156 // hold ondemand connections implicitly a few seconds longer 1198 // hold ondemand connections implicitly a few seconds longer
1157 // should delete octx, though, or something like that ;) 1199 // should delete octx, though, or something like that ;)
1158 w.at = last_activity + ::conf.keepalive + 10; 1200 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1159 else 1201 else
1160 reset_connection (); 1202 reset_connection ();
1161} 1203}
1162 1204
1163void connection::send_connect_request (int id) 1205void connection::send_connect_request (int id)
… …
1169 send_vpn_packet (p, si); 1211 send_vpn_packet (p, si);
1170 1212
1171 delete p; 1213 delete p;
1172} 1214}
1173 1215
1216void connection::script_init_env (const char *ext)
1217{
1218 char *env;
1219 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1220 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1221 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1222 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1223 conf->id & 0xff); putenv (env);
1224}
1225
1174void connection::script_node () 1226void connection::script_init_connect_env ()
1175{ 1227{
1176 vpn->script_if_up (); 1228 vpn->script_init_env ();
1177 1229
1178 char *env; 1230 char *env;
1179 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1231 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1180 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1232 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1181 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1233 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1182 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1234 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1183} 1235}
1184 1236
1237inline const char *
1185const char *connection::script_node_up () 1238connection::script_node_up ()
1186{ 1239{
1187 script_node (); 1240 script_init_connect_env ();
1188 1241
1189 putenv ("STATE=up"); 1242 putenv ((char *)"STATE=up");
1190 1243
1244 char *filename;
1245 asprintf (&filename,
1246 "%s/%s",
1247 confbase,
1191 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1248 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1192}
1193 1249
1250 return filename;
1251}
1252
1253inline const char *
1194const char *connection::script_node_down () 1254connection::script_node_down ()
1195{ 1255{
1196 script_node (); 1256 script_init_connect_env ();
1197 1257
1198 putenv ("STATE=down"); 1258 putenv ((char *)"STATE=down");
1199 1259
1200 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1260 char *filename;
1201} 1261 asprintf (&filename,
1262 "%s/%s",
1263 confbase,
1264 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1202 1265
1266 return filename;
1267}
1268
1203connection::connection(struct vpn *vpn_) 1269connection::connection (struct vpn *vpn, conf_node *conf)
1204: vpn(vpn_) 1270: vpn(vpn), conf(conf)
1205, rekey (this, &connection::rekey_cb) 1271#if ENABLE_DNS
1206, keepalive (this, &connection::keepalive_cb) 1272, dns (0)
1273#endif
1274{
1275 rekey .set<connection, &connection::rekey_cb > (this);
1276 keepalive .set<connection, &connection::keepalive_cb > (this);
1207, establish_connection (this, &connection::establish_connection_cb) 1277 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1208{ 1278
1209 octx = ictx = 0; 1279 octx = ictx = 0;
1210 retry_cnt = 0; 1280 retry_cnt = 0;
1211 1281
1282 if (!conf->protocols) // make sure some protocol is enabled
1283 conf->protocols = PROT_UDPv4;
1284
1212 connectmode = conf_node::C_ALWAYS; // initial setting 1285 connectmode = conf_node::C_ALWAYS; // initial setting
1213 reset_connection (); 1286 reset_connection ();
1214} 1287}
1215 1288
1216connection::~connection () 1289connection::~connection ()

Diff Legend

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