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.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.116 by root, Mon Apr 1 03:10:26 2019 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines