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.15 by pcg, Fri Aug 8 10:58:28 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 if (prot_major != PROTOCOL_MAJOR) 594 if (prot_major != PROTOCOL_MAJOR)
481 slog (L_WARN, _("major version mismatch (%d <=> %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);
482 else if (randsize != RAND_SIZE) 597 else if (randsize != RAND_SIZE)
483 slog (L_WARN, _("rand size mismatch (%d <=> %d)"), randsize, RAND_SIZE); 598 slog (L_WARN, _("%s(%s): rand size mismatch (remote %d <=> local %d)"),
484 else if (hmaclen != HMACLENGTH) 599 conf->nodename, (const char *)rsi, randsize, RAND_SIZE);
485 slog (L_WARN, _("hmac length mismatch (%d <=> %d)"), hmaclen, HMACLENGTH);
486 else if (flags != curflags ())
487 slog (L_WARN, _("flag mismatch (%x <=> %x)"), flags, curflags ());
488 else if (challengelen != sizeof (rsachallenge))
489 slog (L_WARN, _("challenge length mismatch (%d <=> %d)"), challengelen, sizeof (rsachallenge));
490 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 600 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER ())))
491 slog (L_WARN, _("cipher mismatch (%x <=> %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 601 slog (L_WARN, _("%s(%s): cipher algo mismatch (remote %x <=> local %x)"),
492 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 602 conf->nodename, (const char *)rsi, ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER ()));
493 slog (L_WARN, _("digest mismatch (%x <=> %x)"), ntohl (digest_nid), EVP_MD_type (RSA_HASH));
494 else if (hmac_nid != htonl (EVP_MD_type (DIGEST))) 603 else if (mac_nid != htonl (EVP_MD_type (MAC_DIGEST ())))
495 slog (L_WARN, _("hmac mismatch (%x <=> %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 ()));
496 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)
497 return true; 617 return true;
618 }
498 619
499 return false; 620 return false;
500} 621}
501 622
502struct auth_req_packet : config_packet 623struct auth_req_packet : config_packet // UNPROTECTED
503{ 624{
504 char magic[8]; 625 char magic[8];
505 u8 initiate; // false if this is just an automatic reply 626 u8 initiate; // false if this is just an automatic reply
506 u8 protocols; // supported protocols (will get patches on forward) 627 u8 protocols; // supported protocols (will be patched on forward)
507 u8 pad2, pad3; 628 u8 pad2, pad3;
508 rsaid id; 629 auth_encr encr;
509 rsaencrdata encr;
510 630
511 auth_req_packet (int dst, bool initiate_, u8 protocols_) 631 auth_req_packet (int dst, bool initiate_, u8 protocols_)
512 { 632 {
513 config_packet::setup (PT_AUTH_REQ, dst); 633 config_packet::setup (PT_AUTH_REQ, dst);
514 strncpy (magic, MAGIC, 8); 634 memcpy (magic, MAGIC, 8);
515 initiate = !!initiate_; 635 initiate = !!initiate_;
516 protocols = protocols_; 636 protocols = protocols_;
517 637
518 len = sizeof (*this) - sizeof (net_packet); 638 len = sizeof (*this) - sizeof (net_packet);
519 } 639 }
520}; 640};
521 641
522struct auth_res_packet : config_packet 642struct auth_res_packet : vpn_packet // UNPROTECTED
523{ 643{
524 rsaid id;
525 u8 pad1, pad2, pad3;
526 u8 response_len; // encrypted length
527 rsaresponse response; 644 auth_response response;
528 645
529 auth_res_packet (int dst) 646 auth_res_packet (int dst)
530 { 647 {
531 config_packet::setup (PT_AUTH_RES, dst); 648 set_hdr (PT_AUTH_RES, dst);
532 649
533 len = sizeof (*this) - sizeof (net_packet); 650 len = sizeof (*this) - sizeof (net_packet);
534 } 651 }
535}; 652};
536 653
566}; 683};
567 684
568///////////////////////////////////////////////////////////////////////////// 685/////////////////////////////////////////////////////////////////////////////
569 686
570void 687void
571connection::connection_established () 688connection::connection_established (const sockinfo &rsi)
572{ 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
573 if (ictx && octx) 723 if (ictx && octx)
574 { 724 {
575 connectmode = conf->connectmode; 725 while (tap_packet *p = (tap_packet *)data_queue.get ())
576
577 rekey.start (NOW + ::conf.rekey);
578 keepalive.start (NOW + ::conf.keepalive);
579
580 // send queued packets
581 if (ictx && octx)
582 { 726 {
583 while (tap_packet *p = (tap_packet *)data_queue.get ())
584 {
585 send_data_packet (p); 727 if (p->len) send_data_packet (p);
586 delete p; 728 delete p;
587 }
588
589 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
590 {
591 send_vpn_packet (p, si, IPTOS_RELIABILITY);
592 delete p;
593 }
594 } 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 }
595 } 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 ());
596 else 746 else
597 { 747 {
598 retry_cnt = 0; 748 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
599 establish_connection.start (NOW + 5); 749 protocol = 0;
600 keepalive.reset ();
601 rekey.reset ();
602 } 750 }
603}
604
605void
606connection::reset_si ()
607{
608 protocol = best_protocol (THISNODE->protocols & conf->protocols);
609
610 // mask out protocols we cannot establish
611 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
612 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
613 751
614 si.set (conf, protocol); 752 si.set (conf, protocol);
753
754 is_direct = si.valid ();
615} 755}
616 756
617// ensure sockinfo is valid, forward if necessary 757// ensure sockinfo is valid, forward if necessary
618const sockinfo & 758const sockinfo &
619connection::forward_si (const sockinfo &si) const 759connection::forward_si (const sockinfo &si) const
620{ 760{
621 if (!si.valid ()) 761 if (!si.valid ())
622 { 762 {
623 connection *r = vpn->find_router (); 763 connection *r = vpn->find_router_for (this);
624 764
625 if (r) 765 if (r)
626 { 766 {
627 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 767 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
628 conf->nodename, r->conf->nodename); 768 conf->nodename, r->conf->nodename);
629 return r->si; 769 return r->si;
630 } 770 }
631 else 771 else
632 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 772 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
633 conf->nodename); 773 conf->nodename);
634 } 774 }
635 775
636 return si; 776 return si;
637} 777}
647connection::send_ping (const sockinfo &si, u8 pong) 787connection::send_ping (const sockinfo &si, u8 pong)
648{ 788{
649 ping_packet *pkt = new ping_packet; 789 ping_packet *pkt = new ping_packet;
650 790
651 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);
652 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 794 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
653 795
654 delete pkt; 796 delete pkt;
655} 797}
656 798
671void 813void
672connection::send_auth_request (const sockinfo &si, bool initiate) 814connection::send_auth_request (const sockinfo &si, bool initiate)
673{ 815{
674 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);
675 817
676 rsachallenge chg; 818 generate_auth_data ();
819 auth_encrypt (conf->rsa_key, snd_auth, pkt->encr);
677 820
678 rsa_cache.gen (pkt->id, chg);
679
680 if (0 > RSA_public_encrypt (sizeof chg,
681 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
682 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
683 fatal ("RSA_public_encrypt error");
684
685 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);
686
687 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
688 823
689 delete pkt; 824 delete pkt;
690} 825}
691 826
692void 827void
693connection::send_auth_response (const sockinfo &si, const rsaid &id, const rsachallenge &chg) 828connection::send_auth_response (const sockinfo &si)
694{ 829{
695 auth_res_packet *pkt = new auth_res_packet (conf->id); 830 auth_res_packet *pkt = new auth_res_packet (conf->id);
696 831
697 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);
698 834
699 rsa_hash (id, chg, pkt->response);
700
701 pkt->hmac_set (octx);
702
703 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);
704
705 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
706 837
707 delete pkt; 838 delete pkt;
708} 839}
709 840
710void 841void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 842connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 843{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 844 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s,p%02x)", conf->nodename,
714 conf->id, rid, (const char *)rsi); 845 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi,
846 conf->protocols);
715 847
716 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);
717 849
718 r->hmac_set (octx); 850 r->hmac_set (octx);
719 send_vpn_packet (r, si); 851 send_vpn_packet (r, si);
720 852
721 delete r; 853 delete r;
722} 854}
723 855
724void 856inline void
725connection::establish_connection_cb (time_watcher &w) 857connection::establish_connection_cb (ev::timer &w, int revents)
726{ 858{
727 if (ictx || conf == THISNODE 859 if (!(ictx && octx)
860 && conf != THISNODE
728 || connectmode == conf_node::C_NEVER 861 && connectmode != conf_node::C_NEVER
729 || connectmode == conf_node::C_DISABLED) 862 && connectmode != conf_node::C_DISABLED
730 w.at = TSTAMP_CANCEL; 863 && !w.is_active ())
731 else if (w.at <= NOW)
732 { 864 {
733 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
734 866 // and stop trying. should probably be handled by a per-connection expire handler.
735 if (retry_int < 3600 * 8) 867 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
868 {
869 reset_connection ();
736 retry_cnt++; 870 return;
871 }
737 872
738 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));
739 878
740 reset_si (); 879 reset_si ();
741 880
742 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);
743 vpn->send_connect_request (conf->id); 887 vpn->send_connect_request (this);
888 }
744 else 889 else
745 { 890 {
891 if (si.valid ())
892 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
893 conf->nodename, (const char *)si);
894
746 const sockinfo &dsi = forward_si (si); 895 const sockinfo &dsi = forward_si (si);
896
897 slow = slow || (dsi.prot & PROT_SLOW);
747 898
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 899 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 900 {
750 if (retry_cnt < 4) 901 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 902 send_auth_request (dsi, true);
752 else 903 else
753 send_ping (dsi, 0); 904 send_ping (dsi, 0);
754 } 905 }
755 } 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);
756 } 916 }
757} 917}
758 918
759void 919void
760connection::reset_connection () 920connection::reset_connection ()
763 { 923 {
764 slog (L_INFO, _("%s(%s): connection lost"), 924 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 925 conf->nodename, (const char *)si);
766 926
767 if (::conf.script_node_down) 927 if (::conf.script_node_down)
768 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 }
769 } 933 }
770 934
771 delete ictx; ictx = 0; 935 delete ictx; ictx = 0;
772 delete octx; octx = 0; 936 delete octx; octx = 0;
773 937
774 si.host= 0; 938 si.host = 0;
775 939
940 have_snd_auth = false;
941 have_rcv_auth = false;
942 auth_expire = 0.;
943
776 last_activity = 0; 944 last_activity = 0.;
945 //last_si_change = 0.;
777 retry_cnt = 0; 946 retry_cnt = 0;
778 947
779 rekey.reset (); 948 rekey.stop ();
780 keepalive.reset (); 949 keepalive.stop ();
781 establish_connection.reset (); 950 establish_connection.stop ();
782} 951}
783 952
784void 953void
785connection::shutdown () 954connection::shutdown ()
786{ 955{
788 send_reset (si); 957 send_reset (si);
789 958
790 reset_connection (); 959 reset_connection ();
791} 960}
792 961
793void 962// poor-man's rekeying
794connection::rekey_cb (time_watcher &w) 963inline void
964connection::rekey_cb (ev::timer &w, int revents)
795{ 965{
796 w.at = TSTAMP_CANCEL;
797
798 reset_connection (); 966 reset_connection ();
799 establish_connection (); 967 establish_connection ();
800} 968}
801 969
802void 970void
803connection::send_data_packet (tap_packet *pkt, bool broadcast) 971connection::send_data_packet (tap_packet *pkt)
804{ 972{
805 vpndata_packet *p = new vpndata_packet; 973 vpndata_packet *p = new vpndata_packet;
806 int tos = 0; 974 int tos = 0;
807 975
808 // 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.
809 if (conf->inherit_tos 977 if (conf->inherit_tos && pkt->is_ipv4 ())
810 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
811 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
812 tos = (*pkt)[15] & IPTOS_TOS_MASK; 978 tos = (*pkt)[15] & IPTOS_TOS_MASK;
813 979
814 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
815 send_vpn_packet (p, si, tos); 981 send_vpn_packet (p, si, tos);
816 982
817 delete p; 983 delete p;
818 984
819 if (oseqno > MAX_SEQNO) 985 if (oseqno > MAX_SEQNO)
820 rekey (); 986 rekey ();
821} 987}
822 988
823void 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
824connection::inject_data_packet (tap_packet *pkt, bool broadcast) 1000connection::inject_data_packet (tap_packet *pkt)
825{ 1001{
826 if (ictx && octx) 1002 if (ictx && octx)
827 send_data_packet (pkt, broadcast); 1003 send_data_packet (pkt);
828 else 1004 else
829 { 1005 {
830 if (!broadcast)//DDDD
831 data_queue.put (new tap_packet (*pkt)); 1006 data_queue.put (new tap_packet (*pkt));
832 1007 post_inject_queue ();
833 establish_connection ();
834 } 1008 }
835} 1009}
836 1010
1011void
837void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1012connection::inject_vpn_packet (vpn_packet *pkt, int tos)
838{ 1013{
839 if (ictx && octx) 1014 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos); 1015 send_vpn_packet (pkt, si, tos);
841 else 1016 else
842 { 1017 {
843 vpn_queue.put (new vpn_packet (*pkt)); 1018 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
844 1019 post_inject_queue ();
845 establish_connection ();
846 } 1020 }
847} 1021}
848 1022
849void 1023void
850connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1024connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
851{ 1025{
852 last_activity = NOW; 1026 last_activity = ev_now ();
853 1027
854 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.",
855 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;
856 1033
857 switch (pkt->typ ()) 1034 switch (pkt->typ ())
858 { 1035 {
859 case vpn_packet::PT_PING: 1036 case vpn_packet::PT_PING:
1037 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1038
860 // we send pings instead of auth packets after some retries, 1039 // we send pings instead of auth packets after some retries,
861 // so reset the retry counter and establish a connection 1040 // so reset the retry counter and establish a connection
862 // when we receive a ping. 1041 // when we receive a ping.
863 if (!ictx) 1042 if (!ictx)
864 { 1043 {
865 if (auth_rate_limiter.can (rsi)) 1044 if (auth_rate_limiter.can (rsi))
866 send_auth_request (rsi, true); 1045 send_auth_request (rsi, true);
867 } 1046 }
868 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.
869 send_ping (rsi, 1); // pong 1050 send_ping (rsi, 1); // pong
870 1051
871 break; 1052 break;
872 1053
873 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 ();
874 break; 1060 break;
875 1061
876 case vpn_packet::PT_RESET: 1062 case vpn_packet::PT_RESET:
877 { 1063 {
878 reset_connection (); 1064 reset_connection ();
879 1065
880 config_packet *p = (config_packet *) pkt; 1066 config_packet *p = (config_packet *) pkt;
881 1067
882 if (!p->chk_config ()) 1068 if (p->chk_config (conf, rsi) && connectmode == conf_node::C_ALWAYS)
883 {
884 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"),
885 conf->nodename, (const char *)rsi);
886 connectmode = conf_node::C_DISABLED;
887 }
888 else if (connectmode == conf_node::C_ALWAYS)
889 establish_connection (); 1069 establish_connection ();
890 } 1070 }
891 break; 1071 break;
892 1072
893 case vpn_packet::PT_AUTH_REQ: 1073 case vpn_packet::PT_AUTH_REQ:
894 if (auth_rate_limiter.can (rsi)) 1074 if (auth_rate_limiter.can (rsi))
895 { 1075 {
896 auth_req_packet *p = (auth_req_packet *) pkt; 1076 auth_req_packet *p = (auth_req_packet *)pkt;
897 1077
898 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);
899 1081
900 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))
901 { 1088 {
902 if (p->prot_minor != PROTOCOL_MINOR) 1089 if (p->prot_minor != PROTOCOL_MINOR)
903 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."),
904 conf->nodename, (const char *)rsi, 1091 conf->nodename, (const char *)rsi,
905 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1092 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
906 1093
907 if (p->initiate) 1094 if (p->initiate)
908 send_auth_request (rsi, false); 1095 send_auth_request (rsi, false);
909 1096
910 rsachallenge k; 1097 auth_data auth;
911 1098
912 if (0 > RSA_private_decrypt (sizeof (p->encr), 1099 if (!auth_decrypt (::conf.rsa_key, p->encr, auth))
913 (unsigned char *)&p->encr, (unsigned char *)&k, 1100 {
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 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?"),
916 conf->nodename, (const char *)rsi); 1102 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1103 }
917 else 1104 else
918 { 1105 {
919 delete octx; 1106 bool chg = !have_rcv_auth || memcmp (&rcv_auth, &auth, sizeof auth);
920 1107
921 octx = new crypto_ctx (k, 1); 1108 rcv_auth = auth;
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1109 have_rcv_auth = true;
923 1110
1111 send_auth_response (rsi);
1112
1113 if (chg)
1114 {
924 conf->protocols = p->protocols; 1115 conf->protocols = p->protocols;
1116 features = p->features & config_packet::get_features ();
925 1117
926 send_auth_response (rsi, p->id, k);
927
928 connection_established (); 1118 connection_established (rsi);
929
930 break; 1119 }
931 } 1120 }
1121
1122 break;
932 } 1123 }
933 else
934 slog (L_WARN, _("%s(%s): protocol mismatch"),
935 conf->nodename, (const char *)rsi);
936 1124
937 send_reset (rsi); 1125 send_reset (rsi);
938 } 1126 }
939 1127
940 break; 1128 break;
941 1129
942 case vpn_packet::PT_AUTH_RES: 1130 case vpn_packet::PT_AUTH_RES:
943 { 1131 {
944 auth_res_packet *p = (auth_res_packet *) pkt; 1132 auth_res_packet *p = (auth_res_packet *)pkt;
945 1133
946 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1134 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
947 1135
948 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))
949 { 1140 {
950 if (p->prot_minor != PROTOCOL_MINOR)
951 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
952 conf->nodename, (const char *)rsi,
953 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
954
955 rsachallenge chg;
956
957 if (!rsa_cache.find (p->id, chg))
958 {
959 slog (L_ERR, _("%s(%s): unrequested auth response"), 1141 slog (L_ERR, _("%s(%s): unrequested or outdated auth response, ignoring."),
960 conf->nodename, (const char *)rsi); 1142 conf->nodename, (const char *)rsi);
961 break;
962 }
963 else
964 {
965 crypto_ctx *cctx = new crypto_ctx (chg, 0);
966
967 if (!p->hmac_chk (cctx))
968 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
969 "could be an attack, or just corruption or an synchronization error"),
970 conf->nodename, (const char *)rsi);
971 else
972 {
973 rsaresponse h;
974
975 rsa_hash (p->id, chg, h);
976
977 if (!memcmp ((u8 *)&h, (u8 *)p->response, sizeof h))
978 {
979 prot_minor = p->prot_minor;
980
981 delete ictx; ictx = cctx;
982
983 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
984
985 si = rsi;
986 protocol = rsi.prot;
987
988 connection_established ();
989
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor);
993
994 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false);
996
997 break;
998 }
999 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
1001 conf->nodename, (const char *)rsi);
1002 }
1003
1004 delete cctx;
1005 }
1006 } 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;
1007 } 1153 }
1008 1154
1009 send_reset (rsi); 1155 send_reset (rsi);
1010 break; 1156 break;
1011 1157
1021 { 1167 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1168 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1169
1024 if (!p->hmac_chk (ictx)) 1170 if (!p->hmac_chk (ictx))
1025 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"
1026 "could be an attack, or just corruption or an synchronization error"), 1172 "could be an attack, or just corruption or a synchronization error."),
1027 conf->nodename, (const char *)rsi); 1173 conf->nodename, (const char *)rsi);
1028 else 1174 else
1029 { 1175 {
1030 u32 seqno; 1176 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1177 tap_packet *d = p->unpack (this, seqno);
1178 int seqclass = iseqno.seqno_classify (seqno);
1032 1179
1033 if (iseqno.recv_ok (seqno)) 1180 if (seqclass == 0) // ok
1034 { 1181 {
1035 vpn->tap->send (d); 1182 vpn->tap->send (d);
1036 1183
1037 if (p->dst () == 0) // re-broadcast
1038 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1039 {
1040 connection *c = *i;
1041
1042 if (c->conf != THISNODE && c->conf != conf)
1043 c->inject_data_packet (d);
1044 }
1045
1046 if (si != rsi) 1184 if (si != rsi)
1047 { 1185 {
1048 // 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.)
1049 si = rsi; 1188 // {
1050
1051 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1189 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1052 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);
1053 } 1205 }
1054
1055 delete d;
1056
1057 break;
1058 } 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;
1059 } 1222 }
1060 } 1223 }
1061 1224
1062 send_reset (rsi); 1225 send_reset (rsi);
1063 break; 1226 break;
1064 1227
1065 case vpn_packet::PT_CONNECT_REQ: 1228 case vpn_packet::PT_CONNECT_REQ:
1066 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1229 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1067 { 1230 {
1068 connect_req_packet *p = (connect_req_packet *) pkt; 1231 connect_req_packet *p = (connect_req_packet *)pkt;
1069 1232
1070 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 ())
1071 connection *c = vpn->conns[p->id - 1];
1072 conf->protocols = p->protocols;
1073
1074 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1075 conf->id, p->id, c->ictx && c->octx);
1076
1077 if (c->ictx && c->octx)
1078 { 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 {
1079 // send connect_info packets to both sides, in case one is 1245 // send connect_info packets to both sides, in case one is
1080 // behind a nat firewall (or both ;) 1246 // behind a nat firewall (or both ;)
1081 c->send_connect_info (conf->id, si, conf->protocols); 1247 c->send_connect_info (conf->id, si, conf->protocols);
1082 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 ();
1083 } 1252 }
1084 else 1253 else
1085 c->establish_connection (); 1254 slog (L_WARN,
1255 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1256 p->id);
1086 } 1257 }
1087 1258
1088 break; 1259 break;
1089 1260
1090 case vpn_packet::PT_CONNECT_INFO: 1261 case vpn_packet::PT_CONNECT_INFO:
1091 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1262 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1092 { 1263 {
1093 connect_info_packet *p = (connect_info_packet *) pkt; 1264 connect_info_packet *p = (connect_info_packet *)pkt;
1094 1265
1095 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 ())
1096 1267 {
1097 connection *c = vpn->conns[p->id - 1]; 1268 connection *c = vpn->conns[p->id - 1];
1098 1269
1099 c->conf->protocols = p->protocols; 1270 c->conf->protocols = p->protocols;
1100 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));
1101 p->si.upgrade_protocol (protocol, c->conf); 1272 p->si.upgrade_protocol (protocol, c->conf);
1102 1273
1103 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]",
1104 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);
1105 1282
1106 const sockinfo &dsi = forward_si (p->si); 1283 const sockinfo &dsi = forward_si (p->si);
1107 1284
1108 if (dsi.valid ()) 1285 if (dsi.valid ())
1109 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);
1110 } 1296 }
1111 1297
1112 break; 1298 break;
1113 1299
1114 default: 1300 default:
1115 send_reset (rsi); 1301 send_reset (rsi);
1116 break; 1302 break;
1117 } 1303 }
1118} 1304}
1119 1305
1120void connection::keepalive_cb (time_watcher &w) 1306inline void
1307connection::keepalive_cb (ev::timer &w, int revents)
1121{ 1308{
1122 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)
1123 { 1314 {
1124 reset_connection (); 1315 reset_connection ();
1125 establish_connection (); 1316 establish_connection ();
1126 } 1317 }
1127 else if (NOW < last_activity + ::conf.keepalive)
1128 w.at = last_activity + ::conf.keepalive;
1129 else if (conf->connectmode != conf_node::C_ONDEMAND 1318 else if (conf->connectmode != conf_node::C_ONDEMAND
1130 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1319 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1131 { 1320 {
1321 w.start (3);
1132 send_ping (si); 1322 send_ping (si);
1133 w.at = NOW + 5;
1134 } 1323 }
1135 else if (NOW < last_activity + ::conf.keepalive + 10) 1324 else if (when >= -10)
1136 // hold ondemand connections implicitly a few seconds longer 1325 // hold ondemand connections implicitly a few seconds longer
1137 // should delete octx, though, or something like that ;) 1326 // should delete octx, though, or something like that ;)
1138 w.at = last_activity + ::conf.keepalive + 10; 1327 w.start (when + 10);
1139 else 1328 else
1140 reset_connection (); 1329 reset_connection ();
1141} 1330}
1142 1331
1332void
1143void connection::send_connect_request (int id) 1333connection::send_connect_request (int id)
1144{ 1334{
1145 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);
1146 1336
1147 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);
1148 p->hmac_set (octx); 1340 p->hmac_set (octx);
1149 send_vpn_packet (p, si); 1341 send_vpn_packet (p, si);
1150 1342
1151 delete p; 1343 delete p;
1152} 1344}
1153 1345
1154void connection::script_node () 1346void
1347connection::script_init_env (const char *ext)
1155{ 1348{
1156 vpn->script_if_up ();
1157
1158 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;
1159 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);
1160 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1365 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1161 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1366 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1162 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1367 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1163} 1368}
1164 1369
1370inline const char *
1165const char *connection::script_node_up () 1371connection::script_node_up ()
1166{ 1372{
1167 script_node (); 1373 script_init_connect_env ();
1168 1374
1169 putenv ("STATE=up"); 1375 putenv ((char *)"STATE=up");
1170 1376
1377 char *filename;
1378 asprintf (&filename,
1379 "%s/%s",
1380 confbase,
1171 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1381 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1172}
1173 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 *
1174const char *connection::script_node_down () 1403connection::script_node_down ()
1175{ 1404{
1176 script_node (); 1405 script_init_connect_env ();
1177 1406
1178 putenv ("STATE=down"); 1407 putenv ((char *)"STATE=down");
1179 1408
1180 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1409 char *filename;
1181} 1410 asprintf (&filename,
1411 "%s/%s",
1412 confbase,
1413 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1182 1414
1415 return filename;
1416}
1417
1183connection::connection(struct vpn *vpn_) 1418connection::connection (struct vpn *vpn, conf_node *conf)
1184: vpn(vpn_) 1419: vpn(vpn), conf(conf),
1185, rekey (this, &connection::rekey_cb) 1420#if ENABLE_DNS
1186, 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);
1187, establish_connection (this, &connection::establish_connection_cb) 1428 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1188{ 1429
1430 last_establish_attempt = 0.;
1189 octx = ictx = 0; 1431 octx = ictx = 0;
1190 retry_cnt = 0;
1191 1432
1192 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
1193 reset_connection (); 1439 reset_connection ();
1194} 1440}
1195 1441
1196connection::~connection () 1442connection::~connection ()
1197{ 1443{
1198 shutdown (); 1444 shutdown ();
1199} 1445}
1200 1446
1447void
1201void connection_init () 1448connection_init ()
1202{ 1449{
1203 auth_rate_limiter.clear (); 1450 auth_rate_limiter.clear ();
1204 reset_rate_limiter.clear (); 1451 reset_rate_limiter.clear ();
1205} 1452}
1206 1453

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines