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.12 by pcg, Sun Apr 13 16:53:36 2003 UTC vs.
Revision 1.72 by pcg, Fri Aug 8 16:48:00 2008 UTC

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

Diff Legend

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