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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines