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.39 by pcg, Tue Oct 12 12:06:06 2004 UTC vs.
Revision 1.103 by root, Thu Jul 18 17:35:10 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines