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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines