ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/connection.C
(Generate patch)

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

Diff Legend

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