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.37 by pcg, Fri Jun 11 15:56:34 2004 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-2004 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2008,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
4 4
5 This file is part of GVPE.
6
5 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
6 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
7 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
8 (at your option) any later version. 10 option) any later version.
9 11
10 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
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
12 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
13 GNU General Public License for more details. 15 Public License for more details.
14 16
15 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
16 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
18*/ 30*/
19 31
20#include "config.h" 32#include "config.h"
21 33
22#include <cassert>
23
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>
30 43
31#include "gettext.h" 44// openssl 0.9.8 compatibility
45#if OPENSSL_VERSION_NUMBER < 0x10100000
46 #define require101(exp) exp
47#else
48 #define require101(exp) require (exp)
49#endif
32 50
33#include "conf.h" 51#include "conf.h"
34#include "slog.h" 52#include "slog.h"
35#include "device.h" 53#include "device.h"
36#include "vpn.h" 54#include "vpn.h"
37#include "connection.h" 55#include "connection.h"
56#include "hkdf.h"
38 57
39#include "netcompat.h" 58#include "netcompat.h"
40 59
41#if !HAVE_RAND_PSEUDO_BYTES
42# define RAND_pseudo_bytes RAND_bytes
43#endif
44
45#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 60#define MAGIC "gvpe\xbd\xc6\xdb\x82" // 8 bytes of magic
46 61
47#define ULTRA_FAST 1 62#define ULTRA_FAST 1
48#define HLOG 15 63#define HLOG 15
49#include "lzf/lzf.h" 64#include "lzf/lzf.h"
50#include "lzf/lzf_c.c" 65#include "lzf/lzf_c.c"
51#include "lzf/lzf_d.c" 66#include "lzf/lzf_d.c"
52 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
53struct crypto_ctx 112struct crypto_ctx
54{ 113{
55 EVP_CIPHER_CTX cctx; 114 EVP_CIPHER_CTX cctx;
56 HMAC_CTX hctx; 115 HMAC_CTX hctx;
57 116
58 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);
59 ~crypto_ctx (); 118 ~crypto_ctx ();
60}; 119};
61 120
62crypto_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)
63{ 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
64 EVP_CIPHER_CTX_init (&cctx); 151 EVP_CIPHER_CTX_init (&cctx);
65 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));
66 HMAC_CTX_init (&hctx); 153 }
67 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
68} 154}
69 155
70crypto_ctx::~crypto_ctx () 156crypto_ctx::~crypto_ctx ()
71{ 157{
72 require (EVP_CIPHER_CTX_cleanup (&cctx)); 158 require (EVP_CIPHER_CTX_cleanup (&cctx));
73 HMAC_CTX_cleanup (&hctx); 159 HMAC_CTX_cleanup (&hctx);
74} 160}
75 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
76static void 189static void
77rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 190auth_hash (const auth_data &auth, const ecdh_key &b, auth_mac &mac)
78{ 191{
79 EVP_MD_CTX ctx; 192 hkdf kdf (b, sizeof b, AUTH_DIGEST ()); // use response ecdh b as salt
80 193 kdf.extract (&auth.rsa, sizeof (auth.rsa));
81 EVP_MD_CTX_init (&ctx); 194 kdf.extract_done ();
82 require (EVP_DigestInit (&ctx, RSA_HASH)); 195 kdf.expand (mac, sizeof mac, auth.ecdh, sizeof (auth.ecdh)); // use challenge ecdh b as info
83 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
84 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
85 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
86 EVP_MD_CTX_cleanup (&ctx);
87} 196}
88 197
89struct rsa_entry { 198void
90 tstamp expire; 199connection::generate_auth_data ()
91 rsaid id;
92 rsachallenge chg;
93};
94
95struct rsa_cache : list<rsa_entry>
96{ 200{
97 void cleaner_cb (time_watcher &w); time_watcher cleaner; 201 if (auth_expire < ev_now ())
98
99 bool find (const rsaid &id, rsachallenge &chg)
100 {
101 for (iterator i = begin (); i != end (); ++i)
102 {
103 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW)
104 {
105 memcpy (&chg, &i->chg, sizeof chg);
106
107 erase (i);
108 return true;
109 }
110 }
111
112 if (cleaner.at < NOW)
113 cleaner.start (NOW + RSA_TTL);
114
115 return false;
116 }
117
118 void gen (rsaid &id, rsachallenge &chg)
119 {
120 rsa_entry e;
121
122 RAND_bytes ((unsigned char *)&id, sizeof id);
123 RAND_bytes ((unsigned char *)&chg, sizeof chg);
124
125 e.expire = NOW + RSA_TTL;
126 e.id = id;
127 memcpy (&e.chg, &chg, sizeof chg);
128
129 push_back (e);
130
131 if (cleaner.at < NOW)
132 cleaner.start (NOW + RSA_TTL);
133 }
134
135 rsa_cache ()
136 : cleaner (this, &rsa_cache::cleaner_cb)
137 { } 202 {
203 // request data
204 rand_fill (snd_auth.rsa);
205 curve25519_generate (snd_ecdh_a, snd_auth.ecdh);
138 206
139} rsa_cache; 207 // eventual response data
140 208 curve25519_generate (rcv_ecdh_a, rcv_ecdh_b);
141void rsa_cache::cleaner_cb (time_watcher &w)
142{
143 if (!empty ())
144 { 209 }
145 w.start (NOW + RSA_TTL);
146 210
147 for (iterator i = begin (); i != end (); ) 211 // every use prolongs the expiry
148 if (i->expire <= NOW) 212 auth_expire = ev_now () + AUTH_TTL;
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 < 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 = 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 + (NOW - ri.last); 347 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
250 348
251 ri.last = 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
466 f |= FEATURE_COMPRESSION; 567 f |= FEATURE_COMPRESSION;
467#endif 568#endif
468#if ENABLE_ROHC 569#if ENABLE_ROHC
469 f |= FEATURE_ROHC; 570 f |= FEATURE_ROHC;
470#endif 571#endif
572#if ENABLE_BRIDGING
573 f |= FEATURE_BRIDGING;
574#endif
471 return f; 575 return f;
472 } 576 }
473}; 577};
474 578
579void
475void config_packet::setup (ptype type, int dst) 580config_packet::setup (ptype type, int dst)
476{ 581{
477 prot_major = PROTOCOL_MAJOR; 582 prot_major = PROTOCOL_MAJOR;
478 prot_minor = PROTOCOL_MINOR; 583 prot_minor = PROTOCOL_MINOR;
479 randsize = RAND_SIZE; 584 randsize = RAND_SIZE;
480 hmaclen = HMACLENGTH; 585 flags = 0;
481 flags = ENABLE_COMPRESSION ? 0x81 : 0x80;
482 challengelen = sizeof (rsachallenge);
483 features = get_features (); 586 features = get_features ();
484 587
588 strncpy ((char *)serial, conf.serial, sizeof (serial));
589
485 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 590 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER ()));
486 digest_nid = htonl (EVP_MD_type (RSA_HASH));
487 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 ()));
488 593
489 len = sizeof (*this) - sizeof (net_packet); 594 len = sizeof (*this) - sizeof (net_packet);
490 set_hdr (type, dst); 595 set_hdr (type, dst);
491} 596}
492 597
493bool config_packet::chk_config () const 598bool
599config_packet::chk_config (const conf_node *conf, const sockinfo &rsi) const
494{ 600{
495 if (prot_major != PROTOCOL_MAJOR) 601 if (prot_major != PROTOCOL_MAJOR)
496 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);
497 else if (randsize != RAND_SIZE) 604 else if (randsize != RAND_SIZE)
498 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)"),
499 else if (hmaclen != HMACLENGTH) 606 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
500 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
501#if 0 // this implementation should handle all flag settings
502 else if (flags != curflags ())
503 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
504#endif
505 else if (challengelen != sizeof (rsachallenge))
506 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
507 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 607 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
508 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)"),
509 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 609 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
510 slog (L_WARN, _("digest mismatch (remote %x <=> local %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
511 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 610 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
512 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 ()));
513 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)
514 return true; 624 return true;
625 }
515 626
516 return false; 627 return false;
517} 628}
518 629
519struct auth_req_packet : config_packet 630struct auth_req_packet : config_packet // UNPROTECTED
520{ 631{
521 char magic[8]; 632 char magic[8];
522 u8 initiate; // false if this is just an automatic reply 633 u8 initiate; // false if this is just an automatic reply
523 u8 protocols; // supported protocols (will be patched on forward) 634 u8 protocols; // supported protocols (will be patched on forward)
524 u8 pad2, pad3; 635 u8 pad2, pad3;
525 rsaid id; 636 auth_encr encr;
526 rsaencrdata encr;
527 637
528 auth_req_packet (int dst, bool initiate_, u8 protocols_) 638 auth_req_packet (int dst, bool initiate_, u8 protocols_)
529 { 639 {
530 config_packet::setup (PT_AUTH_REQ, dst); 640 config_packet::setup (PT_AUTH_REQ, dst);
531 strncpy (magic, MAGIC, 8); 641 memcpy (magic, MAGIC, 8);
532 initiate = !!initiate_; 642 initiate = !!initiate_;
533 protocols = protocols_; 643 protocols = protocols_;
534 644
535 len = sizeof (*this) - sizeof (net_packet); 645 len = sizeof (*this) - sizeof (net_packet);
536 } 646 }
537}; 647};
538 648
539struct auth_res_packet : config_packet 649struct auth_res_packet : vpn_packet // UNPROTECTED
540{ 650{
541 rsaid id;
542 u8 pad1, pad2, pad3;
543 u8 response_len; // encrypted length
544 rsaresponse response; 651 auth_response response;
545 652
546 auth_res_packet (int dst) 653 auth_res_packet (int dst)
547 { 654 {
548 config_packet::setup (PT_AUTH_RES, dst); 655 set_hdr (PT_AUTH_RES, dst);
549 656
550 len = sizeof (*this) - sizeof (net_packet); 657 len = sizeof (*this) - sizeof (net_packet);
551 } 658 }
552}; 659};
553 660
583}; 690};
584 691
585///////////////////////////////////////////////////////////////////////////// 692/////////////////////////////////////////////////////////////////////////////
586 693
587void 694void
588connection::connection_established () 695connection::connection_established (const sockinfo &rsi)
589{ 696{
590 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."));
591 { 713 }
592 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);
593 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
594 // make sure rekeying timeouts are slightly asymmetric 723 // make sure rekeying timeouts are slightly asymmetric
595 rekey.start (NOW + ::conf.rekey 724 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
596 + (conf->id > THISNODE->id ? 10 : 0)); 725 rekey.start (rekey_interval, rekey_interval);
726
727 hmac_error = 0.;
728
597 keepalive.start (NOW + ::conf.keepalive); 729 keepalive.start (::conf.keepalive);
598 730
599 // send queued packets 731 // send queued packets
600 if (ictx && octx)
601 {
602 while (tap_packet *p = (tap_packet *)data_queue.get ()) 732 while (tap_packet *p = (tap_packet *)data_queue.get ())
603 { 733 {
604 send_data_packet (p); 734 if (p->len) send_data_packet (p);
605 delete p; 735 delete p;
606 } 736 }
607 737
608 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 738 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
609 { 739 {
610 send_vpn_packet (p, si, IPTOS_RELIABILITY); 740 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
611 delete p; 741 delete p;
612 }
613 }
614 } 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 ());
615 else 752 else
616 { 753 {
617 retry_cnt = 0; 754 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
618 establish_connection.start (NOW + 5); 755 protocol = 0;
619 keepalive.stop ();
620 rekey.stop ();
621 } 756 }
622}
623
624void
625connection::reset_si ()
626{
627 protocol = best_protocol (THISNODE->protocols & conf->protocols);
628
629 // mask out protocols we cannot establish
630 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
631 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
632 757
633 si.set (conf, protocol); 758 si.set (conf, protocol);
634} 759}
635 760
636// ensure sockinfo is valid, forward if necessary 761// ensure sockinfo is valid, forward if necessary
637const sockinfo & 762const sockinfo &
638connection::forward_si (const sockinfo &si) const 763connection::forward_si (const sockinfo &si) const
639{ 764{
640 if (!si.valid ()) 765 if (!si.valid ())
641 { 766 {
642 connection *r = vpn->find_router (); 767 connection *r = vpn->find_router_for (this);
643 768
644 if (r) 769 if (r)
645 { 770 {
646 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 771 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
647 conf->nodename, r->conf->nodename); 772 conf->nodename, r->conf->nodename);
648 return r->si; 773 return r->si;
649 } 774 }
650 else 775 else
651 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 776 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
652 conf->nodename); 777 conf->nodename);
653 } 778 }
654 779
655 return si; 780 return si;
656} 781}
657 782
658void 783void
659connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 784connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
660{ 785{
661 if (!vpn->send_vpn_packet (pkt, si, tos)) 786 if (!vpn->send_vpn_packet (pkt, si, tos))
662 reset_connection (); 787 reset_connection ("packet send error");
663} 788}
664 789
665void 790void
666connection::send_ping (const sockinfo &si, u8 pong) 791connection::send_ping (const sockinfo &si, u8 pong)
667{ 792{
668 ping_packet *pkt = new ping_packet; 793 ping_packet *pkt = new ping_packet;
669 794
670 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);
671 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 798 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
672 799
673 delete pkt; 800 delete pkt;
674} 801}
675 802
690void 817void
691connection::send_auth_request (const sockinfo &si, bool initiate) 818connection::send_auth_request (const sockinfo &si, bool initiate)
692{ 819{
693 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);
694 821
695 rsachallenge chg; 822 generate_auth_data ();
696 rsa_cache.gen (pkt->id, chg);
697 rsa_encrypt (conf->rsa_key, chg, pkt->encr); 823 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
698 824
699 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);
700
701 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
702 827
703 delete pkt; 828 delete pkt;
704} 829}
705 830
706void 831void
707connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 832connection::send_auth_response (const sockinfo &si)
708{ 833{
709 auth_res_packet *pkt = new auth_res_packet (conf->id); 834 auth_res_packet *pkt = new auth_res_packet (conf->id);
710 835
711 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);
712 838
713 rsa_hash (id, chg, pkt->response);
714
715 pkt->hmac_set (octx);
716
717 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);
718
719 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
720 841
721 delete pkt; 842 delete pkt;
722} 843}
723 844
724void 845void
725connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 846connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
726{ 847{
727 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 848 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
728 conf->id, rid, (const char *)rsi); 849 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
850 conf->protocols);
729 851
730 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);
731 853
732 r->hmac_set (octx); 854 r->hmac_set (octx);
733 send_vpn_packet (r, si); 855 send_vpn_packet (r, si);
734 856
735 delete r; 857 delete r;
736} 858}
737 859
738void 860inline void
739connection::establish_connection_cb (time_watcher &w) 861connection::establish_connection_cb (ev::timer &w, int revents)
740{ 862{
741 if (!ictx 863 if (!(ictx && octx)
742 && conf != THISNODE 864 && conf != THISNODE
743 && connectmode != conf_node::C_NEVER 865 && connectmode != conf_node::C_NEVER
744 && connectmode != conf_node::C_DISABLED 866 && connectmode != conf_node::C_DISABLED
745 && NOW > w.at) 867 && !w.is_active ())
746 { 868 {
747 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 869 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
748 870 // and stop trying. should probably be handled by a per-connection expire handler.
749 if (retry_int < conf->max_retry) 871 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
872 {
873 reset_connection ("no demand");
750 retry_cnt++; 874 return;
751 else 875 }
752 retry_int = conf->max_retry;
753 876
754 w.start (NOW + retry_int); 877 last_establish_attempt = ev_now ();
878
879 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
880 ? (retry_cnt & 3) + 1
881 : 1 << (retry_cnt >> 2));
755 882
756 reset_si (); 883 reset_si ();
757 884
758 if (si.prot && !si.host) 885 bool slow = (si.prot & PROT_SLOW) || (conf->low_power || THISNODE->low_power);
886
887 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
888 {
889 /*TODO*/ /* start the timer so we don't recurse endlessly */
890 w.start (1);
759 vpn->send_connect_request (conf->id); 891 vpn->send_connect_request (this);
892 }
760 else 893 else
761 { 894 {
895 if (si.valid ())
896 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
897 conf->nodename, (const char *)si);
898
762 const sockinfo &dsi = forward_si (si); 899 const sockinfo &dsi = forward_si (si);
900
901 slow = slow || (dsi.prot & PROT_SLOW);
763 902
764 if (dsi.valid () && auth_rate_limiter.can (dsi)) 903 if (dsi.valid () && auth_rate_limiter.can (dsi))
765 { 904 {
766 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))
767 send_auth_request (dsi, true); 909 send_auth_request (dsi, true);
768 else 910 else
769 send_ping (dsi, 0); 911 send_ping (dsi, 0);
770 } 912 }
771 } 913 }
772 }
773}
774 914
915 retry_int *= slow ? 4. : 0.9;
916
917 if (retry_int < conf->max_retry)
918 retry_cnt++;
919 else
920 retry_int = conf->max_retry;
921
922 w.start (retry_int);
923 }
924}
925
775void 926void
776connection::reset_connection () 927connection::reset_connection (const char *reason)
777{ 928{
778 if (ictx && octx) 929 if (ictx && octx)
779 { 930 {
780 slog (L_INFO, _("%s(%s): connection lost"), 931 slog (L_INFO, _("%s(%s): connection lost (%s)"),
781 conf->nodename, (const char *)si); 932 conf->nodename, (const char *)si, reason);
782 933
783 if (::conf.script_node_down) 934 if (::conf.script_node_down)
784 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);
938 run_script_queued (cb, _("node-down command execution failed, continuing."));
939 }
785 } 940 }
786 941
787 delete ictx; ictx = 0; 942 delete ictx; ictx = 0;
788 delete octx; octx = 0; 943 delete octx; octx = 0;
789 944
790 si.host= 0; 945 si.host = 0;
791 946
947 have_snd_auth = false;
948 have_rcv_auth = false;
949 auth_expire = 0.;
950
792 last_activity = 0; 951 last_activity = 0.;
952 //last_si_change = 0.;
793 retry_cnt = 0; 953 retry_cnt = 0;
794 954
795 rekey.stop (); 955 rekey.stop ();
796 keepalive.stop (); 956 keepalive.stop ();
797 establish_connection.stop (); 957 establish_connection.stop ();
801connection::shutdown () 961connection::shutdown ()
802{ 962{
803 if (ictx && octx) 963 if (ictx && octx)
804 send_reset (si); 964 send_reset (si);
805 965
806 reset_connection (); 966 reset_connection ("shutdown");
807} 967}
808 968
809void 969// poor-man's rekeying
810connection::rekey_cb (time_watcher &w) 970inline void
971connection::rekey_cb (ev::timer &w, int revents)
811{ 972{
812 reset_connection (); 973 reset_connection ("rekeying");
813 establish_connection (); 974 establish_connection ();
814} 975}
815 976
816void 977void
817connection::send_data_packet (tap_packet *pkt) 978connection::send_data_packet (tap_packet *pkt)
831 if (oseqno > MAX_SEQNO) 992 if (oseqno > MAX_SEQNO)
832 rekey (); 993 rekey ();
833} 994}
834 995
835void 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
836connection::inject_data_packet (tap_packet *pkt, bool broadcast/*TODO DDD*/) 1007connection::inject_data_packet (tap_packet *pkt)
837{ 1008{
838 if (ictx && octx) 1009 if (ictx && octx)
839 send_data_packet (pkt); 1010 send_data_packet (pkt);
840 else 1011 else
841 { 1012 {
842 if (!broadcast)//DDDD
843 data_queue.put (new tap_packet (*pkt)); 1013 data_queue.put (new tap_packet (*pkt));
844 1014 post_inject_queue ();
845 establish_connection ();
846 } 1015 }
847} 1016}
848 1017
1018void
849void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1019connection::inject_vpn_packet (vpn_packet *pkt, int tos)
850{ 1020{
851 if (ictx && octx) 1021 if (ictx && octx)
852 send_vpn_packet (pkt, si, tos); 1022 send_vpn_packet (pkt, si, tos);
853 else 1023 else
854 { 1024 {
855 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt)); 1025 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
856 1026 post_inject_queue ();
857 establish_connection ();
858 } 1027 }
859} 1028}
860 1029
861void 1030void
862connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1031connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
863{ 1032{
864 last_activity = NOW; 1033 last_activity = ev_now ();
865 1034
866 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.",
867 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;
868 1040
869 switch (pkt->typ ()) 1041 switch (pkt->typ ())
870 { 1042 {
871 case vpn_packet::PT_PING: 1043 case vpn_packet::PT_PING:
1044 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1045
872 // we send pings instead of auth packets after some retries, 1046 // we send pings instead of auth packets after some retries,
873 // so reset the retry counter and establish a connection 1047 // so reset the retry counter and establish a connection
874 // when we receive a ping. 1048 // when we receive a ping.
875 if (!ictx) 1049 if (!ictx)
876 { 1050 {
877 if (auth_rate_limiter.can (rsi)) 1051 if (auth_rate_limiter.can (rsi))
878 send_auth_request (rsi, true); 1052 send_auth_request (rsi, true);
879 } 1053 }
880 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.
881 send_ping (rsi, 1); // pong 1057 send_ping (rsi, 1); // pong
882 1058
883 break; 1059 break;
884 1060
885 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 ();
886 break; 1067 break;
887 1068
888 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)
889 { 1073 {
890 reset_connection (); 1074 reset_connection ("remote reset");
891 1075
892 config_packet *p = (config_packet *) pkt; 1076 config_packet *p = (config_packet *) pkt;
893 1077
894 if (!p->chk_config ()) 1078 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
895 {
896 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
897 conf->nodename, (const char *)rsi);
898 connectmode = conf_node::C_DISABLED;
899 }
900 else if (connectmode == conf_node::C_ALWAYS)
901 establish_connection (); 1079 establish_connection ();
902 } 1080 }
1081
903 break; 1082 break;
904 1083
905 case vpn_packet::PT_AUTH_REQ: 1084 case vpn_packet::PT_AUTH_REQ:
906 if (auth_rate_limiter.can (rsi)) 1085 if (auth_rate_limiter.can (rsi))
907 { 1086 {
908 auth_req_packet *p = (auth_req_packet *) pkt; 1087 auth_req_packet *p = (auth_req_packet *)pkt;
909 1088
910 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);
911 1092
912 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))
913 { 1099 {
914 if (p->prot_minor != PROTOCOL_MINOR) 1100 if (p->prot_minor != PROTOCOL_MINOR)
915 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."),
916 conf->nodename, (const char *)rsi, 1102 conf->nodename, (const char *)rsi,
917 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1103 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
918 1104
919 if (p->initiate) 1105 if (p->initiate)
1106 {
920 send_auth_request (rsi, false); 1107 send_auth_request (rsi, false);
921 1108
922 rsachallenge k; 1109 if (ictx && octx)
1110 reset_connection ("reconnect");
1111 }
923 1112
1113 auth_data auth;
1114
924 if (!rsa_decrypt (::conf.rsa_key, p->encr, k)) 1115 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
925 { 1116 {
926 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?"),
927 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));
928 break;
929 } 1119 }
930 else 1120 else
931 { 1121 {
932 delete octx; 1122 bool chg = !have_rcv_auth || !slow_memeq (&rcv_auth, &auth, sizeof auth);
933 1123
934 octx = new crypto_ctx (k, 1); 1124 rcv_auth = auth;
935 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1125 have_rcv_auth = true;
936 1126
937 // compatibility code, remove when no longer required 1127 send_auth_response (rsi);
938 if (p->flags & 1) p->features |= FEATURE_COMPRESSION;
939 1128
1129 if (chg)
1130 {
940 conf->protocols = p->protocols; 1131 conf->protocols = p->protocols;
941 features = p->features & config_packet::get_features (); 1132 features = p->features & config_packet::get_features ();
942 1133
943 send_auth_response (rsi, p->id, k);
944
945 connection_established (); 1134 connection_established (rsi);
946
947 break; 1135 }
948 } 1136 }
1137
1138 break;
949 } 1139 }
950 else
951 slog (L_WARN, _("%s(%s): protocol mismatch"),
952 conf->nodename, (const char *)rsi);
953 1140
954 send_reset (rsi); 1141 send_reset (rsi);
955 } 1142 }
956 1143
957 break; 1144 break;
958 1145
959 case vpn_packet::PT_AUTH_RES: 1146 case vpn_packet::PT_AUTH_RES:
960 { 1147 {
961 auth_res_packet *p = (auth_res_packet *) pkt; 1148 auth_res_packet *p = (auth_res_packet *)pkt;
962 1149
963 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1150 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
964 1151
965 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))
966 { 1156 {
967 if (p->prot_minor != PROTOCOL_MINOR)
968 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
969 conf->nodename, (const char *)rsi,
970 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
971
972 rsachallenge chg;
973
974 if (!rsa_cache.find (p->id, chg))
975 {
976 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1157 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
977 conf->nodename, (const char *)rsi); 1158 conf->nodename, (const char *)rsi);
978 break;
979 } 1159 }
980 else 1160 else if (!have_snd_auth)
981 { 1161 {
982 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1162 memcpy (snd_ecdh_b, p->response.ecdh, sizeof snd_ecdh_b);
983 1163
984 if (!p->hmac_chk (cctx)) 1164 have_snd_auth = true;
985 {
986 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
987 "could be an attack, or just corruption or a synchronization error"),
988 conf->nodename, (const char *)rsi);
989 break;
990 }
991 else
992 {
993 rsaresponse h;
994
995 rsa_hash (p->id, chg, h);
996
997 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
998 {
999 prot_minor = p->prot_minor;
1000
1001 delete ictx; ictx = cctx;
1002
1003 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
1004
1005 si = rsi;
1006 protocol = rsi.prot;
1007
1008 connection_established (); 1165 connection_established (rsi);
1009
1010 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
1011 conf->nodename, (const char *)rsi,
1012 p->prot_major, p->prot_minor);
1013
1014 if (::conf.script_node_up)
1015 run_script (run_script_cb (this, &connection::script_node_up), false);
1016
1017 break;
1018 }
1019 else
1020 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1021 conf->nodename, (const char *)rsi);
1022 }
1023
1024 delete cctx;
1025 }
1026 } 1166 }
1027 } 1167 }
1028
1029 send_reset (rsi);
1030 break; 1168 break;
1031 1169
1032 case vpn_packet::PT_DATA_COMPRESSED: 1170 case vpn_packet::PT_DATA_COMPRESSED:
1033#if !ENABLE_COMPRESSION 1171#if !ENABLE_COMPRESSION
1034 send_reset (rsi); 1172 send_reset (rsi);
1040 if (ictx && octx) 1178 if (ictx && octx)
1041 { 1179 {
1042 vpndata_packet *p = (vpndata_packet *)pkt; 1180 vpndata_packet *p = (vpndata_packet *)pkt;
1043 1181
1044 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 {
1045 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"
1046 "could be an attack, or just corruption or a synchronization error"), 1198 "could be an attack, or just corruption or a synchronization error."),
1047 conf->nodename, (const char *)rsi); 1199 conf->nodename, (const char *)rsi);
1200 // reset
1201 }
1202 }
1048 else 1203 else
1049 { 1204 {
1050 u32 seqno; 1205 u32 seqno;
1051 tap_packet *d = p->unpack (this, seqno); 1206 tap_packet *d = p->unpack (this, seqno);
1207 int seqclass = iseqno.seqno_classify (seqno);
1052 1208
1053 if (iseqno.recv_ok (seqno)) 1209 hmac_error = 0;
1210
1211 if (seqclass == 0) // ok
1054 { 1212 {
1055 vpn->tap->send (d); 1213 vpn->tap->send (d);
1056 1214
1057 if (si != rsi) 1215 if (si != rsi)
1058 { 1216 {
1059 // fast re-sync on connection 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.)
1060 si = rsi; 1219 // {
1061
1062 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1220 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1063 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);
1064 } 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);
1065 } 1249 }
1066 1250
1067 delete d; 1251 delete d;
1068 break; 1252 break;
1069 } 1253 }
1073 break; 1257 break;
1074 1258
1075 case vpn_packet::PT_CONNECT_REQ: 1259 case vpn_packet::PT_CONNECT_REQ:
1076 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1260 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1077 { 1261 {
1078 connect_req_packet *p = (connect_req_packet *) pkt; 1262 connect_req_packet *p = (connect_req_packet *)pkt;
1079 1263
1080 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1264 if (p->id > 0 && p->id <= vpn->conns.size ())
1081 connection *c = vpn->conns[p->id - 1];
1082 conf->protocols = p->protocols;
1083
1084 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1085 conf->id, p->id, c->ictx && c->octx);
1086
1087 if (c->ictx && c->octx)
1088 { 1265 {
1266 connection *c = vpn->conns[p->id - 1];
1267 conf->protocols = p->protocols;
1268
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,
1272 c->ictx && c->octx);
1273
1274 if (c->ictx && c->octx)
1275 {
1089 // send connect_info packets to both sides, in case one is 1276 // send connect_info packets to both sides, in case one is
1090 // behind a nat firewall (or both ;) 1277 // behind a nat firewall (or both ;)
1091 c->send_connect_info (conf->id, si, conf->protocols); 1278 c->send_connect_info (conf->id, si, conf->protocols);
1092 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1279 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1280 }
1281 else
1282 c->establish_connection ();
1093 } 1283 }
1094 else 1284 else
1095 c->establish_connection (); 1285 slog (L_WARN,
1286 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1287 p->id);
1096 } 1288 }
1097 1289
1098 break; 1290 break;
1099 1291
1100 case vpn_packet::PT_CONNECT_INFO: 1292 case vpn_packet::PT_CONNECT_INFO:
1101 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1293 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1102 { 1294 {
1103 connect_info_packet *p = (connect_info_packet *) pkt; 1295 connect_info_packet *p = (connect_info_packet *)pkt;
1104 1296
1105 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1297 if (p->id > 0 && p->id <= vpn->conns.size ())
1106 1298 {
1107 connection *c = vpn->conns[p->id - 1]; 1299 connection *c = vpn->conns[p->id - 1];
1108 1300
1109 c->conf->protocols = p->protocols; 1301 c->conf->protocols = p->protocols;
1110 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));
1111 p->si.upgrade_protocol (protocol, c->conf); 1303 p->si.upgrade_protocol (protocol, c->conf);
1112 1304
1113 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]",
1114 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);
1115 1313
1116 const sockinfo &dsi = forward_si (p->si); 1314 const sockinfo &dsi = forward_si (p->si);
1117 1315
1118 if (dsi.valid ()) 1316 if (dsi.valid ())
1119 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);
1322 }
1323 else
1324 slog (L_WARN,
1325 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1326 p->id);
1120 } 1327 }
1121 1328
1122 break; 1329 break;
1123 1330
1124 default: 1331 default:
1125 send_reset (rsi); 1332 send_reset (rsi);
1126 break; 1333 break;
1127 } 1334 }
1128} 1335}
1129 1336
1130void connection::keepalive_cb (time_watcher &w) 1337inline void
1338connection::keepalive_cb (ev::timer &w, int revents)
1131{ 1339{
1132 if (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)
1133 { 1345 {
1134 reset_connection (); 1346 reset_connection ("keepalive overdue");
1135 establish_connection (); 1347 establish_connection ();
1136 } 1348 }
1137 else if (NOW < last_activity + ::conf.keepalive)
1138 w.start (last_activity + ::conf.keepalive);
1139 else if (conf->connectmode != conf_node::C_ONDEMAND 1349 else if (conf->connectmode != conf_node::C_ONDEMAND
1140 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1350 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1141 { 1351 {
1352 w.start (3);
1142 send_ping (si); 1353 send_ping (si);
1143 w.start (NOW + 5);
1144 } 1354 }
1145 else if (NOW < last_activity + ::conf.keepalive + 10) 1355 else if (when >= -10)
1146 // hold ondemand connections implicitly a few seconds longer 1356 // hold ondemand connections implicitly a few seconds longer
1147 // should delete octx, though, or something like that ;) 1357 // should delete octx, though, or something like that ;)
1148 w.start (last_activity + ::conf.keepalive + 10); 1358 w.start (when + 10);
1149 else 1359 else
1150 reset_connection (); 1360 reset_connection ("keepalive timeout");
1151} 1361}
1152 1362
1363void
1153void connection::send_connect_request (int id) 1364connection::send_connect_request (int id)
1154{ 1365{
1155 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);
1156 1367
1157 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);
1158 p->hmac_set (octx); 1371 p->hmac_set (octx);
1159 send_vpn_packet (p, si); 1372 send_vpn_packet (p, si);
1160 1373
1161 delete p; 1374 delete p;
1162} 1375}
1163 1376
1164void connection::script_node () 1377void
1378connection::script_init_env (const char *ext)
1165{ 1379{
1166 vpn->script_if_up ();
1167
1168 char *env; 1380 char *env;
1381 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1382 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1383 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1384 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1385 conf->id & 0xff); putenv (env);
1386}
1387
1388void
1389connection::script_init_connect_env ()
1390{
1391 vpn->script_init_env ();
1392
1393 char *env;
1169 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);
1170 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1396 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1171 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1397 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1172 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1398 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1173} 1399}
1174 1400
1401inline const char *
1175const char *connection::script_node_up () 1402connection::script_node_up ()
1176{ 1403{
1177 script_node (); 1404 script_init_connect_env ();
1178 1405
1179 putenv ("STATE=up"); 1406 putenv ((char *)"STATE=up");
1180 1407
1408 char *filename;
1409 asprintf (&filename,
1410 "%s/%s",
1411 confbase,
1181 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1412 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1182}
1183 1413
1414 return filename;
1415}
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 *
1184const char *connection::script_node_down () 1434connection::script_node_down ()
1185{ 1435{
1186 script_node (); 1436 script_init_connect_env ();
1187 1437
1188 putenv ("STATE=down"); 1438 putenv ((char *)"STATE=down");
1189 1439
1190 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1440 char *filename;
1191} 1441 asprintf (&filename,
1442 "%s/%s",
1443 confbase,
1444 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1192 1445
1446 return filename;
1447}
1448
1193connection::connection(struct vpn *vpn_) 1449connection::connection (struct vpn *vpn, conf_node *conf)
1194: vpn(vpn_) 1450: vpn(vpn), conf(conf),
1195, rekey (this, &connection::rekey_cb) 1451#if ENABLE_DNS
1196, keepalive (this, &connection::keepalive_cb) 1452 dns (0),
1453#endif
1454 data_queue(conf->max_ttl, conf->max_queue + 1),
1455 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1456{
1457 rekey .set<connection, &connection::rekey_cb > (this);
1458 keepalive .set<connection, &connection::keepalive_cb > (this);
1197, establish_connection (this, &connection::establish_connection_cb) 1459 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1198{ 1460
1461 last_establish_attempt = 0.;
1199 octx = ictx = 0; 1462 octx = ictx = 0;
1200 retry_cnt = 0;
1201 1463
1202 connectmode = conf_node::C_ALWAYS; // initial setting 1464 connectmode = conf->connectmode;
1465
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
1203 reset_connection (); 1470 reset_connection ("startup");
1204} 1471}
1205 1472
1206connection::~connection () 1473connection::~connection ()
1207{ 1474{
1208 shutdown (); 1475 shutdown ();
1209} 1476}
1210 1477
1478void
1211void connection_init () 1479connection_init ()
1212{ 1480{
1213 auth_rate_limiter.clear (); 1481 auth_rate_limiter.clear ();
1214 reset_rate_limiter.clear (); 1482 reset_rate_limiter.clear ();
1215} 1483}
1216 1484

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines