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

Diff Legend

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