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.6 by pcg, Sat Apr 5 02:32:40 2003 UTC vs.
Revision 1.101 by root, Wed Jul 17 16:40:57 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines