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

Comparing gvpe/src/connection.C (file contents):
Revision 1.14 by pcg, Fri Aug 8 09:29:22 2003 UTC vs.
Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines