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.19 by pcg, Tue Oct 14 03:22:09 2003 UTC vs.
Revision 1.104 by root, Fri Jul 19 18:18:27 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines