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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines