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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines