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.22 by pcg, Thu Oct 16 02:41:21 2003 UTC vs.
Revision 1.116 by root, Mon Apr 1 03:10:26 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines