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

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines