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.63 by pcg, Sun Dec 2 00:45:41 2007 UTC vs.
Revision 1.111 by root, Thu Jan 16 07:53:44 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines