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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines