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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines