ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines