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.42 by pcg, Thu Mar 3 16:54:34 2005 UTC vs.
Revision 1.107 by root, Fri Sep 20 11:57:03 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines