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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines