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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines