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.47 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.116 by root, Mon Apr 1 03:10:26 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines