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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines