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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines