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.64 by pcg, Tue Dec 4 15:01:12 2007 UTC vs.
Revision 1.109 by root, Fri Oct 11 07:56:07 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines