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.21 by pcg, Thu Oct 16 02:28:36 2003 UTC vs.
Revision 1.112 by root, Fri Sep 12 10:40:43 2014 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines