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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines