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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.114 by root, Thu Jun 30 11:43:38 2016 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines