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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines