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

Diff Legend

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