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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines