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.52 by pcg, Wed Mar 23 21:55:39 2005 UTC vs.
Revision 1.102 by root, Thu Jul 18 13:35:16 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines