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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines