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.59 by pcg, Mon Dec 5 12:58:09 2005 UTC vs.
Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines