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.28 by pcg, Tue Jan 27 05:56:35 2004 UTC vs.
Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines