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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines