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.23 by pcg, Wed Oct 22 00:42:53 2003 UTC vs.
Revision 1.85 by pcg, Tue Jul 28 00:42:14 2009 UTC

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

Diff Legend

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