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

Diff Legend

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