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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines