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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines