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.37 by pcg, Fri Jun 11 15:56:34 2004 UTC vs.
Revision 1.102 by root, Thu Jul 18 13:35:16 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines