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.47 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.108 by root, Fri Oct 11 04:07:24 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{
592 if (ictx && octx) 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 vpn->can_direct (THISNODE, conf) ? "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."));
593 { 714 }
594 connectmode = conf->connectmode; 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);
595 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
596 // make sure rekeying timeouts are slightly asymmetric 724 // make sure rekeying timeouts are slightly asymmetric
597 rekey.start (NOW + ::conf.rekey 725 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
598 + (conf->id > THISNODE->id ? 10 : 0)); 726 rekey.start (rekey_interval, rekey_interval);
727
728 hmac_error = 0.;
729
599 keepalive.start (NOW + ::conf.keepalive); 730 keepalive.start (::conf.keepalive);
600 731
601 // send queued packets 732 // send queued packets
602 if (ictx && octx)
603 {
604 while (tap_packet *p = (tap_packet *)data_queue.get ()) 733 while (tap_packet *p = (tap_packet *)data_queue.get ())
605 { 734 {
606 send_data_packet (p); 735 if (p->len) send_data_packet (p);
607 delete p; 736 delete p;
608 } 737 }
609 738
610 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 739 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
611 { 740 {
612 send_vpn_packet (p, si, IPTOS_RELIABILITY); 741 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
613 delete p; 742 delete p;
614 }
615 }
616 } 743 }
744
745 vpn->connection_established (this);
746}
747
748void
749connection::reset_si ()
750{
751 if (vpn->can_direct (THISNODE, conf))
752 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
617 else 753 else
618 { 754 {
619 retry_cnt = 0; 755 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
620 establish_connection.start (NOW + 5); 756 protocol = 0;
621 keepalive.stop ();
622 rekey.stop ();
623 } 757 }
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 758
636 si.set (conf, protocol); 759 si.set (conf, protocol);
637} 760}
638 761
639// ensure sockinfo is valid, forward if necessary 762// ensure sockinfo is valid, forward if necessary
640const sockinfo & 763const sockinfo &
641connection::forward_si (const sockinfo &si) const 764connection::forward_si (const sockinfo &si) const
642{ 765{
643 if (!si.valid ()) 766 if (!si.valid ())
644 { 767 {
645 connection *r = vpn->find_router (); 768 connection *r = vpn->find_router_for (this);
646 769
647 if (r) 770 if (r)
648 { 771 {
649 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"), 772 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
650 conf->nodename, r->conf->nodename, (const char *)r->si); 773 conf->nodename, r->conf->nodename);
651 return r->si; 774 return r->si;
652 } 775 }
653 else 776 else
654 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 777 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
655 conf->nodename); 778 conf->nodename);
656 } 779 }
657 780
658 return si; 781 return si;
659} 782}
660 783
661void 784void
662connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 785connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
663{ 786{
664 if (!vpn->send_vpn_packet (pkt, si, tos)) 787 if (!vpn->send_vpn_packet (pkt, si, tos))
665 reset_connection (); 788 reset_connection ("packet send error");
666} 789}
667 790
668void 791void
669connection::send_ping (const sockinfo &si, u8 pong) 792connection::send_ping (const sockinfo &si, u8 pong)
670{ 793{
671 ping_packet *pkt = new ping_packet; 794 ping_packet *pkt = new ping_packet;
672 795
673 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 796 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
797
798 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
674 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 799 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
675 800
676 delete pkt; 801 delete pkt;
677} 802}
678 803
693void 818void
694connection::send_auth_request (const sockinfo &si, bool initiate) 819connection::send_auth_request (const sockinfo &si, bool initiate)
695{ 820{
696 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 821 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
697 822
698 rsachallenge chg; 823 generate_auth_data ();
699 rsa_cache.gen (pkt->id, chg);
700 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 824 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
701 825
702 slog (L_TRACE, ">>%d PT_AUTH_REQ [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
703
704 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 827 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
705 828
706 delete pkt; 829 delete pkt;
707} 830}
708 831
709void 832void
710connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 833connection::send_auth_response (const sockinfo &si)
711{ 834{
712 auth_res_packet *pkt = new auth_res_packet (conf->id); 835 auth_res_packet *pkt = new auth_res_packet (conf->id);
713 836
714 pkt->id = id; 837 memcpy (pkt->response.ecdh, rcv_ecdh_b, sizeof rcv_ecdh_b);
838 auth_hash (rcv_auth, rcv_ecdh_b, pkt->response.mac);
715 839
716 rsa_hash (id, chg, pkt->response);
717
718 pkt->hmac_set (octx);
719
720 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 840 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
721
722 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 841 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
723 842
724 delete pkt; 843 delete pkt;
725} 844}
726 845
727void 846void
728connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 847connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
729{ 848{
730 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 849 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
731 conf->id, rid, (const char *)rsi); 850 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
851 conf->protocols);
732 852
733 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 853 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
734 854
735 r->hmac_set (octx); 855 r->hmac_set (octx);
736 send_vpn_packet (r, si); 856 send_vpn_packet (r, si);
737 857
738 delete r; 858 delete r;
739} 859}
740 860
741void 861inline void
742connection::establish_connection_cb (time_watcher &w) 862connection::establish_connection_cb (ev::timer &w, int revents)
743{ 863{
744 if (!ictx 864 if (!(ictx && octx)
745 && conf != THISNODE 865 && conf != THISNODE
746 && connectmode != conf_node::C_NEVER 866 && connectmode != conf_node::C_NEVER
747 && connectmode != conf_node::C_DISABLED 867 && connectmode != conf_node::C_DISABLED
748 && NOW > w.at) 868 && !w.is_active ())
749 { 869 {
750 w.at = TSTAMP_MAX; // first disable this watcher in case of recursion 870 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
871 // and stop trying. should probably be handled by a per-connection expire handler.
872 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
873 {
874 reset_connection ("no demand");
875 return;
876 }
751 877
752 double retry_int = double (retry_cnt & 3 878 last_establish_attempt = ev_now ();
879
880 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
753 ? (retry_cnt & 3) + 1 881 ? (retry_cnt & 3) + 1
754 : 1 << (retry_cnt >> 2)); 882 : 1 << (retry_cnt >> 2));
755 883
756 reset_si (); 884 reset_si ();
757 885
758 bool slow = si.prot & PROT_SLOW; 886 bool slow = si.prot & PROT_SLOW;
759 887
760 if (si.prot && !si.host) 888 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
889 {
890 /*TODO*/ /* start the timer so we don't recurse endlessly */
891 w.start (1);
761 vpn->send_connect_request (conf->id); 892 vpn->send_connect_request (this);
893 }
762 else 894 else
763 { 895 {
896 if (si.valid ())
897 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
898 conf->nodename, (const char *)si);
899
764 const sockinfo &dsi = forward_si (si); 900 const sockinfo &dsi = forward_si (si);
765 901
766 slow = slow || (dsi.prot & PROT_SLOW); 902 slow = slow || (dsi.prot & PROT_SLOW);
767 903
768 if (dsi.valid () && auth_rate_limiter.can (dsi)) 904 if (dsi.valid () && auth_rate_limiter.can (dsi))
772 else 908 else
773 send_ping (dsi, 0); 909 send_ping (dsi, 0);
774 } 910 }
775 } 911 }
776 912
777 retry_int *= slow ? 3. : 0.7; 913 retry_int *= slow ? 8. : 0.9;
778 914
779 if (retry_int < conf->max_retry) 915 if (retry_int < conf->max_retry)
780 retry_cnt++; 916 retry_cnt++;
781 else 917 else
782 retry_int = conf->max_retry; 918 retry_int = conf->max_retry;
783 919
784 w.start (NOW + retry_int); 920 w.start (retry_int);
785 } 921 }
786} 922}
787 923
788void 924void
789connection::reset_connection () 925connection::reset_connection (const char *reason)
790{ 926{
791 if (ictx && octx) 927 if (ictx && octx)
792 { 928 {
793 slog (L_INFO, _("%s(%s): connection lost"), 929 slog (L_INFO, _("%s(%s): connection lost (%s)"),
794 conf->nodename, (const char *)si); 930 conf->nodename, (const char *)si, reason);
795 931
796 if (::conf.script_node_down) 932 if (::conf.script_node_down)
797 run_script (run_script_cb (this, &connection::script_node_down), false); 933 {
934 run_script_cb *cb = new run_script_cb;
935 cb->set<connection, &connection::script_node_down> (this);
936 run_script_queued (cb, _("node-down command execution failed, continuing."));
937 }
798 } 938 }
799 939
800 delete ictx; ictx = 0; 940 delete ictx; ictx = 0;
801 delete octx; octx = 0; 941 delete octx; octx = 0;
802#if ENABLE_DNS
803 dnsv4_reset_connection ();
804#endif
805 942
806 si.host = 0; 943 si.host = 0;
807 944
945 have_snd_auth = false;
946 have_rcv_auth = false;
947 auth_expire = 0.;
948
808 last_activity = 0; 949 last_activity = 0.;
950 //last_si_change = 0.;
809 retry_cnt = 0; 951 retry_cnt = 0;
810 952
811 rekey.stop (); 953 rekey.stop ();
812 keepalive.stop (); 954 keepalive.stop ();
813 establish_connection.stop (); 955 establish_connection.stop ();
817connection::shutdown () 959connection::shutdown ()
818{ 960{
819 if (ictx && octx) 961 if (ictx && octx)
820 send_reset (si); 962 send_reset (si);
821 963
822 reset_connection (); 964 reset_connection ("shutdown");
823} 965}
824 966
825void 967// poor-man's rekeying
826connection::rekey_cb (time_watcher &w) 968inline void
969connection::rekey_cb (ev::timer &w, int revents)
827{ 970{
828 reset_connection (); 971 reset_connection ("rekeying");
829 establish_connection (); 972 establish_connection ();
830} 973}
831 974
832void 975void
833connection::send_data_packet (tap_packet *pkt) 976connection::send_data_packet (tap_packet *pkt)
847 if (oseqno > MAX_SEQNO) 990 if (oseqno > MAX_SEQNO)
848 rekey (); 991 rekey ();
849} 992}
850 993
851void 994void
995connection::post_inject_queue ()
996{
997 // force a connection every now and when when packets are sent (max 1/s)
998 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
999 establish_connection.stop ();
1000
1001 establish_connection ();
1002}
1003
1004void
852connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 1005connection::inject_data_packet (tap_packet *pkt)
853{ 1006{
854 if (ictx && octx) 1007 if (ictx && octx)
855 send_data_packet (pkt); 1008 send_data_packet (pkt);
856 else 1009 else
857 { 1010 {
858 if (!broadcast)//DDDD
859 data_queue.put (new tap_packet (*pkt)); 1011 data_queue.put (new tap_packet (*pkt));
860 1012 post_inject_queue ();
861 establish_connection ();
862 } 1013 }
863} 1014}
864 1015
1016void
865void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1017connection::inject_vpn_packet (vpn_packet *pkt, int tos)
866{ 1018{
867 if (ictx && octx) 1019 if (ictx && octx)
868 send_vpn_packet (pkt, si, tos); 1020 send_vpn_packet (pkt, si, tos);
869 else 1021 else
870 { 1022 {
871 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1023 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
872 1024 post_inject_queue ();
873 establish_connection ();
874 } 1025 }
875} 1026}
876 1027
877void 1028void
878connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1029connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
879{ 1030{
880 last_activity = NOW; 1031 last_activity = ev_now ();
881 1032
882 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1033 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
883 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1034 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1035
1036 if (connectmode == conf_node::C_DISABLED)
1037 return;
884 1038
885 switch (pkt->typ ()) 1039 switch (pkt->typ ())
886 { 1040 {
887 case vpn_packet::PT_PING: 1041 case vpn_packet::PT_PING:
1042 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1043
888 // we send pings instead of auth packets after some retries, 1044 // we send pings instead of auth packets after some retries,
889 // so reset the retry counter and establish a connection 1045 // so reset the retry counter and establish a connection
890 // when we receive a ping. 1046 // when we receive a ping.
891 if (!ictx) 1047 if (!ictx)
892 { 1048 {
893 if (auth_rate_limiter.can (rsi)) 1049 if (auth_rate_limiter.can (rsi))
894 send_auth_request (rsi, true); 1050 send_auth_request (rsi, true);
895 } 1051 }
896 else 1052 else
1053 // we would love to change the socket address here, but ping's aren't
1054 // authenticated, so we best ignore it.
897 send_ping (rsi, 1); // pong 1055 send_ping (rsi, 1); // pong
898 1056
899 break; 1057 break;
900 1058
901 case vpn_packet::PT_PONG: 1059 case vpn_packet::PT_PONG:
1060 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1061
1062 // a PONG might mean that the other side doesn't really know
1063 // about our desire for communication.
1064 establish_connection ();
902 break; 1065 break;
903 1066
904 case vpn_packet::PT_RESET: 1067 case vpn_packet::PT_RESET:
1068 slog (L_TRACE, "%s >> PT_RESET", conf->nodename);
1069
1070 if (ictx && octx)
905 { 1071 {
906 reset_connection (); 1072 reset_connection ("remote reset");
907 1073
908 config_packet *p = (config_packet *) pkt; 1074 config_packet *p = (config_packet *) pkt;
909 1075
910 if (!p->chk_config ()) 1076 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
911 {
912 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
913 conf->nodename, (const char *)rsi);
914 connectmode = conf_node::C_DISABLED;
915 }
916 else if (connectmode == conf_node::C_ALWAYS)
917 establish_connection (); 1077 establish_connection ();
918 } 1078 }
1079
919 break; 1080 break;
920 1081
921 case vpn_packet::PT_AUTH_REQ: 1082 case vpn_packet::PT_AUTH_REQ:
922 if (auth_rate_limiter.can (rsi)) 1083 if (auth_rate_limiter.can (rsi))
923 { 1084 {
924 auth_req_packet *p = (auth_req_packet *) pkt; 1085 auth_req_packet *p = (auth_req_packet *)pkt;
925 1086
926 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1087 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s,p%02x,f%02x)",
1088 conf->nodename, p->initiate ? "initiate" : "reply",
1089 p->protocols, p->features);
927 1090
928 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1091 if (memcmp (p->magic, MAGIC, 8))
1092 {
1093 slog (L_WARN, _("%s(%s): protocol magic mismatch - stray packet?"),
1094 conf->nodename, (const char *)rsi);
1095 }
1096 else if (p->chk_config (conf, rsi))
929 { 1097 {
930 if (p->prot_minor != PROTOCOL_MINOR) 1098 if (p->prot_minor != PROTOCOL_MINOR)
931 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1099 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
932 conf->nodename, (const char *)rsi, 1100 conf->nodename, (const char *)rsi,
933 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1101 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
934 1102
935 if (p->initiate) 1103 if (p->initiate)
1104 {
936 send_auth_request (rsi, false); 1105 send_auth_request (rsi, false);
937 1106
938 rsachallenge k; 1107 if (ictx && octx)
1108 reset_connection ("reconnect");
1109 }
939 1110
1111 auth_data auth;
1112
940 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1113 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
941 { 1114 {
942 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1115 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
943 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1116 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
944 break;
945 } 1117 }
946 else 1118 else
947 { 1119 {
948 delete octx; 1120 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
949 1121
950 octx = new crypto_ctx (k, 1); 1122 rcv_auth = auth;
951 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1123 have_rcv_auth = true;
952 1124
953 // compatibility code, remove when no longer required 1125 send_auth_response (rsi);
954 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
955 1126
1127 if (chg)
1128 {
956 conf->protocols = p->protocols; 1129 conf->protocols = p->protocols;
957 features = p->features & config_packet::get_features (); 1130 features = p->features & config_packet::get_features ();
958 1131
959 send_auth_response (rsi, p->id, k);
960
961 connection_established (); 1132 connection_established (rsi);
962
963 break; 1133 }
964 } 1134 }
1135
1136 break;
965 } 1137 }
966 else
967 slog (L_WARN, _("%s(%s): protocol mismatch"),
968 conf->nodename, (const char *)rsi);
969 1138
970 send_reset (rsi); 1139 send_reset (rsi);
971 } 1140 }
972 1141
973 break; 1142 break;
974 1143
975 case vpn_packet::PT_AUTH_RES: 1144 case vpn_packet::PT_AUTH_RES:
976 { 1145 {
977 auth_res_packet *p = (auth_res_packet *) pkt; 1146 auth_res_packet *p = (auth_res_packet *)pkt;
978 1147
979 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1148 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
980 1149
981 if (p->chk_config ()) 1150 auth_mac local_mac;
1151 auth_hash (snd_auth, p->response.ecdh, local_mac);
1152
1153 if (memcmp (&p->response.mac, local_mac, sizeof local_mac))
982 { 1154 {
983 if (p->prot_minor != PROTOCOL_MINOR)
984 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
985 conf->nodename, (const char *)rsi,
986 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
987
988 rsachallenge chg;
989
990 if (!rsa_cache.find (p->id, chg))
991 {
992 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1155 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
993 conf->nodename, (const char *)rsi); 1156 conf->nodename, (const char *)rsi);
994 break;
995 } 1157 }
996 else 1158 else if (!have_snd_auth)
997 { 1159 {
998 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1160 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
999 1161
1000 if (!p->hmac_chk (cctx)) 1162 have_snd_auth = true;
1001 {
1002 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
1003 "could be an attack, or just corruption or a synchronization error"),
1004 conf->nodename, (const char *)rsi);
1005 break;
1006 }
1007 else
1008 {
1009 rsaresponse h;
1010
1011 rsa_hash (p->id, chg, h);
1012
1013 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
1014 {
1015 prot_minor = p->prot_minor;
1016
1017 delete ictx; ictx = cctx;
1018
1019 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1020
1021 si = rsi;
1022 protocol = rsi.prot;
1023
1024 connection_established (); 1163 connection_established (rsi);
1025
1026 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1027 conf->nodename, (const char *)rsi,
1028 p->prot_major, p->prot_minor);
1029
1030 if (::conf.script_node_up)
1031 run_script (run_script_cb (this, &connection::script_node_up), false);
1032
1033 break;
1034 }
1035 else
1036 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1037 conf->nodename, (const char *)rsi);
1038 }
1039
1040 delete cctx;
1041 }
1042 } 1164 }
1043 } 1165 }
1044
1045 send_reset (rsi);
1046 break; 1166 break;
1047 1167
1048 case vpn_packet::PT_DATA_COMPRESSED: 1168 case vpn_packet::PT_DATA_COMPRESSED:
1049#if !ENABLE_COMPRESSION 1169#if !ENABLE_COMPRESSION
1050 send_reset (rsi); 1170 send_reset (rsi);
1056 if (ictx && octx) 1176 if (ictx && octx)
1057 { 1177 {
1058 vpndata_packet *p = (vpndata_packet *)pkt; 1178 vpndata_packet *p = (vpndata_packet *)pkt;
1059 1179
1060 if (!p->hmac_chk (ictx)) 1180 if (!p->hmac_chk (ictx))
1181 {
1182 // rekeying often creates temporary hmac auth floods
1183 // we assume they don't take longer than a few seconds normally,
1184 // and suppress messages and resets during that time.
1185 //TODO: should be done per source address
1186 if (!hmac_error)
1187 {
1188 hmac_error = ev_now () + 3;
1189 break;
1190 }
1191 else if (hmac_error >= ev_now ())
1192 break; // silently suppress
1193 else
1194 {
1061 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1195 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1062 "could be an attack, or just corruption or a synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1063 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1198 // reset
1199 }
1200 }
1064 else 1201 else
1065 { 1202 {
1066 u32 seqno; 1203 u32 seqno;
1067 tap_packet *d = p->unpack (this, seqno); 1204 tap_packet *d = p->unpack (this, seqno);
1205 int seqclass = iseqno.seqno_classify (seqno);
1068 1206
1069 if (iseqno.recv_ok (seqno)) 1207 hmac_error = 0;
1208
1209 if (seqclass == 0) // ok
1070 { 1210 {
1071 vpn->tap->send (d); 1211 vpn->tap->send (d);
1072 1212
1073 if (si != rsi) 1213 if (si != rsi)
1074 { 1214 {
1075 // fast re-sync on connection changes, useful especially for tcp/ip 1215 // fast re-sync on source address changes, useful especially for tcp/ip
1216 //if (last_si_change < ev_now () + 5.)
1076 si = rsi; 1217 // {
1077
1078 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1218 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1079 conf->nodename, (const char *)si, (const char *)rsi); 1219 conf->nodename, (const char *)si, (const char *)rsi);
1220
1221 si = rsi;
1222
1223 if (::conf.script_node_change)
1224 {
1225 run_script_cb *cb = new run_script_cb;
1226 cb->set<connection, &connection::script_node_change> (this);
1227 run_script_queued (cb, _("node-change command execution failed, continuing."));
1228 }
1229
1230 // }
1231 //else
1232 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1233 // conf->nodename, (const char *)si, (const char *)rsi);
1080 } 1234 }
1235 }
1236 else if (seqclass == 1) // far history
1237 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1238 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1239 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1240 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1241 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1242 else if (seqclass == 3) // reset
1243 {
1244 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1245 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1246 send_reset (rsi);
1081 } 1247 }
1082 1248
1083 delete d; 1249 delete d;
1084 break; 1250 break;
1085 } 1251 }
1089 break; 1255 break;
1090 1256
1091 case vpn_packet::PT_CONNECT_REQ: 1257 case vpn_packet::PT_CONNECT_REQ:
1092 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1258 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1093 { 1259 {
1094 connect_req_packet *p = (connect_req_packet *) pkt; 1260 connect_req_packet *p = (connect_req_packet *)pkt;
1095 1261
1096 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1262 if (p->id > 0 && p->id <= vpn->conns.size ())
1097 connection *c = vpn->conns[p->id - 1];
1098 conf->protocols = p->protocols;
1099
1100 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1101 conf->id, p->id, c->ictx && c->octx);
1102
1103 if (c->ictx && c->octx)
1104 { 1263 {
1264 connection *c = vpn->conns[p->id - 1];
1265 conf->protocols = p->protocols;
1266
1267 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s,p%02x) [%d]",
1268 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1269 p->protocols,
1270 c->ictx && c->octx);
1271
1272 if (c->ictx && c->octx)
1273 {
1105 // send connect_info packets to both sides, in case one is 1274 // send connect_info packets to both sides, in case one is
1106 // behind a nat firewall (or both ;) 1275 // behind a nat firewall (or both ;)
1107 c->send_connect_info (conf->id, si, conf->protocols); 1276 c->send_connect_info (conf->id, si, conf->protocols);
1108 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1277 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1278 }
1279 else
1280 c->establish_connection ();
1109 } 1281 }
1110 else 1282 else
1111 c->establish_connection (); 1283 slog (L_WARN,
1284 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1285 p->id);
1112 } 1286 }
1113 1287
1114 break; 1288 break;
1115 1289
1116 case vpn_packet::PT_CONNECT_INFO: 1290 case vpn_packet::PT_CONNECT_INFO:
1117 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1291 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1118 { 1292 {
1119 connect_info_packet *p = (connect_info_packet *)pkt; 1293 connect_info_packet *p = (connect_info_packet *)pkt;
1120 1294
1121 if (p->id > 0 && p->id <= vpn->conns.size ()) // hmac-auth does not mean we accept anything 1295 if (p->id > 0 && p->id <= vpn->conns.size ())
1122 { 1296 {
1123 connection *c = vpn->conns[p->id - 1]; 1297 connection *c = vpn->conns[p->id - 1];
1124 1298
1125 c->conf->protocols = p->protocols; 1299 c->conf->protocols = p->protocols;
1126 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1300 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1127 p->si.upgrade_protocol (protocol, c->conf); 1301 p->si.upgrade_protocol (protocol, c->conf);
1128 1302
1129 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1303 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s,protocols=%02x,protocol=%02x,upgradable=%02x) [%d]",
1130 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1304 conf->nodename,
1305 vpn->conns[p->id - 1]->conf->nodename,
1306 (const char *)p->si,
1307 p->protocols,
1308 protocol,
1309 p->si.supported_protocols (c->conf),
1310 !c->ictx && !c->octx);
1131 1311
1132 const sockinfo &dsi = forward_si (p->si); 1312 const sockinfo &dsi = forward_si (p->si);
1133 1313
1134 if (dsi.valid ()) 1314 if (dsi.valid ())
1135 c->send_auth_request (dsi, true); 1315 c->send_auth_request (dsi, true);
1316 else
1317 slog (L_INFO, "connect info for %s received (%s), but still unable to contact.",
1318 vpn->conns[p->id - 1]->conf->nodename,
1319 (const char *)p->si);
1136 } 1320 }
1321 else
1322 slog (L_WARN,
1323 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1324 p->id);
1137 } 1325 }
1138 1326
1139 break; 1327 break;
1140 1328
1141 default: 1329 default:
1142 send_reset (rsi); 1330 send_reset (rsi);
1143 break; 1331 break;
1144 } 1332 }
1145} 1333}
1146 1334
1147void connection::keepalive_cb (time_watcher &w) 1335inline void
1336connection::keepalive_cb (ev::timer &w, int revents)
1148{ 1337{
1149 if (NOW >= last_activity + ::conf.keepalive + 30) 1338 ev_tstamp when = last_activity + ::conf.keepalive - ev::now ();
1339
1340 if (when >= 0)
1341 w.start (when);
1342 else if (when < -15)
1150 { 1343 {
1151 reset_connection (); 1344 reset_connection ("keepalive overdue");
1152 establish_connection (); 1345 establish_connection ();
1153 } 1346 }
1154 else if (NOW < last_activity + ::conf.keepalive)
1155 w.start (last_activity + ::conf.keepalive);
1156 else if (conf->connectmode != conf_node::C_ONDEMAND 1347 else if (conf->connectmode != conf_node::C_ONDEMAND
1157 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1348 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1158 { 1349 {
1350 w.start (3);
1159 send_ping (si); 1351 send_ping (si);
1160 w.start (NOW + 5);
1161 } 1352 }
1162 else if (NOW < last_activity + ::conf.keepalive + 10) 1353 else if (when >= -10)
1163 // hold ondemand connections implicitly a few seconds longer 1354 // hold ondemand connections implicitly a few seconds longer
1164 // should delete octx, though, or something like that ;) 1355 // should delete octx, though, or something like that ;)
1165 w.start (last_activity + ::conf.keepalive + 10); 1356 w.start (when + 10);
1166 else 1357 else
1167 reset_connection (); 1358 reset_connection ("keepalive timeout");
1168} 1359}
1169 1360
1361void
1170void connection::send_connect_request (int id) 1362connection::send_connect_request (int id)
1171{ 1363{
1172 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1364 connect_req_packet *p = new connect_req_packet (conf->id, id, THISNODE->protocols);
1173 1365
1174 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1366 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s,p%02x)",
1367 conf->nodename, vpn->conns[id - 1]->conf->nodename,
1368 THISNODE->protocols);
1175 p->hmac_set (octx); 1369 p->hmac_set (octx);
1176 send_vpn_packet (p, si); 1370 send_vpn_packet (p, si);
1177 1371
1178 delete p; 1372 delete p;
1179} 1373}
1180 1374
1181void connection::script_node () 1375void
1376connection::script_init_env (const char *ext)
1182{ 1377{
1183 vpn->script_if_up ();
1184
1185 char *env; 1378 char *env;
1379 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1380 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1381 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1382 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1383 conf->id & 0xff); putenv (env);
1384}
1385
1386void
1387connection::script_init_connect_env ()
1388{
1389 vpn->script_init_env ();
1390
1391 char *env;
1186 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1392 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1393 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1187 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1394 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1188 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1395 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1189 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1396 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1190} 1397}
1191 1398
1399inline const char *
1192const char *connection::script_node_up () 1400connection::script_node_up ()
1193{ 1401{
1194 script_node (); 1402 script_init_connect_env ();
1195 1403
1196 putenv ("STATE=up"); 1404 putenv ((char *)"STATE=up");
1197 1405
1406 char *filename;
1407 asprintf (&filename,
1408 "%s/%s",
1409 confbase,
1198 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1410 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1199}
1200 1411
1412 return filename;
1413}
1414
1415inline const char *
1416connection::script_node_change ()
1417{
1418 script_init_connect_env ();
1419
1420 putenv ((char *)"STATE=change");
1421
1422 char *filename;
1423 asprintf (&filename,
1424 "%s/%s",
1425 confbase,
1426 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1427
1428 return filename;
1429}
1430
1431inline const char *
1201const char *connection::script_node_down () 1432connection::script_node_down ()
1202{ 1433{
1203 script_node (); 1434 script_init_connect_env ();
1204 1435
1205 putenv ("STATE=down"); 1436 putenv ((char *)"STATE=down");
1206 1437
1207 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1438 char *filename;
1439 asprintf (&filename,
1440 "%s/%s",
1441 confbase,
1442 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1443
1444 return filename;
1208} 1445}
1209 1446
1210connection::connection (struct vpn *vpn, conf_node *conf) 1447connection::connection (struct vpn *vpn, conf_node *conf)
1211: vpn(vpn), conf(conf) 1448: vpn(vpn), conf(conf),
1212, rekey (this, &connection::rekey_cb)
1213, keepalive (this, &connection::keepalive_cb)
1214, establish_connection (this, &connection::establish_connection_cb)
1215#if ENABLE_DNS 1449#if ENABLE_DNS
1216, dns (0) 1450 dns (0),
1217#endif 1451#endif
1452 data_queue(conf->max_ttl, conf->max_queue + 1),
1453 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1218{ 1454{
1455 rekey .set<connection, &connection::rekey_cb > (this);
1456 keepalive .set<connection, &connection::keepalive_cb > (this);
1457 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1458
1459 last_establish_attempt = 0.;
1219 octx = ictx = 0; 1460 octx = ictx = 0;
1220 retry_cnt = 0;
1221 1461
1222 if (!conf->protocols) // make sure some protocol is enabled 1462 connectmode = conf->connectmode;
1223 conf->protocols = PROT_UDPv4;
1224 1463
1225 connectmode = conf_node::C_ALWAYS; // initial setting 1464 // queue a dummy packet to force an initial connection attempt
1465 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1466 vpn_queue.put (new net_packet);
1467
1226 reset_connection (); 1468 reset_connection ("startup");
1227} 1469}
1228 1470
1229connection::~connection () 1471connection::~connection ()
1230{ 1472{
1231 shutdown (); 1473 shutdown ();
1232} 1474}
1233 1475
1476void
1234void connection_init () 1477connection_init ()
1235{ 1478{
1236 auth_rate_limiter.clear (); 1479 auth_rate_limiter.clear ();
1237 reset_rate_limiter.clear (); 1480 reset_rate_limiter.clear ();
1238} 1481}
1239 1482

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines