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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines