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.108 by root, Fri Oct 11 04:07:24 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines