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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines