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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines