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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines