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.7 by pcg, Sat Apr 5 17:54:22 2003 UTC vs.
Revision 1.102 by root, Thu Jul 18 13:35:16 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines