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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines