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

Comparing gvpe/src/connection.C (file contents):
Revision 1.12 by pcg, Sun Apr 13 16:53:36 2003 UTC vs.
Revision 1.88 by root, Thu Dec 2 07:15:14 2010 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003-2008,2010 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 (time_watcher &w); 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 (time_watcher &w) 196void rsa_cache::cleaner_cb (ev::timer &w, int revents)
135{ 197{
136 if (empty ()) 198 if (empty ())
137 w.at = TSTAMP_CANCEL; 199 w.stop ();
138 else 200 else
139 { 201 {
140 w.at = 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 (net_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
165net_packet *pkt_queue::get ()
166{
167 net_packet *p = queue[j];
168
169 if (p)
170 {
171 queue[j] = 0;
172 j = (j + 1) % QUEUEDEPTH;
173 }
174
175 return p;
176}
177
178pkt_queue::pkt_queue ()
179{
180 memset (queue, 0, sizeof (queue));
181 i = 0; 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. / 180.; // allow bursts 296# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
203 static const double CUTOFF = 10.; // 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
205 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
206 300
207 bool can (const sockinfo &si) { return can((u32)si.host); } 301 bool can (const sockinfo &si) { return can((u32)si.host); }
208 bool can (u32 host); 302 bool can (u32 host);
209}; 303};
210 304
211net_rate_limiter auth_rate_limiter, reset_rate_limiter; 305net_rate_limiter auth_rate_limiter, reset_rate_limiter;
212 306
… …
215 iterator i; 309 iterator i;
216 310
217 for (i = begin (); i != end (); ) 311 for (i = begin (); i != end (); )
218 if (i->host == host) 312 if (i->host == host)
219 break; 313 break;
220 else if (i->last < NOW - EXPIRE) 314 else if (i->last < ev_now () - NRL_EXPIRE)
221 i = erase (i); 315 i = erase (i);
222 else 316 else
223 i++; 317 i++;
224 318
225 if (i == end ()) 319 if (i == end ())
226 { 320 {
227 net_rateinfo ri; 321 net_rateinfo ri;
228 322
229 ri.host = host; 323 ri.host = host;
230 ri.pcnt = 1.; 324 ri.pcnt = 1.;
231 ri.diff = MAXDIF; 325 ri.diff = NRL_MAXDIF;
232 ri.last = NOW; 326 ri.last = ev_now ();
233 327
234 push_front (ri); 328 push_front (ri);
235 329
236 return true; 330 return true;
237 } 331 }
238 else 332 else
239 { 333 {
240 net_rateinfo ri (*i); 334 net_rateinfo ri (*i);
241 erase (i); 335 erase (i);
242 336
243 ri.pcnt = ri.pcnt * ALPHA; 337 ri.pcnt = ri.pcnt * NRL_ALPHA;
244 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 338 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
245 339
246 ri.last = NOW; 340 ri.last = ev_now ();
247 341
248 double dif = ri.diff / ri.pcnt; 342 double dif = ri.diff / ri.pcnt;
249 343
250 bool send = dif > CUTOFF; 344 bool send = dif > NRL_CUTOFF;
251 345
252 if (dif > MAXDIF) 346 if (dif > NRL_MAXDIF)
253 { 347 {
254 ri.pcnt = 1.; 348 ri.pcnt = 1.;
255 ri.diff = MAXDIF; 349 ri.diff = NRL_MAXDIF;
256 } 350 }
257 else if (send) 351 else if (send)
258 ri.pcnt++; 352 ri.pcnt++;
259 353
260 push_front (ri); 354 push_front (ri);
… …
307} 401}
308 402
309#define MAXVPNDATA (MAX_MTU - 6 - 6) 403#define MAXVPNDATA (MAX_MTU - 6 - 6)
310#define DATAHDR (sizeof (u32) + RAND_SIZE) 404#define DATAHDR (sizeof (u32) + RAND_SIZE)
311 405
312struct vpndata_packet:vpn_packet 406struct vpndata_packet : vpn_packet
313 { 407 {
314 u8 data[MAXVPNDATA + DATAHDR]; // seqno 408 u8 data[MAXVPNDATA + DATAHDR]; // seqno
315 409
316 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);
317 tap_packet *unpack (connection *conn, u32 &seqno); 411 tap_packet *unpack (connection *conn, u32 &seqno);
… …
330 int outl = 0, outl2; 424 int outl = 0, outl2;
331 ptype type = PT_DATA_UNCOMPRESSED; 425 ptype type = PT_DATA_UNCOMPRESSED;
332 426
333#if ENABLE_COMPRESSION 427#if ENABLE_COMPRESSION
334 u8 cdata[MAX_MTU]; 428 u8 cdata[MAX_MTU];
335 u32 cl;
336 429
430 if (conn->features & FEATURE_COMPRESSION)
431 {
337 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 432 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
433
338 if (cl) 434 if (cl)
339 { 435 {
340 type = PT_DATA_COMPRESSED; 436 type = PT_DATA_COMPRESSED;
341 d = cdata; 437 d = cdata;
342 l = cl + 2; 438 l = cl + 2;
343 439
344 d[0] = cl >> 8; 440 d[0] = cl >> 8;
345 d[1] = cl; 441 d[1] = cl;
442 }
346 } 443 }
347#endif 444#endif
348 445
349 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 446 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
350 447
351 struct { 448 struct {
352#if RAND_SIZE 449#if RAND_SIZE
353 u8 rnd[RAND_SIZE]; 450 u8 rnd[RAND_SIZE];
354#endif 451#endif
… …
358 datahdr.seqno = ntohl (seqno); 455 datahdr.seqno = ntohl (seqno);
359#if RAND_SIZE 456#if RAND_SIZE
360 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 457 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
361#endif 458#endif
362 459
363 EVP_EncryptUpdate (cctx, 460 require (EVP_EncryptUpdate (cctx,
364 (unsigned char *) data + outl, &outl2, 461 (unsigned char *) data + outl, &outl2,
365 (unsigned char *) &datahdr, DATAHDR); 462 (unsigned char *) &datahdr, DATAHDR));
366 outl += outl2; 463 outl += outl2;
367 464
368 EVP_EncryptUpdate (cctx, 465 require (EVP_EncryptUpdate (cctx,
369 (unsigned char *) data + outl, &outl2, 466 (unsigned char *) data + outl, &outl2,
370 (unsigned char *) d, l); 467 (unsigned char *) d, l));
371 outl += outl2; 468 outl += outl2;
372 469
373 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 470 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
374 outl += outl2; 471 outl += outl2;
375 472
376 len = outl + data_hdr_size (); 473 len = outl + data_hdr_size ();
377 474
378 set_hdr (type, dst); 475 set_hdr (type, dst);
… …
387 int outl = 0, outl2; 484 int outl = 0, outl2;
388 tap_packet *p = new tap_packet; 485 tap_packet *p = new tap_packet;
389 u8 *d; 486 u8 *d;
390 u32 l = len - data_hdr_size (); 487 u32 l = len - data_hdr_size ();
391 488
392 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 489 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
393 490
394#if ENABLE_COMPRESSION 491#if ENABLE_COMPRESSION
395 u8 cdata[MAX_MTU]; 492 u8 cdata[MAX_MTU];
396 493
397 if (type == PT_DATA_COMPRESSED) 494 if (type == PT_DATA_COMPRESSED)
… …
399 else 496 else
400#endif 497#endif
401 d = &(*p)[6 + 6 - DATAHDR]; 498 d = &(*p)[6 + 6 - DATAHDR];
402 499
403 /* 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 */
404 EVP_DecryptUpdate (cctx, 501 require (EVP_DecryptUpdate (cctx,
405 d, &outl2, 502 d, &outl2,
406 (unsigned char *)&data, len - data_hdr_size ()); 503 (unsigned char *)&data, len - data_hdr_size ()));
407 outl += outl2; 504 outl += outl2;
408 505
409 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 506 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
410 outl += outl2; 507 outl += outl2;
411 508
412 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 509 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
413 510
414 id2mac (dst () ? dst() : THISNODE->id, p->dst); 511 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
443{ 540{
444 // actually, hmaclen cannot be checked because the hmac 541 // actually, hmaclen cannot be checked because the hmac
445 // field comes before this data, so peers with other 542 // field comes before this data, so peers with other
446 // hmacs simply will not work. 543 // hmacs simply will not work.
447 u8 prot_major, prot_minor, randsize, hmaclen; 544 u8 prot_major, prot_minor, randsize, hmaclen;
448 u8 flags, challengelen, pad2, pad3; 545 u8 flags, challengelen, features, pad3;
449 u32 cipher_nid, digest_nid, hmac_nid; 546 u32 cipher_nid, digest_nid, hmac_nid;
450
451 const u8 curflags () const
452 {
453 return 0x80
454 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
455 }
456 547
457 void setup (ptype type, int dst); 548 void setup (ptype type, int dst);
458 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 }
459}; 565};
460 566
461void config_packet::setup (ptype type, int dst) 567void config_packet::setup (ptype type, int dst)
462{ 568{
463 prot_major = PROTOCOL_MAJOR; 569 prot_major = PROTOCOL_MAJOR;
464 prot_minor = PROTOCOL_MINOR; 570 prot_minor = PROTOCOL_MINOR;
465 randsize = RAND_SIZE; 571 randsize = RAND_SIZE;
466 hmaclen = HMACLENGTH; 572 hmaclen = HMACLENGTH;
467 flags = curflags (); 573 flags = 0;
468 challengelen = sizeof (rsachallenge); 574 challengelen = sizeof (rsachallenge);
575 features = get_features ();
469 576
470 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 577 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
471 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 578 digest_nid = htonl (EVP_MD_type (RSA_HASH));
472 hmac_nid = htonl (EVP_MD_type (DIGEST)); 579 hmac_nid = htonl (EVP_MD_type (DIGEST));
473 580
… …
475 set_hdr (type, dst); 582 set_hdr (type, dst);
476} 583}
477 584
478bool config_packet::chk_config () const 585bool config_packet::chk_config () const
479{ 586{
480 return prot_major == PROTOCOL_MAJOR 587 if (prot_major != PROTOCOL_MAJOR)
481 && randsize == RAND_SIZE 588 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
482 && hmaclen == HMACLENGTH 589 else if (randsize != RAND_SIZE)
483 && 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);
484 && challengelen == sizeof (rsachallenge) 593 else if (challengelen != sizeof (rsachallenge))
594 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
485 && 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));
486 && 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));
487 && 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;
488} 605}
489 606
490struct auth_req_packet : config_packet 607struct auth_req_packet : config_packet
491{ 608{
492 char magic[8]; 609 char magic[8];
493 u8 initiate; // false if this is just an automatic reply 610 u8 initiate; // false if this is just an automatic reply
494 u8 protocols; // supported protocols (will get patches on forward) 611 u8 protocols; // supported protocols (will be patched on forward)
495 u8 pad2, pad3; 612 u8 pad2, pad3;
496 rsaid id; 613 rsaid id;
497 rsaencrdata encr; 614 rsaencrdata encr;
498 615
499 auth_req_packet (int dst, bool initiate_, u8 protocols_) 616 auth_req_packet (int dst, bool initiate_, u8 protocols_)
500 { 617 {
501 config_packet::setup (PT_AUTH_REQ, dst); 618 config_packet::setup (PT_AUTH_REQ, dst);
502 strncpy (magic, MAGIC, 8); 619 strncpy (magic, MAGIC_OLD, 8);
503 initiate = !!initiate_; 620 initiate = !!initiate_;
504 protocols = protocols_; 621 protocols = protocols_;
505 622
506 len = sizeof (*this) - sizeof (net_packet); 623 len = sizeof (*this) - sizeof (net_packet);
507 } 624 }
… …
556///////////////////////////////////////////////////////////////////////////// 673/////////////////////////////////////////////////////////////////////////////
557 674
558void 675void
559connection::connection_established () 676connection::connection_established ()
560{ 677{
678 slog (L_NOISE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
679
561 if (ictx && octx) 680 if (ictx && octx)
562 { 681 {
563 connectmode = conf->connectmode; 682 // make sure rekeying timeouts are slightly asymmetric
564 683 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
565 rekey.start (NOW + ::conf.rekey); 684 rekey.start (rekey_interval, rekey_interval);
566 keepalive.start (NOW + ::conf.keepalive); 685 keepalive.start (::conf.keepalive);
567 686
568 // send queued packets 687 // send queued packets
569 if (ictx && octx) 688 if (ictx && octx)
570 { 689 {
571 while (tap_packet *p = (tap_packet *)data_queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
572 { 691 {
573 send_data_packet (p); 692 if (p->len) send_data_packet (p);
574 delete p; 693 delete p;
575 } 694 }
576 695
577 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ()) 696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
578 { 697 {
579 send_vpn_packet (p, si, IPTOS_RELIABILITY); 698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
580 delete p; 699 delete p;
581 } 700 }
582 } 701 }
702
703 vpn->connection_established (this);
583 } 704 }
584 else 705 else
585 { 706 {
586 retry_cnt = 0; 707 retry_cnt = 0;
587 establish_connection.start (NOW + 5); 708 establish_connection.start (5);
588 keepalive.reset (); 709 keepalive.stop ();
589 rekey.reset (); 710 rekey.stop ();
590 } 711 }
591} 712}
592 713
593void 714void
594connection::reset_si () 715connection::reset_si ()
595{ 716{
717 if (vpn->can_direct (THISNODE, conf))
596 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
597 719 else
598 // mask out protocols we cannot establish 720 {
599 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
600 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 722 protocol = 0;
723 }
601 724
602 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
603} 728}
604 729
605// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
606const sockinfo & 731const sockinfo &
607connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
608{ 733{
609 if (!si.valid ()) 734 if (!si.valid ())
610 { 735 {
611 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
612 737
613 if (r) 738 if (r)
614 { 739 {
615 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 740 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
616 conf->nodename, r->conf->nodename); 741 conf->nodename, r->conf->nodename);
617 return r->si; 742 return r->si;
618 } 743 }
619 else 744 else
620 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
621 conf->nodename); 746 conf->nodename);
622 } 747 }
623 748
624 return si; 749 return si;
625} 750}
… …
635connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
636{ 761{
637 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
638 763
639 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
640 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
641 769
642 delete pkt; 770 delete pkt;
643} 771}
644 772
… …
660connection::send_auth_request (const sockinfo &si, bool initiate) 788connection::send_auth_request (const sockinfo &si, bool initiate)
661{ 789{
662 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);
663 791
664 rsachallenge chg; 792 rsachallenge chg;
665
666 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
667 795
668 if (0 > RSA_public_encrypt (sizeof chg,
669 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
670 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
671 fatal ("RSA_public_encrypt error");
672
673 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);
674 797
675 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
676 799
677 delete pkt; 800 delete pkt;
678} 801}
… …
686 809
687 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
688 811
689 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
690 813
691 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);
692 815
693 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
694 817
695 delete pkt; 818 delete pkt;
696} 819}
697 820
698void 821void
699connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
700{ 823{
701 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
702 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
703 826
704 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);
705 828
706 r->hmac_set (octx); 829 r->hmac_set (octx);
707 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
708 831
709 delete r; 832 delete r;
710} 833}
711 834
712void 835inline void
713connection::establish_connection_cb (time_watcher &w) 836connection::establish_connection_cb (ev::timer &w, int revents)
714{ 837{
715 if (ictx || conf == THISNODE 838 if (!ictx
839 && conf != THISNODE
716 || connectmode == conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
717 || connectmode == conf_node::C_DISABLED) 841 && connectmode != conf_node::C_DISABLED
718 w.at = TSTAMP_CANCEL; 842 && !w.is_active ())
719 else if (w.at <= NOW)
720 { 843 {
721 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
722 845 // and stop trying. should probably be handled by a per-connection expire handler.
723 if (retry_int < 3600 * 8) 846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 {
848 reset_connection ();
724 retry_cnt++; 849 return;
850 }
725 851
726 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));
727 857
728 reset_si (); 858 reset_si ();
729 859
730 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);
731 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
867 }
732 else 868 else
733 { 869 {
870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
873
734 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
875
876 slow = slow || (dsi.prot & PROT_SLOW);
735 877
736 if (dsi.valid () && auth_rate_limiter.can (dsi)) 878 if (dsi.valid () && auth_rate_limiter.can (dsi))
737 { 879 {
738 if (retry_cnt < 4) 880 if (retry_cnt < 4)
739 send_auth_request (dsi, true); 881 send_auth_request (dsi, true);
740 else 882 else
741 send_ping (dsi, 0); 883 send_ping (dsi, 0);
742 } 884 }
743 } 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);
744 } 895 }
745} 896}
746 897
747void 898void
748connection::reset_connection () 899connection::reset_connection ()
… …
751 { 902 {
752 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
753 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
754 905
755 if (::conf.script_node_down) 906 if (::conf.script_node_down)
756 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 }
757 } 912 }
758 913
759 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
760 delete octx; octx = 0; 915 delete octx; octx = 0;
916#if ENABLE_DNS
917 dnsv4_reset_connection ();
918#endif
761 919
762 si.host= 0; 920 si.host = 0;
763 921
764 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
765 retry_cnt = 0; 924 retry_cnt = 0;
766 925
767 rekey.reset (); 926 rekey.stop ();
768 keepalive.reset (); 927 keepalive.stop ();
769 establish_connection.reset (); 928 establish_connection.stop ();
770} 929}
771 930
772void 931void
773connection::shutdown () 932connection::shutdown ()
774{ 933{
… …
776 send_reset (si); 935 send_reset (si);
777 936
778 reset_connection (); 937 reset_connection ();
779} 938}
780 939
781void 940// poor-man's rekeying
782connection::rekey_cb (time_watcher &w) 941inline void
942connection::rekey_cb (ev::timer &w, int revents)
783{ 943{
784 w.at = TSTAMP_CANCEL;
785
786 reset_connection (); 944 reset_connection ();
787 establish_connection (); 945 establish_connection ();
788} 946}
789 947
790void 948void
791connection::send_data_packet (tap_packet *pkt, bool broadcast) 949connection::send_data_packet (tap_packet *pkt)
792{ 950{
793 vpndata_packet *p = new vpndata_packet; 951 vpndata_packet *p = new vpndata_packet;
794 int tos = 0; 952 int tos = 0;
795 953
796 // 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.
797 if (conf->inherit_tos 955 if (conf->inherit_tos && pkt->is_ipv4 ())
798 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP
799 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
800 tos = (*pkt)[15] & IPTOS_TOS_MASK; 956 tos = (*pkt)[15] & IPTOS_TOS_MASK;
801 957
802 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
803 send_vpn_packet (p, si, tos); 959 send_vpn_packet (p, si, tos);
804 960
805 delete p; 961 delete p;
806 962
807 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
808 rekey (); 964 rekey ();
809} 965}
810 966
811void 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
812connection::inject_data_packet (tap_packet *pkt, bool broadcast) 978connection::inject_data_packet (tap_packet *pkt)
813{ 979{
814 if (ictx && octx) 980 if (ictx && octx)
815 send_data_packet (pkt, broadcast); 981 send_data_packet (pkt);
816 else 982 else
817 { 983 {
818 if (!broadcast)//DDDD
819 data_queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
820 985 post_inject_queue ();
821 establish_connection ();
822 } 986 }
823} 987}
824 988
825void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
826{ 990{
827 if (ictx && octx) 991 if (ictx && octx)
828 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
829 else 993 else
830 { 994 {
831 vpn_queue.put (new vpn_packet (*pkt)); 995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
832 996 post_inject_queue ();
833 establish_connection ();
834 } 997 }
835} 998}
836 999
837void 1000void
838connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
839{ 1002{
840 last_activity = NOW; 1003 last_activity = ev_now ();
841 1004
842 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.",
843 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;
844 1010
845 switch (pkt->typ ()) 1011 switch (pkt->typ ())
846 { 1012 {
847 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
848 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
849 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
850 // when we receive a ping. 1018 // when we receive a ping.
851 if (!ictx) 1019 if (!(ictx && octx))
852 { 1020 {
853 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
854 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
855 } 1023 }
856 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.
857 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
858 1028
859 break; 1029 break;
860 1030
861 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
862 break; 1033 break;
863 1034
864 case vpn_packet::PT_RESET: 1035 case vpn_packet::PT_RESET:
865 { 1036 {
866 reset_connection (); 1037 reset_connection ();
867 1038
868 config_packet *p = (config_packet *) pkt; 1039 config_packet *p = (config_packet *) pkt;
869 1040
870 if (!p->chk_config ()) 1041 if (!p->chk_config ())
871 { 1042 {
872 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1043 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
873 conf->nodename, (const char *)rsi); 1044 conf->nodename, (const char *)rsi);
874 connectmode = conf_node::C_DISABLED; 1045 connectmode = conf_node::C_DISABLED;
875 } 1046 }
876 else if (connectmode == conf_node::C_ALWAYS) 1047 else if (connectmode == conf_node::C_ALWAYS)
877 establish_connection (); 1048 establish_connection ();
… …
881 case vpn_packet::PT_AUTH_REQ: 1052 case vpn_packet::PT_AUTH_REQ:
882 if (auth_rate_limiter.can (rsi)) 1053 if (auth_rate_limiter.can (rsi))
883 { 1054 {
884 auth_req_packet *p = (auth_req_packet *) pkt; 1055 auth_req_packet *p = (auth_req_packet *) pkt;
885 1056
886 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");
887 1058
888 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)))
889 { 1061 {
890 if (p->prot_minor != PROTOCOL_MINOR) 1062 if (p->prot_minor != PROTOCOL_MINOR)
891 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."),
892 conf->nodename, (const char *)rsi, 1064 conf->nodename, (const char *)rsi,
893 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1065 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
895 if (p->initiate) 1067 if (p->initiate)
896 send_auth_request (rsi, false); 1068 send_auth_request (rsi, false);
897 1069
898 rsachallenge k; 1070 rsachallenge k;
899 1071
900 if (0 > RSA_private_decrypt (sizeof (p->encr), 1072 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
901 (unsigned char *)&p->encr, (unsigned char *)&k, 1073 {
902 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
903 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?"),
904 conf->nodename, (const char *)rsi); 1075 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1076 break;
1077 }
905 else 1078 else
906 { 1079 {
907 delete octx; 1080 delete octx;
908 1081
909 octx = new crypto_ctx (k, 1); 1082 octx = new crypto_ctx (k, 1);
910 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1083 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
911 1084
912 conf->protocols = p->protocols; 1085 conf->protocols = p->protocols;
1086 features = p->features & config_packet::get_features ();
913 1087
914 send_auth_response (rsi, p->id, k); 1088 send_auth_response (rsi, p->id, k);
915 1089
916 connection_established (); 1090 connection_established ();
917 1091
918 break; 1092 break;
919 } 1093 }
920 } 1094 }
1095 else
1096 slog (L_WARN, _("%s(%s): protocol mismatch."),
1097 conf->nodename, (const char *)rsi);
921 1098
922 send_reset (rsi); 1099 send_reset (rsi);
923 } 1100 }
924 1101
925 break; 1102 break;
926 1103
927 case vpn_packet::PT_AUTH_RES: 1104 case vpn_packet::PT_AUTH_RES:
928 { 1105 {
929 auth_res_packet *p = (auth_res_packet *) pkt; 1106 auth_res_packet *p = (auth_res_packet *)pkt;
930 1107
931 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1108 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
932 1109
933 if (p->chk_config ()) 1110 if (p->chk_config ())
934 { 1111 {
935 if (p->prot_minor != PROTOCOL_MINOR) 1112 if (p->prot_minor != PROTOCOL_MINOR)
936 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."),
… …
938 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1115 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
939 1116
940 rsachallenge chg; 1117 rsachallenge chg;
941 1118
942 if (!rsa_cache.find (p->id, chg)) 1119 if (!rsa_cache.find (p->id, chg))
1120 {
943 slog (L_ERR, _("%s(%s): unrequested auth response"), 1121 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
944 conf->nodename, (const char *)rsi); 1122 conf->nodename, (const char *)rsi);
1123 break;
1124 }
945 else 1125 else
946 { 1126 {
947 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1127 crypto_ctx *cctx = new crypto_ctx (chg, 0);
948 1128
949 if (!p->hmac_chk (cctx)) 1129 if (!p->hmac_chk (cctx))
1130 {
950 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"
951 "could be an attack, or just corruption or an synchronization error"), 1132 "could be an attack, or just corruption or a synchronization error."),
952 conf->nodename, (const char *)rsi); 1133 conf->nodename, (const char *)rsi);
1134 break;
1135 }
953 else 1136 else
954 { 1137 {
955 rsaresponse h; 1138 rsaresponse h;
956 1139
957 rsa_hash (p->id, chg, h); 1140 rsa_hash (p->id, chg, h);
… …
965 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
966 1149
967 si = rsi; 1150 si = rsi;
968 protocol = rsi.prot; 1151 protocol = rsi.prot;
969 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
970 connection_established (); 1158 connection_established ();
971 1159
972 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
973 conf->nodename, (const char *)rsi,
974 p->prot_major, p->prot_minor);
975
976 if (::conf.script_node_up) 1160 if (::conf.script_node_up)
977 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 }
978 1166
979 break; 1167 break;
980 } 1168 }
981 else 1169 else
982 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."),
983 conf->nodename, (const char *)rsi); 1171 conf->nodename, (const char *)rsi);
984 } 1172 }
985 1173
986 delete cctx; 1174 delete cctx;
987 } 1175 }
… …
1003 { 1191 {
1004 vpndata_packet *p = (vpndata_packet *)pkt; 1192 vpndata_packet *p = (vpndata_packet *)pkt;
1005 1193
1006 if (!p->hmac_chk (ictx)) 1194 if (!p->hmac_chk (ictx))
1007 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"
1008 "could be an attack, or just corruption or an synchronization error"), 1196 "could be an attack, or just corruption or a synchronization error."),
1009 conf->nodename, (const char *)rsi); 1197 conf->nodename, (const char *)rsi);
1010 else 1198 else
1011 { 1199 {
1012 u32 seqno; 1200 u32 seqno;
1013 tap_packet *d = p->unpack (this, seqno); 1201 tap_packet *d = p->unpack (this, seqno);
1202 int seqclass = iseqno.seqno_classify (seqno);
1014 1203
1015 if (iseqno.recv_ok (seqno)) 1204 if (seqclass == 0) // ok
1016 { 1205 {
1017 vpn->tap->send (d); 1206 vpn->tap->send (d);
1018 1207
1019 if (p->dst () == 0) // re-broadcast
1020 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1021 {
1022 connection *c = *i;
1023
1024 if (c->conf != THISNODE && c->conf != conf)
1025 c->inject_data_packet (d);
1026 }
1027
1028 if (si != rsi) 1208 if (si != rsi)
1029 { 1209 {
1030 // fast re-sync on conneciton 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.)
1031 si = rsi; 1212 // {
1032
1033 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1213 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1034 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);
1035 } 1229 }
1036
1037 delete d;
1038
1039 break;
1040 } 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;
1041 } 1246 }
1042 } 1247 }
1043 1248
1044 send_reset (rsi); 1249 send_reset (rsi);
1045 break; 1250 break;
1046 1251
1047 case vpn_packet::PT_CONNECT_REQ: 1252 case vpn_packet::PT_CONNECT_REQ:
1048 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1253 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1049 { 1254 {
1050 connect_req_packet *p = (connect_req_packet *) pkt; 1255 connect_req_packet *p = (connect_req_packet *)pkt;
1051 1256
1052 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 ())
1053 connection *c = vpn->conns[p->id - 1];
1054 conf->protocols = p->protocols;
1055
1056 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1057 conf->id, p->id, c->ictx && c->octx);
1058
1059 if (c->ictx && c->octx)
1060 { 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 {
1061 // send connect_info packets to both sides, in case one is 1267 // send connect_info packets to both sides, in case one is
1062 // behind a nat firewall (or both ;) 1268 // behind a nat firewall (or both ;)
1063 c->send_connect_info (conf->id, si, conf->protocols); 1269 c->send_connect_info (conf->id, si, conf->protocols);
1064 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 ();
1065 } 1274 }
1066 else 1275 else
1067 c->establish_connection (); 1276 slog (L_WARN,
1277 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1278 p->id);
1068 } 1279 }
1069 1280
1070 break; 1281 break;
1071 1282
1072 case vpn_packet::PT_CONNECT_INFO: 1283 case vpn_packet::PT_CONNECT_INFO:
1073 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1284 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1074 { 1285 {
1075 connect_info_packet *p = (connect_info_packet *) pkt; 1286 connect_info_packet *p = (connect_info_packet *)pkt;
1076 1287
1077 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 ())
1078 1289 {
1079 connection *c = vpn->conns[p->id - 1]; 1290 connection *c = vpn->conns[p->id - 1];
1080 1291
1081 c->conf->protocols = p->protocols; 1292 c->conf->protocols = p->protocols;
1082 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));
1083 p->si.upgrade_protocol (protocol, c->conf); 1294 p->si.upgrade_protocol (protocol, c->conf);
1084 1295
1085 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,
1086 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1298 (const char *)p->si, !c->ictx && !c->octx);
1087 1299
1088 const sockinfo &dsi = forward_si (p->si); 1300 const sockinfo &dsi = forward_si (p->si);
1089 1301
1090 if (dsi.valid ()) 1302 if (dsi.valid ())
1091 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);
1092 } 1309 }
1093 1310
1094 break; 1311 break;
1095 1312
1096 default: 1313 default:
1097 send_reset (rsi); 1314 send_reset (rsi);
1098 break; 1315 break;
1099 } 1316 }
1100} 1317}
1101 1318
1102void connection::keepalive_cb (time_watcher &w) 1319inline void
1320connection::keepalive_cb (ev::timer &w, int revents)
1103{ 1321{
1104 if (NOW >= last_activity + ::conf.keepalive + 30) 1322 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1105 { 1323 {
1106 reset_connection (); 1324 reset_connection ();
1107 establish_connection (); 1325 establish_connection ();
1108 } 1326 }
1109 else if (NOW < last_activity + ::conf.keepalive) 1327 else if (ev_now () < last_activity + ::conf.keepalive)
1110 w.at = last_activity + ::conf.keepalive; 1328 w.start (last_activity + ::conf.keepalive - ev::now ());
1111 else if (conf->connectmode != conf_node::C_ONDEMAND 1329 else if (conf->connectmode != conf_node::C_ONDEMAND
1112 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1330 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1113 { 1331 {
1114 send_ping (si); 1332 send_ping (si);
1115 w.at = NOW + 5; 1333 w.start (3);
1116 } 1334 }
1117 else if (NOW < last_activity + ::conf.keepalive + 10) 1335 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1118 // hold ondemand connections implicitly a few seconds longer 1336 // hold ondemand connections implicitly a few seconds longer
1119 // should delete octx, though, or something like that ;) 1337 // should delete octx, though, or something like that ;)
1120 w.at = last_activity + ::conf.keepalive + 10; 1338 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1121 else 1339 else
1122 reset_connection (); 1340 reset_connection ();
1123} 1341}
1124 1342
1125void connection::send_connect_request (int id) 1343void connection::send_connect_request (int id)
1126{ 1344{
1127 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);
1128 1346
1129 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);
1130 p->hmac_set (octx); 1349 p->hmac_set (octx);
1131 send_vpn_packet (p, si); 1350 send_vpn_packet (p, si);
1132 1351
1133 delete p; 1352 delete p;
1134} 1353}
1135 1354
1136void connection::script_node () 1355void connection::script_init_env (const char *ext)
1137{ 1356{
1138 vpn->script_if_up ();
1139
1140 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;
1141 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);
1142 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1372 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1143 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1373 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1144 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1374 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1145} 1375}
1146 1376
1377inline const char *
1147const char *connection::script_node_up () 1378connection::script_node_up ()
1148{ 1379{
1149 script_node (); 1380 script_init_connect_env ();
1150 1381
1151 putenv ("STATE=up"); 1382 putenv ((char *)"STATE=up");
1152 1383
1384 char *filename;
1385 asprintf (&filename,
1386 "%s/%s",
1387 confbase,
1153 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1388 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1154}
1155 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 *
1156const char *connection::script_node_down () 1410connection::script_node_down ()
1157{ 1411{
1158 script_node (); 1412 script_init_connect_env ();
1159 1413
1160 putenv ("STATE=down"); 1414 putenv ((char *)"STATE=down");
1161 1415
1162 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1416 char *filename;
1163} 1417 asprintf (&filename,
1418 "%s/%s",
1419 confbase,
1420 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1164 1421
1422 return filename;
1423}
1424
1165connection::connection(struct vpn *vpn_) 1425connection::connection (struct vpn *vpn, conf_node *conf)
1166: vpn(vpn_) 1426: vpn(vpn), conf(conf),
1167, rekey (this, &connection::rekey_cb) 1427#if ENABLE_DNS
1168, 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);
1169, establish_connection (this, &connection::establish_connection_cb) 1435 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1170{ 1436
1437 last_establish_attempt = 0.;
1171 octx = ictx = 0; 1438 octx = ictx = 0;
1172 retry_cnt = 0;
1173 1439
1174 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
1175 reset_connection (); 1449 reset_connection ();
1176} 1450}
1177 1451
1178connection::~connection () 1452connection::~connection ()
1179{ 1453{

Diff Legend

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