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.3 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines