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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines