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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines