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.46 by pcg, Sat Mar 5 19:13:15 2005 UTC vs.
Revision 1.110 by root, Thu Jan 9 08:15:05 2014 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 Copyright (C) 2003-2008,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE. 5 This file is part of GVPE.
6 6
7 GVPE is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
8 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
9 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
10 (at your option) any later version. 10 option) any later version.
11 11
12 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, but
13 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
15 GNU General Public License for more details. 15 Public License for more details.
16 16
17 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 along
18 along with gvpe; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
19 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
20*/ 30*/
21 31
22#include "config.h" 32#include "config.h"
23 33
24#include <cassert>
25
26#include <list> 34#include <list>
35#include <queue>
36#include <utility>
27 37
38#include <openssl/opensslv.h>
28#include <openssl/rand.h> 39#include <openssl/rand.h>
29#include <openssl/evp.h> 40#include <openssl/evp.h>
30#include <openssl/rsa.h> 41#include <openssl/rsa.h>
31#include <openssl/err.h> 42#include <openssl/err.h>
32 43
33#include "gettext.h" 44// openssl 0.9.8 compatibility
45#if OPENSSL_VERSION_NUMBER < 0x10100000
46 #define require101(exp) exp
47#else
48 #define require101(exp) equire (exp)
49#endif
34 50
35#include "conf.h" 51#include "conf.h"
36#include "slog.h" 52#include "slog.h"
37#include "device.h" 53#include "device.h"
38#include "vpn.h" 54#include "vpn.h"
39#include "connection.h" 55#include "connection.h"
56#include "hkdf.h"
40 57
41#include "netcompat.h" 58#include "netcompat.h"
42 59
43#if !HAVE_RAND_PSEUDO_BYTES
44# define RAND_pseudo_bytes RAND_bytes
45#endif
46
47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 60#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
61#define MAGIC "HUHN\xbd\xc6\xdb\x82" // 8 bytes of magic//D
48 62
49#define ULTRA_FAST 1 63#define ULTRA_FAST 1
50#define HLOG 15 64#define HLOG 15
51#include "lzf/lzf.h" 65#include "lzf/lzf.h"
52#include "lzf/lzf_c.c" 66#include "lzf/lzf_c.c"
53#include "lzf/lzf_d.c" 67#include "lzf/lzf_d.c"
54 68
69//////////////////////////////////////////////////////////////////////////////
70
71static std::queue< std::pair<run_script_cb *, const char *> > rs_queue;
72static ev::child rs_child_ev;
73
74namespace
75{
76 void // c++ requires external linkage here, apparently :(
77 rs_child_cb (ev::child &w, int revents)
78 {
79 w.stop ();
80
81 if (rs_queue.empty ())
82 return;
83
84 pid_t pid = run_script (*rs_queue.front ().first, false);
85 if (pid)
86 {
87 w.set (pid);
88 w.start ();
89 }
90 else
91 slog (L_WARN, rs_queue.front ().second);
92
93 delete rs_queue.front ().first;
94 rs_queue.pop ();
95 }
96};
97
98// despite the fancy name, this is quite a hack
99static void
100run_script_queued (run_script_cb *cb, const char *warnmsg)
101{
102 rs_queue.push (std::make_pair (cb, warnmsg));
103
104 if (!rs_child_ev.is_active ())
105 {
106 rs_child_ev.set<rs_child_cb> ();
107 rs_child_ev ();
108 }
109}
110
111//////////////////////////////////////////////////////////////////////////////
112
55struct crypto_ctx 113struct crypto_ctx
56{ 114{
57 EVP_CIPHER_CTX cctx; 115 EVP_CIPHER_CTX cctx;
58 HMAC_CTX hctx; 116 HMAC_CTX hctx;
59 117
60 crypto_ctx (const rsachallenge &challenge, int enc); 118 crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc);
61 ~crypto_ctx (); 119 ~crypto_ctx ();
62}; 120};
63 121
64crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 122crypto_ctx::crypto_ctx (const auth_data &auth1, const auth_data &auth2, const ecdh_key &a, const ecdh_key &b, int enc)
65{ 123{
124 ecdh_key s;
125
126 curve25519_combine (a, b, s);
127
128 {
129 u8 mac_key[MAC_KEYSIZE];
130 static const unsigned char mac_info[] = "gvpe mac key";
131
132 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
133 kdf.extract (auth1.rsa.mac_key, sizeof (auth1.rsa.mac_key));
134 kdf.extract (s, sizeof (s));
135 kdf.extract_done (HKDF_PRF_HASH ());
136 kdf.expand (mac_key, sizeof (mac_key), mac_info, sizeof (mac_info));
137
138 HMAC_CTX_init (&hctx);
139 require101 (HMAC_Init_ex (&hctx, mac_key, MAC_KEYSIZE, MAC_DIGEST (), 0));
140 }
141
142 {
143 u8 cipher_key[CIPHER_KEYSIZE];
144 static const unsigned char cipher_info[] = "gvpe cipher key";
145
146 hkdf kdf (auth2.rsa.hkdf_salt, sizeof (auth2.rsa.hkdf_salt), HKDF_XTR_HASH ());
147 kdf.extract (auth1.rsa.cipher_key, sizeof (auth1.rsa.cipher_key));
148 kdf.extract (s, sizeof (s));
149 kdf.extract_done (HKDF_PRF_HASH ());
150 kdf.expand (cipher_key, sizeof (cipher_key), cipher_info, sizeof (cipher_info));
151
66 EVP_CIPHER_CTX_init (&cctx); 152 EVP_CIPHER_CTX_init (&cctx);
67 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc)); 153 require (EVP_CipherInit_ex (&cctx, CIPHER (), 0, cipher_key, 0, enc));
68 HMAC_CTX_init (&hctx); 154 }
69 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
70} 155}
71 156
72crypto_ctx::~crypto_ctx () 157crypto_ctx::~crypto_ctx ()
73{ 158{
74 require (EVP_CIPHER_CTX_cleanup (&cctx)); 159 require (EVP_CIPHER_CTX_cleanup (&cctx));
75 HMAC_CTX_cleanup (&hctx); 160 HMAC_CTX_cleanup (&hctx);
76} 161}
77 162
163static inline void
164auth_encrypt (RSA *key, const auth_data &auth, auth_encr &encr)
165{
166 if (RSA_public_encrypt (sizeof (auth.rsa),
167 (unsigned char *)&auth.rsa, (unsigned char *)&encr.rsa,
168 key, RSA_PKCS1_OAEP_PADDING) < 0)
169 fatal ("RSA_public_encrypt error");
170
171 memcpy (&encr.ecdh, &auth.ecdh, sizeof (encr.ecdh));
172}
173
174static inline bool
175auth_decrypt (RSA *key, const auth_encr &encr, auth_data &auth)
176{
177 u8 rsa_decrypt[RSA_KEYLEN];
178
179 if (RSA_private_decrypt (sizeof (encr.rsa),
180 (const unsigned char *)&encr.rsa, (unsigned char *)rsa_decrypt,
181 key, RSA_PKCS1_OAEP_PADDING) != sizeof (auth.rsa))
182 return 0;
183
184 memcpy (&auth.rsa, rsa_decrypt, sizeof (auth.rsa));
185 memcpy (&auth.ecdh, &encr.ecdh, sizeof (auth.ecdh));
186
187 return 1;
188}
189
78static void 190static void
79rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 191auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
80{ 192{
81 EVP_MD_CTX ctx; 193 hkdf kdf (b, sizeof b, AUTH_DIGEST ()); // use response ecdh b as salt
82 194 kdf.extract (&auth.rsa, sizeof (auth.rsa));
83 EVP_MD_CTX_init (&ctx); 195 kdf.extract_done ();
84 require (EVP_DigestInit (&ctx, RSA_HASH)); 196 kdf.expand (mac, sizeof mac, auth.ecdh, sizeof (auth.ecdh)); // use challenge ecdh b as info
85 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
86 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
87 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
88 EVP_MD_CTX_cleanup (&ctx);
89} 197}
90 198
91struct rsa_entry { 199void
92 tstamp expire; 200connection::generate_auth_data ()
93 rsaid id;
94 rsachallenge chg;
95};
96
97struct rsa_cache : list<rsa_entry>
98{ 201{
99 void cleaner_cb (time_watcher &w); time_watcher cleaner; 202 if (auth_expire < ev_now ())
100
101 bool find (const rsaid &id, rsachallenge &chg)
102 {
103 for (iterator i = begin (); i != end (); ++i)
104 {
105 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
106 {
107 memcpy (&chg, &i->chg, sizeof chg);
108
109 erase (i);
110 return true;
111 }
112 }
113
114 if (cleaner.at < NOW)
115 cleaner.start (NOW + RSA_TTL);
116
117 return false;
118 }
119
120 void gen (rsaid &id, rsachallenge &chg)
121 {
122 rsa_entry e;
123
124 RAND_bytes ((unsigned char *)&id, sizeof id);
125 RAND_bytes ((unsigned char *)&chg, sizeof chg);
126
127 e.expire = NOW + RSA_TTL;
128 e.id = id;
129 memcpy (&e.chg, &chg, sizeof chg);
130
131 push_back (e);
132
133 if (cleaner.at < NOW)
134 cleaner.start (NOW + RSA_TTL);
135 }
136
137 rsa_cache ()
138 : cleaner (this, &rsa_cache::cleaner_cb)
139 { } 203 {
204 // request data
205 rand_fill (snd_auth.rsa);
206 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
140 207
141} rsa_cache; 208 // eventual response data
142 209 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
143void rsa_cache::cleaner_cb (time_watcher &w)
144{
145 if (!empty ())
146 { 210 }
147 w.start (NOW + RSA_TTL);
148 211
149 for (iterator i = begin (); i != end (); ) 212 // every use prolongs the expiry
150 if (i->expire <= NOW) 213 auth_expire = ev_now () + AUTH_TTL;
151 i = erase (i);
152 else
153 ++i;
154 }
155} 214}
156 215
157////////////////////////////////////////////////////////////////////////////// 216//////////////////////////////////////////////////////////////////////////////
158 217
159void pkt_queue::put (net_packet *p) 218pkt_queue::pkt_queue (double max_ttl, int max_queue)
219: max_ttl (max_ttl), max_queue (max_queue)
160{ 220{
161 if (queue[i]) 221 queue = new pkt [max_queue];
162 {
163 delete queue[i];
164 j = (j + 1) % QUEUEDEPTH;
165 }
166 222
167 queue[i] = p;
168
169 i = (i + 1) % QUEUEDEPTH;
170}
171
172net_packet *pkt_queue::get ()
173{
174 net_packet *p = queue[j];
175
176 if (p)
177 {
178 queue[j] = 0;
179 j = (j + 1) % QUEUEDEPTH;
180 }
181
182 return p;
183}
184
185pkt_queue::pkt_queue ()
186{
187 memset (queue, 0, sizeof (queue));
188 i = 0; 223 i = 0;
189 j = 0; 224 j = 0;
225
226 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
190} 227}
191 228
192pkt_queue::~pkt_queue () 229pkt_queue::~pkt_queue ()
193{ 230{
194 for (i = QUEUEDEPTH; --i > 0; ) 231 while (net_packet *p = get ())
232 delete p;
233
195 delete queue[i]; 234 delete [] queue;
196} 235}
197 236
237void
238pkt_queue::expire_cb (ev::timer &w, int revents)
239{
240 ev_tstamp expire = ev_now () - max_ttl;
241
242 for (;;)
243 {
244 if (empty ())
245 break;
246
247 double diff = queue[j].tstamp - expire;
248
249 if (diff >= 0.)
250 {
251 w.start (diff > 0.5 ? diff : 0.5);
252 break;
253 }
254
255 delete get ();
256 }
257}
258
259void
260pkt_queue::put (net_packet *p)
261{
262 ev_tstamp now = ev_now ();
263
264 // start expiry timer
265 if (empty ())
266 expire.start (max_ttl);
267
268 int ni = i + 1 == max_queue ? 0 : i + 1;
269
270 if (ni == j)
271 delete get ();
272
273 queue[i].pkt = p;
274 queue[i].tstamp = now;
275
276 i = ni;
277}
278
279net_packet *
280pkt_queue::get ()
281{
282 if (empty ())
283 return 0;
284
285 net_packet *p = queue[j].pkt;
286 queue[j].pkt = 0;
287
288 j = j + 1 == max_queue ? 0 : j + 1;
289
290 return p;
291}
292
198struct net_rateinfo { 293struct net_rateinfo
294{
199 u32 host; 295 u32 host;
200 double pcnt, diff; 296 double pcnt, diff;
201 tstamp last; 297 tstamp last;
202}; 298};
203 299
213 309
214 bool can (const sockinfo &si) { return can((u32)si.host); } 310 bool can (const sockinfo &si) { return can((u32)si.host); }
215 bool can (u32 host); 311 bool can (u32 host);
216}; 312};
217 313
218net_rate_limiter auth_rate_limiter, reset_rate_limiter; 314static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
219 315
316bool
220bool net_rate_limiter::can (u32 host) 317net_rate_limiter::can (u32 host)
221{ 318{
222 iterator i; 319 iterator i;
223 320
224 for (i = begin (); i != end (); ) 321 for (i = begin (); i != end (); )
225 if (i->host == host) 322 if (i->host == host)
226 break; 323 break;
227 else if (i->last < NOW - NRL_EXPIRE) 324 else if (i->last < ev_now () - NRL_EXPIRE)
228 i = erase (i); 325 i = erase (i);
229 else 326 else
230 i++; 327 i++;
231 328
232 if (i == end ()) 329 if (i == end ())
234 net_rateinfo ri; 331 net_rateinfo ri;
235 332
236 ri.host = host; 333 ri.host = host;
237 ri.pcnt = 1.; 334 ri.pcnt = 1.;
238 ri.diff = NRL_MAXDIF; 335 ri.diff = NRL_MAXDIF;
239 ri.last = NOW; 336 ri.last = ev_now ();
240 337
241 push_front (ri); 338 push_front (ri);
242 339
243 return true; 340 return true;
244 } 341 }
246 { 343 {
247 net_rateinfo ri (*i); 344 net_rateinfo ri (*i);
248 erase (i); 345 erase (i);
249 346
250 ri.pcnt = ri.pcnt * NRL_ALPHA; 347 ri.pcnt = ri.pcnt * NRL_ALPHA;
251 ri.diff = ri.diff * NRL_ALPHA + (NOW - ri.last); 348 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
252 349
253 ri.last = NOW; 350 ri.last = ev_now ();
254 351
255 double dif = ri.diff / ri.pcnt; 352 double dif = ri.diff / ri.pcnt;
256 353
257 bool send = dif > NRL_CUTOFF; 354 bool send = dif > NRL_CUTOFF;
258 355
270 } 367 }
271} 368}
272 369
273///////////////////////////////////////////////////////////////////////////// 370/////////////////////////////////////////////////////////////////////////////
274 371
275unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 372void
276
277void hmac_packet::hmac_gen (crypto_ctx *ctx) 373hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
278{ 374{
279 unsigned int xlen;
280
281 HMAC_CTX *hctx = &ctx->hctx; 375 HMAC_CTX *hctx = &ctx->hctx;
282 376
283 HMAC_Init_ex (hctx, 0, 0, 0, 0); 377 require101 (HMAC_Init_ex (hctx, 0, 0, 0, 0));
284 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 378 require101 (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
285 len - sizeof (hmac_packet)); 379 require101 (HMAC_Final (hctx, hmac_digest, 0));
286 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
287} 380}
288 381
289void 382void
290hmac_packet::hmac_set (crypto_ctx *ctx) 383hmac_packet::hmac_set (crypto_ctx *ctx)
291{ 384{
292 hmac_gen (ctx); 385 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
293 386 hmac_gen (ctx, hmac_digest);
294 memcpy (hmac, hmac_digest, HMACLENGTH); 387 memcpy (hmac, hmac_digest, HMACLENGTH);
295} 388}
296 389
297bool 390bool
298hmac_packet::hmac_chk (crypto_ctx *ctx) 391hmac_packet::hmac_chk (crypto_ctx *ctx)
299{ 392{
300 hmac_gen (ctx); 393 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
301 394 hmac_gen (ctx, hmac_digest);
302 return !memcmp (hmac, hmac_digest, HMACLENGTH); 395 return slow_memeq (hmac, hmac_digest, HMACLENGTH);
303} 396}
304 397
398void
305void vpn_packet::set_hdr (ptype type_, unsigned int dst) 399vpn_packet::set_hdr (ptype type_, unsigned int dst)
306{ 400{
307 type = type_; 401 type = type_;
308 402
309 int src = THISNODE->id; 403 int src = THISNODE->id;
310 404
315 409
316#define MAXVPNDATA (MAX_MTU - 6 - 6) 410#define MAXVPNDATA (MAX_MTU - 6 - 6)
317#define DATAHDR (sizeof (u32) + RAND_SIZE) 411#define DATAHDR (sizeof (u32) + RAND_SIZE)
318 412
319struct vpndata_packet : vpn_packet 413struct vpndata_packet : vpn_packet
414{
415 u8 data[MAXVPNDATA + DATAHDR]; // seqno
416
417 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
418 tap_packet *unpack (connection *conn, u32 &seqno);
419
420private:
421 const u32 data_hdr_size () const
320 { 422 {
321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
322
323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
324 tap_packet *unpack (connection *conn, u32 &seqno);
325private:
326
327 const u32 data_hdr_size () const
328 {
329 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 423 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
330 }
331 }; 424 }
425};
332 426
333void 427void
334vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno) 428vpndata_packet::setup (connection *conn, int dst, u8 *d, u32 l, u32 seqno)
335{ 429{
336 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 430 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
338 ptype type = PT_DATA_UNCOMPRESSED; 432 ptype type = PT_DATA_UNCOMPRESSED;
339 433
340#if ENABLE_COMPRESSION 434#if ENABLE_COMPRESSION
341 u8 cdata[MAX_MTU]; 435 u8 cdata[MAX_MTU];
342 436
343 if (conn->features & ENABLE_COMPRESSION) 437 if (conn->features & FEATURE_COMPRESSION)
344 { 438 {
345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 439 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346 440
347 if (cl) 441 if (cl)
348 { 442 {
354 d[1] = cl; 448 d[1] = cl;
355 } 449 }
356 } 450 }
357#endif 451#endif
358 452
359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 453 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
360 454
361 struct { 455 struct {
362#if RAND_SIZE 456#if RAND_SIZE
363 u8 rnd[RAND_SIZE]; 457 u8 rnd[RAND_SIZE];
364#endif 458#endif
365 u32 seqno; 459 u32 seqno;
366 } datahdr; 460 } datahdr;
367 461
368 datahdr.seqno = ntohl (seqno); 462 datahdr.seqno = ntohl (seqno);
369#if RAND_SIZE 463#if RAND_SIZE
370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 464 // NB: a constant (per session) random prefix
465 // is likely enough, but we don't take any chances.
466 conn->oiv.get (datahdr.rnd, RAND_SIZE);
371#endif 467#endif
372 468
373 require (EVP_EncryptUpdate (cctx, 469 require (EVP_EncryptUpdate (cctx,
374 (unsigned char *) data + outl, &outl2, 470 (unsigned char *) data + outl, &outl2,
375 (unsigned char *) &datahdr, DATAHDR)); 471 (unsigned char *) &datahdr, DATAHDR));
397 int outl = 0, outl2; 493 int outl = 0, outl2;
398 tap_packet *p = new tap_packet; 494 tap_packet *p = new tap_packet;
399 u8 *d; 495 u8 *d;
400 u32 l = len - data_hdr_size (); 496 u32 l = len - data_hdr_size ();
401 497
402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 498 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
403 499
404#if ENABLE_COMPRESSION 500#if ENABLE_COMPRESSION
405 u8 cdata[MAX_MTU]; 501 u8 cdata[MAX_MTU];
406 502
407 if (type == PT_DATA_COMPRESSED) 503 if (type == PT_DATA_COMPRESSED)
408 d = cdata; 504 d = cdata;
409 else 505 else
410#endif 506#endif
411 d = &(*p)[6 + 6 - DATAHDR]; 507 d = &(*p)[6 + 6] - DATAHDR;
412 508
413 /* this overwrites part of the src mac, but we fix that later */ 509 // we play do evil games with the struct layout atm.
510 // pending better solutions, we at least do some verification.
511 // this is fine, as we left ISO territory long ago.
512 require (DATAHDR <= 16);
513 require ((u8 *)(&p->len + 1) == &(*p)[0]);
514
515 // this can overwrite the len/dst/src fields
414 require (EVP_DecryptUpdate (cctx, 516 require (EVP_DecryptUpdate (cctx,
415 d, &outl2, 517 d, &outl2,
416 (unsigned char *)&data, len - data_hdr_size ())); 518 (unsigned char *)&data, len - data_hdr_size ()));
417 outl += outl2; 519 outl += outl2;
418 520
449 } 551 }
450}; 552};
451 553
452struct config_packet : vpn_packet 554struct config_packet : vpn_packet
453{ 555{
454 // actually, hmaclen cannot be checked because the hmac 556 u8 serial[SERIAL_SIZE];
455 // field comes before this data, so peers with other
456 // hmacs simply will not work.
457 u8 prot_major, prot_minor, randsize, hmaclen; 557 u8 prot_major, prot_minor, randsize;
458 u8 flags, challengelen, features, pad3; 558 u8 flags, features, pad6, pad7, pad8;
459 u32 cipher_nid, digest_nid, hmac_nid; 559 u32 cipher_nid, mac_nid, auth_nid;
460 560
461 void setup (ptype type, int dst); 561 void setup (ptype type, int dst);
462 bool chk_config () const; 562 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
463 563
464 static u8 get_features () 564 static u8 get_features ()
465 { 565 {
466 u8 f = 0; 566 u8 f = 0;
467#if ENABLE_COMPRESSION 567#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION; 568 f |= FEATURE_COMPRESSION;
469#endif 569#endif
470#if ENABLE_ROHC 570#if ENABLE_ROHC
471 f |= FEATURE_ROHC; 571 f |= FEATURE_ROHC;
472#endif 572#endif
573#if ENABLE_BRIDGING
574 f |= FEATURE_BRIDGING;
575#endif
473 return f; 576 return f;
474 } 577 }
475}; 578};
476 579
580void
477void config_packet::setup (ptype type, int dst) 581config_packet::setup (ptype type, int dst)
478{ 582{
479 prot_major = PROTOCOL_MAJOR; 583 prot_major = PROTOCOL_MAJOR;
480 prot_minor = PROTOCOL_MINOR; 584 prot_minor = PROTOCOL_MINOR;
481 randsize = RAND_SIZE; 585 randsize = RAND_SIZE;
482 hmaclen = HMACLENGTH; 586 flags = 0;
483 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
484 challengelen = sizeof (rsachallenge);
485 features = get_features (); 587 features = get_features ();
486 588
589 strncpy ((char *)serial, conf.serial, sizeof (serial));
590
487 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 591 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
488 digest_nid = htonl (EVP_MD_type (RSA_HASH));
489 hmac_nid = htonl (EVP_MD_type (DIGEST)); 592 mac_nid = htonl (EVP_MD_type (MAC_DIGEST ()));
593 auth_nid = htonl (EVP_MD_type (AUTH_DIGEST ()));
490 594
491 len = sizeof (*this) - sizeof (net_packet); 595 len = sizeof (*this) - sizeof (net_packet);
492 set_hdr (type, dst); 596 set_hdr (type, dst);
493} 597}
494 598
495bool config_packet::chk_config () const 599bool
600config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
496{ 601{
497 if (prot_major != PROTOCOL_MAJOR) 602 if (prot_major != PROTOCOL_MAJOR)
498 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 603 slog (L_WARN, _("%s(%s): major version mismatch (remote %d <=> local %d)"),
604 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
499 else if (randsize != RAND_SIZE) 605 else if (randsize != RAND_SIZE)
500 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 606 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
501 else if (hmaclen != HMACLENGTH) 607 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
502 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
503#if 0 // this implementation should handle all flag settings
504 else if (flags != curflags ())
505 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
506#endif
507 else if (challengelen != sizeof (rsachallenge))
508 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
509 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 608 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
510 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 609 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
511 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 610 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
512 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
513 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 611 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
514 slog (L_WARN, _("hmac mismatch (remote %x <=> local %x)"), ntohl (hmac_nid), EVP_MD_type (DIGEST)); 612 slog (L_WARN, _("%s(%s): mac algo mismatch (remote %x <=> local %x)"),
613 conf->nodename, (const char *)rsi, ntohl (mac_nid), EVP_MD_type (MAC_DIGEST ()));
614 else if (auth_nid != htonl (EVP_MD_type (AUTH_DIGEST ())))
615 slog (L_WARN, _("%s(%s): auth algo mismatch (remote %x <=> local %x)"),
616 conf->nodename, (const char *)rsi, ntohl (auth_nid), EVP_MD_type (AUTH_DIGEST ()));
515 else 617 else
618 {
619 int cmp = memcmp (serial, ::conf.serial, sizeof (serial));
620
621 if (cmp > 0)
622 slog (L_WARN, _("%s(%s): remote serial newer than local serial - outdated config?"),
623 conf->nodename, (const char *)rsi);
624 else if (cmp == 0)
516 return true; 625 return true;
626 }
517 627
518 return false; 628 return false;
519} 629}
520 630
521struct auth_req_packet : config_packet 631struct auth_req_packet : config_packet // UNPROTECTED
522{ 632{
523 char magic[8]; 633 char magic[8];
524 u8 initiate; // false if this is just an automatic reply 634 u8 initiate; // false if this is just an automatic reply
525 u8 protocols; // supported protocols (will be patched on forward) 635 u8 protocols; // supported protocols (will be patched on forward)
526 u8 pad2, pad3; 636 u8 pad2, pad3;
527 rsaid id; 637 auth_encr encr;
528 rsaencrdata encr;
529 638
530 auth_req_packet (int dst, bool initiate_, u8 protocols_) 639 auth_req_packet (int dst, bool initiate_, u8 protocols_)
531 { 640 {
532 config_packet::setup (PT_AUTH_REQ, dst); 641 config_packet::setup (PT_AUTH_REQ, dst);
533 strncpy (magic, MAGIC, 8); 642 memcpy (magic, MAGIC, 8);
534 initiate = !!initiate_; 643 initiate = !!initiate_;
535 protocols = protocols_; 644 protocols = protocols_;
536 645
537 len = sizeof (*this) - sizeof (net_packet); 646 len = sizeof (*this) - sizeof (net_packet);
538 } 647 }
539}; 648};
540 649
541struct auth_res_packet : config_packet 650struct auth_res_packet : vpn_packet // UNPROTECTED
542{ 651{
543 rsaid id;
544 u8 pad1, pad2, pad3;
545 u8 response_len; // encrypted length
546 rsaresponse response; 652 auth_response response;
547 653
548 auth_res_packet (int dst) 654 auth_res_packet (int dst)
549 { 655 {
550 config_packet::setup (PT_AUTH_RES, dst); 656 set_hdr (PT_AUTH_RES, dst);
551 657
552 len = sizeof (*this) - sizeof (net_packet); 658 len = sizeof (*this) - sizeof (net_packet);
553 } 659 }
554}; 660};
555 661
585}; 691};
586 692
587///////////////////////////////////////////////////////////////////////////// 693/////////////////////////////////////////////////////////////////////////////
588 694
589void 695void
590connection::connection_established () 696connection::connection_established (const sockinfo &rsi)
591{ 697{
592 if (ictx && octx) 698 if (!have_snd_auth || !have_rcv_auth)
699 return;
700
701 si = rsi;
702 protocol = rsi.prot;
703
704 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
705 conf->nodename, (const char *)rsi,
706 vpn->can_direct (THISNODE, conf) ? "direct" : "forwarded",
707 PROTOCOL_MAJOR, prot_minor);
708
709 if (::conf.script_node_up)
710 {
711 run_script_cb *cb = new run_script_cb;
712 cb->set<connection, &connection::script_node_up> (this);
713 run_script_queued (cb, _("node-up command execution failed, continuing."));
593 { 714 }
594 connectmode = conf->connectmode; 715
716 delete ictx; ictx = new crypto_ctx (rcv_auth, snd_auth, rcv_ecdh_a, rcv_auth.ecdh, 0);
717 iseqno.reset (ntohl (rcv_auth.rsa.seqno) & 0x7fffffff);
595 718
719 delete octx; octx = new crypto_ctx (snd_auth, rcv_auth, snd_ecdh_a, snd_ecdh_b , 1);
720 oseqno = ntohl (snd_auth.rsa.seqno) & 0x7fffffff;
721
722 oiv.reset ();
723
596 // make sure rekeying timeouts are slightly asymmetric 724 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 725 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 726 rekey.start (rekey_interval, rekey_interval);
727
728 hmac_error = 0.;
729
599 keepalive.start (NOW + ::conf.keepalive); 730 keepalive.start (::conf.keepalive);
600 731
601 // send queued packets 732 // send queued packets
602 if (ictx && octx)
603 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 733 while (tap_packet *p = (tap_packet *)data_queue.get ())
605 { 734 {
606 send_data_packet (p); 735 if (p->len) send_data_packet (p);
607 delete p; 736 delete p;
608 } 737 }
609 738
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 739 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 { 740 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY); 741 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p; 742 delete p;
614 }
615 }
616 } 743 }
744
745 vpn->connection_established (this);
746}
747
748void
749connection::reset_si ()
750{
751 if (vpn->can_direct (THISNODE, conf))
752 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
617 else 753 else
618 { 754 {
619 retry_cnt = 0; 755 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
620 establish_connection.start (NOW + 5); 756 protocol = 0;
621 keepalive.stop ();
622 rekey.stop ();
623 } 757 }
624}
625
626void
627connection::reset_si ()
628{
629 protocol = best_protocol (THISNODE->protocols & conf->protocols);
630
631 // mask out protocols we cannot establish
632 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
633 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
634 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
635 758
636 si.set (conf, protocol); 759 si.set (conf, protocol);
637} 760}
638 761
639// ensure sockinfo is valid, forward if necessary 762// ensure sockinfo is valid, forward if necessary
640const sockinfo & 763const sockinfo &
641connection::forward_si (const sockinfo &si) const 764connection::forward_si (const sockinfo &si) const
642{ 765{
643 if (!si.valid ()) 766 if (!si.valid ())
644 { 767 {
645 connection *r = vpn->find_router (); 768 connection *r = vpn->find_router_for (this);
646 769
647 if (r) 770 if (r)
648 { 771 {
649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 772 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
650 conf->nodename, r->conf->nodename, (const char *)r->si); 773 conf->nodename, r->conf->nodename);
651 return r->si; 774 return r->si;
652 } 775 }
653 else 776 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 777 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
655 conf->nodename); 778 conf->nodename);
656 } 779 }
657 780
658 return si; 781 return si;
659} 782}
660 783
661void 784void
662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 785connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
663{ 786{
664 if (!vpn->send_vpn_packet (pkt, si, tos)) 787 if (!vpn->send_vpn_packet (pkt, si, tos))
665 reset_connection (); 788 reset_connection ("packet send error");
666} 789}
667 790
668void 791void
669connection::send_ping (const sockinfo &si, u8 pong) 792connection::send_ping (const sockinfo &si, u8 pong)
670{ 793{
671 ping_packet *pkt = new ping_packet; 794 ping_packet *pkt = new ping_packet;
672 795
673 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 796 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
797
798 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
674 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 799 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
675 800
676 delete pkt; 801 delete pkt;
677} 802}
678 803
693void 818void
694connection::send_auth_request (const sockinfo &si, bool initiate) 819connection::send_auth_request (const sockinfo &si, bool initiate)
695{ 820{
696 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 821 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
697 822
698 rsachallenge chg; 823 generate_auth_data ();
699 rsa_cache.gen (pkt->id, chg);
700 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 824 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
701 825
702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
703
704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 827 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
705 828
706 delete pkt; 829 delete pkt;
707} 830}
708 831
709void 832void
710connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 833connection::send_auth_response (const sockinfo &si)
711{ 834{
712 auth_res_packet *pkt = new auth_res_packet (conf->id); 835 auth_res_packet *pkt = new auth_res_packet (conf->id);
713 836
714 pkt->id = id; 837 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
838 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
715 839
716 rsa_hash (id, chg, pkt->response);
717
718 pkt->hmac_set (octx);
719
720 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 840 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
721
722 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 841 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
723 842
724 delete pkt; 843 delete pkt;
725} 844}
726 845
727void 846void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 847connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 848{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 849 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
731 conf->id, rid, (const char *)rsi); 850 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
851 conf->protocols);
732 852
733 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 853 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
734 854
735 r->hmac_set (octx); 855 r->hmac_set (octx);
736 send_vpn_packet (r, si); 856 send_vpn_packet (r, si);
737 857
738 delete r; 858 delete r;
739} 859}
740 860
741void 861inline void
742connection::establish_connection_cb (time_watcher &w) 862connection::establish_connection_cb (ev::timer &w, int revents)
743{ 863{
744 if (!ictx 864 if (!(ictx && octx)
745 && conf != THISNODE 865 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 866 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 867 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 868 && !w.is_active ())
749 { 869 {
750 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 870 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
751 871 // and stop trying. should probably be handled by a per-connection expire handler.
752 if (retry_int < conf->max_retry) 872 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
873 {
874 reset_connection ("no demand");
753 retry_cnt++; 875 return;
754 else 876 }
755 retry_int = conf->max_retry;
756 877
757 w.start (NOW + retry_int); 878 last_establish_attempt = ev_now ();
879
880 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
881 ? (retry_cnt & 3) + 1
882 : 1 << (retry_cnt >> 2));
758 883
759 reset_si (); 884 reset_si ();
760 885
761 if (si.prot && !si.host) 886 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
887
888 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
889 {
890 /*TODO*/ /* start the timer so we don't recurse endlessly */
891 w.start (1);
762 vpn->send_connect_request (conf->id); 892 vpn->send_connect_request (this);
893 }
763 else 894 else
764 { 895 {
896 if (si.valid ())
897 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
898 conf->nodename, (const char *)si);
899
765 const sockinfo &dsi = forward_si (si); 900 const sockinfo &dsi = forward_si (si);
901
902 slow = slow || (dsi.prot & PROT_SLOW);
766 903
767 if (dsi.valid () && auth_rate_limiter.can (dsi)) 904 if (dsi.valid () && auth_rate_limiter.can (dsi))
768 { 905 {
769 if (retry_cnt < 4) 906 // use ping after the first few retries
907 // TODO: on rekeys, the other node might not interpret ping correctly,
908 // TODO: as it will still have a valid connection
909 if (retry_cnt < 4 && (!conf->low_power || THISNODE->low_power))
770 send_auth_request (dsi, true); 910 send_auth_request (dsi, true);
771 else 911 else
772 send_ping (dsi, 0); 912 send_ping (dsi, 0);
773 } 913 }
774 } 914 }
775 }
776}
777 915
916 retry_int *= slow ? 4. : 0.9;
917
918 if (retry_int < conf->max_retry)
919 retry_cnt++;
920 else
921 retry_int = conf->max_retry;
922
923 w.start (retry_int);
924 }
925}
926
778void 927void
779connection::reset_connection () 928connection::reset_connection (const char *reason)
780{ 929{
781 if (ictx && octx) 930 if (ictx && octx)
782 { 931 {
783 slog (L_INFO, _("%s(%s): connection lost"), 932 slog (L_INFO, _("%s(%s): connection lost (%s)"),
784 conf->nodename, (const char *)si); 933 conf->nodename, (const char *)si, reason);
785 934
786 if (::conf.script_node_down) 935 if (::conf.script_node_down)
787 run_script (run_script_cb (this, &connection::script_node_down), false); 936 {
937 run_script_cb *cb = new run_script_cb;
938 cb->set<connection, &connection::script_node_down> (this);
939 run_script_queued (cb, _("node-down command execution failed, continuing."));
940 }
788 } 941 }
789 942
790 delete ictx; ictx = 0; 943 delete ictx; ictx = 0;
791 delete octx; octx = 0; 944 delete octx; octx = 0;
792#if ENABLE_DNS
793 dnsv4_reset_connection ();
794#endif
795 945
796 si.host = 0; 946 si.host = 0;
797 947
948 have_snd_auth = false;
949 have_rcv_auth = false;
950 auth_expire = 0.;
951
798 last_activity = 0; 952 last_activity = 0.;
953 //last_si_change = 0.;
799 retry_cnt = 0; 954 retry_cnt = 0;
800 955
801 rekey.stop (); 956 rekey.stop ();
802 keepalive.stop (); 957 keepalive.stop ();
803 establish_connection.stop (); 958 establish_connection.stop ();
807connection::shutdown () 962connection::shutdown ()
808{ 963{
809 if (ictx && octx) 964 if (ictx && octx)
810 send_reset (si); 965 send_reset (si);
811 966
812 reset_connection (); 967 reset_connection ("shutdown");
813} 968}
814 969
815void 970// poor-man's rekeying
816connection::rekey_cb (time_watcher &w) 971inline void
972connection::rekey_cb (ev::timer &w, int revents)
817{ 973{
818 reset_connection (); 974 reset_connection ("rekeying");
819 establish_connection (); 975 establish_connection ();
820} 976}
821 977
822void 978void
823connection::send_data_packet (tap_packet *pkt) 979connection::send_data_packet (tap_packet *pkt)
837 if (oseqno > MAX_SEQNO) 993 if (oseqno > MAX_SEQNO)
838 rekey (); 994 rekey ();
839} 995}
840 996
841void 997void
998connection::post_inject_queue ()
999{
1000 // force a connection every now and when when packets are sent (max 1/s)
1001 if (ev_now () - last_establish_attempt >= (conf->low_power || THISNODE->low_power ? 2.95 : 0.95)) // arbitrary
1002 establish_connection.stop ();
1003
1004 establish_connection ();
1005}
1006
1007void
842connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 1008connection::inject_data_packet (tap_packet *pkt)
843{ 1009{
844 if (ictx && octx) 1010 if (ictx && octx)
845 send_data_packet (pkt); 1011 send_data_packet (pkt);
846 else 1012 else
847 { 1013 {
848 if (!broadcast)//DDDD
849 data_queue.put (new tap_packet (*pkt)); 1014 data_queue.put (new tap_packet (*pkt));
850 1015 post_inject_queue ();
851 establish_connection ();
852 } 1016 }
853} 1017}
854 1018
1019void
855void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1020connection::inject_vpn_packet (vpn_packet *pkt, int tos)
856{ 1021{
857 if (ictx && octx) 1022 if (ictx && octx)
858 send_vpn_packet (pkt, si, tos); 1023 send_vpn_packet (pkt, si, tos);
859 else 1024 else
860 { 1025 {
861 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1026 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
862 1027 post_inject_queue ();
863 establish_connection ();
864 } 1028 }
865} 1029}
866 1030
867void 1031void
868connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1032connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
869{ 1033{
870 last_activity = NOW; 1034 last_activity = ev_now ();
871 1035
872 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1036 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
873 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1037 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1038
1039 if (connectmode == conf_node::C_DISABLED)
1040 return;
874 1041
875 switch (pkt->typ ()) 1042 switch (pkt->typ ())
876 { 1043 {
877 case vpn_packet::PT_PING: 1044 case vpn_packet::PT_PING:
1045 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1046
878 // we send pings instead of auth packets after some retries, 1047 // we send pings instead of auth packets after some retries,
879 // so reset the retry counter and establish a connection 1048 // so reset the retry counter and establish a connection
880 // when we receive a ping. 1049 // when we receive a ping.
881 if (!ictx) 1050 if (!ictx)
882 { 1051 {
883 if (auth_rate_limiter.can (rsi)) 1052 if (auth_rate_limiter.can (rsi))
884 send_auth_request (rsi, true); 1053 send_auth_request (rsi, true);
885 } 1054 }
886 else 1055 else
1056 // we would love to change the socket address here, but ping's aren't
1057 // authenticated, so we best ignore it.
887 send_ping (rsi, 1); // pong 1058 send_ping (rsi, 1); // pong
888 1059
889 break; 1060 break;
890 1061
891 case vpn_packet::PT_PONG: 1062 case vpn_packet::PT_PONG:
1063 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1064
1065 // a PONG might mean that the other side doesn't really know
1066 // about our desire for communication.
1067 establish_connection ();
892 break; 1068 break;
893 1069
894 case vpn_packet::PT_RESET: 1070 case vpn_packet::PT_RESET:
1071 slog (L_TRACE, "%s >> PT_RESET", conf->nodename);
1072
1073 if (ictx && octx)
895 { 1074 {
896 reset_connection (); 1075 reset_connection ("remote reset");
897 1076
898 config_packet *p = (config_packet *) pkt; 1077 config_packet *p = (config_packet *) pkt;
899 1078
900 if (!p->chk_config ()) 1079 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
901 {
902 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
903 conf->nodename, (const char *)rsi);
904 connectmode = conf_node::C_DISABLED;
905 }
906 else if (connectmode == conf_node::C_ALWAYS)
907 establish_connection (); 1080 establish_connection ();
908 } 1081 }
1082
909 break; 1083 break;
910 1084
911 case vpn_packet::PT_AUTH_REQ: 1085 case vpn_packet::PT_AUTH_REQ:
912 if (auth_rate_limiter.can (rsi)) 1086 if (auth_rate_limiter.can (rsi))
913 { 1087 {
914 auth_req_packet *p = (auth_req_packet *) pkt; 1088 auth_req_packet *p = (auth_req_packet *)pkt;
915 1089
916 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1090 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1091 conf->nodename, p->initiate ? "initiate" : "reply",
1092 p->protocols, p->features);
917 1093
918 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1094 if (memcmp (p->magic, MAGIC, 8))
1095 {
1096 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1097 conf->nodename, (const char *)rsi);
1098 }
1099 else if (p->chk_config (conf, rsi))
919 { 1100 {
920 if (p->prot_minor != PROTOCOL_MINOR) 1101 if (p->prot_minor != PROTOCOL_MINOR)
921 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1102 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
922 conf->nodename, (const char *)rsi, 1103 conf->nodename, (const char *)rsi,
923 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1104 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
924 1105
925 if (p->initiate) 1106 if (p->initiate)
1107 {
926 send_auth_request (rsi, false); 1108 send_auth_request (rsi, false);
927 1109
928 rsachallenge k; 1110 if (ictx && octx)
1111 reset_connection ("reconnect");
1112 }
929 1113
1114 auth_data auth;
1115
930 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1116 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
931 { 1117 {
932 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1118 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
933 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1119 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
934 break;
935 } 1120 }
936 else 1121 else
937 { 1122 {
938 delete octx; 1123 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
939 1124
940 octx = new crypto_ctx (k, 1); 1125 rcv_auth = auth;
941 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1126 have_rcv_auth = true;
942 1127
943 // compatibility code, remove when no longer required 1128 send_auth_response (rsi);
944 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
945 1129
1130 if (chg)
1131 {
946 conf->protocols = p->protocols; 1132 conf->protocols = p->protocols;
947 features = p->features & config_packet::get_features (); 1133 features = p->features & config_packet::get_features ();
948 1134
949 send_auth_response (rsi, p->id, k);
950
951 connection_established (); 1135 connection_established (rsi);
952
953 break; 1136 }
954 } 1137 }
1138
1139 break;
955 } 1140 }
956 else
957 slog (L_WARN, _("%s(%s): protocol mismatch"),
958 conf->nodename, (const char *)rsi);
959 1141
960 send_reset (rsi); 1142 send_reset (rsi);
961 } 1143 }
962 1144
963 break; 1145 break;
964 1146
965 case vpn_packet::PT_AUTH_RES: 1147 case vpn_packet::PT_AUTH_RES:
966 { 1148 {
967 auth_res_packet *p = (auth_res_packet *) pkt; 1149 auth_res_packet *p = (auth_res_packet *)pkt;
968 1150
969 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1151 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
970 1152
971 if (p->chk_config ()) 1153 auth_mac local_mac;
1154 auth_hash (snd_auth, p->response.ecdh, local_mac);
1155
1156 if (!slow_memeq (&p->response.mac, local_mac, sizeof local_mac))
972 { 1157 {
973 if (p->prot_minor != PROTOCOL_MINOR)
974 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
975 conf->nodename, (const char *)rsi,
976 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
977
978 rsachallenge chg;
979
980 if (!rsa_cache.find (p->id, chg))
981 {
982 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1158 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
983 conf->nodename, (const char *)rsi); 1159 conf->nodename, (const char *)rsi);
984 break;
985 } 1160 }
986 else 1161 else if (!have_snd_auth)
987 { 1162 {
988 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1163 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
989 1164
990 if (!p->hmac_chk (cctx)) 1165 have_snd_auth = true;
991 {
992 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
993 "could be an attack, or just corruption or a synchronization error"),
994 conf->nodename, (const char *)rsi);
995 break;
996 }
997 else
998 {
999 rsaresponse h;
1000
1001 rsa_hash (p->id, chg, h);
1002
1003 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1004 {
1005 prot_minor = p->prot_minor;
1006
1007 delete ictx; ictx = cctx;
1008
1009 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1010
1011 si = rsi;
1012 protocol = rsi.prot;
1013
1014 connection_established (); 1166 connection_established (rsi);
1015
1016 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1017 conf->nodename, (const char *)rsi,
1018 p->prot_major, p->prot_minor);
1019
1020 if (::conf.script_node_up)
1021 run_script (run_script_cb (this, &connection::script_node_up), false);
1022
1023 break;
1024 }
1025 else
1026 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1027 conf->nodename, (const char *)rsi);
1028 }
1029
1030 delete cctx;
1031 }
1032 } 1167 }
1033 } 1168 }
1034
1035 send_reset (rsi);
1036 break; 1169 break;
1037 1170
1038 case vpn_packet::PT_DATA_COMPRESSED: 1171 case vpn_packet::PT_DATA_COMPRESSED:
1039#if !ENABLE_COMPRESSION 1172#if !ENABLE_COMPRESSION
1040 send_reset (rsi); 1173 send_reset (rsi);
1046 if (ictx && octx) 1179 if (ictx && octx)
1047 { 1180 {
1048 vpndata_packet *p = (vpndata_packet *)pkt; 1181 vpndata_packet *p = (vpndata_packet *)pkt;
1049 1182
1050 if (!p->hmac_chk (ictx)) 1183 if (!p->hmac_chk (ictx))
1184 {
1185 // rekeying often creates temporary hmac auth floods
1186 // we assume they don't take longer than a few seconds normally,
1187 // and suppress messages and resets during that time.
1188 //TODO: should be done per source address
1189 if (!hmac_error)
1190 {
1191 hmac_error = ev_now () + 3;
1192 break;
1193 }
1194 else if (hmac_error >= ev_now ())
1195 break; // silently suppress
1196 else
1197 {
1051 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1198 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1052 "could be an attack, or just corruption or a synchronization error"), 1199 "could be an attack, or just corruption or a synchronization error."),
1053 conf->nodename, (const char *)rsi); 1200 conf->nodename, (const char *)rsi);
1201 // reset
1202 }
1203 }
1054 else 1204 else
1055 { 1205 {
1056 u32 seqno; 1206 u32 seqno;
1057 tap_packet *d = p->unpack (this, seqno); 1207 tap_packet *d = p->unpack (this, seqno);
1208 int seqclass = iseqno.seqno_classify (seqno);
1058 1209
1059 if (iseqno.recv_ok (seqno)) 1210 hmac_error = 0;
1211
1212 if (seqclass == 0) // ok
1060 { 1213 {
1061 vpn->tap->send (d); 1214 vpn->tap->send (d);
1062 1215
1063 if (si != rsi) 1216 if (si != rsi)
1064 { 1217 {
1065 // fast re-sync on connection changes, useful especially for tcp/ip 1218 // fast re-sync on source address changes, useful especially for tcp/ip
1219 //if (last_si_change < ev_now () + 5.)
1066 si = rsi; 1220 // {
1067
1068 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1221 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1069 conf->nodename, (const char *)si, (const char *)rsi); 1222 conf->nodename, (const char *)si, (const char *)rsi);
1223
1224 si = rsi;
1225
1226 if (::conf.script_node_change)
1227 {
1228 run_script_cb *cb = new run_script_cb;
1229 cb->set<connection, &connection::script_node_change> (this);
1230 run_script_queued (cb, _("node-change command execution failed, continuing."));
1231 }
1232
1233 // }
1234 //else
1235 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1236 // conf->nodename, (const char *)si, (const char *)rsi);
1070 } 1237 }
1238 }
1239 else if (seqclass == 1) // far history
1240 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1241 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1242 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1243 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1244 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1245 else if (seqclass == 3) // reset
1246 {
1247 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1248 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1249 send_reset (rsi);
1071 } 1250 }
1072 1251
1073 delete d; 1252 delete d;
1074 break; 1253 break;
1075 } 1254 }
1079 break; 1258 break;
1080 1259
1081 case vpn_packet::PT_CONNECT_REQ: 1260 case vpn_packet::PT_CONNECT_REQ:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1261 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1262 {
1084 connect_req_packet *p = (connect_req_packet *) pkt; 1263 connect_req_packet *p = (connect_req_packet *)pkt;
1085 1264
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1265 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 connection *c = vpn->conns[p->id - 1];
1088 conf->protocols = p->protocols;
1089
1090 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1091 conf->id, p->id, c->ictx && c->octx);
1092
1093 if (c->ictx && c->octx)
1094 { 1266 {
1267 connection *c = vpn->conns[p->id - 1];
1268 conf->protocols = p->protocols;
1269
1270 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1271 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1272 p->protocols,
1273 c->ictx && c->octx);
1274
1275 if (c->ictx && c->octx)
1276 {
1095 // send connect_info packets to both sides, in case one is 1277 // send connect_info packets to both sides, in case one is
1096 // behind a nat firewall (or both ;) 1278 // behind a nat firewall (or both ;)
1097 c->send_connect_info (conf->id, si, conf->protocols); 1279 c->send_connect_info (conf->id, si, conf->protocols);
1098 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1280 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1281 }
1282 else
1283 c->establish_connection ();
1099 } 1284 }
1100 else 1285 else
1101 c->establish_connection (); 1286 slog (L_WARN,
1287 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1288 p->id);
1102 } 1289 }
1103 1290
1104 break; 1291 break;
1105 1292
1106 case vpn_packet::PT_CONNECT_INFO: 1293 case vpn_packet::PT_CONNECT_INFO:
1107 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1294 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1108 { 1295 {
1109 connect_info_packet *p = (connect_info_packet *)pkt; 1296 connect_info_packet *p = (connect_info_packet *)pkt;
1110 1297
1111 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1298 if (p->id > 0 && p->id <= vpn->conns.size ())
1112 { 1299 {
1113 connection *c = vpn->conns[p->id - 1]; 1300 connection *c = vpn->conns[p->id - 1];
1114 1301
1115 c->conf->protocols = p->protocols; 1302 c->conf->protocols = p->protocols;
1116 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1303 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1117 p->si.upgrade_protocol (protocol, c->conf); 1304 p->si.upgrade_protocol (protocol, c->conf);
1118 1305
1119 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1306 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1120 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1307 conf->nodename,
1308 vpn->conns[p->id - 1]->conf->nodename,
1309 (const char *)p->si,
1310 p->protocols,
1311 protocol,
1312 p->si.supported_protocols (c->conf),
1313 !c->ictx && !c->octx);
1121 1314
1122 const sockinfo &dsi = forward_si (p->si); 1315 const sockinfo &dsi = forward_si (p->si);
1123 1316
1124 if (dsi.valid ()) 1317 if (dsi.valid ())
1125 c->send_auth_request (dsi, true); 1318 c->send_auth_request (dsi, true);
1319 else
1320 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1321 vpn->conns[p->id - 1]->conf->nodename,
1322 (const char *)p->si);
1126 } 1323 }
1324 else
1325 slog (L_WARN,
1326 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1327 p->id);
1127 } 1328 }
1128 1329
1129 break; 1330 break;
1130 1331
1131 default: 1332 default:
1132 send_reset (rsi); 1333 send_reset (rsi);
1133 break; 1334 break;
1134 } 1335 }
1135} 1336}
1136 1337
1137void connection::keepalive_cb (time_watcher &w) 1338inline void
1339connection::keepalive_cb (ev::timer &w, int revents)
1138{ 1340{
1139 if (NOW >= last_activity + ::conf.keepalive + 30) 1341 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1342
1343 if (when >= 0)
1344 w.start (when);
1345 else if (when < -15)
1140 { 1346 {
1141 reset_connection (); 1347 reset_connection ("keepalive overdue");
1142 establish_connection (); 1348 establish_connection ();
1143 } 1349 }
1144 else if (NOW < last_activity + ::conf.keepalive)
1145 w.start (last_activity + ::conf.keepalive);
1146 else if (conf->connectmode != conf_node::C_ONDEMAND 1350 else if (conf->connectmode != conf_node::C_ONDEMAND
1147 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1351 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1148 { 1352 {
1353 w.start (3);
1149 send_ping (si); 1354 send_ping (si);
1150 w.start (NOW + 5);
1151 } 1355 }
1152 else if (NOW < last_activity + ::conf.keepalive + 10) 1356 else if (when >= -10)
1153 // hold ondemand connections implicitly a few seconds longer 1357 // hold ondemand connections implicitly a few seconds longer
1154 // should delete octx, though, or something like that ;) 1358 // should delete octx, though, or something like that ;)
1155 w.start (last_activity + ::conf.keepalive + 10); 1359 w.start (when + 10);
1156 else 1360 else
1157 reset_connection (); 1361 reset_connection ("keepalive timeout");
1158} 1362}
1159 1363
1364void
1160void connection::send_connect_request (int id) 1365connection::send_connect_request (int id)
1161{ 1366{
1162 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1367 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1163 1368
1164 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1369 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1370 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1371 THISNODE->protocols);
1165 p->hmac_set (octx); 1372 p->hmac_set (octx);
1166 send_vpn_packet (p, si); 1373 send_vpn_packet (p, si);
1167 1374
1168 delete p; 1375 delete p;
1169} 1376}
1170 1377
1171void connection::script_node () 1378void
1379connection::script_init_env (const char *ext)
1172{ 1380{
1173 vpn->script_if_up ();
1174
1175 char *env; 1381 char *env;
1382 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1383 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1384 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1385 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1386 conf->id & 0xff); putenv (env);
1387}
1388
1389void
1390connection::script_init_connect_env ()
1391{
1392 vpn->script_init_env ();
1393
1394 char *env;
1176 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1395 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1396 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1177 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1397 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1178 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1398 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1179 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1399 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1180} 1400}
1181 1401
1402inline const char *
1182const char *connection::script_node_up () 1403connection::script_node_up ()
1183{ 1404{
1184 script_node (); 1405 script_init_connect_env ();
1185 1406
1186 putenv ("STATE=up"); 1407 putenv ((char *)"STATE=up");
1187 1408
1409 char *filename;
1410 asprintf (&filename,
1411 "%s/%s",
1412 confbase,
1188 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1413 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1189}
1190 1414
1415 return filename;
1416}
1417
1418inline const char *
1419connection::script_node_change ()
1420{
1421 script_init_connect_env ();
1422
1423 putenv ((char *)"STATE=change");
1424
1425 char *filename;
1426 asprintf (&filename,
1427 "%s/%s",
1428 confbase,
1429 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1430
1431 return filename;
1432}
1433
1434inline const char *
1191const char *connection::script_node_down () 1435connection::script_node_down ()
1192{ 1436{
1193 script_node (); 1437 script_init_connect_env ();
1194 1438
1195 putenv ("STATE=down"); 1439 putenv ((char *)"STATE=down");
1196 1440
1197 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1441 char *filename;
1442 asprintf (&filename,
1443 "%s/%s",
1444 confbase,
1445 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1446
1447 return filename;
1198} 1448}
1199 1449
1200connection::connection (struct vpn *vpn, conf_node *conf) 1450connection::connection (struct vpn *vpn, conf_node *conf)
1201: vpn(vpn), conf(conf) 1451: vpn(vpn), conf(conf),
1202, rekey (this, &connection::rekey_cb)
1203, keepalive (this, &connection::keepalive_cb)
1204, establish_connection (this, &connection::establish_connection_cb)
1205#if ENABLE_DNS 1452#if ENABLE_DNS
1206, dns (0) 1453 dns (0),
1207#endif 1454#endif
1455 data_queue(conf->max_ttl, conf->max_queue + 1),
1456 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1208{ 1457{
1458 rekey .set<connection, &connection::rekey_cb > (this);
1459 keepalive .set<connection, &connection::keepalive_cb > (this);
1460 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1461
1462 last_establish_attempt = 0.;
1209 octx = ictx = 0; 1463 octx = ictx = 0;
1210 retry_cnt = 0;
1211 1464
1212 if (!conf->protocols) // make sure some protocol is enabled 1465 connectmode = conf->connectmode;
1213 conf->protocols = PROT_UDPv4;
1214 1466
1215 connectmode = conf_node::C_ALWAYS; // initial setting 1467 // queue a dummy packet to force an initial connection attempt
1468 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1469 vpn_queue.put (new net_packet);
1470
1216 reset_connection (); 1471 reset_connection ("startup");
1217} 1472}
1218 1473
1219connection::~connection () 1474connection::~connection ()
1220{ 1475{
1221 shutdown (); 1476 shutdown ();
1222} 1477}
1223 1478
1479void
1224void connection_init () 1480connection_init ()
1225{ 1481{
1226 auth_rate_limiter.clear (); 1482 auth_rate_limiter.clear ();
1227 reset_rate_limiter.clear (); 1483 reset_rate_limiter.clear ();
1228} 1484}
1229 1485

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines