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.8 by pcg, Sun Apr 6 04:17:36 2003 UTC vs.
Revision 1.70 by pcg, Thu Aug 7 19:07:02 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 (tap_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
165tap_packet *pkt_queue::get ()
166{
167 tap_packet *p = queue[j];
168
169 if (p)
170 {
171 queue[j] = 0;
172 j = (j + 1) % QUEUEDEPTH;
173 }
174
175 return p;
176}
177
178pkt_queue::pkt_queue ()
179{
180 memset (queue, 0, sizeof (queue));
181 i = 0; 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. / 90.; // allow bursts 295# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 20.; // 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
298# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
205 299
206 bool can (const sockinfo &si) { return can((u32)si.host); } 300 bool can (const sockinfo &si) { return can((u32)si.host); }
207 bool can (u32 host); 301 bool can (u32 host);
208}; 302};
209 303
210net_rate_limiter auth_rate_limiter, reset_rate_limiter; 304net_rate_limiter auth_rate_limiter, reset_rate_limiter;
211 305
… …
214 iterator i; 308 iterator i;
215 309
216 for (i = begin (); i != end (); ) 310 for (i = begin (); i != end (); )
217 if (i->host == host) 311 if (i->host == host)
218 break; 312 break;
219 else if (i->last < NOW - EXPIRE) 313 else if (i->last < ev_now () - NRL_EXPIRE)
220 i = erase (i); 314 i = erase (i);
221 else 315 else
222 i++; 316 i++;
223 317
224 if (i == end ()) 318 if (i == end ())
225 { 319 {
226 net_rateinfo ri; 320 net_rateinfo ri;
227 321
228 ri.host = host; 322 ri.host = host;
229 ri.pcnt = 1.; 323 ri.pcnt = 1.;
230 ri.diff = CUTOFF * (1. / (1. - ALPHA)); 324 ri.diff = NRL_MAXDIF;
231 ri.last = NOW; 325 ri.last = ev_now ();
232 326
233 push_front (ri); 327 push_front (ri);
234 328
235 return true; 329 return true;
236 } 330 }
237 else 331 else
238 { 332 {
239 net_rateinfo ri (*i); 333 net_rateinfo ri (*i);
240 erase (i); 334 erase (i);
241 335
242 ri.pcnt = ri.pcnt * ALPHA; 336 ri.pcnt = ri.pcnt * NRL_ALPHA;
243 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 337 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
244 338
245 ri.last = NOW; 339 ri.last = ev_now ();
246 340
341 double dif = ri.diff / ri.pcnt;
342
247 bool send = ri.diff / ri.pcnt > CUTOFF; 343 bool send = dif > NRL_CUTOFF;
248 344
345 if (dif > NRL_MAXDIF)
346 {
347 ri.pcnt = 1.;
348 ri.diff = NRL_MAXDIF;
349 }
249 if (send) 350 else if (send)
250 ri.pcnt++; 351 ri.pcnt++;
251 352
252 push_front (ri); 353 push_front (ri);
253 354
254 return send; 355 return send;
… …
299} 400}
300 401
301#define MAXVPNDATA (MAX_MTU - 6 - 6) 402#define MAXVPNDATA (MAX_MTU - 6 - 6)
302#define DATAHDR (sizeof (u32) + RAND_SIZE) 403#define DATAHDR (sizeof (u32) + RAND_SIZE)
303 404
304struct vpndata_packet:vpn_packet 405struct vpndata_packet : vpn_packet
305 { 406 {
306 u8 data[MAXVPNDATA + DATAHDR]; // seqno 407 u8 data[MAXVPNDATA + DATAHDR]; // seqno
307 408
308 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);
309 tap_packet *unpack (connection *conn, u32 &seqno); 410 tap_packet *unpack (connection *conn, u32 &seqno);
… …
322 int outl = 0, outl2; 423 int outl = 0, outl2;
323 ptype type = PT_DATA_UNCOMPRESSED; 424 ptype type = PT_DATA_UNCOMPRESSED;
324 425
325#if ENABLE_COMPRESSION 426#if ENABLE_COMPRESSION
326 u8 cdata[MAX_MTU]; 427 u8 cdata[MAX_MTU];
327 u32 cl;
328 428
429 if (conn->features & ENABLE_COMPRESSION)
430 {
329 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 431 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
432
330 if (cl) 433 if (cl)
331 { 434 {
332 type = PT_DATA_COMPRESSED; 435 type = PT_DATA_COMPRESSED;
333 d = cdata; 436 d = cdata;
334 l = cl + 2; 437 l = cl + 2;
335 438
336 d[0] = cl >> 8; 439 d[0] = cl >> 8;
337 d[1] = cl; 440 d[1] = cl;
441 }
338 } 442 }
339#endif 443#endif
340 444
341 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 445 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
342 446
343 struct { 447 struct {
344#if RAND_SIZE 448#if RAND_SIZE
345 u8 rnd[RAND_SIZE]; 449 u8 rnd[RAND_SIZE];
346#endif 450#endif
… …
350 datahdr.seqno = ntohl (seqno); 454 datahdr.seqno = ntohl (seqno);
351#if RAND_SIZE 455#if RAND_SIZE
352 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 456 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
353#endif 457#endif
354 458
355 EVP_EncryptUpdate (cctx, 459 require (EVP_EncryptUpdate (cctx,
356 (unsigned char *) data + outl, &outl2, 460 (unsigned char *) data + outl, &outl2,
357 (unsigned char *) &datahdr, DATAHDR); 461 (unsigned char *) &datahdr, DATAHDR));
358 outl += outl2; 462 outl += outl2;
359 463
360 EVP_EncryptUpdate (cctx, 464 require (EVP_EncryptUpdate (cctx,
361 (unsigned char *) data + outl, &outl2, 465 (unsigned char *) data + outl, &outl2,
362 (unsigned char *) d, l); 466 (unsigned char *) d, l));
363 outl += outl2; 467 outl += outl2;
364 468
365 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 469 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
366 outl += outl2; 470 outl += outl2;
367 471
368 len = outl + data_hdr_size (); 472 len = outl + data_hdr_size ();
369 473
370 set_hdr (type, dst); 474 set_hdr (type, dst);
… …
379 int outl = 0, outl2; 483 int outl = 0, outl2;
380 tap_packet *p = new tap_packet; 484 tap_packet *p = new tap_packet;
381 u8 *d; 485 u8 *d;
382 u32 l = len - data_hdr_size (); 486 u32 l = len - data_hdr_size ();
383 487
384 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 488 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
385 489
386#if ENABLE_COMPRESSION 490#if ENABLE_COMPRESSION
387 u8 cdata[MAX_MTU]; 491 u8 cdata[MAX_MTU];
388 492
389 if (type == PT_DATA_COMPRESSED) 493 if (type == PT_DATA_COMPRESSED)
… …
391 else 495 else
392#endif 496#endif
393 d = &(*p)[6 + 6 - DATAHDR]; 497 d = &(*p)[6 + 6 - DATAHDR];
394 498
395 /* 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 */
396 EVP_DecryptUpdate (cctx, 500 require (EVP_DecryptUpdate (cctx,
397 d, &outl2, 501 d, &outl2,
398 (unsigned char *)&data, len - data_hdr_size ()); 502 (unsigned char *)&data, len - data_hdr_size ()));
399 outl += outl2; 503 outl += outl2;
400 504
401 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 505 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
402 outl += outl2; 506 outl += outl2;
403 507
404 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 508 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
405 509
406 id2mac (dst () ? dst() : THISNODE->id, p->dst); 510 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
435{ 539{
436 // actually, hmaclen cannot be checked because the hmac 540 // actually, hmaclen cannot be checked because the hmac
437 // field comes before this data, so peers with other 541 // field comes before this data, so peers with other
438 // hmacs simply will not work. 542 // hmacs simply will not work.
439 u8 prot_major, prot_minor, randsize, hmaclen; 543 u8 prot_major, prot_minor, randsize, hmaclen;
440 u8 flags, challengelen, pad2, pad3; 544 u8 flags, challengelen, features, pad3;
441 u32 cipher_nid, digest_nid, hmac_nid; 545 u32 cipher_nid, digest_nid, hmac_nid;
442
443 const u8 curflags () const
444 {
445 return 0x80
446 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
447 }
448 546
449 void setup (ptype type, int dst); 547 void setup (ptype type, int dst);
450 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 }
451}; 564};
452 565
453void config_packet::setup (ptype type, int dst) 566void config_packet::setup (ptype type, int dst)
454{ 567{
455 prot_major = PROTOCOL_MAJOR; 568 prot_major = PROTOCOL_MAJOR;
456 prot_minor = PROTOCOL_MINOR; 569 prot_minor = PROTOCOL_MINOR;
457 randsize = RAND_SIZE; 570 randsize = RAND_SIZE;
458 hmaclen = HMACLENGTH; 571 hmaclen = HMACLENGTH;
459 flags = curflags (); 572 flags = 0;
460 challengelen = sizeof (rsachallenge); 573 challengelen = sizeof (rsachallenge);
574 features = get_features ();
461 575
462 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 576 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
463 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 577 digest_nid = htonl (EVP_MD_type (RSA_HASH));
464 hmac_nid = htonl (EVP_MD_type (DIGEST)); 578 hmac_nid = htonl (EVP_MD_type (DIGEST));
465 579
… …
467 set_hdr (type, dst); 581 set_hdr (type, dst);
468} 582}
469 583
470bool config_packet::chk_config () const 584bool config_packet::chk_config () const
471{ 585{
472 return prot_major == PROTOCOL_MAJOR 586 if (prot_major != PROTOCOL_MAJOR)
473 && randsize == RAND_SIZE 587 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
474 && hmaclen == HMACLENGTH 588 else if (randsize != RAND_SIZE)
475 && 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);
476 && challengelen == sizeof (rsachallenge) 592 else if (challengelen != sizeof (rsachallenge))
593 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
477 && 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));
478 && 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));
479 && 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;
480} 604}
481 605
482struct auth_req_packet : config_packet 606struct auth_req_packet : config_packet
483{ 607{
484 char magic[8]; 608 char magic[8];
485 u8 initiate; // false if this is just an automatic reply 609 u8 initiate; // false if this is just an automatic reply
486 u8 protocols; // supported protocols (will get patches on forward) 610 u8 protocols; // supported protocols (will be patched on forward)
487 u8 pad2, pad3; 611 u8 pad2, pad3;
488 rsaid id; 612 rsaid id;
489 rsaencrdata encr; 613 rsaencrdata encr;
490 614
491 auth_req_packet (int dst, bool initiate_, u8 protocols_) 615 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
546}; 670};
547 671
548///////////////////////////////////////////////////////////////////////////// 672/////////////////////////////////////////////////////////////////////////////
549 673
550void 674void
675connection::connection_established ()
676{
677 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
678
679 if (ictx && octx)
680 {
681 // make sure rekeying timeouts are slightly asymmetric
682 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
683 rekey.start (rekey_interval, rekey_interval);
684 keepalive.start (::conf.keepalive);
685
686 // send queued packets
687 if (ictx && octx)
688 {
689 while (tap_packet *p = (tap_packet *)data_queue.get ())
690 {
691 if (p->len) send_data_packet (p);
692 delete p;
693 }
694
695 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
696 {
697 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
698 delete p;
699 }
700 }
701 }
702 else
703 {
704 retry_cnt = 0;
705 establish_connection.start (5);
706 keepalive.stop ();
707 rekey.stop ();
708 }
709}
710
711void
551connection::reset_si () 712connection::reset_si ()
552{ 713{
553 protocol = best_protocol (THISNODE->protocols & conf->protocols); 714 protocol = best_protocol (THISNODE->protocols & conf->protocols);
554 715
555 // mask out protocols we cannot establish 716 // mask out protocols we cannot establish
556 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 717 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
557 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 }
558 728
559 si.set (conf, protocol); 729 si.set (conf, protocol);
560} 730}
561 731
562// ensure sockinfo is valid, forward if necessary 732// ensure sockinfo is valid, forward if necessary
… …
567 { 737 {
568 connection *r = vpn->find_router (); 738 connection *r = vpn->find_router ();
569 739
570 if (r) 740 if (r)
571 { 741 {
572 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 742 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
573 conf->nodename, r->conf->nodename); 743 conf->nodename, r->conf->nodename, (const char *)r->si);
574 return r->si; 744 return r->si;
575 } 745 }
576 else 746 else
577 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 747 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
578 conf->nodename); 748 conf->nodename);
… …
580 750
581 return si; 751 return si;
582} 752}
583 753
584void 754void
755connection::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
756{
757 if (!vpn->send_vpn_packet (pkt, si, tos))
758 reset_connection ();
759}
760
761void
585connection::send_ping (const sockinfo &si, u8 pong) 762connection::send_ping (const sockinfo &si, u8 pong)
586{ 763{
587 ping_packet *pkt = new ping_packet; 764 ping_packet *pkt = new ping_packet;
588 765
589 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING); 766 pkt->setup (conf->id, pong ? ping_packet::PT_PONG : ping_packet::PT_PING);
590 vpn->send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 767 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
591 768
592 delete pkt; 769 delete pkt;
593} 770}
594 771
595void 772void
… …
598 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED) 775 if (reset_rate_limiter.can (si) && connectmode != conf_node::C_DISABLED)
599 { 776 {
600 config_packet *pkt = new config_packet; 777 config_packet *pkt = new config_packet;
601 778
602 pkt->setup (vpn_packet::PT_RESET, conf->id); 779 pkt->setup (vpn_packet::PT_RESET, conf->id);
603 vpn->send_vpn_packet (pkt, si, IPTOS_MINCOST); 780 send_vpn_packet (pkt, si, IPTOS_MINCOST);
604 781
605 delete pkt; 782 delete pkt;
606 } 783 }
607} 784}
608 785
… …
610connection::send_auth_request (const sockinfo &si, bool initiate) 787connection::send_auth_request (const sockinfo &si, bool initiate)
611{ 788{
612 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);
613 790
614 rsachallenge chg; 791 rsachallenge chg;
615
616 rsa_cache.gen (pkt->id, chg); 792 rsa_cache.gen (pkt->id, chg);
617 793 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
618 if (0 > RSA_public_encrypt (sizeof chg,
619 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
620 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
621 fatal ("RSA_public_encrypt error");
622 794
623 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);
624 796
625 vpn->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
626
627 798
628 delete pkt; 799 delete pkt;
629} 800}
630 801
631void 802void
… …
639 810
640 pkt->hmac_set (octx); 811 pkt->hmac_set (octx);
641 812
642 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si); 813 slog (L_TRACE, ">>%d PT_AUTH_RES [%s]", conf->id, (const char *)si);
643 814
644 vpn->send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly 815 send_vpn_packet (pkt, si, IPTOS_RELIABILITY); // rsa is very very costly
645 816
646 delete pkt; 817 delete pkt;
647} 818}
648 819
649void 820void
650connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 821connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
651{ 822{
652 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 823 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
653 conf->id, rid, (const char *)rsi); 824 conf->id, rid, (const char *)rsi);
654 825
655 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);
656 827
657 r->hmac_set (octx); 828 r->hmac_set (octx);
658 vpn->send_vpn_packet (r, si); 829 send_vpn_packet (r, si);
659 830
660 delete r; 831 delete r;
661} 832}
662 833
663void 834inline void
664connection::establish_connection_cb (time_watcher &w) 835connection::establish_connection_cb (ev::timer &w, int revents)
665{ 836{
666 if (ictx || conf == THISNODE 837 if (!ictx
838 && conf != THISNODE
667 || connectmode == conf_node::C_NEVER 839 && connectmode != conf_node::C_NEVER
668 || connectmode == conf_node::C_DISABLED) 840 && connectmode != conf_node::C_DISABLED
669 w.at = TSTAMP_CANCEL; 841 && !w.is_active ())
670 else if (w.at <= NOW)
671 { 842 {
672 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
673 844 // and stop trying. should probably be handled by a per-connection expire handler.
674 if (retry_int < 3600 * 8) 845 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
846 {
847 reset_connection ();
675 retry_cnt++; 848 return;
849 }
676 850
677 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));
678 856
679 reset_si (); 857 reset_si ();
680 858
859 bool slow = si.prot & PROT_SLOW;
860
681 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);
682 vpn->connect_request (conf->id); 866 vpn->send_connect_request (conf->id);
867 }
683 else 868 else
684 { 869 {
870 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
871
685 const sockinfo &dsi = forward_si (si); 872 const sockinfo &dsi = forward_si (si);
873
874 slow = slow || (dsi.prot & PROT_SLOW);
686 875
687 if (dsi.valid () && auth_rate_limiter.can (dsi)) 876 if (dsi.valid () && auth_rate_limiter.can (dsi))
688 { 877 {
689 if (retry_cnt < 4) 878 if (retry_cnt < 4)
690 send_auth_request (dsi, true); 879 send_auth_request (dsi, true);
691 else 880 else
692 send_ping (dsi, 0); 881 send_ping (dsi, 0);
693 } 882 }
694 } 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);
695 } 893 }
696} 894}
697 895
698void 896void
699connection::reset_connection () 897connection::reset_connection ()
… …
702 { 900 {
703 slog (L_INFO, _("%s(%s): connection lost"), 901 slog (L_INFO, _("%s(%s): connection lost"),
704 conf->nodename, (const char *)si); 902 conf->nodename, (const char *)si);
705 903
706 if (::conf.script_node_down) 904 if (::conf.script_node_down)
707 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 }
708 } 910 }
709 911
710 delete ictx; ictx = 0; 912 delete ictx; ictx = 0;
711 delete octx; octx = 0; 913 delete octx; octx = 0;
914#if ENABLE_DNS
915 dnsv4_reset_connection ();
916#endif
712 917
713 si.host= 0; 918 si.host = 0;
714 919
715 last_activity = 0; 920 last_activity = 0;
716 retry_cnt = 0; 921 retry_cnt = 0;
717 922
718 rekey.reset (); 923 rekey.stop ();
719 keepalive.reset (); 924 keepalive.stop ();
720 establish_connection.reset (); 925 establish_connection.stop ();
721} 926}
722 927
723void 928void
724connection::shutdown () 929connection::shutdown ()
725{ 930{
… …
727 send_reset (si); 932 send_reset (si);
728 933
729 reset_connection (); 934 reset_connection ();
730} 935}
731 936
732void 937inline void
733connection::rekey_cb (time_watcher &w) 938connection::rekey_cb (ev::timer &w, int revents)
734{ 939{
735 w.at = TSTAMP_CANCEL;
736
737 reset_connection (); 940 reset_connection ();
738 establish_connection (); 941 establish_connection ();
739} 942}
740 943
741void 944void
742connection::send_data_packet (tap_packet *pkt, bool broadcast) 945connection::send_data_packet (tap_packet *pkt)
743{ 946{
744 vpndata_packet *p = new vpndata_packet; 947 vpndata_packet *p = new vpndata_packet;
745 int tos = 0; 948 int tos = 0;
746 949
747 if (conf->inherit_tos 950 // I am not hilarious about peeking into packets, but so be it.
748 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 951 if (conf->inherit_tos && pkt->is_ipv4 ())
749 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
750 tos = (*pkt)[15] & IPTOS_TOS_MASK; 952 tos = (*pkt)[15] & IPTOS_TOS_MASK;
751 953
752 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
753 vpn->send_vpn_packet (p, si, tos); 955 send_vpn_packet (p, si, tos);
754 956
755 delete p; 957 delete p;
756 958
757 if (oseqno > MAX_SEQNO) 959 if (oseqno > MAX_SEQNO)
758 rekey (); 960 rekey ();
759} 961}
760 962
761void 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
762connection::inject_data_packet (tap_packet *pkt, bool broadcast) 974connection::inject_data_packet (tap_packet *pkt)
763{ 975{
764 if (ictx && octx) 976 if (ictx && octx)
765 send_data_packet (pkt, broadcast); 977 send_data_packet (pkt);
766 else 978 else
767 { 979 {
768 if (!broadcast)//DDDD
769 queue.put (new tap_packet (*pkt)); 980 data_queue.put (new tap_packet (*pkt));
770 981 post_inject_queue ();
771 establish_connection ();
772 } 982 }
773} 983}
774 984
775void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 985void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
776{ 986{
777 if (ictx && octx) 987 if (ictx && octx)
778 vpn->send_vpn_packet (pkt, si, tos); 988 send_vpn_packet (pkt, si, tos);
779 else 989 else
780 establish_connection (); 990 {
991 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
992 post_inject_queue ();
993 }
781} 994}
782 995
783void 996void
784connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 997connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
785{ 998{
786 last_activity = NOW; 999 last_activity = ev_now ();
787 1000
788 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",
789 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;
790 1006
791 switch (pkt->typ ()) 1007 switch (pkt->typ ())
792 { 1008 {
793 case vpn_packet::PT_PING: 1009 case vpn_packet::PT_PING:
794 // we send pings instead of auth packets after some retries, 1010 // we send pings instead of auth packets after some retries,
… …
841 if (p->initiate) 1057 if (p->initiate)
842 send_auth_request (rsi, false); 1058 send_auth_request (rsi, false);
843 1059
844 rsachallenge k; 1060 rsachallenge k;
845 1061
846 if (0 > RSA_private_decrypt (sizeof (p->encr), 1062 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
847 (unsigned char *)&p->encr, (unsigned char *)&k, 1063 {
848 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
849 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?"),
850 conf->nodename, (const char *)rsi); 1065 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1066 break;
1067 }
851 else 1068 else
852 { 1069 {
853 retry_cnt = 0;
854 establish_connection.start (NOW + 8); //? ;)
855 keepalive.reset ();
856 rekey.reset ();
857
858 delete ictx;
859 ictx = 0;
860
861 delete octx; 1070 delete octx;
862 1071
863 octx = new crypto_ctx (k, 1); 1072 octx = new crypto_ctx (k, 1);
864 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1073 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
865 1074
866 conf->protocols = p->protocols; 1075 conf->protocols = p->protocols;
1076 features = p->features & config_packet::get_features ();
1077
867 send_auth_response (rsi, p->id, k); 1078 send_auth_response (rsi, p->id, k);
1079
1080 connection_established ();
868 1081
869 break; 1082 break;
870 } 1083 }
871 } 1084 }
1085 else
1086 slog (L_WARN, _("%s(%s): protocol mismatch"),
1087 conf->nodename, (const char *)rsi);
872 1088
873 send_reset (rsi); 1089 send_reset (rsi);
874 } 1090 }
875 1091
876 break; 1092 break;
… …
889 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1105 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
890 1106
891 rsachallenge chg; 1107 rsachallenge chg;
892 1108
893 if (!rsa_cache.find (p->id, chg)) 1109 if (!rsa_cache.find (p->id, chg))
1110 {
894 slog (L_ERR, _("%s(%s): unrequested auth response"), 1111 slog (L_ERR, _("%s(%s): unrequested auth response ignored"),
895 conf->nodename, (const char *)rsi); 1112 conf->nodename, (const char *)rsi);
1113 break;
1114 }
896 else 1115 else
897 { 1116 {
898 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1117 crypto_ctx *cctx = new crypto_ctx (chg, 0);
899 1118
900 if (!p->hmac_chk (cctx)) 1119 if (!p->hmac_chk (cctx))
1120 {
901 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"
902 "could be an attack, or just corruption or an synchronization error"), 1122 "could be an attack, or just corruption or a synchronization error"),
903 conf->nodename, (const char *)rsi); 1123 conf->nodename, (const char *)rsi);
1124 break;
1125 }
904 else 1126 else
905 { 1127 {
906 rsaresponse h; 1128 rsaresponse h;
907 1129
908 rsa_hash (p->id, chg, h); 1130 rsa_hash (p->id, chg, h);
… …
916 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1138 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
917 1139
918 si = rsi; 1140 si = rsi;
919 protocol = rsi.prot; 1141 protocol = rsi.prot;
920 1142
921 rekey.start (NOW + ::conf.rekey); 1143 connection_established ();
922 keepalive.start (NOW + ::conf.keepalive);
923
924 // send queued packets
925 while (tap_packet *p = queue.get ())
926 {
927 send_data_packet (p);
928 delete p;
929 }
930
931 connectmode = conf->connectmode;
932 1144
933 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1145 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
934 conf->nodename, (const char *)rsi, 1146 conf->nodename, (const char *)rsi,
935 p->prot_major, p->prot_minor); 1147 p->prot_major, p->prot_minor);
936 1148
937 if (::conf.script_node_up) 1149 if (::conf.script_node_up)
938 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 }
939 1155
940 break; 1156 break;
941 } 1157 }
942 else 1158 else
943 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"),
… …
962 1178
963 if (ictx && octx) 1179 if (ictx && octx)
964 { 1180 {
965 vpndata_packet *p = (vpndata_packet *)pkt; 1181 vpndata_packet *p = (vpndata_packet *)pkt;
966 1182
967 if (rsi == si) 1183 if (!p->hmac_chk (ictx))
1184 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1185 "could be an attack, or just corruption or a synchronization error"),
1186 conf->nodename, (const char *)rsi);
1187 else
968 { 1188 {
969 if (!p->hmac_chk (ictx))
970 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
971 "could be an attack, or just corruption or an synchronization error"),
972 conf->nodename, (const char *)rsi);
973 else 1189 u32 seqno;
1190 tap_packet *d = p->unpack (this, seqno);
1191
1192 if (iseqno.recv_ok (seqno))
974 { 1193 {
975 u32 seqno; 1194 vpn->tap->send (d);
976 tap_packet *d = p->unpack (this, seqno);
977 1195
978 if (iseqno.recv_ok (seqno)) 1196 if (si != rsi)
979 { 1197 {
980 vpn->tap->send (d); 1198 // fast re-sync on source address changes, useful especially for tcp/ip
981
982 if (p->dst () == 0) // re-broadcast
983 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
984 {
985 connection *c = *i;
986
987 if (c->conf != THISNODE && c->conf != conf)
988 c->inject_data_packet (d);
989 }
990
991 delete d;
992
993 break; 1199 si = rsi;
1200
1201 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1202 conf->nodename, (const char *)si, (const char *)rsi);
994 } 1203 }
995 } 1204 }
1205
1206 delete d;
1207 break;
996 } 1208 }
997 else
998 slog (L_ERR, _("received data packet from unknown source %s"), (const char *)rsi);
999 } 1209 }
1000 1210
1001 send_reset (rsi); 1211 send_reset (rsi);
1002 break; 1212 break;
1003 1213
1004 case vpn_packet::PT_CONNECT_REQ: 1214 case vpn_packet::PT_CONNECT_REQ:
1005 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1215 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1006 { 1216 {
1007 connect_req_packet *p = (connect_req_packet *) pkt; 1217 connect_req_packet *p = (connect_req_packet *) pkt;
1008 1218
1009 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 ())
1010 connection *c = vpn->conns[p->id - 1];
1011 conf->protocols = p->protocols;
1012
1013 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1014 conf->id, p->id, c->ictx && c->octx);
1015
1016 if (c->ictx && c->octx)
1017 { 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 {
1018 // send connect_info packets to both sides, in case one is 1229 // send connect_info packets to both sides, in case one is
1019 // behind a nat firewall (or both ;) 1230 // behind a nat firewall (or both ;)
1020 c->send_connect_info (conf->id, si, conf->protocols); 1231 c->send_connect_info (conf->id, si, conf->protocols);
1021 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 ();
1022 } 1236 }
1237 else
1238 slog (L_WARN,
1239 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1240 p->id);
1023 } 1241 }
1024 1242
1025 break; 1243 break;
1026 1244
1027 case vpn_packet::PT_CONNECT_INFO: 1245 case vpn_packet::PT_CONNECT_INFO:
1028 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1246 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1029 { 1247 {
1030 connect_info_packet *p = (connect_info_packet *) pkt; 1248 connect_info_packet *p = (connect_info_packet *)pkt;
1031 1249
1032 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 ())
1033 1251 {
1034 connection *c = vpn->conns[p->id - 1]; 1252 connection *c = vpn->conns[p->id - 1];
1035 1253
1036 c->conf->protocols = p->protocols; 1254 c->conf->protocols = p->protocols;
1037 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));
1038 p->si.upgrade_protocol (protocol, c->conf); 1256 p->si.upgrade_protocol (protocol, c->conf);
1039 1257
1040 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1258 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1041 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);
1042 1260
1043 const sockinfo &dsi = forward_si (p->si); 1261 const sockinfo &dsi = forward_si (p->si);
1044 1262
1045 if (dsi.valid ()) 1263 if (dsi.valid ())
1046 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);
1047 } 1270 }
1048 1271
1049 break; 1272 break;
1050 1273
1051 default: 1274 default:
1052 send_reset (rsi); 1275 send_reset (rsi);
1053 break; 1276 break;
1054 } 1277 }
1055} 1278}
1056 1279
1057void connection::keepalive_cb (time_watcher &w) 1280inline void
1281connection::keepalive_cb (ev::timer &w, int revents)
1058{ 1282{
1059 if (NOW >= last_activity + ::conf.keepalive + 30) 1283 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1060 { 1284 {
1061 reset_connection (); 1285 reset_connection ();
1062 establish_connection (); 1286 establish_connection ();
1063 } 1287 }
1064 else if (NOW < last_activity + ::conf.keepalive) 1288 else if (ev_now () < last_activity + ::conf.keepalive)
1065 w.at = last_activity + ::conf.keepalive; 1289 w.start (last_activity + ::conf.keepalive - ev::now ());
1066 else if (conf->connectmode != conf_node::C_ONDEMAND 1290 else if (conf->connectmode != conf_node::C_ONDEMAND
1067 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1291 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1068 { 1292 {
1069 send_ping (si); 1293 send_ping (si);
1070 w.at = NOW + 5; 1294 w.start (5);
1071 } 1295 }
1296 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1297 // hold ondemand connections implicitly a few seconds longer
1298 // should delete octx, though, or something like that ;)
1299 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1072 else 1300 else
1073 reset_connection (); 1301 reset_connection ();
1074} 1302}
1075 1303
1076void connection::connect_request (int id) 1304void connection::send_connect_request (int id)
1077{ 1305{
1078 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1306 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1079 1307
1080 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1308 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id);
1081 p->hmac_set (octx); 1309 p->hmac_set (octx);
1082 vpn->send_vpn_packet (p, si); 1310 send_vpn_packet (p, si);
1083 1311
1084 delete p; 1312 delete p;
1085} 1313}
1086 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
1087void connection::script_node () 1325void connection::script_init_connect_env ()
1088{ 1326{
1089 vpn->script_if_up (); 1327 vpn->script_init_env ();
1090 1328
1091 char *env; 1329 char *env;
1092 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1330 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1093 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1331 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1094 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1332 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1095 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1333 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1096} 1334}
1097 1335
1336inline const char *
1098const char *connection::script_node_up () 1337connection::script_node_up ()
1099{ 1338{
1100 script_node (); 1339 script_init_connect_env ();
1101 1340
1102 putenv ("STATE=up"); 1341 putenv ((char *)"STATE=up");
1103 1342
1343 char *filename;
1344 asprintf (&filename,
1345 "%s/%s",
1346 confbase,
1104 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1347 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1105}
1106 1348
1349 return filename;
1350}
1351
1352inline const char *
1107const char *connection::script_node_down () 1353connection::script_node_down ()
1108{ 1354{
1109 script_node (); 1355 script_init_connect_env ();
1110 1356
1111 putenv ("STATE=down"); 1357 putenv ((char *)"STATE=down");
1112 1358
1113 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1359 char *filename;
1114} 1360 asprintf (&filename,
1361 "%s/%s",
1362 confbase,
1363 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1115 1364
1365 return filename;
1366}
1367
1116connection::connection(struct vpn *vpn_) 1368connection::connection (struct vpn *vpn, conf_node *conf)
1117: vpn(vpn_) 1369: vpn(vpn), conf(conf),
1118, rekey (this, &connection::rekey_cb) 1370#if ENABLE_DNS
1119, keepalive (this, &connection::keepalive_cb) 1371 dns (0),
1372#endif
1373 data_queue(conf->max_ttl, conf->max_queue),
1374 vpn_queue(conf->max_ttl, conf->max_queue)
1375{
1376 rekey .set<connection, &connection::rekey_cb > (this);
1377 keepalive .set<connection, &connection::keepalive_cb > (this);
1120, establish_connection (this, &connection::establish_connection_cb) 1378 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1121{ 1379
1380 last_establish_attempt = 0.;
1122 octx = ictx = 0; 1381 octx = ictx = 0;
1123 retry_cnt = 0;
1124 1382
1125 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
1126 reset_connection (); 1392 reset_connection ();
1127} 1393}
1128 1394
1129connection::~connection () 1395connection::~connection ()
1130{ 1396{

Diff Legend

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