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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines