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

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

Diff Legend

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