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.29 by pcg, Thu Jan 29 18:55:10 2004 UTC vs.
Revision 1.102 by root, Thu Jul 18 13:35:16 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines