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.18 by pcg, Sat Oct 4 13:20:07 2003 UTC vs.
Revision 1.92 by root, Thu Feb 10 03:59:51 2011 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2008,2010 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
576 695 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
577 rekey.start (NOW + ::conf.rekey); 696 rekey.start (rekey_interval, rekey_interval);
578 keepalive.start (NOW + ::conf.keepalive); 697 keepalive.start (::conf.keepalive);
579 698
580 // send queued packets 699 // send queued packets
581 if (ictx && octx) 700 if (ictx && octx)
582 { 701 {
583 while (tap_packet *p = (tap_packet *)data_queue.get ()) 702 while (tap_packet *p = (tap_packet *)data_queue.get ())
584 { 703 {
585 send_data_packet (p); 704 if (p->len) send_data_packet (p);
586 delete p; 705 delete p;
587 } 706 }
588 707
589 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 708 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
590 { 709 {
591 send_vpn_packet (p, si, IPTOS_RELIABILITY); 710 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
592 delete p; 711 delete p;
593 } 712 }
594 } 713 }
714
715 vpn->connection_established (this);
595 } 716 }
596 else 717 else
597 { 718 {
598 retry_cnt = 0; 719 retry_cnt = 0;
599 establish_connection.start (NOW + 5); 720 establish_connection.start (5);
600 keepalive.reset (); 721 keepalive.stop ();
601 rekey.reset (); 722 rekey.stop ();
602 } 723 }
603} 724}
604 725
605void 726void
606connection::reset_si () 727connection::reset_si ()
607{ 728{
729 if (vpn->can_direct (THISNODE, conf))
608 protocol = best_protocol (THISNODE->protocols & conf->protocols); 730 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
609 731 else
610 // mask out protocols we cannot establish 732 {
611 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 733 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
612 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 734 protocol = 0;
735 }
613 736
614 si.set (conf, protocol); 737 si.set (conf, protocol);
738
739 is_direct = si.valid ();
615} 740}
616 741
617// ensure sockinfo is valid, forward if necessary 742// ensure sockinfo is valid, forward if necessary
618const sockinfo & 743const sockinfo &
619connection::forward_si (const sockinfo &si) const 744connection::forward_si (const sockinfo &si) const
620{ 745{
621 if (!si.valid ()) 746 if (!si.valid ())
622 { 747 {
623 connection *r = vpn->find_router (); 748 connection *r = vpn->find_router_for (this);
624 749
625 if (r) 750 if (r)
626 { 751 {
627 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 752 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
628 conf->nodename, r->conf->nodename); 753 conf->nodename, r->conf->nodename);
629 return r->si; 754 return r->si;
630 } 755 }
631 else 756 else
632 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 757 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
633 conf->nodename); 758 conf->nodename);
634 } 759 }
635 760
636 return si; 761 return si;
637} 762}
… …
647connection::send_ping (const sockinfo &si, u8 pong) 772connection::send_ping (const sockinfo &si, u8 pong)
648{ 773{
649 ping_packet *pkt = new ping_packet; 774 ping_packet *pkt = new ping_packet;
650 775
651 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 776 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
777
778 slog (L_TRACE, "%s << %s [%s]", conf->nodename, pong ? "PT_PONG" : "PT_PING", (const char *)si);
779
652 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 780 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
653 781
654 delete pkt; 782 delete pkt;
655} 783}
656 784
… …
672connection::send_auth_request (const sockinfo &si, bool initiate) 800connection::send_auth_request (const sockinfo &si, bool initiate)
673{ 801{
674 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols); 802 auth_req_packet *pkt = new auth_req_packet (conf->id, initiate, THISNODE->protocols);
675 803
676 rsachallenge chg; 804 rsachallenge chg;
677
678 rsa_cache.gen (pkt->id, chg); 805 rsa_cache.gen (pkt->id, chg);
806 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
679 807
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); 808 slog (L_TRACE, "%s << PT_AUTH_REQ [%s]", conf->nodename, (const char *)si);
686 809
687 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly 810 send_vpn_packet (pkt, si, IPTOS_RELIABILITY | IPTOS_LOWDELAY); // rsa is very very costly
688 811
689 delete pkt; 812 delete pkt;
690} 813}
… …
698 821
699 rsa_hash (id, chg, pkt->response); 822 rsa_hash (id, chg, pkt->response);
700 823
701 pkt->hmac_set (octx); 824 pkt->hmac_set (octx);
702 825
703 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 826 slog (L_TRACE, "%s << PT_AUTH_RES [%s]", conf->nodename, (const char *)si);
704 827
705 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 828 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
706 829
707 delete pkt; 830 delete pkt;
708} 831}
709 832
710void 833void
711connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 834connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
712{ 835{
713 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 836 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
714 conf->id, rid, (const char *)rsi); 837 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
715 838
716 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 839 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
717 840
718 r->hmac_set (octx); 841 r->hmac_set (octx);
719 send_vpn_packet (r, si); 842 send_vpn_packet (r, si);
720 843
721 delete r; 844 delete r;
722} 845}
723 846
724void 847inline void
725connection::establish_connection_cb (time_watcher &w) 848connection::establish_connection_cb (ev::timer &w, int revents)
726{ 849{
727 if (ictx || conf == THISNODE 850 if (!(ictx && octx)
851 && conf != THISNODE
728 || connectmode == conf_node::C_NEVER 852 && connectmode != conf_node::C_NEVER
729 || connectmode == conf_node::C_DISABLED) 853 && connectmode != conf_node::C_DISABLED
730 w.at = TSTAMP_CANCEL; 854 && !w.is_active ())
731 else if (w.at <= NOW)
732 { 855 {
733 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 856 // a bit hacky, if ondemand, and packets are no longer queued, then reset the connection
734 857 // and stop trying. should probably be handled by a per-connection expire handler.
735 if (retry_int < 3600 * 8) 858 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
859 {
860 reset_connection ();
736 retry_cnt++; 861 return;
862 }
737 863
738 w.at = NOW + retry_int; 864 last_establish_attempt = ev_now ();
865
866 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
867 ? (retry_cnt & 3) + 1
868 : 1 << (retry_cnt >> 2));
739 869
740 reset_si (); 870 reset_si ();
741 871
742 if (si.prot && !si.host) 872 bool slow = si.prot & PROT_SLOW;
873
874 if (si.prot && !si.host && vpn->can_direct (THISNODE, conf))
875 {
876 /*TODO*/ /* start the timer so we don't recurse endlessly */
877 w.start (1);
743 vpn->send_connect_request (conf->id); 878 vpn->send_connect_request (this);
879 }
744 else 880 else
745 { 881 {
882 if (si.valid ())
883 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
884 conf->nodename, (const char *)si);
885
746 const sockinfo &dsi = forward_si (si); 886 const sockinfo &dsi = forward_si (si);
887
888 slow = slow || (dsi.prot & PROT_SLOW);
747 889
748 if (dsi.valid () && auth_rate_limiter.can (dsi)) 890 if (dsi.valid () && auth_rate_limiter.can (dsi))
749 { 891 {
750 if (retry_cnt < 4) 892 if (retry_cnt < 4)
751 send_auth_request (dsi, true); 893 send_auth_request (dsi, true);
752 else 894 else
753 send_ping (dsi, 0); 895 send_ping (dsi, 0);
754 } 896 }
755 } 897 }
898
899 retry_int *= slow ? 8. : 0.9;
900
901 if (retry_int < conf->max_retry)
902 retry_cnt++;
903 else
904 retry_int = conf->max_retry;
905
906 w.start (retry_int);
756 } 907 }
757} 908}
758 909
759void 910void
760connection::reset_connection () 911connection::reset_connection ()
… …
763 { 914 {
764 slog (L_INFO, _("%s(%s): connection lost"), 915 slog (L_INFO, _("%s(%s): connection lost"),
765 conf->nodename, (const char *)si); 916 conf->nodename, (const char *)si);
766 917
767 if (::conf.script_node_down) 918 if (::conf.script_node_down)
768 run_script (run_script_cb (this, &connection::script_node_down), false); 919 {
920 run_script_cb *cb = new run_script_cb;
921 cb->set<connection, &connection::script_node_down> (this);
922 run_script_queued (cb, _("node-down command execution failed, continuing."));
923 }
769 } 924 }
770 925
771 delete ictx; ictx = 0; 926 delete ictx; ictx = 0;
772 delete octx; octx = 0; 927 delete octx; octx = 0;
928#if ENABLE_DNS
929 dnsv4_reset_connection ();
930#endif
773 931
774 si.host= 0; 932 si.host = 0;
775 933
776 last_activity = 0; 934 last_activity = 0.;
935 //last_si_change = 0.;
777 retry_cnt = 0; 936 retry_cnt = 0;
778 937
779 rekey.reset (); 938 rekey.stop ();
780 keepalive.reset (); 939 keepalive.stop ();
781 establish_connection.reset (); 940 establish_connection.stop ();
782} 941}
783 942
784void 943void
785connection::shutdown () 944connection::shutdown ()
786{ 945{
… …
788 send_reset (si); 947 send_reset (si);
789 948
790 reset_connection (); 949 reset_connection ();
791} 950}
792 951
793void 952// poor-man's rekeying
794connection::rekey_cb (time_watcher &w) 953inline void
954connection::rekey_cb (ev::timer &w, int revents)
795{ 955{
796 w.at = TSTAMP_CANCEL;
797
798 reset_connection (); 956 reset_connection ();
799 establish_connection (); 957 establish_connection ();
800} 958}
801 959
802void 960void
803connection::send_data_packet (tap_packet *pkt, bool broadcast) 961connection::send_data_packet (tap_packet *pkt)
804{ 962{
805 vpndata_packet *p = new vpndata_packet; 963 vpndata_packet *p = new vpndata_packet;
806 int tos = 0; 964 int tos = 0;
807 965
808 // I am not hilarious about peeking into packets, but so be it. 966 // I am not hilarious about peeking into packets, but so be it.
809 if (conf->inherit_tos 967 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; 968 tos = (*pkt)[15] & IPTOS_TOS_MASK;
813 969
814 p->setup (this, broadcast ? 0 : conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs 970 p->setup (this, conf->id, &((*pkt)[6 + 6]), pkt->len - 6 - 6, ++oseqno); // skip 2 macs
815 send_vpn_packet (p, si, tos); 971 send_vpn_packet (p, si, tos);
816 972
817 delete p; 973 delete p;
818 974
819 if (oseqno > MAX_SEQNO) 975 if (oseqno > MAX_SEQNO)
820 rekey (); 976 rekey ();
821} 977}
822 978
823void 979void
980connection::post_inject_queue ()
981{
982 // force a connection every now and when when packets are sent (max 1/s)
983 if (ev_now () - last_establish_attempt >= 0.95) // arbitrary
984 establish_connection.stop ();
985
986 establish_connection ();
987}
988
989void
824connection::inject_data_packet (tap_packet *pkt, bool broadcast) 990connection::inject_data_packet (tap_packet *pkt)
825{ 991{
826 if (ictx && octx) 992 if (ictx && octx)
827 send_data_packet (pkt, broadcast); 993 send_data_packet (pkt);
828 else 994 else
829 { 995 {
830 if (!broadcast)//DDDD
831 data_queue.put (new tap_packet (*pkt)); 996 data_queue.put (new tap_packet (*pkt));
832 997 post_inject_queue ();
833 establish_connection ();
834 } 998 }
835} 999}
836 1000
1001void
837void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 1002connection::inject_vpn_packet (vpn_packet *pkt, int tos)
838{ 1003{
839 if (ictx && octx) 1004 if (ictx && octx)
840 send_vpn_packet (pkt, si, tos); 1005 send_vpn_packet (pkt, si, tos);
841 else 1006 else
842 { 1007 {
843 vpn_queue.put (new vpn_packet (*pkt)); 1008 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
844 1009 post_inject_queue ();
845 establish_connection ();
846 } 1010 }
847} 1011}
848 1012
849void 1013void
850connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1014connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
851{ 1015{
852 last_activity = NOW; 1016 last_activity = ev_now ();
853 1017
854 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 1018 slog (L_NOISE, "%s >> received packet type %d from %d to %d.",
855 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 1019 conf->nodename, pkt->typ (), pkt->src (), pkt->dst ());
1020
1021 if (connectmode == conf_node::C_DISABLED)
1022 return;
856 1023
857 switch (pkt->typ ()) 1024 switch (pkt->typ ())
858 { 1025 {
859 case vpn_packet::PT_PING: 1026 case vpn_packet::PT_PING:
1027 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1028
860 // we send pings instead of auth packets after some retries, 1029 // we send pings instead of auth packets after some retries,
861 // so reset the retry counter and establish a connection 1030 // so reset the retry counter and establish a connection
862 // when we receive a ping. 1031 // when we receive a ping.
863 if (!ictx) 1032 if (!ictx)
864 { 1033 {
865 if (auth_rate_limiter.can (rsi)) 1034 if (auth_rate_limiter.can (rsi))
866 send_auth_request (rsi, true); 1035 send_auth_request (rsi, true);
867 } 1036 }
868 else 1037 else
1038 // we would love to change the socket address here, but ping's aren't
1039 // authenticated, so we best ignore it.
869 send_ping (rsi, 1); // pong 1040 send_ping (rsi, 1); // pong
870 1041
871 break; 1042 break;
872 1043
873 case vpn_packet::PT_PONG: 1044 case vpn_packet::PT_PONG:
1045 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1046
1047 // a PONG might mean that the other side doesn't really know
1048 // about our desire for communication.
1049 establish_connection ();
874 break; 1050 break;
875 1051
876 case vpn_packet::PT_RESET: 1052 case vpn_packet::PT_RESET:
877 { 1053 {
878 reset_connection (); 1054 reset_connection ();
879 1055
880 config_packet *p = (config_packet *) pkt; 1056 config_packet *p = (config_packet *) pkt;
881 1057
882 if (!p->chk_config ()) 1058 if (!p->chk_config ())
883 { 1059 {
884 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1060 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
885 conf->nodename, (const char *)rsi); 1061 conf->nodename, (const char *)rsi);
886 connectmode = conf_node::C_DISABLED; 1062 connectmode = conf_node::C_DISABLED;
887 } 1063 }
888 else if (connectmode == conf_node::C_ALWAYS) 1064 else if (connectmode == conf_node::C_ALWAYS)
889 establish_connection (); 1065 establish_connection ();
… …
893 case vpn_packet::PT_AUTH_REQ: 1069 case vpn_packet::PT_AUTH_REQ:
894 if (auth_rate_limiter.can (rsi)) 1070 if (auth_rate_limiter.can (rsi))
895 { 1071 {
896 auth_req_packet *p = (auth_req_packet *) pkt; 1072 auth_req_packet *p = (auth_req_packet *) pkt;
897 1073
898 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1074 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
899 1075
900 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1076 if (p->chk_config ()
1077 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
901 { 1078 {
902 if (p->prot_minor != PROTOCOL_MINOR) 1079 if (p->prot_minor != PROTOCOL_MINOR)
903 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1080 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
904 conf->nodename, (const char *)rsi, 1081 conf->nodename, (const char *)rsi,
905 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1082 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
907 if (p->initiate) 1084 if (p->initiate)
908 send_auth_request (rsi, false); 1085 send_auth_request (rsi, false);
909 1086
910 rsachallenge k; 1087 rsachallenge k;
911 1088
912 if (0 > RSA_private_decrypt (sizeof (p->encr), 1089 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
913 (unsigned char *)&p->encr, (unsigned char *)&k, 1090 {
914 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
915 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"), 1091 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
916 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0)); 1092 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1093 break;
1094 }
917 else 1095 else
918 { 1096 {
919 delete octx; 1097 delete octx;
920 1098
921 octx = new crypto_ctx (k, 1); 1099 octx = new crypto_ctx (k, 1);
922 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1100 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
923 1101
924 conf->protocols = p->protocols; 1102 conf->protocols = p->protocols;
1103 features = p->features & config_packet::get_features ();
925 1104
926 send_auth_response (rsi, p->id, k); 1105 send_auth_response (rsi, p->id, k);
927 1106
928 connection_established (); 1107 connection_established ();
929 1108
930 break; 1109 break;
931 } 1110 }
932 } 1111 }
933 else 1112 else
934 slog (L_WARN, _("%s(%s): protocol mismatch"), 1113 slog (L_WARN, _("%s(%s): protocol mismatch."),
935 conf->nodename, (const char *)rsi); 1114 conf->nodename, (const char *)rsi);
936 1115
937 send_reset (rsi); 1116 send_reset (rsi);
938 } 1117 }
939 1118
940 break; 1119 break;
941 1120
942 case vpn_packet::PT_AUTH_RES: 1121 case vpn_packet::PT_AUTH_RES:
943 { 1122 {
944 auth_res_packet *p = (auth_res_packet *) pkt; 1123 auth_res_packet *p = (auth_res_packet *)pkt;
945 1124
946 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1125 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
947 1126
948 if (p->chk_config ()) 1127 if (p->chk_config ())
949 { 1128 {
950 if (p->prot_minor != PROTOCOL_MINOR) 1129 if (p->prot_minor != PROTOCOL_MINOR)
951 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1130 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
954 1133
955 rsachallenge chg; 1134 rsachallenge chg;
956 1135
957 if (!rsa_cache.find (p->id, chg)) 1136 if (!rsa_cache.find (p->id, chg))
958 { 1137 {
959 slog (L_ERR, _("%s(%s): unrequested auth response ignored"), 1138 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
960 conf->nodename, (const char *)rsi); 1139 conf->nodename, (const char *)rsi);
961 break; 1140 break;
962 } 1141 }
963 else 1142 else
964 { 1143 {
965 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1144 crypto_ctx *cctx = new crypto_ctx (chg, 0);
966 1145
967 if (!p->hmac_chk (cctx)) 1146 if (!p->hmac_chk (cctx))
968 { 1147 {
969 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1148 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
970 "could be an attack, or just corruption or an synchronization error"), 1149 "could be an attack, or just corruption or a synchronization error."),
971 conf->nodename, (const char *)rsi); 1150 conf->nodename, (const char *)rsi);
972 break; 1151 break;
973 } 1152 }
974 else 1153 else
975 { 1154 {
… …
986 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1165 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
987 1166
988 si = rsi; 1167 si = rsi;
989 protocol = rsi.prot; 1168 protocol = rsi.prot;
990 1169
1170 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1171 conf->nodename, (const char *)rsi,
1172 is_direct ? "direct" : "forwarded",
1173 p->prot_major, p->prot_minor);
1174
991 connection_established (); 1175 connection_established ();
992 1176
993 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
994 conf->nodename, (const char *)rsi,
995 p->prot_major, p->prot_minor);
996
997 if (::conf.script_node_up) 1177 if (::conf.script_node_up)
998 run_script (run_script_cb (this, &connection::script_node_up), false); 1178 {
1179 run_script_cb *cb = new run_script_cb;
1180 cb->set<connection, &connection::script_node_up> (this);
1181 run_script_queued (cb, _("node-up command execution failed, continuing."));
1182 }
999 1183
1000 break; 1184 break;
1001 } 1185 }
1002 else 1186 else
1003 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1187 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
1004 conf->nodename, (const char *)rsi); 1188 conf->nodename, (const char *)rsi);
1005 } 1189 }
1006 1190
1007 delete cctx; 1191 delete cctx;
1008 } 1192 }
… …
1024 { 1208 {
1025 vpndata_packet *p = (vpndata_packet *)pkt; 1209 vpndata_packet *p = (vpndata_packet *)pkt;
1026 1210
1027 if (!p->hmac_chk (ictx)) 1211 if (!p->hmac_chk (ictx))
1028 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1212 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1029 "could be an attack, or just corruption or an synchronization error"), 1213 "could be an attack, or just corruption or a synchronization error."),
1030 conf->nodename, (const char *)rsi); 1214 conf->nodename, (const char *)rsi);
1031 else 1215 else
1032 { 1216 {
1033 u32 seqno; 1217 u32 seqno;
1034 tap_packet *d = p->unpack (this, seqno); 1218 tap_packet *d = p->unpack (this, seqno);
1219 int seqclass = iseqno.seqno_classify (seqno);
1035 1220
1036 if (iseqno.recv_ok (seqno)) 1221 if (seqclass == 0) // ok
1037 { 1222 {
1038 vpn->tap->send (d); 1223 vpn->tap->send (d);
1039 1224
1040 if (p->dst () == 0) // re-broadcast
1041 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1042 {
1043 connection *c = *i;
1044
1045 if (c->conf != THISNODE && c->conf != conf)
1046 c->inject_data_packet (d);
1047 }
1048
1049 if (si != rsi) 1225 if (si != rsi)
1050 { 1226 {
1051 // fast re-sync on connection changes, useful especially for tcp/ip 1227 // fast re-sync on source address changes, useful especially for tcp/ip
1228 //if (last_si_change < ev_now () + 5.)
1052 si = rsi; 1229 // {
1053
1054 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1230 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1055 conf->nodename, (const char *)si, (const char *)rsi); 1231 conf->nodename, (const char *)si, (const char *)rsi);
1232
1233 si = rsi;
1234
1235 if (::conf.script_node_change)
1236 {
1237 run_script_cb *cb = new run_script_cb;
1238 cb->set<connection, &connection::script_node_change> (this);
1239 run_script_queued (cb, _("node-change command execution failed, continuing."));
1240 }
1241
1242 // }
1243 //else
1244 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1245 // conf->nodename, (const char *)si, (const char *)rsi);
1056 } 1246 }
1057
1058 delete d;
1059
1060 break;
1061 } 1247 }
1248 else if (seqclass == 1) // far history
1249 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1250 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1251 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1252 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1253 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1254 else if (seqclass == 3) // reset
1255 {
1256 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1257 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1258 send_reset (rsi);
1259 }
1260
1261 delete d;
1262 break;
1062 } 1263 }
1063 } 1264 }
1064 1265
1065 send_reset (rsi); 1266 send_reset (rsi);
1066 break; 1267 break;
1067 1268
1068 case vpn_packet::PT_CONNECT_REQ: 1269 case vpn_packet::PT_CONNECT_REQ:
1069 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1270 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1070 { 1271 {
1071 connect_req_packet *p = (connect_req_packet *) pkt; 1272 connect_req_packet *p = (connect_req_packet *)pkt;
1072 1273
1073 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1274 if (p->id > 0 && p->id <= vpn->conns.size ())
1074 connection *c = vpn->conns[p->id - 1];
1075 conf->protocols = p->protocols;
1076
1077 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1078 conf->id, p->id, c->ictx && c->octx);
1079
1080 if (c->ictx && c->octx)
1081 { 1275 {
1276 connection *c = vpn->conns[p->id - 1];
1277 conf->protocols = p->protocols;
1278
1279 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1280 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1281
1282 if (c->ictx && c->octx)
1283 {
1082 // send connect_info packets to both sides, in case one is 1284 // send connect_info packets to both sides, in case one is
1083 // behind a nat firewall (or both ;) 1285 // behind a nat firewall (or both ;)
1084 c->send_connect_info (conf->id, si, conf->protocols); 1286 c->send_connect_info (conf->id, si, conf->protocols);
1085 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1287 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1288 }
1289 else
1290 c->establish_connection ();
1086 } 1291 }
1087 else 1292 else
1088 c->establish_connection (); 1293 slog (L_WARN,
1294 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1295 p->id);
1089 } 1296 }
1090 1297
1091 break; 1298 break;
1092 1299
1093 case vpn_packet::PT_CONNECT_INFO: 1300 case vpn_packet::PT_CONNECT_INFO:
1094 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1301 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1095 { 1302 {
1096 connect_info_packet *p = (connect_info_packet *) pkt; 1303 connect_info_packet *p = (connect_info_packet *)pkt;
1097 1304
1098 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1305 if (p->id > 0 && p->id <= vpn->conns.size ())
1099 1306 {
1100 connection *c = vpn->conns[p->id - 1]; 1307 connection *c = vpn->conns[p->id - 1];
1101 1308
1102 c->conf->protocols = p->protocols; 1309 c->conf->protocols = p->protocols;
1103 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1310 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1104 p->si.upgrade_protocol (protocol, c->conf); 1311 p->si.upgrade_protocol (protocol, c->conf);
1105 1312
1106 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1313 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1314 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1107 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1315 (const char *)p->si, !c->ictx && !c->octx);
1108 1316
1109 const sockinfo &dsi = forward_si (p->si); 1317 const sockinfo &dsi = forward_si (p->si);
1110 1318
1111 if (dsi.valid ()) 1319 if (dsi.valid ())
1112 c->send_auth_request (dsi, true); 1320 c->send_auth_request (dsi, true);
1321 }
1322 else
1323 slog (L_WARN,
1324 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1325 p->id);
1113 } 1326 }
1114 1327
1115 break; 1328 break;
1116 1329
1117 default: 1330 default:
1118 send_reset (rsi); 1331 send_reset (rsi);
1119 break; 1332 break;
1120 } 1333 }
1121} 1334}
1122 1335
1123void connection::keepalive_cb (time_watcher &w) 1336inline void
1337connection::keepalive_cb (ev::timer &w, int revents)
1124{ 1338{
1125 if (NOW >= last_activity + ::conf.keepalive + 30) 1339 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1126 { 1340 {
1127 reset_connection (); 1341 reset_connection ();
1128 establish_connection (); 1342 establish_connection ();
1129 } 1343 }
1130 else if (NOW < last_activity + ::conf.keepalive) 1344 else if (ev_now () < last_activity + ::conf.keepalive)
1131 w.at = last_activity + ::conf.keepalive; 1345 w.start (last_activity + ::conf.keepalive - ev::now ());
1132 else if (conf->connectmode != conf_node::C_ONDEMAND 1346 else if (conf->connectmode != conf_node::C_ONDEMAND
1133 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1347 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1134 { 1348 {
1135 send_ping (si); 1349 send_ping (si);
1136 w.at = NOW + 5; 1350 w.start (3);
1137 } 1351 }
1138 else if (NOW < last_activity + ::conf.keepalive + 10) 1352 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1139 // hold ondemand connections implicitly a few seconds longer 1353 // hold ondemand connections implicitly a few seconds longer
1140 // should delete octx, though, or something like that ;) 1354 // should delete octx, though, or something like that ;)
1141 w.at = last_activity + ::conf.keepalive + 10; 1355 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1142 else 1356 else
1143 reset_connection (); 1357 reset_connection ();
1144} 1358}
1145 1359
1360void
1146void connection::send_connect_request (int id) 1361connection::send_connect_request (int id)
1147{ 1362{
1148 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1363 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1149 1364
1150 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1365 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1366 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1151 p->hmac_set (octx); 1367 p->hmac_set (octx);
1152 send_vpn_packet (p, si); 1368 send_vpn_packet (p, si);
1153 1369
1154 delete p; 1370 delete p;
1155} 1371}
1156 1372
1157void connection::script_node () 1373void
1374connection::script_init_env (const char *ext)
1158{ 1375{
1159 vpn->script_if_up ();
1160
1161 char *env; 1376 char *env;
1377 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1378 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1379 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1380 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1381 conf->id & 0xff); putenv (env);
1382}
1383
1384void
1385connection::script_init_connect_env ()
1386{
1387 vpn->script_init_env ();
1388
1389 char *env;
1162 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1390 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1391 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1163 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1392 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1164 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1393 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1165 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1394 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1166} 1395}
1167 1396
1397inline const char *
1168const char *connection::script_node_up () 1398connection::script_node_up ()
1169{ 1399{
1170 script_node (); 1400 script_init_connect_env ();
1171 1401
1172 putenv ("STATE=up"); 1402 putenv ((char *)"STATE=up");
1173 1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1174 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1408 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1175}
1176 1409
1410 return filename;
1411}
1412
1413inline const char *
1414connection::script_node_change ()
1415{
1416 script_init_connect_env ();
1417
1418 putenv ((char *)"STATE=change");
1419
1420 char *filename;
1421 asprintf (&filename,
1422 "%s/%s",
1423 confbase,
1424 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1425
1426 return filename;
1427}
1428
1429inline const char *
1177const char *connection::script_node_down () 1430connection::script_node_down ()
1178{ 1431{
1179 script_node (); 1432 script_init_connect_env ();
1180 1433
1181 putenv ("STATE=down"); 1434 putenv ((char *)"STATE=down");
1182 1435
1183 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1436 char *filename;
1184} 1437 asprintf (&filename,
1438 "%s/%s",
1439 confbase,
1440 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1185 1441
1442 return filename;
1443}
1444
1186connection::connection(struct vpn *vpn_) 1445connection::connection (struct vpn *vpn, conf_node *conf)
1187: vpn(vpn_) 1446: vpn(vpn), conf(conf),
1188, rekey (this, &connection::rekey_cb) 1447#if ENABLE_DNS
1189, keepalive (this, &connection::keepalive_cb) 1448 dns (0),
1449#endif
1450 data_queue(conf->max_ttl, conf->max_queue + 1),
1451 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1452{
1453 rekey .set<connection, &connection::rekey_cb > (this);
1454 keepalive .set<connection, &connection::keepalive_cb > (this);
1190, establish_connection (this, &connection::establish_connection_cb) 1455 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1191{ 1456
1457 last_establish_attempt = 0.;
1192 octx = ictx = 0; 1458 octx = ictx = 0;
1193 retry_cnt = 0;
1194 1459
1195 connectmode = conf_node::C_ALWAYS; // initial setting 1460 if (!conf->protocols) // make sure some protocol is enabled
1461 conf->protocols = PROT_UDPv4;
1462
1463 connectmode = conf->connectmode;
1464
1465 // queue a dummy packet to force an initial connection attempt
1466 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1467 vpn_queue.put (new net_packet);
1468
1196 reset_connection (); 1469 reset_connection ();
1197} 1470}
1198 1471
1199connection::~connection () 1472connection::~connection ()
1200{ 1473{
1201 shutdown (); 1474 shutdown ();
1202} 1475}
1203 1476
1477void
1204void connection_init () 1478connection_init ()
1205{ 1479{
1206 auth_rate_limiter.clear (); 1480 auth_rate_limiter.clear ();
1207 reset_rate_limiter.clear (); 1481 reset_rate_limiter.clear ();
1208} 1482}
1209 1483

Diff Legend

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