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.49 by pcg, Sat Mar 12 18:10:40 2005 UTC vs.
Revision 1.113 by root, Thu Jan 29 00:21:39 2015 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines