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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines