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.10 by pcg, Sun Apr 6 18:12:18 2003 UTC vs.
Revision 1.89 by root, Thu Dec 2 08:15:09 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 (tap_packet *p) 212pkt_queue::pkt_queue (double max_ttl, int max_queue)
213: max_ttl (max_ttl), max_queue (max_queue)
153{ 214{
154 if (queue[i]) 215 queue = new pkt [max_queue];
155 {
156 delete queue[i];
157 j = (j + 1) % QUEUEDEPTH;
158 }
159 216
160 queue[i] = p;
161
162 i = (i + 1) % QUEUEDEPTH;
163}
164
165tap_packet *pkt_queue::get ()
166{
167 tap_packet *p = queue[j];
168
169 if (p)
170 {
171 queue[j] = 0;
172 j = (j + 1) % QUEUEDEPTH;
173 }
174
175 return p;
176}
177
178pkt_queue::pkt_queue ()
179{
180 memset (queue, 0, sizeof (queue));
181 i = 0; 217 i = 0;
182 j = 0; 218 j = 0;
219
220 expire.set<pkt_queue, &pkt_queue::expire_cb> (this);
183} 221}
184 222
185pkt_queue::~pkt_queue () 223pkt_queue::~pkt_queue ()
186{ 224{
187 for (i = QUEUEDEPTH; --i > 0; ) 225 while (net_packet *p = get ())
226 delete p;
227
188 delete queue[i]; 228 delete [] queue;
189} 229}
190 230
231void pkt_queue::expire_cb (ev::timer &w, int revents)
232{
233 ev_tstamp expire = ev_now () - max_ttl;
234
235 for (;;)
236 {
237 if (empty ())
238 break;
239
240 double diff = queue[j].tstamp - expire;
241
242 if (diff >= 0.)
243 {
244 w.start (diff > 0.5 ? diff : 0.5);
245 break;
246 }
247
248 delete get ();
249 }
250}
251
252void pkt_queue::put (net_packet *p)
253{
254 ev_tstamp now = ev_now ();
255
256 // start expiry timer
257 if (empty ())
258 expire.start (max_ttl);
259
260 int ni = i + 1 == max_queue ? 0 : i + 1;
261
262 if (ni == j)
263 delete get ();
264
265 queue[i].pkt = p;
266 queue[i].tstamp = now;
267
268 i = ni;
269}
270
271net_packet *pkt_queue::get ()
272{
273 if (empty ())
274 return 0;
275
276 net_packet *p = queue[j].pkt;
277 queue[j].pkt = 0;
278
279 j = j + 1 == max_queue ? 0 : j + 1;
280
281 return p;
282}
283
191struct net_rateinfo { 284struct net_rateinfo
285{
192 u32 host; 286 u32 host;
193 double pcnt, diff; 287 double pcnt, diff;
194 tstamp last; 288 tstamp last;
195}; 289};
196 290
197// only do action once every x seconds per host whole allowing bursts. 291// only do action once every x seconds per host whole allowing bursts.
198// this implementation ("splay list" ;) is inefficient, 292// this implementation ("splay list" ;) is inefficient,
199// but low on resources. 293// but low on resources.
200struct net_rate_limiter : list<net_rateinfo> 294struct net_rate_limiter : list<net_rateinfo>
201{ 295{
202 static const double ALPHA = 1. - 1. / 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)
689 {
570 while (tap_packet *p = queue.get ()) 690 while (tap_packet *p = (tap_packet *)data_queue.get ())
571 { 691 {
572 send_data_packet (p); 692 if (p->len) send_data_packet (p);
573 delete p; 693 delete p;
574 } 694 }
695
696 while (vpn_packet *p = (vpn_packet *)vpn_queue.get ())
697 {
698 if (p->len) send_vpn_packet (p, si, IPTOS_RELIABILITY);
699 delete p;
700 }
701 }
702
703 vpn->connection_established (this);
575 } 704 }
576 else 705 else
577 { 706 {
578 retry_cnt = 0; 707 retry_cnt = 0;
579 establish_connection.start (NOW + 5); 708 establish_connection.start (5);
580 keepalive.reset (); 709 keepalive.stop ();
581 rekey.reset (); 710 rekey.stop ();
582 } 711 }
583} 712}
584 713
585void 714void
586connection::reset_si () 715connection::reset_si ()
587{ 716{
717 if (vpn->can_direct (THISNODE, conf))
588 protocol = best_protocol (THISNODE->protocols & conf->protocols); 718 protocol = best_protocol (THISNODE->protocols & conf->connectable_protocols ());
589 719 else
590 // mask out protocols we cannot establish 720 {
591 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 721 slog (L_TRACE, _("%s: direct connection denied by config."), conf->nodename);
592 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 722 protocol = 0;
723 }
593 724
594 si.set (conf, protocol); 725 si.set (conf, protocol);
726
727 is_direct = si.valid ();
595} 728}
596 729
597// ensure sockinfo is valid, forward if necessary 730// ensure sockinfo is valid, forward if necessary
598const sockinfo & 731const sockinfo &
599connection::forward_si (const sockinfo &si) const 732connection::forward_si (const sockinfo &si) const
600{ 733{
601 if (!si.valid ()) 734 if (!si.valid ())
602 { 735 {
603 connection *r = vpn->find_router (); 736 connection *r = vpn->find_router_for (this);
604 737
605 if (r) 738 if (r)
606 { 739 {
607 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 740 slog (L_DEBUG, _("%s: no common protocol, trying to route through %s."),
608 conf->nodename, r->conf->nodename); 741 conf->nodename, r->conf->nodename);
609 return r->si; 742 return r->si;
610 } 743 }
611 else 744 else
612 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 745 slog (L_DEBUG, _("%s: node unreachable, no common protocol or no router available."),
613 conf->nodename); 746 conf->nodename);
614 } 747 }
615 748
616 return si; 749 return si;
617} 750}
… …
627connection::send_ping (const sockinfo &si, u8 pong) 760connection::send_ping (const sockinfo &si, u8 pong)
628{ 761{
629 ping_packet *pkt = new ping_packet; 762 ping_packet *pkt = new ping_packet;
630 763
631 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
632 send_vpn_packet (pkt, si, IPTOS_LOWDELAY); 768 send_vpn_packet (pkt, si, IPTOS_LOWDELAY);
633 769
634 delete pkt; 770 delete pkt;
635} 771}
636 772
… …
652connection::send_auth_request (const sockinfo &si, bool initiate) 788connection::send_auth_request (const sockinfo &si, bool initiate)
653{ 789{
654 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);
655 791
656 rsachallenge chg; 792 rsachallenge chg;
657
658 rsa_cache.gen (pkt->id, chg); 793 rsa_cache.gen (pkt->id, chg);
794 rsa_encrypt (conf->rsa_key, chg, pkt->encr);
659 795
660 if (0 > RSA_public_encrypt (sizeof chg,
661 (unsigned char *)&chg, (unsigned char *)&pkt->encr,
662 conf->rsa_key, RSA_PKCS1_OAEP_PADDING))
663 fatal ("RSA_public_encrypt error");
664
665 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);
666 797
667 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
668 799
669 delete pkt; 800 delete pkt;
670} 801}
… …
678 809
679 rsa_hash (id, chg, pkt->response); 810 rsa_hash (id, chg, pkt->response);
680 811
681 pkt->hmac_set (octx); 812 pkt->hmac_set (octx);
682 813
683 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);
684 815
685 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
686 817
687 delete pkt; 818 delete pkt;
688} 819}
689 820
690void 821void
691connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 822connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
692{ 823{
693 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 824 slog (L_TRACE, "%s << PT_CONNECT_INFO(%s,%s)", conf->nodename,
694 conf->id, rid, (const char *)rsi); 825 vpn->conns[rid - 1]->conf->nodename, (const char *)rsi);
695 826
696 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);
697 828
698 r->hmac_set (octx); 829 r->hmac_set (octx);
699 send_vpn_packet (r, si); 830 send_vpn_packet (r, si);
700 831
701 delete r; 832 delete r;
702} 833}
703 834
704void 835inline void
705connection::establish_connection_cb (time_watcher &w) 836connection::establish_connection_cb (ev::timer &w, int revents)
706{ 837{
707 if (ictx || conf == THISNODE 838 if (!ictx
839 && conf != THISNODE
708 || connectmode == conf_node::C_NEVER 840 && connectmode != conf_node::C_NEVER
709 || connectmode == conf_node::C_DISABLED) 841 && connectmode != conf_node::C_DISABLED
710 w.at = TSTAMP_CANCEL; 842 && !w.is_active ())
711 else if (w.at <= NOW)
712 { 843 {
713 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
714 845 // and stop trying. should probably be handled by a per-connection expire handler.
715 if (retry_int < 3600 * 8) 846 if (connectmode == conf_node::C_ONDEMAND && vpn_queue.empty () && data_queue.empty ())
847 {
848 reset_connection ();
716 retry_cnt++; 849 return;
850 }
717 851
718 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));
719 857
720 reset_si (); 858 reset_si ();
721 859
722 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);
723 vpn->send_connect_request (conf->id); 866 vpn->send_connect_request (this);
867 }
724 else 868 else
725 { 869 {
870 if (si.valid ())
871 slog (L_DEBUG, _("%s: sending direct connection request to %s."),
872 conf->nodename, (const char *)si);
873
726 const sockinfo &dsi = forward_si (si); 874 const sockinfo &dsi = forward_si (si);
875
876 slow = slow || (dsi.prot & PROT_SLOW);
727 877
728 if (dsi.valid () && auth_rate_limiter.can (dsi)) 878 if (dsi.valid () && auth_rate_limiter.can (dsi))
729 { 879 {
730 if (retry_cnt < 4) 880 if (retry_cnt < 4)
731 send_auth_request (dsi, true); 881 send_auth_request (dsi, true);
732 else 882 else
733 send_ping (dsi, 0); 883 send_ping (dsi, 0);
734 } 884 }
735 } 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);
736 } 895 }
737} 896}
738 897
739void 898void
740connection::reset_connection () 899connection::reset_connection ()
… …
743 { 902 {
744 slog (L_INFO, _("%s(%s): connection lost"), 903 slog (L_INFO, _("%s(%s): connection lost"),
745 conf->nodename, (const char *)si); 904 conf->nodename, (const char *)si);
746 905
747 if (::conf.script_node_down) 906 if (::conf.script_node_down)
748 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 }
749 } 912 }
750 913
751 delete ictx; ictx = 0; 914 delete ictx; ictx = 0;
752 delete octx; octx = 0; 915 delete octx; octx = 0;
916#if ENABLE_DNS
917 dnsv4_reset_connection ();
918#endif
753 919
754 si.host= 0; 920 si.host = 0;
755 921
756 last_activity = 0; 922 last_activity = 0.;
923 //last_si_change = 0.;
757 retry_cnt = 0; 924 retry_cnt = 0;
758 925
759 rekey.reset (); 926 rekey.stop ();
760 keepalive.reset (); 927 keepalive.stop ();
761 establish_connection.reset (); 928 establish_connection.stop ();
762} 929}
763 930
764void 931void
765connection::shutdown () 932connection::shutdown ()
766{ 933{
… …
768 send_reset (si); 935 send_reset (si);
769 936
770 reset_connection (); 937 reset_connection ();
771} 938}
772 939
773void 940// poor-man's rekeying
774connection::rekey_cb (time_watcher &w) 941inline void
942connection::rekey_cb (ev::timer &w, int revents)
775{ 943{
776 w.at = TSTAMP_CANCEL;
777
778 reset_connection (); 944 reset_connection ();
779 establish_connection (); 945 establish_connection ();
780} 946}
781 947
782void 948void
783connection::send_data_packet (tap_packet *pkt, bool broadcast) 949connection::send_data_packet (tap_packet *pkt)
784{ 950{
785 vpndata_packet *p = new vpndata_packet; 951 vpndata_packet *p = new vpndata_packet;
786 int tos = 0; 952 int tos = 0;
787 953
788 if (conf->inherit_tos 954 // I am not hilarious about peeking into packets, but so be it.
789 && (*pkt)[12] == 0x08 && (*pkt)[13] == 0x00 // IP 955 if (conf->inherit_tos && pkt->is_ipv4 ())
790 && ((*pkt)[14] & 0xf0) == 0x40) // IPv4
791 tos = (*pkt)[15] & IPTOS_TOS_MASK; 956 tos = (*pkt)[15] & IPTOS_TOS_MASK;
792 957
793 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
794 send_vpn_packet (p, si, tos); 959 send_vpn_packet (p, si, tos);
795 960
796 delete p; 961 delete p;
797 962
798 if (oseqno > MAX_SEQNO) 963 if (oseqno > MAX_SEQNO)
799 rekey (); 964 rekey ();
800} 965}
801 966
802void 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
803connection::inject_data_packet (tap_packet *pkt, bool broadcast) 978connection::inject_data_packet (tap_packet *pkt)
804{ 979{
805 if (ictx && octx) 980 if (ictx && octx)
806 send_data_packet (pkt, broadcast); 981 send_data_packet (pkt);
807 else 982 else
808 { 983 {
809 if (!broadcast)//DDDD
810 queue.put (new tap_packet (*pkt)); 984 data_queue.put (new tap_packet (*pkt));
811 985 post_inject_queue ();
812 establish_connection ();
813 } 986 }
814} 987}
815 988
816void connection::inject_vpn_packet (vpn_packet *pkt, int tos) 989void connection::inject_vpn_packet (vpn_packet *pkt, int tos)
817{ 990{
818 if (ictx && octx) 991 if (ictx && octx)
819 send_vpn_packet (pkt, si, tos); 992 send_vpn_packet (pkt, si, tos);
820 else 993 else
821 establish_connection (); 994 {
995 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
996 post_inject_queue ();
997 }
822} 998}
823 999
824void 1000void
825connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 1001connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
826{ 1002{
827 last_activity = NOW; 1003 last_activity = ev_now ();
828 1004
829 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.",
830 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;
831 1010
832 switch (pkt->typ ()) 1011 switch (pkt->typ ())
833 { 1012 {
834 case vpn_packet::PT_PING: 1013 case vpn_packet::PT_PING:
1014 slog (L_TRACE, "%s >> PT_PING", conf->nodename);
1015
835 // we send pings instead of auth packets after some retries, 1016 // we send pings instead of auth packets after some retries,
836 // so reset the retry counter and establish a connection 1017 // so reset the retry counter and establish a connection
837 // when we receive a ping. 1018 // when we receive a ping.
838 if (!ictx) 1019 if (!ictx)
839 { 1020 {
840 if (auth_rate_limiter.can (rsi)) 1021 if (auth_rate_limiter.can (rsi))
841 send_auth_request (rsi, true); 1022 send_auth_request (rsi, true);
842 } 1023 }
843 else 1024 else
1025 // we would love to change the socket address here, but ping's aren't
1026 // authenticated, so we best ignore it.
844 send_ping (rsi, 1); // pong 1027 send_ping (rsi, 1); // pong
845 1028
846 break; 1029 break;
847 1030
848 case vpn_packet::PT_PONG: 1031 case vpn_packet::PT_PONG:
1032 slog (L_TRACE, "%s >> PT_PONG", conf->nodename);
1033
1034 // a PONG might mean that the other side doesn't really know
1035 // about our desire for communication.
1036 establish_connection ();
849 break; 1037 break;
850 1038
851 case vpn_packet::PT_RESET: 1039 case vpn_packet::PT_RESET:
852 { 1040 {
853 reset_connection (); 1041 reset_connection ();
854 1042
855 config_packet *p = (config_packet *) pkt; 1043 config_packet *p = (config_packet *) pkt;
856 1044
857 if (!p->chk_config ()) 1045 if (!p->chk_config ())
858 { 1046 {
859 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node"), 1047 slog (L_WARN, _("%s(%s): protocol mismatch, disabling node."),
860 conf->nodename, (const char *)rsi); 1048 conf->nodename, (const char *)rsi);
861 connectmode = conf_node::C_DISABLED; 1049 connectmode = conf_node::C_DISABLED;
862 } 1050 }
863 else if (connectmode == conf_node::C_ALWAYS) 1051 else if (connectmode == conf_node::C_ALWAYS)
864 establish_connection (); 1052 establish_connection ();
… …
868 case vpn_packet::PT_AUTH_REQ: 1056 case vpn_packet::PT_AUTH_REQ:
869 if (auth_rate_limiter.can (rsi)) 1057 if (auth_rate_limiter.can (rsi))
870 { 1058 {
871 auth_req_packet *p = (auth_req_packet *) pkt; 1059 auth_req_packet *p = (auth_req_packet *) pkt;
872 1060
873 slog (L_TRACE, "<<%d PT_AUTH_REQ(%d)", conf->id, p->initiate); 1061 slog (L_TRACE, "%s >> PT_AUTH_REQ(%s)", conf->nodename, p->initiate ? "initiate" : "reply");
874 1062
875 if (p->chk_config () && !strncmp (p->magic, MAGIC, 8)) 1063 if (p->chk_config ()
1064 && (!strncmp (p->magic, MAGIC_OLD, 8) || !strncmp (p->magic, MAGIC, 8)))
876 { 1065 {
877 if (p->prot_minor != PROTOCOL_MINOR) 1066 if (p->prot_minor != PROTOCOL_MINOR)
878 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1067 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
879 conf->nodename, (const char *)rsi, 1068 conf->nodename, (const char *)rsi,
880 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1069 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
… …
882 if (p->initiate) 1071 if (p->initiate)
883 send_auth_request (rsi, false); 1072 send_auth_request (rsi, false);
884 1073
885 rsachallenge k; 1074 rsachallenge k;
886 1075
887 if (0 > RSA_private_decrypt (sizeof (p->encr), 1076 if (!rsa_decrypt (::conf.rsa_key, p->encr, k))
888 (unsigned char *)&p->encr, (unsigned char *)&k, 1077 {
889 ::conf.rsa_key, RSA_PKCS1_OAEP_PADDING))
890 slog (L_ERR, _("%s(%s): challenge illegal or corrupted"), 1078 slog (L_ERR, _("%s(%s): challenge illegal or corrupted (%s). mismatched key or config file?"),
891 conf->nodename, (const char *)rsi); 1079 conf->nodename, (const char *)rsi, ERR_error_string (ERR_get_error (), 0));
1080 break;
1081 }
892 else 1082 else
893 { 1083 {
894 delete octx; 1084 delete octx;
895 1085
896 octx = new crypto_ctx (k, 1); 1086 octx = new crypto_ctx (k, 1);
897 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 1087 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
898 1088
899 conf->protocols = p->protocols; 1089 conf->protocols = p->protocols;
1090 features = p->features & config_packet::get_features ();
900 1091
901 send_auth_response (rsi, p->id, k); 1092 send_auth_response (rsi, p->id, k);
902 1093
903 connection_established (); 1094 connection_established ();
904 1095
905 break; 1096 break;
906 } 1097 }
907 } 1098 }
1099 else
1100 slog (L_WARN, _("%s(%s): protocol mismatch."),
1101 conf->nodename, (const char *)rsi);
908 1102
909 send_reset (rsi); 1103 send_reset (rsi);
910 } 1104 }
911 1105
912 break; 1106 break;
913 1107
914 case vpn_packet::PT_AUTH_RES: 1108 case vpn_packet::PT_AUTH_RES:
915 { 1109 {
916 auth_res_packet *p = (auth_res_packet *) pkt; 1110 auth_res_packet *p = (auth_res_packet *)pkt;
917 1111
918 slog (L_TRACE, "<<%d PT_AUTH_RES", conf->id); 1112 slog (L_TRACE, "%s >> PT_AUTH_RES", conf->nodename);
919 1113
920 if (p->chk_config ()) 1114 if (p->chk_config ())
921 { 1115 {
922 if (p->prot_minor != PROTOCOL_MINOR) 1116 if (p->prot_minor != PROTOCOL_MINOR)
923 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."), 1117 slog (L_INFO, _("%s(%s): protocol minor version mismatch: ours is %d, %s's is %d."),
… …
925 PROTOCOL_MINOR, conf->nodename, p->prot_minor); 1119 PROTOCOL_MINOR, conf->nodename, p->prot_minor);
926 1120
927 rsachallenge chg; 1121 rsachallenge chg;
928 1122
929 if (!rsa_cache.find (p->id, chg)) 1123 if (!rsa_cache.find (p->id, chg))
1124 {
930 slog (L_ERR, _("%s(%s): unrequested auth response"), 1125 slog (L_ERR, _("%s(%s): unrequested auth response, ignoring."),
931 conf->nodename, (const char *)rsi); 1126 conf->nodename, (const char *)rsi);
1127 break;
1128 }
932 else 1129 else
933 { 1130 {
934 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1131 crypto_ctx *cctx = new crypto_ctx (chg, 0);
935 1132
936 if (!p->hmac_chk (cctx)) 1133 if (!p->hmac_chk (cctx))
1134 {
937 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1135 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
938 "could be an attack, or just corruption or an synchronization error"), 1136 "could be an attack, or just corruption or a synchronization error."),
939 conf->nodename, (const char *)rsi); 1137 conf->nodename, (const char *)rsi);
1138 break;
1139 }
940 else 1140 else
941 { 1141 {
942 rsaresponse h; 1142 rsaresponse h;
943 1143
944 rsa_hash (p->id, chg, h); 1144 rsa_hash (p->id, chg, h);
… …
952 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid 1152 iseqno.reset (ntohl (*(u32 *)&chg[CHG_SEQNO]) & 0x7fffffff); // at least 2**31 sequence numbers are valid
953 1153
954 si = rsi; 1154 si = rsi;
955 protocol = rsi.prot; 1155 protocol = rsi.prot;
956 1156
1157 slog (L_INFO, _("%s(%s): connection established (%s), protocol version %d.%d."),
1158 conf->nodename, (const char *)rsi,
1159 is_direct ? "direct" : "forwarded",
1160 p->prot_major, p->prot_minor);
1161
957 connection_established (); 1162 connection_established ();
958 1163
959 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
960 conf->nodename, (const char *)rsi,
961 p->prot_major, p->prot_minor);
962
963 if (::conf.script_node_up) 1164 if (::conf.script_node_up)
964 run_script (run_script_cb (this, &connection::script_node_up), false); 1165 {
1166 run_script_cb *cb = new run_script_cb;
1167 cb->set<connection, &connection::script_node_up> (this);
1168 run_script_queued (cb, _("node-up command execution failed, continuing."));
1169 }
965 1170
966 break; 1171 break;
967 } 1172 }
968 else 1173 else
969 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1174 slog (L_ERR, _("%s(%s): sent and received challenge do not match."),
970 conf->nodename, (const char *)rsi); 1175 conf->nodename, (const char *)rsi);
971 } 1176 }
972 1177
973 delete cctx; 1178 delete cctx;
974 } 1179 }
… …
990 { 1195 {
991 vpndata_packet *p = (vpndata_packet *)pkt; 1196 vpndata_packet *p = (vpndata_packet *)pkt;
992 1197
993 if (!p->hmac_chk (ictx)) 1198 if (!p->hmac_chk (ictx))
994 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1199 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
995 "could be an attack, or just corruption or an synchronization error"), 1200 "could be an attack, or just corruption or a synchronization error."),
996 conf->nodename, (const char *)rsi); 1201 conf->nodename, (const char *)rsi);
997 else 1202 else
998 { 1203 {
999 u32 seqno; 1204 u32 seqno;
1000 tap_packet *d = p->unpack (this, seqno); 1205 tap_packet *d = p->unpack (this, seqno);
1206 int seqclass = iseqno.seqno_classify (seqno);
1001 1207
1002 if (iseqno.recv_ok (seqno)) 1208 if (seqclass == 0) // ok
1003 { 1209 {
1004 vpn->tap->send (d); 1210 vpn->tap->send (d);
1005 1211
1006 if (p->dst () == 0) // re-broadcast
1007 for (vpn::conns_vector::iterator i = vpn->conns.begin (); i != vpn->conns.end (); ++i)
1008 {
1009 connection *c = *i;
1010
1011 if (c->conf != THISNODE && c->conf != conf)
1012 c->inject_data_packet (d);
1013 }
1014
1015 if (si != rsi) 1212 if (si != rsi)
1016 { 1213 {
1017 // fast re-sync on conneciton changes, useful especially for tcp/ip 1214 // fast re-sync on source address changes, useful especially for tcp/ip
1215 //if (last_si_change < ev_now () + 5.)
1018 si = rsi; 1216 // {
1019
1020 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1217 slog (L_INFO, _("%s(%s): changing socket address to %s."),
1021 conf->nodename, (const char *)si, (const char *)rsi); 1218 conf->nodename, (const char *)si, (const char *)rsi);
1219
1220 si = rsi;
1221
1222 if (::conf.script_node_change)
1223 {
1224 run_script_cb *cb = new run_script_cb;
1225 cb->set<connection, &connection::script_node_change> (this);
1226 run_script_queued (cb, _("node-change command execution failed, continuing."));
1227 }
1228
1229 // }
1230 //else
1231 // slog (L_INFO, _("%s(%s): accepted packet from %s, not (yet) redirecting traffic."),
1232 // conf->nodename, (const char *)si, (const char *)rsi);
1022 } 1233 }
1023
1024 delete d;
1025
1026 break;
1027 } 1234 }
1235 else if (seqclass == 1) // far history
1236 slog (L_ERR, _("received very old packet (received %08lx, expected %08lx). "
1237 "possible replay attack, or just packet duplication/delay, ignoring."), seqno, iseqno.seq + 1);
1238 else if (seqclass == 2) // in-window duplicate, happens often on wireless
1239 slog (L_DEBUG, _("received recent duplicated packet (received %08lx, expected %08lx). "
1240 "possible replay attack, or just packet duplication, ignoring."), seqno, iseqno.seq + 1);
1241 else if (seqclass == 3) // reset
1242 {
1243 slog (L_ERR, _("received out-of-sync (far future) packet (received %08lx, expected %08lx). "
1244 "probably just massive packet loss, sending reset."), seqno, iseqno.seq + 1);
1245 send_reset (rsi);
1246 }
1247
1248 delete d;
1249 break;
1028 } 1250 }
1029 } 1251 }
1030 1252
1031 send_reset (rsi); 1253 send_reset (rsi);
1032 break; 1254 break;
1033 1255
1034 case vpn_packet::PT_CONNECT_REQ: 1256 case vpn_packet::PT_CONNECT_REQ:
1035 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1257 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1036 { 1258 {
1037 connect_req_packet *p = (connect_req_packet *) pkt; 1259 connect_req_packet *p = (connect_req_packet *)pkt;
1038 1260
1039 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1261 if (p->id > 0 && p->id <= vpn->conns.size ())
1040 connection *c = vpn->conns[p->id - 1];
1041 conf->protocols = p->protocols;
1042
1043 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1044 conf->id, p->id, c->ictx && c->octx);
1045
1046 if (c->ictx && c->octx)
1047 { 1262 {
1263 connection *c = vpn->conns[p->id - 1];
1264 conf->protocols = p->protocols;
1265
1266 slog (L_TRACE, "%s >> PT_CONNECT_REQ(%s) [%d]",
1267 conf->nodename, vpn->conns[p->id - 1]->conf->nodename, c->ictx && c->octx);
1268
1269 if (c->ictx && c->octx)
1270 {
1048 // send connect_info packets to both sides, in case one is 1271 // send connect_info packets to both sides, in case one is
1049 // behind a nat firewall (or both ;) 1272 // behind a nat firewall (or both ;)
1050 c->send_connect_info (conf->id, si, conf->protocols); 1273 c->send_connect_info (conf->id, si, conf->protocols);
1051 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1274 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1275 }
1276 else
1277 c->establish_connection ();
1052 } 1278 }
1279 else
1280 slog (L_WARN,
1281 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1282 p->id);
1053 } 1283 }
1054 1284
1055 break; 1285 break;
1056 1286
1057 case vpn_packet::PT_CONNECT_INFO: 1287 case vpn_packet::PT_CONNECT_INFO:
1058 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1288 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1059 { 1289 {
1060 connect_info_packet *p = (connect_info_packet *) pkt; 1290 connect_info_packet *p = (connect_info_packet *)pkt;
1061 1291
1062 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1292 if (p->id > 0 && p->id <= vpn->conns.size ())
1063 1293 {
1064 connection *c = vpn->conns[p->id - 1]; 1294 connection *c = vpn->conns[p->id - 1];
1065 1295
1066 c->conf->protocols = p->protocols; 1296 c->conf->protocols = p->protocols;
1067 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1297 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1068 p->si.upgrade_protocol (protocol, c->conf); 1298 p->si.upgrade_protocol (protocol, c->conf);
1069 1299
1070 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1300 slog (L_TRACE, "%s >> PT_CONNECT_INFO(%s,%s) [%d]",
1301 conf->nodename, vpn->conns[p->id - 1]->conf->nodename,
1071 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1302 (const char *)p->si, !c->ictx && !c->octx);
1072 1303
1073 const sockinfo &dsi = forward_si (p->si); 1304 const sockinfo &dsi = forward_si (p->si);
1074 1305
1075 if (dsi.valid ()) 1306 if (dsi.valid ())
1076 c->send_auth_request (dsi, true); 1307 c->send_auth_request (dsi, true);
1308 }
1309 else
1310 slog (L_WARN,
1311 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1312 p->id);
1077 } 1313 }
1078 1314
1079 break; 1315 break;
1080 1316
1081 default: 1317 default:
1082 send_reset (rsi); 1318 send_reset (rsi);
1083 break; 1319 break;
1084 } 1320 }
1085} 1321}
1086 1322
1087void connection::keepalive_cb (time_watcher &w) 1323inline void
1324connection::keepalive_cb (ev::timer &w, int revents)
1088{ 1325{
1089 if (NOW >= last_activity + ::conf.keepalive + 30) 1326 if (ev_now () >= last_activity + ::conf.keepalive + 15)
1090 { 1327 {
1091 reset_connection (); 1328 reset_connection ();
1092 establish_connection (); 1329 establish_connection ();
1093 } 1330 }
1094 else if (NOW < last_activity + ::conf.keepalive) 1331 else if (ev_now () < last_activity + ::conf.keepalive)
1095 w.at = last_activity + ::conf.keepalive; 1332 w.start (last_activity + ::conf.keepalive - ev::now ());
1096 else if (conf->connectmode != conf_node::C_ONDEMAND 1333 else if (conf->connectmode != conf_node::C_ONDEMAND
1097 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1334 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1098 { 1335 {
1099 send_ping (si); 1336 send_ping (si);
1100 w.at = NOW + 5; 1337 w.start (3);
1101 } 1338 }
1339 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1340 // hold ondemand connections implicitly a few seconds longer
1341 // should delete octx, though, or something like that ;)
1342 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1102 else 1343 else
1103 reset_connection (); 1344 reset_connection ();
1104} 1345}
1105 1346
1106void connection::send_connect_request (int id) 1347void connection::send_connect_request (int id)
1107{ 1348{
1108 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols); 1349 connect_req_packet *p = new connect_req_packet (conf->id, id, conf->protocols);
1109 1350
1110 slog (L_TRACE, ">>%d PT_CONNECT_REQ(%d)", conf->id, id); 1351 slog (L_TRACE, "%s << PT_CONNECT_REQ(%s)",
1352 conf->nodename, vpn->conns[id - 1]->conf->nodename);
1111 p->hmac_set (octx); 1353 p->hmac_set (octx);
1112 send_vpn_packet (p, si); 1354 send_vpn_packet (p, si);
1113 1355
1114 delete p; 1356 delete p;
1115} 1357}
1116 1358
1117void connection::script_node () 1359void connection::script_init_env (const char *ext)
1118{ 1360{
1119 vpn->script_if_up ();
1120
1121 char *env; 1361 char *env;
1362 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1363 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1364 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1365 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1366 conf->id & 0xff); putenv (env);
1367}
1368
1369void connection::script_init_connect_env ()
1370{
1371 vpn->script_init_env ();
1372
1373 char *env;
1122 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1374 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1375 asprintf (&env, "DESTSI=%s", (const char *)si); putenv (env);
1123 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1376 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1124 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1377 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1125 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1378 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1126} 1379}
1127 1380
1381inline const char *
1128const char *connection::script_node_up () 1382connection::script_node_up ()
1129{ 1383{
1130 script_node (); 1384 script_init_connect_env ();
1131 1385
1132 putenv ("STATE=up"); 1386 putenv ((char *)"STATE=up");
1133 1387
1388 char *filename;
1389 asprintf (&filename,
1390 "%s/%s",
1391 confbase,
1134 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1392 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1135}
1136 1393
1394 return filename;
1395}
1396
1397inline const char *
1398connection::script_node_change ()
1399{
1400 script_init_connect_env ();
1401
1402 putenv ((char *)"STATE=change");
1403
1404 char *filename;
1405 asprintf (&filename,
1406 "%s/%s",
1407 confbase,
1408 ::conf.script_node_change ? ::conf.script_node_change : "node-change");
1409
1410 return filename;
1411}
1412
1413inline const char *
1137const char *connection::script_node_down () 1414connection::script_node_down ()
1138{ 1415{
1139 script_node (); 1416 script_init_connect_env ();
1140 1417
1141 putenv ("STATE=down"); 1418 putenv ((char *)"STATE=down");
1142 1419
1143 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1420 char *filename;
1144} 1421 asprintf (&filename,
1422 "%s/%s",
1423 confbase,
1424 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1145 1425
1426 return filename;
1427}
1428
1146connection::connection(struct vpn *vpn_) 1429connection::connection (struct vpn *vpn, conf_node *conf)
1147: vpn(vpn_) 1430: vpn(vpn), conf(conf),
1148, rekey (this, &connection::rekey_cb) 1431#if ENABLE_DNS
1149, keepalive (this, &connection::keepalive_cb) 1432 dns (0),
1433#endif
1434 data_queue(conf->max_ttl, conf->max_queue + 1),
1435 vpn_queue(conf->max_ttl, conf->max_queue + 1)
1436{
1437 rekey .set<connection, &connection::rekey_cb > (this);
1438 keepalive .set<connection, &connection::keepalive_cb > (this);
1150, establish_connection (this, &connection::establish_connection_cb) 1439 establish_connection.set<connection, &connection::establish_connection_cb> (this);
1151{ 1440
1441 last_establish_attempt = 0.;
1152 octx = ictx = 0; 1442 octx = ictx = 0;
1153 retry_cnt = 0;
1154 1443
1155 connectmode = conf_node::C_ALWAYS; // initial setting 1444 if (!conf->protocols) // make sure some protocol is enabled
1445 conf->protocols = PROT_UDPv4;
1446
1447 connectmode = conf->connectmode;
1448
1449 // queue a dummy packet to force an initial connection attempt
1450 if (connectmode != conf_node::C_ALWAYS && connectmode != conf_node::C_DISABLED)
1451 vpn_queue.put (new net_packet);
1452
1156 reset_connection (); 1453 reset_connection ();
1157} 1454}
1158 1455
1159connection::~connection () 1456connection::~connection ()
1160{ 1457{

Diff Legend

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