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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines