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.60 by pcg, Sat Nov 10 05:14:22 2007 UTC vs.
Revision 1.116 by root, Mon Apr 1 03:10:26 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines