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.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.67 by pcg, Thu Aug 7 16:34:21 2008 UTC

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

Diff Legend

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