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.67 by pcg, Thu Aug 7 16:34:21 2008 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 inline void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
97
98 bool find (const rsaid &id, rsachallenge &chg)
99 {
100 for (iterator i = begin (); i != end (); ++i)
101 { 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 {
136 cleaner.set<rsa_cache, &rsa_cache::cleaner_cb> (this);
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
139
140} rsa_cache;
141
142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
143{
144 if (empty ())
145 w.stop ();
146 else
147 {
148 for (iterator i = begin (); i != end (); )
149 if (i->expire <= ev_now ())
150 i = erase (i);
151 else
152 ++i;
153 }
154} 213}
155 214
156////////////////////////////////////////////////////////////////////////////// 215//////////////////////////////////////////////////////////////////////////////
157 216
158pkt_queue::pkt_queue (double max_ttl, int max_queue) 217pkt_queue::pkt_queue (double max_ttl, int max_queue)
172 delete p; 231 delete p;
173 232
174 delete [] queue; 233 delete [] queue;
175} 234}
176 235
236void
177void pkt_queue::expire_cb (ev::timer &w, int revents) 237pkt_queue::expire_cb (ev::timer &w, int revents)
178{ 238{
179 ev_tstamp expire = ev_now () - max_ttl; 239 ev_tstamp expire = ev_now () - max_ttl;
180 240
181 for (;;) 241 for (;;)
182 { 242 {
193 253
194 delete get (); 254 delete get ();
195 } 255 }
196} 256}
197 257
258void
198void pkt_queue::put (net_packet *p) 259pkt_queue::put (net_packet *p)
199{ 260{
200 ev_tstamp now = ev_now (); 261 ev_tstamp now = ev_now ();
201 262
202 // start expiry timer 263 // start expiry timer
203 if (empty ()) 264 if (empty ())
212 queue[i].tstamp = now; 273 queue[i].tstamp = now;
213 274
214 i = ni; 275 i = ni;
215} 276}
216 277
217net_packet *pkt_queue::get () 278net_packet *
279pkt_queue::get ()
218{ 280{
219 if (empty ()) 281 if (empty ())
220 return 0; 282 return 0;
221 283
222 net_packet *p = queue[j].pkt; 284 net_packet *p = queue[j].pkt;
246 308
247 bool can (const sockinfo &si) { return can((u32)si.host); } 309 bool can (const sockinfo &si) { return can((u32)si.host); }
248 bool can (u32 host); 310 bool can (u32 host);
249}; 311};
250 312
251net_rate_limiter auth_rate_limiter, reset_rate_limiter; 313static net_rate_limiter auth_rate_limiter, reset_rate_limiter;
252 314
315bool
253bool net_rate_limiter::can (u32 host) 316net_rate_limiter::can (u32 host)
254{ 317{
255 iterator i; 318 iterator i;
256 319
257 for (i = begin (); i != end (); ) 320 for (i = begin (); i != end (); )
258 if (i->host == host) 321 if (i->host == host)
303 } 366 }
304} 367}
305 368
306///////////////////////////////////////////////////////////////////////////// 369/////////////////////////////////////////////////////////////////////////////
307 370
308unsigned char hmac_packet::hmac_digest[EVP_MAX_MD_SIZE]; 371void
309
310void hmac_packet::hmac_gen (crypto_ctx *ctx) 372hmac_packet::hmac_gen (crypto_ctx *ctx, u8 *hmac_digest)
311{ 373{
312 unsigned int xlen;
313
314 HMAC_CTX *hctx = &ctx->hctx; 374 HMAC_CTX *hctx = &ctx->hctx;
315 375
316 HMAC_Init_ex (hctx, 0, 0, 0, 0); 376 require101 (HMAC_Init_ex (hctx, 0, 0, 0, 0));
317 HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), 377 require101 (HMAC_Update (hctx, ((unsigned char *) this) + sizeof (hmac_packet), len - sizeof (hmac_packet)));
318 len - sizeof (hmac_packet)); 378 require101 (HMAC_Final (hctx, hmac_digest, 0));
319 HMAC_Final (hctx, (unsigned char *) &hmac_digest, &xlen);
320} 379}
321 380
322void 381void
323hmac_packet::hmac_set (crypto_ctx *ctx) 382hmac_packet::hmac_set (crypto_ctx *ctx)
324{ 383{
325 hmac_gen (ctx); 384 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
326 385 hmac_gen (ctx, hmac_digest);
327 memcpy (hmac, hmac_digest, HMACLENGTH); 386 memcpy (hmac, hmac_digest, HMACLENGTH);
328} 387}
329 388
330bool 389bool
331hmac_packet::hmac_chk (crypto_ctx *ctx) 390hmac_packet::hmac_chk (crypto_ctx *ctx)
332{ 391{
333 hmac_gen (ctx); 392 unsigned char hmac_digest[EVP_MAX_MD_SIZE];
334 393 hmac_gen (ctx, hmac_digest);
335 return !memcmp (hmac, hmac_digest, HMACLENGTH); 394 return slow_memeq (hmac, hmac_digest, HMACLENGTH);
336} 395}
337 396
397void
338void vpn_packet::set_hdr (ptype type_, unsigned int dst) 398vpn_packet::set_hdr (ptype type_, unsigned int dst)
339{ 399{
340 type = type_; 400 type = type_;
341 401
342 int src = THISNODE->id; 402 int src = THISNODE->id;
343 403
348 408
349#define MAXVPNDATA (MAX_MTU - 6 - 6) 409#define MAXVPNDATA (MAX_MTU - 6 - 6)
350#define DATAHDR (sizeof (u32) + RAND_SIZE) 410#define DATAHDR (sizeof (u32) + RAND_SIZE)
351 411
352struct 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
353 { 421 {
354 u8 data[MAXVPNDATA + DATAHDR]; // seqno
355
356 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
357 tap_packet *unpack (connection *conn, u32 &seqno);
358private:
359
360 const u32 data_hdr_size () const
361 {
362 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR; 422 return sizeof (vpndata_packet) - sizeof (net_packet) - MAXVPNDATA - DATAHDR;
363 }
364 }; 423 }
424};
365 425
366void 426void
367vpndata_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)
368{ 428{
369 EVP_CIPHER_CTX *cctx = &conn->octx->cctx; 429 EVP_CIPHER_CTX *cctx = &conn->octx->cctx;
371 ptype type = PT_DATA_UNCOMPRESSED; 431 ptype type = PT_DATA_UNCOMPRESSED;
372 432
373#if ENABLE_COMPRESSION 433#if ENABLE_COMPRESSION
374 u8 cdata[MAX_MTU]; 434 u8 cdata[MAX_MTU];
375 435
376 if (conn->features & ENABLE_COMPRESSION) 436 if (conn->features & FEATURE_COMPRESSION)
377 { 437 {
378 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 438 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
379 439
380 if (cl) 440 if (cl)
381 { 441 {
387 d[1] = cl; 447 d[1] = cl;
388 } 448 }
389 } 449 }
390#endif 450#endif
391 451
392 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0)); 452 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 1));
393 453
394 struct { 454 struct {
395#if RAND_SIZE 455#if RAND_SIZE
396 u8 rnd[RAND_SIZE]; 456 u8 rnd[RAND_SIZE];
397#endif 457#endif
398 u32 seqno; 458 u32 seqno;
399 } datahdr; 459 } datahdr;
400 460
401 datahdr.seqno = ntohl (seqno); 461 datahdr.seqno = ntohl (seqno);
402#if RAND_SIZE 462#if RAND_SIZE
403 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);
404#endif 466#endif
405 467
406 require (EVP_EncryptUpdate (cctx, 468 require (EVP_EncryptUpdate (cctx,
407 (unsigned char *) data + outl, &outl2, 469 (unsigned char *) data + outl, &outl2,
408 (unsigned char *) &datahdr, DATAHDR)); 470 (unsigned char *) &datahdr, DATAHDR));
430 int outl = 0, outl2; 492 int outl = 0, outl2;
431 tap_packet *p = new tap_packet; 493 tap_packet *p = new tap_packet;
432 u8 *d; 494 u8 *d;
433 u32 l = len - data_hdr_size (); 495 u32 l = len - data_hdr_size ();
434 496
435 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0)); 497 require (EVP_CipherInit_ex (cctx, 0, 0, 0, 0, 0));
436 498
437#if ENABLE_COMPRESSION 499#if ENABLE_COMPRESSION
438 u8 cdata[MAX_MTU]; 500 u8 cdata[MAX_MTU];
439 501
440 if (type == PT_DATA_COMPRESSED) 502 if (type == PT_DATA_COMPRESSED)
441 d = cdata; 503 d = cdata;
442 else 504 else
443#endif 505#endif
444 d = &(*p)[6 + 6 - DATAHDR]; 506 d = &(*p)[6 + 6] - DATAHDR;
445 507
446 /* 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
447 require (EVP_DecryptUpdate (cctx, 515 require (EVP_DecryptUpdate (cctx,
448 d, &outl2, 516 d, &outl2,
449 (unsigned char *)&data, len - data_hdr_size ())); 517 (unsigned char *)&data, len - data_hdr_size ()));
450 outl += outl2; 518 outl += outl2;
451 519
482 } 550 }
483}; 551};
484 552
485struct config_packet : vpn_packet 553struct config_packet : vpn_packet
486{ 554{
487 // actually, hmaclen cannot be checked because the hmac 555 u8 serial[SERIAL_SIZE];
488 // field comes before this data, so peers with other
489 // hmacs simply will not work.
490 u8 prot_major, prot_minor, randsize, hmaclen; 556 u8 prot_major, prot_minor, randsize;
491 u8 flags, challengelen, features, pad3; 557 u8 flags, features, pad6, pad7, pad8;
492 u32 cipher_nid, digest_nid, hmac_nid; 558 u32 cipher_nid, mac_nid, auth_nid;
493 559
494 void setup (ptype type, int dst); 560 void setup (ptype type, int dst);
495 bool chk_config () const; 561 bool chk_config (const conf_node *conf, const sockinfo &rsi) const;
496 562
497 static u8 get_features () 563 static u8 get_features ()
498 { 564 {
499 u8 f = 0; 565 u8 f = 0;
500#if ENABLE_COMPRESSION 566#if ENABLE_COMPRESSION
508#endif 574#endif
509 return f; 575 return f;
510 } 576 }
511}; 577};
512 578
579void
513void config_packet::setup (ptype type, int dst) 580config_packet::setup (ptype type, int dst)
514{ 581{
515 prot_major = PROTOCOL_MAJOR; 582 prot_major = PROTOCOL_MAJOR;
516 prot_minor = PROTOCOL_MINOR; 583 prot_minor = PROTOCOL_MINOR;
517 randsize = RAND_SIZE; 584 randsize = RAND_SIZE;
518 hmaclen = HMACLENGTH;
519 flags = 0; 585 flags = 0;
520 challengelen = sizeof (rsachallenge);
521 features = get_features (); 586 features = get_features ();
522 587
588 strncpy ((char *)serial, conf.serial, sizeof (serial));
589
523 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 590 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
524 digest_nid = htonl (EVP_MD_type (RSA_HASH));
525 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 ()));
526 593
527 len = sizeof (*this) - sizeof (net_packet); 594 len = sizeof (*this) - sizeof (net_packet);
528 set_hdr (type, dst); 595 set_hdr (type, dst);
529} 596}
530 597
531bool config_packet::chk_config () const 598bool
599config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
532{ 600{
533 if (prot_major != PROTOCOL_MAJOR) 601 if (prot_major != PROTOCOL_MAJOR)
534 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);
535 else if (randsize != RAND_SIZE) 604 else if (randsize != RAND_SIZE)
536 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)"),
537 else if (hmaclen != HMACLENGTH) 606 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
538 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
539 else if (challengelen != sizeof (rsachallenge))
540 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
541 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
542 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)"),
543 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
544 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
545 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 610 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
546 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 ()));
547 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)
548 return true; 624 return true;
625 }
549 626
550 return false; 627 return false;
551} 628}
552 629
553struct auth_req_packet : config_packet 630struct auth_req_packet : config_packet // UNPROTECTED
554{ 631{
555 char magic[8]; 632 char magic[8];
556 u8 initiate; // false if this is just an automatic reply 633 u8 initiate; // false if this is just an automatic reply
557 u8 protocols; // supported protocols (will be patched on forward) 634 u8 protocols; // supported protocols (will be patched on forward)
558 u8 pad2, pad3; 635 u8 pad2, pad3;
559 rsaid id; 636 auth_encr encr;
560 rsaencrdata encr;
561 637
562 auth_req_packet (int dst, bool initiate_, u8 protocols_) 638 auth_req_packet (int dst, bool initiate_, u8 protocols_)
563 { 639 {
564 config_packet::setup (PT_AUTH_REQ, dst); 640 config_packet::setup (PT_AUTH_REQ, dst);
565 strncpy (magic, MAGIC, 8); 641 memcpy (magic, MAGIC, 8);
566 initiate = !!initiate_; 642 initiate = !!initiate_;
567 protocols = protocols_; 643 protocols = protocols_;
568 644
569 len = sizeof (*this) - sizeof (net_packet); 645 len = sizeof (*this) - sizeof (net_packet);
570 } 646 }
571}; 647};
572 648
573struct auth_res_packet : config_packet 649struct auth_res_packet : vpn_packet // UNPROTECTED
574{ 650{
575 rsaid id;
576 u8 pad1, pad2, pad3;
577 u8 response_len; // encrypted length
578 rsaresponse response; 651 auth_response response;
579 652
580 auth_res_packet (int dst) 653 auth_res_packet (int dst)
581 { 654 {
582 config_packet::setup (PT_AUTH_RES, dst); 655 set_hdr (PT_AUTH_RES, dst);
583 656
584 len = sizeof (*this) - sizeof (net_packet); 657 len = sizeof (*this) - sizeof (net_packet);
585 } 658 }
586}; 659};
587 660
617}; 690};
618 691
619///////////////////////////////////////////////////////////////////////////// 692/////////////////////////////////////////////////////////////////////////////
620 693
621void 694void
622connection::connection_established () 695connection::connection_established (const sockinfo &rsi)
623{ 696{
624 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;
625 699
626 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."));
627 { 713 }
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);
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
628 // make sure rekeying timeouts are slightly asymmetric 723 // make sure rekeying timeouts are slightly asymmetric
629 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);
630 rekey.start (rekey_interval, rekey_interval); 725 rekey.start (rekey_interval, rekey_interval);
726
727 hmac_error = 0.;
728
631 keepalive.start (::conf.keepalive); 729 keepalive.start (::conf.keepalive);
632 730
633 // send queued packets 731 // send queued packets
634 if (ictx && octx)
635 {
636 while (tap_packet *p = (tap_packet *)data_queue.get ()) 732 while (tap_packet *p = (tap_packet *)data_queue.get ())
637 { 733 {
638 if (p->len) send_data_packet (p); 734 if (p->len) send_data_packet (p);
639 delete p; 735 delete p;
640 } 736 }
641 737
642 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 738 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
643 { 739 {
644 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY); 740 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
645 delete p; 741 delete p;
646 }
647 }
648 } 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 ());
649 else 752 else
650 { 753 {
651 retry_cnt = 0;
652 establish_connection.start (5);
653 keepalive.stop ();
654 rekey.stop ();
655 }
656}
657
658void
659connection::reset_si ()
660{
661 protocol = best_protocol (THISNODE->protocols & conf->protocols);
662
663 // mask out protocols we cannot establish
664 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
665 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
666 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
667
668 if (protocol
669 && (!conf->can_direct (THISNODE)
670 || !THISNODE->can_direct (conf)))
671 {
672 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename); 754 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
673 protocol = 0; 755 protocol = 0;
674 } 756 }
675 757
676 si.set (conf, protocol); 758 si.set (conf, protocol);
677} 759}
680const sockinfo & 762const sockinfo &
681connection::forward_si (const sockinfo &si) const 763connection::forward_si (const sockinfo &si) const
682{ 764{
683 if (!si.valid ()) 765 if (!si.valid ())
684 { 766 {
685 connection *r = vpn->find_router (); 767 connection *r = vpn->find_router_for (this);
686 768
687 if (r) 769 if (r)
688 { 770 {
689 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."),
690 conf->nodename, r->conf->nodename, (const char *)r->si); 772 conf->nodename, r->conf->nodename);
691 return r->si; 773 return r->si;
692 } 774 }
693 else 775 else
694 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 776 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
695 conf->nodename); 777 conf->nodename);
696 } 778 }
697 779
698 return si; 780 return si;
699} 781}
700 782
701void 783void
702connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 784connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
703{ 785{
704 if (!vpn->send_vpn_packet (pkt, si, tos)) 786 if (!vpn->send_vpn_packet (pkt, si, tos))
705 reset_connection (); 787 reset_connection ("packet send error");
706} 788}
707 789
708void 790void
709connection::send_ping (const sockinfo &si, u8 pong) 791connection::send_ping (const sockinfo &si, u8 pong)
710{ 792{
711 ping_packet *pkt = new ping_packet; 793 ping_packet *pkt = new ping_packet;
712 794
713 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);
714 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 798 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
715 799
716 delete pkt; 800 delete pkt;
717} 801}
718 802
733void 817void
734connection::send_auth_request (const sockinfo &si, bool initiate) 818connection::send_auth_request (const sockinfo &si, bool initiate)
735{ 819{
736 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);
737 821
738 rsachallenge chg; 822 generate_auth_data ();
739 rsa_cache.gen (pkt->id, chg);
740 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 823 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
741 824
742 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);
743
744 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
745 827
746 delete pkt; 828 delete pkt;
747} 829}
748 830
749void 831void
750connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 832connection::send_auth_response (const sockinfo &si)
751{ 833{
752 auth_res_packet *pkt = new auth_res_packet (conf->id); 834 auth_res_packet *pkt = new auth_res_packet (conf->id);
753 835
754 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);
755 838
756 rsa_hash (id, chg, pkt->response);
757
758 pkt->hmac_set (octx);
759
760 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);
761
762 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
763 841
764 delete pkt; 842 delete pkt;
765} 843}
766 844
767void 845void
768connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 846connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
769{ 847{
770 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)", 848 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
771 conf->id, rid, (const char *)rsi); 849 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
850 conf->protocols);
772 851
773 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);
774 853
775 r->hmac_set (octx); 854 r->hmac_set (octx);
776 send_vpn_packet (r, si); 855 send_vpn_packet (r, si);
779} 858}
780 859
781inline void 860inline void
782connection::establish_connection_cb (ev::timer &w, int revents) 861connection::establish_connection_cb (ev::timer &w, int revents)
783{ 862{
784 if (!ictx 863 if (!(ictx && octx)
785 && conf != THISNODE 864 && conf != THISNODE
786 && connectmode != conf_node::C_NEVER 865 && connectmode != conf_node::C_NEVER
787 && connectmode != conf_node::C_DISABLED 866 && connectmode != conf_node::C_DISABLED
788 && !w.is_active ()) 867 && !w.is_active ())
789 { 868 {
790 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection 869 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
791 // and stop trying. should probably be handled by a per-connection expire handler. 870 // and stop trying. should probably be handled by a per-connection expire handler.
792 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ()) 871 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
793 { 872 {
794 reset_connection (); 873 reset_connection ("no demand");
795 return; 874 return;
796 } 875 }
876
877 last_establish_attempt = ev_now ();
797 878
798 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3 879 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
799 ? (retry_cnt & 3) + 1 880 ? (retry_cnt & 3) + 1
800 : 1 << (retry_cnt >> 2)); 881 : 1 << (retry_cnt >> 2));
801 882
802 reset_si (); 883 reset_si ();
803 884
804 bool slow = si.prot & PROT_SLOW; 885 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
805 886
806 if (si.prot && !si.host) 887 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
807 { 888 {
808 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
809 /*TODO*/ /* start the timer so we don't recurse endlessly */ 889 /*TODO*/ /* start the timer so we don't recurse endlessly */
810 w.start (1); 890 w.start (1);
811 vpn->send_connect_request (conf->id); 891 vpn->send_connect_request (this);
812 } 892 }
813 else 893 else
814 { 894 {
815 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);
816 898
817 const sockinfo &dsi = forward_si (si); 899 const sockinfo &dsi = forward_si (si);
818 900
819 slow = slow || (dsi.prot & PROT_SLOW); 901 slow = slow || (dsi.prot & PROT_SLOW);
820 902
821 if (dsi.valid () && auth_rate_limiter.can (dsi)) 903 if (dsi.valid () && auth_rate_limiter.can (dsi))
822 { 904 {
823 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))
824 send_auth_request (dsi, true); 909 send_auth_request (dsi, true);
825 else 910 else
826 send_ping (dsi, 0); 911 send_ping (dsi, 0);
827 } 912 }
828 } 913 }
829 914
830 retry_int *= slow ? 8. : 0.7; 915 retry_int *= slow ? 4. : 0.9;
831 916
832 if (retry_int < conf->max_retry) 917 if (retry_int < conf->max_retry)
833 retry_cnt++; 918 retry_cnt++;
834 else 919 else
835 retry_int = conf->max_retry; 920 retry_int = conf->max_retry;
837 w.start (retry_int); 922 w.start (retry_int);
838 } 923 }
839} 924}
840 925
841void 926void
842connection::reset_connection () 927connection::reset_connection (const char *reason)
843{ 928{
844 if (ictx && octx) 929 if (ictx && octx)
845 { 930 {
846 slog (L_INFO, _("%s(%s): connection lost"), 931 slog (L_INFO, _("%s(%s): connection lost (%s)"),
847 conf->nodename, (const char *)si); 932 conf->nodename, (const char *)si, reason);
848 933
849 if (::conf.script_node_down) 934 if (::conf.script_node_down)
850 { 935 {
851 run_script_cb cb; 936 run_script_cb *cb = new run_script_cb;
852 cb.set<connection, &connection::script_node_down> (this); 937 cb->set<connection, &connection::script_node_down> (this);
853 if (!run_script (cb, false))
854 slog (L_WARN, _("node-down command execution failed, continuing.")); 938 run_script_queued (cb, _("node-down command execution failed, continuing."));
855 } 939 }
856 } 940 }
857 941
858 delete ictx; ictx = 0; 942 delete ictx; ictx = 0;
859 delete octx; octx = 0; 943 delete octx; octx = 0;
860#if ENABLE_DNS
861 dnsv4_reset_connection ();
862#endif
863 944
864 si.host = 0; 945 si.host = 0;
865 946
947 have_snd_auth = false;
948 have_rcv_auth = false;
949 auth_expire = 0.;
950
866 last_activity = 0; 951 last_activity = 0.;
952 //last_si_change = 0.;
867 retry_cnt = 0; 953 retry_cnt = 0;
868 954
869 rekey.stop (); 955 rekey.stop ();
870 keepalive.stop (); 956 keepalive.stop ();
871 establish_connection.stop (); 957 establish_connection.stop ();
875connection::shutdown () 961connection::shutdown ()
876{ 962{
877 if (ictx && octx) 963 if (ictx && octx)
878 send_reset (si); 964 send_reset (si);
879 965
880 reset_connection (); 966 reset_connection ("shutdown");
881} 967}
882 968
969// poor-man's rekeying
883inline void 970inline void
884connection::rekey_cb (ev::timer &w, int revents) 971connection::rekey_cb (ev::timer &w, int revents)
885{ 972{
886 reset_connection (); 973 reset_connection ("rekeying");
887 establish_connection (); 974 establish_connection ();
888} 975}
889 976
890void 977void
891connection::send_data_packet (tap_packet *pkt) 978connection::send_data_packet (tap_packet *pkt)
905 if (oseqno > MAX_SEQNO) 992 if (oseqno > MAX_SEQNO)
906 rekey (); 993 rekey ();
907} 994}
908 995
909void 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
910connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 1007connection::inject_data_packet (tap_packet *pkt)
911{ 1008{
912 if (ictx && octx) 1009 if (ictx && octx)
913 send_data_packet (pkt); 1010 send_data_packet (pkt);
914 else 1011 else
915 { 1012 {
916 if (!broadcast)
917 data_queue.put (new tap_packet (*pkt)); 1013 data_queue.put (new tap_packet (*pkt));
918 1014 post_inject_queue ();
919 establish_connection ();
920 } 1015 }
921} 1016}
922 1017
1018void
923void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1019connection::inject_vpn_packet (vpn_packet *pkt, int tos)
924{ 1020{
925 if (ictx && octx) 1021 if (ictx && octx)
926 send_vpn_packet (pkt, si, tos); 1022 send_vpn_packet (pkt, si, tos);
927 else 1023 else
928 { 1024 {
929 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1025 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
930 1026 post_inject_queue ();
931 establish_connection ();
932 } 1027 }
933} 1028}
934 1029
935void 1030void
936connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1031connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
937{ 1032{
938 last_activity = ev_now (); 1033 last_activity = ev_now ();
939 1034
940 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.",
941 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1036 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
942 1037
943 if (connectmode == conf_node::C_DISABLED) 1038 if (connectmode == conf_node::C_DISABLED)
944 return; 1039 return;
945 1040
946 switch (pkt->typ ()) 1041 switch (pkt->typ ())
947 { 1042 {
948 case vpn_packet::PT_PING: 1043 case vpn_packet::PT_PING:
1044 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1045
949 // we send pings instead of auth packets after some retries, 1046 // we send pings instead of auth packets after some retries,
950 // so reset the retry counter and establish a connection 1047 // so reset the retry counter and establish a connection
951 // when we receive a ping. 1048 // when we receive a ping.
952 if (!ictx) 1049 if (!ictx)
953 { 1050 {
954 if (auth_rate_limiter.can (rsi)) 1051 if (auth_rate_limiter.can (rsi))
955 send_auth_request (rsi, true); 1052 send_auth_request (rsi, true);
956 } 1053 }
957 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.
958 send_ping (rsi, 1); // pong 1057 send_ping (rsi, 1); // pong
959 1058
960 break; 1059 break;
961 1060
962 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 ();
963 break; 1067 break;
964 1068
965 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)
966 { 1073 {
967 reset_connection (); 1074 reset_connection ("remote reset");
968 1075
969 config_packet *p = (config_packet *) pkt; 1076 config_packet *p = (config_packet *) pkt;
970 1077
971 if (!p->chk_config ()) 1078 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
972 {
973 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
974 conf->nodename, (const char *)rsi);
975 connectmode = conf_node::C_DISABLED;
976 }
977 else if (connectmode == conf_node::C_ALWAYS)
978 establish_connection (); 1079 establish_connection ();
979 } 1080 }
1081
980 break; 1082 break;
981 1083
982 case vpn_packet::PT_AUTH_REQ: 1084 case vpn_packet::PT_AUTH_REQ:
983 if (auth_rate_limiter.can (rsi)) 1085 if (auth_rate_limiter.can (rsi))
984 { 1086 {
985 auth_req_packet *p = (auth_req_packet *) pkt; 1087 auth_req_packet *p = (auth_req_packet *)pkt;
986 1088
987 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);
988 1092
989 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))
990 { 1099 {
991 if (p->prot_minor != PROTOCOL_MINOR) 1100 if (p->prot_minor != PROTOCOL_MINOR)
992 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."),
993 conf->nodename, (const char *)rsi, 1102 conf->nodename, (const char *)rsi,
994 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1103 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
995 1104
996 if (p->initiate) 1105 if (p->initiate)
1106 {
997 send_auth_request (rsi, false); 1107 send_auth_request (rsi, false);
998 1108
999 rsachallenge k; 1109 if (ictx && octx)
1110 reset_connection ("reconnect");
1111 }
1000 1112
1113 auth_data auth;
1114
1001 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1115 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
1002 { 1116 {
1003 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?"),
1004 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));
1005 break;
1006 } 1119 }
1007 else 1120 else
1008 { 1121 {
1009 delete octx; 1122 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
1010 1123
1011 octx = new crypto_ctx (k, 1); 1124 rcv_auth = auth;
1012 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1125 have_rcv_auth = true;
1013 1126
1127 send_auth_response (rsi);
1128
1129 if (chg)
1130 {
1014 conf->protocols = p->protocols; 1131 conf->protocols = p->protocols;
1015 features = p->features & config_packet::get_features (); 1132 features = p->features & config_packet::get_features ();
1016 1133
1017 send_auth_response (rsi, p->id, k);
1018
1019 connection_established (); 1134 connection_established (rsi);
1020
1021 break; 1135 }
1022 } 1136 }
1137
1138 break;
1023 } 1139 }
1024 else
1025 slog (L_WARN, _("%s(%s): protocol mismatch"),
1026 conf->nodename, (const char *)rsi);
1027 1140
1028 send_reset (rsi); 1141 send_reset (rsi);
1029 } 1142 }
1030 1143
1031 break; 1144 break;
1032 1145
1033 case vpn_packet::PT_AUTH_RES: 1146 case vpn_packet::PT_AUTH_RES:
1034 { 1147 {
1035 auth_res_packet *p = (auth_res_packet *) pkt; 1148 auth_res_packet *p = (auth_res_packet *)pkt;
1036 1149
1037 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1150 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
1038 1151
1039 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))
1040 { 1156 {
1041 if (p->prot_minor != PROTOCOL_MINOR)
1042 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
1043 conf->nodename, (const char *)rsi,
1044 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
1045
1046 rsachallenge chg;
1047
1048 if (!rsa_cache.find (p->id, chg))
1049 {
1050 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1157 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
1051 conf->nodename, (const char *)rsi); 1158 conf->nodename, (const char *)rsi);
1052 break;
1053 } 1159 }
1054 else 1160 else if (!have_snd_auth)
1055 { 1161 {
1056 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1162 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
1057 1163
1058 if (!p->hmac_chk (cctx)) 1164 have_snd_auth = true;
1059 {
1060 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1061 "could be an attack, or just corruption or a synchronization error"),
1062 conf->nodename, (const char *)rsi);
1063 break;
1064 }
1065 else
1066 {
1067 rsaresponse h;
1068
1069 rsa_hash (p->id, chg, h);
1070
1071 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1072 {
1073 prot_minor = p->prot_minor;
1074
1075 delete ictx; ictx = cctx;
1076
1077 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1078
1079 si = rsi;
1080 protocol = rsi.prot;
1081
1082 connection_established (); 1165 connection_established (rsi);
1083
1084 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1085 conf->nodename, (const char *)rsi,
1086 p->prot_major, p->prot_minor);
1087
1088 if (::conf.script_node_up)
1089 {
1090 run_script_cb cb;
1091 cb.set<connection, &connection::script_node_up> (this);
1092 if (!run_script (cb, false))
1093 slog (L_WARN, _("node-up command execution failed, continuing."));
1094 }
1095
1096 break;
1097 }
1098 else
1099 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1100 conf->nodename, (const char *)rsi);
1101 }
1102
1103 delete cctx;
1104 }
1105 } 1166 }
1106 } 1167 }
1107
1108 send_reset (rsi);
1109 break; 1168 break;
1110 1169
1111 case vpn_packet::PT_DATA_COMPRESSED: 1170 case vpn_packet::PT_DATA_COMPRESSED:
1112#if !ENABLE_COMPRESSION 1171#if !ENABLE_COMPRESSION
1113 send_reset (rsi); 1172 send_reset (rsi);
1119 if (ictx && octx) 1178 if (ictx && octx)
1120 { 1179 {
1121 vpndata_packet *p = (vpndata_packet *)pkt; 1180 vpndata_packet *p = (vpndata_packet *)pkt;
1122 1181
1123 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 {
1124 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"
1125 "could be an attack, or just corruption or a synchronization error"), 1198 "could be an attack, or just corruption or a synchronization error."),
1126 conf->nodename, (const char *)rsi); 1199 conf->nodename, (const char *)rsi);
1200 // reset
1201 }
1202 }
1127 else 1203 else
1128 { 1204 {
1129 u32 seqno; 1205 u32 seqno;
1130 tap_packet *d = p->unpack (this, seqno); 1206 tap_packet *d = p->unpack (this, seqno);
1207 int seqclass = iseqno.seqno_classify (seqno);
1131 1208
1132 if (iseqno.recv_ok (seqno)) 1209 hmac_error = 0;
1210
1211 if (seqclass == 0) // ok
1133 { 1212 {
1134 vpn->tap->send (d); 1213 vpn->tap->send (d);
1135 1214
1136 if (si != rsi) 1215 if (si != rsi)
1137 { 1216 {
1138 // 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.)
1139 si = rsi; 1219 // {
1140
1141 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1220 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1142 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);
1143 } 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);
1144 } 1249 }
1145 1250
1146 delete d; 1251 delete d;
1147 break; 1252 break;
1148 } 1253 }
1152 break; 1257 break;
1153 1258
1154 case vpn_packet::PT_CONNECT_REQ: 1259 case vpn_packet::PT_CONNECT_REQ:
1155 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1260 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1156 { 1261 {
1157 connect_req_packet *p = (connect_req_packet *) pkt; 1262 connect_req_packet *p = (connect_req_packet *)pkt;
1158 1263
1159 if (p->id > 0 && p->id <= vpn->conns.size ()) 1264 if (p->id > 0 && p->id <= vpn->conns.size ())
1160 { 1265 {
1161 connection *c = vpn->conns[p->id - 1]; 1266 connection *c = vpn->conns[p->id - 1];
1162 conf->protocols = p->protocols; 1267 conf->protocols = p->protocols;
1163 1268
1164 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,
1165 conf->id, p->id, c->ictx && c->octx); 1272 c->ictx && c->octx);
1166 1273
1167 if (c->ictx && c->octx) 1274 if (c->ictx && c->octx)
1168 { 1275 {
1169 // send connect_info packets to both sides, in case one is 1276 // send connect_info packets to both sides, in case one is
1170 // behind a nat firewall (or both ;) 1277 // behind a nat firewall (or both ;)
1193 1300
1194 c->conf->protocols = p->protocols; 1301 c->conf->protocols = p->protocols;
1195 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));
1196 p->si.upgrade_protocol (protocol, c->conf); 1303 p->si.upgrade_protocol (protocol, c->conf);
1197 1304
1198 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]",
1199 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);
1200 1313
1201 const sockinfo &dsi = forward_si (p->si); 1314 const sockinfo &dsi = forward_si (p->si);
1202 1315
1203 if (dsi.valid ()) 1316 if (dsi.valid ())
1204 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);
1205 } 1322 }
1206 else 1323 else
1207 slog (L_WARN, 1324 slog (L_WARN,
1208 _("received authenticated connection request from unknown node #%d, config file mismatch?"), 1325 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1209 p->id); 1326 p->id);
1218} 1335}
1219 1336
1220inline void 1337inline void
1221connection::keepalive_cb (ev::timer &w, int revents) 1338connection::keepalive_cb (ev::timer &w, int revents)
1222{ 1339{
1223 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)
1224 { 1345 {
1225 reset_connection (); 1346 reset_connection ("keepalive overdue");
1226 establish_connection (); 1347 establish_connection ();
1227 } 1348 }
1228 else if (ev_now () < last_activity + ::conf.keepalive)
1229 w.start (last_activity + ::conf.keepalive - ev::now ());
1230 else if (conf->connectmode != conf_node::C_ONDEMAND 1349 else if (conf->connectmode != conf_node::C_ONDEMAND
1231 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1350 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1232 { 1351 {
1352 w.start (3);
1233 send_ping (si); 1353 send_ping (si);
1234 w.start (5);
1235 } 1354 }
1236 else if (ev_now () < last_activity + ::conf.keepalive + 10) 1355 else if (when >= -10)
1237 // hold ondemand connections implicitly a few seconds longer 1356 // hold ondemand connections implicitly a few seconds longer
1238 // should delete octx, though, or something like that ;) 1357 // should delete octx, though, or something like that ;)
1239 w.start (last_activity + ::conf.keepalive + 10 - ev::now ()); 1358 w.start (when + 10);
1240 else 1359 else
1241 reset_connection (); 1360 reset_connection ("keepalive timeout");
1242} 1361}
1243 1362
1363void
1244void connection::send_connect_request (int id) 1364connection::send_connect_request (int id)
1245{ 1365{
1246 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);
1247 1367
1248 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);
1249 p->hmac_set (octx); 1371 p->hmac_set (octx);
1250 send_vpn_packet (p, si); 1372 send_vpn_packet (p, si);
1251 1373
1252 delete p; 1374 delete p;
1253} 1375}
1254 1376
1377void
1255void connection::script_init_env (const char *ext) 1378connection::script_init_env (const char *ext)
1256{ 1379{
1257 char *env; 1380 char *env;
1258 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);
1259 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env); 1382 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1260 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext, 1383 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1261 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8, 1384 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1262 conf->id & 0xff); putenv (env); 1385 conf->id & 0xff); putenv (env);
1263} 1386}
1264 1387
1388void
1265void connection::script_init_connect_env () 1389connection::script_init_connect_env ()
1266{ 1390{
1267 vpn->script_init_env (); 1391 vpn->script_init_env ();
1268 1392
1269 char *env; 1393 char *env;
1270 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);
1271 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1396 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1272 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1397 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1273 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1398 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1274} 1399}
1275 1400
1276inline const char * 1401inline const char *
1277connection::script_node_up () 1402connection::script_node_up ()
1278{ 1403{
1288 1413
1289 return filename; 1414 return filename;
1290} 1415}
1291 1416
1292inline const char * 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 *
1293connection::script_node_down () 1434connection::script_node_down ()
1294{ 1435{
1295 script_init_connect_env (); 1436 script_init_connect_env ();
1296 1437
1297 putenv ((char *)"STATE=down"); 1438 putenv ((char *)"STATE=down");
1308connection::connection (struct vpn *vpn, conf_node *conf) 1449connection::connection (struct vpn *vpn, conf_node *conf)
1309: vpn(vpn), conf(conf), 1450: vpn(vpn), conf(conf),
1310#if ENABLE_DNS 1451#if ENABLE_DNS
1311 dns (0), 1452 dns (0),
1312#endif 1453#endif
1313 data_queue(conf->max_ttl, conf->max_queue), 1454 data_queue(conf->max_ttl, conf->max_queue + 1),
1314 vpn_queue(conf->max_ttl, conf->max_queue) 1455 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1315{ 1456{
1316 rekey .set<connection, &connection::rekey_cb > (this); 1457 rekey .set<connection, &connection::rekey_cb > (this);
1317 keepalive .set<connection, &connection::keepalive_cb > (this); 1458 keepalive .set<connection, &connection::keepalive_cb > (this);
1318 establish_connection.set<connection, &connection::establish_connection_cb> (this); 1459 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1319 1460
1461 last_establish_attempt = 0.;
1320 octx = ictx = 0; 1462 octx = ictx = 0;
1321 retry_cnt = 0;
1322
1323 if (!conf->protocols) // make sure some protocol is enabled
1324 conf->protocols = PROT_UDPv4;
1325 1463
1326 connectmode = conf->connectmode; 1464 connectmode = conf->connectmode;
1327 1465
1328 // queue a dummy packet to force an initial connection attempt 1466 // queue a dummy packet to force an initial connection attempt
1329 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED) 1467 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1330 { 1468 vpn_queue.put (new net_packet);
1331 net_packet *p = new net_packet;
1332 p->len = 0;
1333 vpn_queue.put (p);
1334 }
1335 1469
1336 reset_connection (); 1470 reset_connection ("startup");
1337} 1471}
1338 1472
1339connection::~connection () 1473connection::~connection ()
1340{ 1474{
1341 shutdown (); 1475 shutdown ();
1342} 1476}
1343 1477
1478void
1344void connection_init () 1479connection_init ()
1345{ 1480{
1346 auth_rate_limiter.clear (); 1481 auth_rate_limiter.clear ();
1347 reset_rate_limiter.clear (); 1482 reset_rate_limiter.clear ();
1348} 1483}
1349 1484

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines