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

Diff Legend

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