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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines