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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines