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.66 by pcg, Thu Dec 6 00:35:29 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
191connection::generate_auth_data ()
88{ 192{
89 tstamp expire; 193 if (auth_expire < ev_now ())
90 rsaid id;
91 rsachallenge chg;
92};
93
94struct rsa_cache : list<rsa_entry>
95{
96 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
97
98 bool find (const rsaid &id, rsachallenge &chg)
99 {
100 for (iterator i = begin (); i != end (); ++i)
101 { 194 {
102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ()) 195 // request data
103 { 196 rand_fill (snd_auth.rsa);
104 memcpy (&chg, &i->chg, sizeof chg); 197 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
105 198
106 erase (i); 199 // eventual response data
107 return true; 200 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
108 }
109 } 201 }
110 202
111 if (!cleaner.is_active ()) 203 // every use prolongs the expiry
112 cleaner.again ();
113
114 return false;
115 }
116
117 void gen (rsaid &id, rsachallenge &chg)
118 {
119 rsa_entry e;
120
121 RAND_bytes ((unsigned char *)&id, sizeof id);
122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
123
124 e.expire = ev_now () + RSA_TTL; 204 auth_expire = ev_now () + AUTH_TTL;
125 e.id = id;
126 memcpy (&e.chg, &chg, sizeof chg);
127
128 push_back (e);
129
130 if (!cleaner.is_active ())
131 cleaner.again ();
132 }
133
134 rsa_cache ()
135 {
136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
139
140} rsa_cache;
141
142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
143{
144 if (empty ())
145 w.stop ();
146 else
147 {
148 for (iterator i = begin (); i != end (); )
149 if (i->expire <= ev_now ())
150 i = erase (i);
151 else
152 ++i;
153 }
154} 205}
155 206
156////////////////////////////////////////////////////////////////////////////// 207//////////////////////////////////////////////////////////////////////////////
157 208
158void 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)
159{ 211{
160 if (queue[i]) 212 queue = new pkt [max_queue];
161 {
162 delete queue[i];
163 j = (j + 1) % QUEUEDEPTH;
164 }
165 213
166 queue[i] = p;
167
168 i = (i + 1) % QUEUEDEPTH;
169}
170
171net_packet *pkt_queue::get ()
172{
173 net_packet *p = queue[j];
174
175 if (p)
176 {
177 queue[j] = 0;
178 j = (j + 1) % QUEUEDEPTH;
179 }
180
181 return p;
182}
183
184pkt_queue::pkt_queue ()
185{
186 memset (queue, 0, sizeof (queue));
187 i = 0; 214 i = 0;
188 j = 0; 215 j = 0;
216
217 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
189} 218}
190 219
191pkt_queue::~pkt_queue () 220pkt_queue::~pkt_queue ()
192{ 221{
193 for (i = QUEUEDEPTH; --i > 0; ) 222 while (net_packet *p = get ())
223 delete p;
224
194 delete queue[i]; 225 delete [] queue;
226}
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;
195} 282}
196 283
197struct net_rateinfo 284struct net_rateinfo
198{ 285{
199 u32 host; 286 u32 host;
213 300
214 bool can (const sockinfo &si) { return can((u32)si.host); } 301 bool can (const sockinfo &si) { return can((u32)si.host); }
215 bool can (u32 host); 302 bool can (u32 host);
216}; 303};
217 304
218net_rate_limiter auth_rate_limiter, reset_rate_limiter; 305static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
219 306
307bool
220bool net_rate_limiter::can (u32 host) 308net_rate_limiter::can (u32 host)
221{ 309{
222 iterator i; 310 iterator i;
223 311
224 for (i = begin (); i != end (); ) 312 for (i = begin (); i != end (); )
225 if (i->host == host) 313 if (i->host == host)
270 } 358 }
271} 359}
272 360
273///////////////////////////////////////////////////////////////////////////// 361/////////////////////////////////////////////////////////////////////////////
274 362
275unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 363void
276
277void hmac_packet::hmac_gen (crypto_ctx *ctx) 364hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
278{ 365{
279 unsigned int xlen; 366 ctx->hctx.init ();
280 367 ctx->hctx.add (((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet));
281 HMAC_CTX *hctx = &ctx->hctx; 368 ctx->hctx.digest (hmac_digest);
282
283 HMAC_Init_ex (hctx, 0, 0, 0, 0);
284 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet),
285 len - sizeof (hmac_packet));
286 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
287} 369}
288 370
289void 371void
290hmac_packet::hmac_set (crypto_ctx *ctx) 372hmac_packet::hmac_set (crypto_ctx *ctx)
291{ 373{
292 hmac_gen (ctx); 374 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
293 375 hmac_gen (ctx, hmac_digest);
294 memcpy (hmac, hmac_digest, HMACLENGTH); 376 memcpy (hmac, hmac_digest, HMACLENGTH);
295} 377}
296 378
297bool 379bool
298hmac_packet::hmac_chk (crypto_ctx *ctx) 380hmac_packet::hmac_chk (crypto_ctx *ctx)
299{ 381{
300 hmac_gen (ctx); 382 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
301 383 hmac_gen (ctx, hmac_digest);
302 return !memcmp (hmac, hmac_digest, HMACLENGTH); 384 return slow_memeq (hmac, hmac_digest, HMACLENGTH);
303} 385}
304 386
387void
305void vpn_packet::set_hdr (ptype type_, unsigned int dst) 388vpn_packet::set_hdr (ptype type_, unsigned int dst)
306{ 389{
307 type = type_; 390 type = type_;
308 391
309 int src = THISNODE->id; 392 int src = THISNODE->id;
310 393
312 srcdst = ((src >> 8) << 4) | (dst >> 8); 395 srcdst = ((src >> 8) << 4) | (dst >> 8);
313 dst1 = dst; 396 dst1 = dst;
314} 397}
315 398
316#define MAXVPNDATA (MAX_MTU - 6 - 6) 399#define MAXVPNDATA (MAX_MTU - 6 - 6)
317#define DATAHDR (sizeof (u32) + RAND_SIZE)
318 400
319struct 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
320 { 411 {
321 u8 data[MAXVPNDATA + DATAHDR]; // seqno 412 // the distance from beginning of packet to data member
322 413 return data - at (0);
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;
330 }
331 }; 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}
332 438
333void 439void
334vpndata_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)
335{ 441{
336 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 442 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
338 ptype type = PT_DATA_UNCOMPRESSED; 444 ptype type = PT_DATA_UNCOMPRESSED;
339 445
340#if ENABLE_COMPRESSION 446#if ENABLE_COMPRESSION
341 u8 cdata[MAX_MTU]; 447 u8 cdata[MAX_MTU];
342 448
343 if (conn->features & ENABLE_COMPRESSION) 449 if (conn->features & FEATURE_COMPRESSION)
344 { 450 {
345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 451 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346 452
347 if (cl) 453 if (cl)
348 { 454 {
354 d[1] = cl; 460 d[1] = cl;
355 } 461 }
356 } 462 }
357#endif 463#endif
358 464
465 ctr = htonl (seqno);
466
359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 467 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, expand_iv (ctr)));
360
361 struct {
362#if RAND_SIZE
363 u8 rnd[RAND_SIZE];
364#endif
365 u32 seqno;
366 } datahdr;
367
368 datahdr.seqno = ntohl (seqno);
369#if RAND_SIZE
370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
371#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 *)d, l));
376 outl += outl2; 472 outl += outl2;
377 473
378 require (EVP_EncryptUpdate (cctx, 474 // it seems this is a nop for us, but we do it anyways
379 (unsigned char *) data + outl, &outl2, 475 require (EVP_EncryptFinal_ex (cctx, (unsigned char *)data + outl, &outl2));
380 (unsigned char *) d, l));
381 outl += outl2; 476 outl += outl2;
382 477
383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
384 outl += outl2;
385
386 len = outl + data_hdr_size (); 478 len = data_hdr_size () + outl;
387 479
388 set_hdr (type, dst); 480 set_hdr (type, dst);
389 481
390 hmac_set (conn->octx); 482 hmac_set (conn->octx);
391} 483}
395{ 487{
396 EVP_CIPHER_CTX *cctx = &conn->ictx->cctx; 488 EVP_CIPHER_CTX *cctx = &conn->ictx->cctx;
397 int outl = 0, outl2; 489 int outl = 0, outl2;
398 tap_packet *p = new tap_packet; 490 tap_packet *p = new tap_packet;
399 u8 *d; 491 u8 *d;
400 u32 l = len - data_hdr_size ();
401 492
493 seqno = ntohl (ctr);
494
402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 495 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, expand_iv (ctr)));
403 496
404#if ENABLE_COMPRESSION 497#if ENABLE_COMPRESSION
405 u8 cdata[MAX_MTU]; 498 u8 cdata[MAX_MTU];
406 499
407 if (type == PT_DATA_COMPRESSED) 500 if (type == PT_DATA_COMPRESSED)
408 d = cdata; 501 d = cdata;
409 else 502 else
410#endif 503#endif
411 d = &(*p)[6 + 6 - DATAHDR]; 504 d = &(*p)[6 + 6];
412 505
413 /* this overwrites part of the src mac, but we fix that later */ 506 // this can overwrite the len/dst/src fields
414 require (EVP_DecryptUpdate (cctx, 507 require (EVP_DecryptUpdate (cctx,
415 d, &outl2, 508 d, &outl2,
416 (unsigned char *)&data, len - data_hdr_size ())); 509 (unsigned char *)&data, len - data_hdr_size ()));
417 outl += outl2; 510 outl += outl2;
418 511
512 // it seems this is a nop for us, but we do it anyways
419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2)); 513 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
420 outl += outl2; 514 outl += outl2;
421 515
422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
423
424 id2mac (dst () ? dst() : THISNODE->id, p->dst); 516 id2mac (dst () ? dst() : THISNODE->id, p->dst);
425 id2mac (src (), p->src); 517 id2mac (src (), p->src);
426 518
427#if ENABLE_COMPRESSION 519#if ENABLE_COMPRESSION
428 if (type == PT_DATA_COMPRESSED) 520 if (type == PT_DATA_COMPRESSED)
429 { 521 {
430 u32 cl = (d[DATAHDR] << 8) | d[DATAHDR + 1]; 522 u32 cl = (d[0] << 8) | d[1];
431 523
432 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,
433 &(*p)[6 + 6], MAX_MTU) 525 &(*p)[6 + 6], MAX_MTU)
434 + 6 + 6; 526 + 6 + 6;
435 } 527 }
436 else 528 else
437 p->len = outl + (6 + 6 - DATAHDR); 529 p->len = outl + (6 + 6);
438#endif 530#endif
439 531
440 return p; 532 return p;
441} 533}
442 534
449 } 541 }
450}; 542};
451 543
452struct config_packet : vpn_packet 544struct config_packet : vpn_packet
453{ 545{
454 // actually, hmaclen cannot be checked because the hmac 546 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; 547 u8 prot_major, prot_minor, randsize;
458 u8 flags, challengelen, features, pad3; 548 u8 flags, features, pad6, pad7, pad8;
459 u32 cipher_nid, digest_nid, hmac_nid; 549 u32 cipher_nid, mac_nid, auth_nid;
460 550
461 void setup (ptype type, int dst); 551 void setup (ptype type, int dst);
462 bool chk_config () const; 552 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
463 553
464 static u8 get_features () 554 static u8 get_features ()
465 { 555 {
466 u8 f = 0; 556 u8 f = 0;
467#if ENABLE_COMPRESSION 557#if ENABLE_COMPRESSION
475#endif 565#endif
476 return f; 566 return f;
477 } 567 }
478}; 568};
479 569
570void
480void config_packet::setup (ptype type, int dst) 571config_packet::setup (ptype type, int dst)
481{ 572{
482 prot_major = PROTOCOL_MAJOR; 573 prot_major = PROTOCOL_MAJOR;
483 prot_minor = PROTOCOL_MINOR; 574 prot_minor = PROTOCOL_MINOR;
484 randsize = RAND_SIZE;
485 hmaclen = HMACLENGTH;
486 flags = 0; 575 flags = 0;
487 challengelen = sizeof (rsachallenge);
488 features = get_features (); 576 features = get_features ();
489 577
578 strncpy ((char *)serial, conf.serial, sizeof (serial));
579
490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 580 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
492 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 ()));
493 583
494 len = sizeof (*this) - sizeof (net_packet); 584 len = sizeof (*this) - sizeof (net_packet);
495 set_hdr (type, dst); 585 set_hdr (type, dst);
496} 586}
497 587
498bool config_packet::chk_config () const 588bool
589config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
499{ 590{
500 if (prot_major != PROTOCOL_MAJOR) 591 if (prot_major != PROTOCOL_MAJOR)
501 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)"),
502 else if (randsize != RAND_SIZE) 593 conf->nodename, (const char *)rsi, prot_major, PROTOCOL_MAJOR);
503 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
504 else if (hmaclen != HMACLENGTH)
505 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
506 else if (challengelen != sizeof (rsachallenge))
507 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
508 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 594 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
509 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)"),
510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 596 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
511 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
512 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 597 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
513 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 ()));
514 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)
515 return true; 611 return true;
612 }
516 613
517 return false; 614 return false;
518} 615}
519 616
520struct auth_req_packet : config_packet 617struct auth_req_packet : config_packet // UNPROTECTED
521{ 618{
522 char magic[8]; 619 char magic[8];
523 u8 initiate; // false if this is just an automatic reply 620 u8 initiate; // false if this is just an automatic reply
524 u8 protocols; // supported protocols (will be patched on forward) 621 u8 protocols; // supported protocols (will be patched on forward)
525 u8 pad2, pad3; 622 u8 pad2, pad3;
526 rsaid id; 623 auth_encr encr;
527 rsaencrdata encr;
528 624
529 auth_req_packet (int dst, bool initiate_, u8 protocols_) 625 auth_req_packet (int dst, bool initiate_, u8 protocols_)
530 { 626 {
531 config_packet::setup (PT_AUTH_REQ, dst); 627 config_packet::setup (PT_AUTH_REQ, dst);
532 strncpy (magic, MAGIC, 8); 628 memcpy (magic, MAGIC, 8);
533 initiate = !!initiate_; 629 initiate = !!initiate_;
534 protocols = protocols_; 630 protocols = protocols_;
535 631
536 len = sizeof (*this) - sizeof (net_packet); 632 len = sizeof (*this) - sizeof (net_packet);
537 } 633 }
538}; 634};
539 635
540struct auth_res_packet : config_packet 636struct auth_res_packet : vpn_packet // UNPROTECTED
541{ 637{
542 rsaid id;
543 u8 pad1, pad2, pad3;
544 u8 response_len; // encrypted length
545 rsaresponse response; 638 auth_response response;
546 639
547 auth_res_packet (int dst) 640 auth_res_packet (int dst)
548 { 641 {
549 config_packet::setup (PT_AUTH_RES, dst); 642 set_hdr (PT_AUTH_RES, dst);
550 643
551 len = sizeof (*this) - sizeof (net_packet); 644 len = sizeof (*this) - sizeof (net_packet);
552 } 645 }
553}; 646};
554 647
584}; 677};
585 678
586///////////////////////////////////////////////////////////////////////////// 679/////////////////////////////////////////////////////////////////////////////
587 680
588void 681void
589connection::connection_established () 682connection::connection_established (const sockinfo &rsi)
590{ 683{
591 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;
592 686
593 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."));
594 { 700 }
595 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);
596 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
597 // make sure rekeying timeouts are slightly asymmetric 708 // make sure rekeying timeouts are slightly asymmetric
598 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);
599 rekey.start (rekey_interval, rekey_interval); 710 rekey.start (rekey_interval, rekey_interval);
711
712 hmac_error = 0.;
713
600 keepalive.start (::conf.keepalive); 714 keepalive.start (::conf.keepalive);
601 715
602 // send queued packets 716 // send queued packets
603 if (ictx && octx)
604 {
605 while (tap_packet *p = (tap_packet *)data_queue.get ()) 717 while (tap_packet *p = (tap_packet *)data_queue.get ())
606 { 718 {
607 send_data_packet (p); 719 if (p->len) send_data_packet (p);
608 delete p; 720 delete p;
609 } 721 }
610 722
611 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 723 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
612 { 724 {
613 send_vpn_packet (p, si, IPTOS_RELIABILITY); 725 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
614 delete p; 726 delete p;
615 }
616 }
617 } 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 ());
618 else 737 else
619 { 738 {
620 retry_cnt = 0;
621 establish_connection.start (5);
622 keepalive.stop ();
623 rekey.stop ();
624 }
625}
626
627void
628connection::reset_si ()
629{
630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
631
632 // mask out protocols we cannot establish
633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 739 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
642 protocol = 0; 740 protocol = 0;
643 } 741 }
644 742
645 si.set (conf, protocol); 743 si.set (conf, protocol);
646} 744}
649const sockinfo & 747const sockinfo &
650connection::forward_si (const sockinfo &si) const 748connection::forward_si (const sockinfo &si) const
651{ 749{
652 if (!si.valid ()) 750 if (!si.valid ())
653 { 751 {
654 connection *r = vpn->find_router (); 752 connection *r = vpn->find_router_for (this);
655 753
656 if (r) 754 if (r)
657 { 755 {
658 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."),
659 conf->nodename, r->conf->nodename, (const char *)r->si); 757 conf->nodename, r->conf->nodename);
660 return r->si; 758 return r->si;
661 } 759 }
662 else 760 else
663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 761 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
664 conf->nodename); 762 conf->nodename);
665 } 763 }
666 764
667 return si; 765 return si;
668} 766}
669 767
670void 768void
671connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 769connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
672{ 770{
673 if (!vpn->send_vpn_packet (pkt, si, tos)) 771 if (!vpn->send_vpn_packet (pkt, si, tos))
674 reset_connection (); 772 reset_connection ("packet send error");
675} 773}
676 774
677void 775void
678connection::send_ping (const sockinfo &si, u8 pong) 776connection::send_ping (const sockinfo &si, u8 pong)
679{ 777{
680 ping_packet *pkt = new ping_packet; 778 ping_packet *pkt = new ping_packet;
681 779
682 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);
683 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 783 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
684 784
685 delete pkt; 785 delete pkt;
686} 786}
687 787
702void 802void
703connection::send_auth_request (const sockinfo &si, bool initiate) 803connection::send_auth_request (const sockinfo &si, bool initiate)
704{ 804{
705 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);
706 806
707 rsachallenge chg; 807 generate_auth_data ();
708 rsa_cache.gen (pkt->id, chg);
709 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 808 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
710 809
711 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);
712
713 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
714 812
715 delete pkt; 813 delete pkt;
716} 814}
717 815
718void 816void
719connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 817connection::send_auth_response (const sockinfo &si)
720{ 818{
721 auth_res_packet *pkt = new auth_res_packet (conf->id); 819 auth_res_packet *pkt = new auth_res_packet (conf->id);
722 820
723 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);
724 823
725 rsa_hash (id, chg, pkt->response);
726
727 pkt->hmac_set (octx);
728
729 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);
730
731 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
732 826
733 delete pkt; 827 delete pkt;
734} 828}
735 829
736void 830void
737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 831connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
738{ 832{
739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 833 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
740 conf->id, rid, (const char *)rsi); 834 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
835 conf->protocols);
741 836
742 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);
743 838
744 r->hmac_set (octx); 839 r->hmac_set (octx);
745 send_vpn_packet (r, si); 840 send_vpn_packet (r, si);
748} 843}
749 844
750inline void 845inline void
751connection::establish_connection_cb (ev::timer &w, int revents) 846connection::establish_connection_cb (ev::timer &w, int revents)
752{ 847{
753 if (!ictx 848 if (!(ictx && octx)
754 && conf != THISNODE 849 && conf != THISNODE
755 && connectmode != conf_node::C_NEVER 850 && connectmode != conf_node::C_NEVER
756 && connectmode != conf_node::C_DISABLED 851 && connectmode != conf_node::C_DISABLED
757 && !w.is_active ()) 852 && !w.is_active ())
758 { 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
759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 864 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
760 ? (retry_cnt & 3) + 1 865 ? (retry_cnt & 3) + 1
761 : 1 << (retry_cnt >> 2)); 866 : 1 << (retry_cnt >> 2));
762 867
763 reset_si (); 868 reset_si ();
764 869
765 bool slow = si.prot & PROT_SLOW; 870 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
766 871
767 if (si.prot && !si.host) 872 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
768 { 873 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */ 874 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1); 875 w.start (1);
772 vpn->send_connect_request (conf->id); 876 vpn->send_connect_request (this);
773 } 877 }
774 else 878 else
775 { 879 {
776 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);
777 883
778 const sockinfo &dsi = forward_si (si); 884 const sockinfo &dsi = forward_si (si);
779 885
780 slow = slow || (dsi.prot & PROT_SLOW); 886 slow = slow || (dsi.prot & PROT_SLOW);
781 887
782 if (dsi.valid () && auth_rate_limiter.can (dsi)) 888 if (dsi.valid () && auth_rate_limiter.can (dsi))
783 { 889 {
784 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))
785 send_auth_request (dsi, true); 894 send_auth_request (dsi, true);
786 else 895 else
787 send_ping (dsi, 0); 896 send_ping (dsi, 0);
788 } 897 }
789 } 898 }
790 899
791 retry_int *= slow ? 8. : 0.7; 900 retry_int *= slow ? 4. : 0.9;
792 901
793 if (retry_int < conf->max_retry) 902 if (retry_int < conf->max_retry)
794 retry_cnt++; 903 retry_cnt++;
795 else 904 else
796 retry_int = conf->max_retry; 905 retry_int = conf->max_retry;
798 w.start (retry_int); 907 w.start (retry_int);
799 } 908 }
800} 909}
801 910
802void 911void
803connection::reset_connection () 912connection::reset_connection (const char *reason)
804{ 913{
805 if (ictx && octx) 914 if (ictx && octx)
806 { 915 {
807 slog (L_INFO, _("%s(%s): connection lost"), 916 slog (L_INFO, _("%s(%s): connection lost (%s)"),
808 conf->nodename, (const char *)si); 917 conf->nodename, (const char *)si, reason);
809 918
810 if (::conf.script_node_down) 919 if (::conf.script_node_down)
811 { 920 {
812 run_script_cb cb; 921 run_script_cb *cb = new run_script_cb;
813 cb.set<connection, &connection::script_node_down> (this); 922 cb->set<connection, &connection::script_node_down> (this);
814 if (!run_script (cb, false))
815 slog (L_WARN, _("node-down command execution failed, continuing.")); 923 run_script_queued (cb, _("node-down command execution failed, continuing."));
816 } 924 }
817 } 925 }
818 926
819 delete ictx; ictx = 0; 927 delete ictx; ictx = 0;
820 delete octx; octx = 0; 928 delete octx; octx = 0;
821#if ENABLE_DNS
822 dnsv4_reset_connection ();
823#endif
824 929
825 si.host = 0; 930 si.host = 0;
826 931
932 have_snd_auth = false;
933 have_rcv_auth = false;
934 auth_expire = 0.;
935
827 last_activity = 0; 936 last_activity = 0.;
937 //last_si_change = 0.;
828 retry_cnt = 0; 938 retry_cnt = 0;
829 939
830 rekey.stop (); 940 rekey.stop ();
831 keepalive.stop (); 941 keepalive.stop ();
832 establish_connection.stop (); 942 establish_connection.stop ();
836connection::shutdown () 946connection::shutdown ()
837{ 947{
838 if (ictx && octx) 948 if (ictx && octx)
839 send_reset (si); 949 send_reset (si);
840 950
841 reset_connection (); 951 reset_connection ("shutdown");
842} 952}
843 953
954// poor-man's rekeying
844inline void 955inline void
845connection::rekey_cb (ev::timer &w, int revents) 956connection::rekey_cb (ev::timer &w, int revents)
846{ 957{
847 reset_connection (); 958 reset_connection ("rekeying");
848 establish_connection (); 959 establish_connection ();
849} 960}
850 961
851void 962void
852connection::send_data_packet (tap_packet *pkt) 963connection::send_data_packet (tap_packet *pkt)
866 if (oseqno > MAX_SEQNO) 977 if (oseqno > MAX_SEQNO)
867 rekey (); 978 rekey ();
868} 979}
869 980
870void 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
871connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 992connection::inject_data_packet (tap_packet *pkt)
872{ 993{
873 if (ictx && octx) 994 if (ictx && octx)
874 send_data_packet (pkt); 995 send_data_packet (pkt);
875 else 996 else
876 { 997 {
877 if (!broadcast)
878 data_queue.put (new tap_packet (*pkt)); 998 data_queue.put (new tap_packet (*pkt));
879 999 post_inject_queue ();
880 establish_connection ();
881 } 1000 }
882} 1001}
883 1002
1003void
884void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1004connection::inject_vpn_packet (vpn_packet *pkt, int tos)
885{ 1005{
886 if (ictx && octx) 1006 if (ictx && octx)
887 send_vpn_packet (pkt, si, tos); 1007 send_vpn_packet (pkt, si, tos);
888 else 1008 else
889 { 1009 {
890 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1010 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
891 1011 post_inject_queue ();
892 establish_connection ();
893 } 1012 }
894} 1013}
895 1014
896void 1015void
897connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1016connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
898{ 1017{
899 last_activity = ev_now (); 1018 last_activity = ev_now ();
900 1019
901 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.",
902 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1021 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
903 1022
904 if (connectmode == conf_node::C_DISABLED) 1023 if (connectmode == conf_node::C_DISABLED)
905 return; 1024 return;
906 1025
907 switch (pkt->typ ()) 1026 switch (pkt->typ ())
908 { 1027 {
909 case vpn_packet::PT_PING: 1028 case vpn_packet::PT_PING:
1029 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1030
910 // we send pings instead of auth packets after some retries, 1031 // we send pings instead of auth packets after some retries,
911 // so reset the retry counter and establish a connection 1032 // so reset the retry counter and establish a connection
912 // when we receive a ping. 1033 // when we receive a ping.
913 if (!ictx) 1034 if (!ictx)
914 { 1035 {
915 if (auth_rate_limiter.can (rsi)) 1036 if (auth_rate_limiter.can (rsi))
916 send_auth_request (rsi, true); 1037 send_auth_request (rsi, true);
917 } 1038 }
918 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.
919 send_ping (rsi, 1); // pong 1042 send_ping (rsi, 1); // pong
920 1043
921 break; 1044 break;
922 1045
923 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 ();
924 break; 1052 break;
925 1053
926 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)
927 { 1058 {
928 reset_connection (); 1059 reset_connection ("remote reset");
929 1060
930 config_packet *p = (config_packet *) pkt; 1061 config_packet *p = (config_packet *) pkt;
931 1062
932 if (!p->chk_config ()) 1063 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
933 {
934 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
935 conf->nodename, (const char *)rsi);
936 connectmode = conf_node::C_DISABLED;
937 }
938 else if (connectmode == conf_node::C_ALWAYS)
939 establish_connection (); 1064 establish_connection ();
940 } 1065 }
1066
941 break; 1067 break;
942 1068
943 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
944 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
945 { 1071 {
946 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *)pkt;
947 1073
948 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);
949 1077
950 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))
951 { 1084 {
952 if (p->prot_minor != PROTOCOL_MINOR) 1085 if (p->prot_minor != PROTOCOL_MINOR)
953 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."),
954 conf->nodename, (const char *)rsi, 1087 conf->nodename, (const char *)rsi,
955 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1088 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
956 1089
957 if (p->initiate) 1090 if (p->initiate)
1091 {
958 send_auth_request (rsi, false); 1092 send_auth_request (rsi, false);
959 1093
960 rsachallenge k; 1094 if (ictx && octx)
1095 reset_connection ("reconnect");
1096 }
961 1097
1098 auth_data auth;
1099
962 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1100 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
963 { 1101 {
964 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?"),
965 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));
966 break;
967 } 1104 }
968 else 1105 else
969 { 1106 {
970 delete octx; 1107 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
971 1108
972 octx = new crypto_ctx (k, 1); 1109 rcv_auth = auth;
973 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1110 have_rcv_auth = true;
974 1111
1112 send_auth_response (rsi);
1113
1114 if (chg)
1115 {
975 conf->protocols = p->protocols; 1116 conf->protocols = p->protocols;
976 features = p->features & config_packet::get_features (); 1117 features = p->features & config_packet::get_features ();
977 1118
978 send_auth_response (rsi, p->id, k);
979
980 connection_established (); 1119 connection_established (rsi);
981
982 break; 1120 }
983 } 1121 }
1122
1123 break;
984 } 1124 }
985 else
986 slog (L_WARN, _("%s(%s): protocol mismatch"),
987 conf->nodename, (const char *)rsi);
988 1125
989 send_reset (rsi); 1126 send_reset (rsi);
990 } 1127 }
991 1128
992 break; 1129 break;
993 1130
994 case vpn_packet::PT_AUTH_RES: 1131 case vpn_packet::PT_AUTH_RES:
995 { 1132 {
996 auth_res_packet *p = (auth_res_packet *) pkt; 1133 auth_res_packet *p = (auth_res_packet *)pkt;
997 1134
998 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1135 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
999 1136
1000 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))
1001 { 1141 {
1002 if (p->prot_minor != PROTOCOL_MINOR)
1003 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1004 conf->nodename, (const char *)rsi,
1005 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1006
1007 rsachallenge chg;
1008
1009 if (!rsa_cache.find (p->id, chg))
1010 {
1011 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1142 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1012 conf->nodename, (const char *)rsi); 1143 conf->nodename, (const char *)rsi);
1013 break;
1014 } 1144 }
1015 else 1145 else if (!have_snd_auth)
1016 { 1146 {
1017 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1147 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1018 1148
1019 if (!p->hmac_chk (cctx)) 1149 have_snd_auth = true;
1020 {
1021 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1022 "could be an attack, or just corruption or a synchronization error"),
1023 conf->nodename, (const char *)rsi);
1024 break;
1025 }
1026 else
1027 {
1028 rsaresponse h;
1029
1030 rsa_hash (p->id, chg, h);
1031
1032 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1033 {
1034 prot_minor = p->prot_minor;
1035
1036 delete ictx; ictx = cctx;
1037
1038 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1039
1040 si = rsi;
1041 protocol = rsi.prot;
1042
1043 connection_established (); 1150 connection_established (rsi);
1044
1045 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1046 conf->nodename, (const char *)rsi,
1047 p->prot_major, p->prot_minor);
1048
1049 if (::conf.script_node_up)
1050 {
1051 run_script_cb cb;
1052 cb.set<connection, &connection::script_node_up> (this);
1053 if (!run_script (cb, false))
1054 slog (L_WARN, _("node-up command execution failed, continuing."));
1055 }
1056
1057 break;
1058 }
1059 else
1060 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1061 conf->nodename, (const char *)rsi);
1062 }
1063
1064 delete cctx;
1065 }
1066 } 1151 }
1067 } 1152 }
1068
1069 send_reset (rsi);
1070 break; 1153 break;
1071 1154
1072 case vpn_packet::PT_DATA_COMPRESSED: 1155 case vpn_packet::PT_DATA_COMPRESSED:
1073#if !ENABLE_COMPRESSION 1156#if !ENABLE_COMPRESSION
1074 send_reset (rsi); 1157 send_reset (rsi);
1080 if (ictx && octx) 1163 if (ictx && octx)
1081 { 1164 {
1082 vpndata_packet *p = (vpndata_packet *)pkt; 1165 vpndata_packet *p = (vpndata_packet *)pkt;
1083 1166
1084 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 {
1085 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"
1086 "could be an attack, or just corruption or a synchronization error"), 1183 "could be an attack, or just corruption or a synchronization error."),
1087 conf->nodename, (const char *)rsi); 1184 conf->nodename, (const char *)rsi);
1185 // reset
1186 }
1187 }
1088 else 1188 else
1089 { 1189 {
1090 u32 seqno; 1190 u32 seqno;
1091 tap_packet *d = p->unpack (this, seqno); 1191 tap_packet *d = p->unpack (this, seqno);
1192 int seqclass = iseqno.seqno_classify (seqno);
1092 1193
1093 if (iseqno.recv_ok (seqno)) 1194 hmac_error = 0;
1195
1196 if (seqclass == 0) // ok
1094 { 1197 {
1095 vpn->tap->send (d); 1198 vpn->tap->send (d);
1096 1199
1097 if (si != rsi) 1200 if (si != rsi)
1098 { 1201 {
1099 // 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.)
1100 si = rsi; 1204 // {
1101
1102 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1205 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1103 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);
1104 } 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);
1105 } 1234 }
1106 1235
1107 delete d; 1236 delete d;
1108 break; 1237 break;
1109 } 1238 }
1113 break; 1242 break;
1114 1243
1115 case vpn_packet::PT_CONNECT_REQ: 1244 case vpn_packet::PT_CONNECT_REQ:
1116 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1245 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1117 { 1246 {
1118 connect_req_packet *p = (connect_req_packet *) pkt; 1247 connect_req_packet *p = (connect_req_packet *)pkt;
1119 1248
1120 if (p->id > 0 && p->id <= vpn->conns.size ()) 1249 if (p->id > 0 && p->id <= vpn->conns.size ())
1121 { 1250 {
1122 connection *c = vpn->conns[p->id - 1]; 1251 connection *c = vpn->conns[p->id - 1];
1123 conf->protocols = p->protocols; 1252 conf->protocols = p->protocols;
1124 1253
1125 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,
1126 conf->id, p->id, c->ictx && c->octx); 1257 c->ictx && c->octx);
1127 1258
1128 if (c->ictx && c->octx) 1259 if (c->ictx && c->octx)
1129 { 1260 {
1130 // send connect_info packets to both sides, in case one is 1261 // send connect_info packets to both sides, in case one is
1131 // behind a nat firewall (or both ;) 1262 // behind a nat firewall (or both ;)
1154 1285
1155 c->conf->protocols = p->protocols; 1286 c->conf->protocols = p->protocols;
1156 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));
1157 p->si.upgrade_protocol (protocol, c->conf); 1288 p->si.upgrade_protocol (protocol, c->conf);
1158 1289
1159 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]",
1160 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);
1161 1298
1162 const sockinfo &dsi = forward_si (p->si); 1299 const sockinfo &dsi = forward_si (p->si);
1163 1300
1164 if (dsi.valid ()) 1301 if (dsi.valid ())
1165 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);
1166 } 1307 }
1167 else 1308 else
1168 slog (L_WARN, 1309 slog (L_WARN,
1169 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1310 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1170 p->id); 1311 p->id);
1179} 1320}
1180 1321
1181inline void 1322inline void
1182connection::keepalive_cb (ev::timer &w, int revents) 1323connection::keepalive_cb (ev::timer &w, int revents)
1183{ 1324{
1184 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)
1185 { 1330 {
1186 reset_connection (); 1331 reset_connection ("keepalive overdue");
1187 establish_connection (); 1332 establish_connection ();
1188 } 1333 }
1189 else if (ev_now () < last_activity + ::conf.keepalive)
1190 w.start (last_activity + ::conf.keepalive - ev::now ());
1191 else if (conf->connectmode != conf_node::C_ONDEMAND 1334 else if (conf->connectmode != conf_node::C_ONDEMAND
1192 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1335 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1193 { 1336 {
1337 w.start (3);
1194 send_ping (si); 1338 send_ping (si);
1195 w.start (5);
1196 } 1339 }
1197 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1340 else if (when >= -10)
1198 // hold ondemand connections implicitly a few seconds longer 1341 // hold ondemand connections implicitly a few seconds longer
1199 // should delete octx, though, or something like that ;) 1342 // should delete octx, though, or something like that ;)
1200 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1343 w.start (when + 10);
1201 else 1344 else
1202 reset_connection (); 1345 reset_connection ("keepalive timeout");
1203} 1346}
1204 1347
1348void
1205void connection::send_connect_request (int id) 1349connection::send_connect_request (int id)
1206{ 1350{
1207 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);
1208 1352
1209 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);
1210 p->hmac_set (octx); 1356 p->hmac_set (octx);
1211 send_vpn_packet (p, si); 1357 send_vpn_packet (p, si);
1212 1358
1213 delete p; 1359 delete p;
1214} 1360}
1215 1361
1362void
1216void connection::script_init_env (const char *ext) 1363connection::script_init_env (const char *ext)
1217{ 1364{
1218 char *env; 1365 char *env;
1219 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);
1220 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1367 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1221 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1368 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1222 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1369 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1223 conf->id & 0xff); putenv (env); 1370 conf->id & 0xff); putenv (env);
1224} 1371}
1225 1372
1373void
1226void connection::script_init_connect_env () 1374connection::script_init_connect_env ()
1227{ 1375{
1228 vpn->script_init_env (); 1376 vpn->script_init_env ();
1229 1377
1230 char *env; 1378 char *env;
1231 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);
1232 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1381 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1233 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1382 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1234 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1383 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1235} 1384}
1236 1385
1237inline const char * 1386inline const char *
1238connection::script_node_up () 1387connection::script_node_up ()
1239{ 1388{
1249 1398
1250 return filename; 1399 return filename;
1251} 1400}
1252 1401
1253inline const char * 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 *
1254connection::script_node_down () 1419connection::script_node_down ()
1255{ 1420{
1256 script_init_connect_env (); 1421 script_init_connect_env ();
1257 1422
1258 putenv ((char *)"STATE=down"); 1423 putenv ((char *)"STATE=down");
1265 1430
1266 return filename; 1431 return filename;
1267} 1432}
1268 1433
1269connection::connection (struct vpn *vpn, conf_node *conf) 1434connection::connection (struct vpn *vpn, conf_node *conf)
1270: vpn(vpn), conf(conf) 1435: vpn(vpn), conf(conf),
1271#if ENABLE_DNS 1436#if ENABLE_DNS
1272, dns (0) 1437 dns (0),
1273#endif 1438#endif
1439 data_queue(conf->max_ttl, conf->max_queue + 1),
1440 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1274{ 1441{
1275 rekey .set<connection, &connection::rekey_cb > (this); 1442 rekey .set<connection, &connection::rekey_cb > (this);
1276 keepalive .set<connection, &connection::keepalive_cb > (this); 1443 keepalive .set<connection, &connection::keepalive_cb > (this);
1277 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1444 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1278 1445
1446 last_establish_attempt = 0.;
1279 octx = ictx = 0; 1447 octx = ictx = 0;
1280 retry_cnt = 0;
1281 1448
1282 if (!conf->protocols) // make sure some protocol is enabled 1449 connectmode = conf->connectmode;
1283 conf->protocols = PROT_UDPv4;
1284 1450
1285 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
1286 reset_connection (); 1455 reset_connection ("startup");
1287} 1456}
1288 1457
1289connection::~connection () 1458connection::~connection ()
1290{ 1459{
1291 shutdown (); 1460 shutdown ();
1292} 1461}
1293 1462
1463void
1294void connection_init () 1464connection_init ()
1295{ 1465{
1296 auth_rate_limiter.clear (); 1466 auth_rate_limiter.clear ();
1297 reset_rate_limiter.clear (); 1467 reset_rate_limiter.clear ();
1298} 1468}
1299 1469

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines