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.58 by pcg, Sat Jul 9 02:35:42 2005 UTC vs.
Revision 1.112 by root, Fri Sep 12 10:40:43 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines