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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines