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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines