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.3 by pcg, Wed Apr 2 05:15:00 2003 UTC vs.
Revision 1.103 by root, Thu Jul 18 17:35:10 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines