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.47 by pcg, Mon Mar 7 01:31:26 2005 UTC vs.
Revision 1.100 by root, Wed Jul 17 05:34:17 2013 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines