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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines