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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines