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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines