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.26 by pcg, Sat Jan 17 14:08:57 2004 UTC vs.
Revision 1.113 by root, Thu Jan 29 00:21:39 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines