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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines