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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines