ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines