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.16 by pcg, Mon Sep 1 15:52:03 2003 UTC vs.
Revision 1.97 by root, Tue Dec 4 13:23:17 2012 UTC

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

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines