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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines