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.24 by pcg, Wed Oct 22 01:05:23 2003 UTC vs.
Revision 1.63 by pcg, Sun Dec 2 00:45:41 2007 UTC

1/* 1/*
2 connection.C -- manage a single connection 2 connection.C -- manage a single connection
3 Copyright (C) 2003 Marc Lehmann <pcg@goof.com> 3 Copyright (C) 2003-2005 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
6 it under the terms of the GNU General Public License as published by 8 it under the terms of the GNU General Public License as published by
7 the Free Software Foundation; either version 2 of the License, or 9 the Free Software Foundation; either version 2 of the License, or
8 (at your option) any later version. 10 (at your 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,
11 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 but 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
13 GNU General Public License for more details. 15 GNU General 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
16 along with this program; if not, write to the Free Software 18 along with gvpe; if not, write to the Free Software
17 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19 Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
18*/ 20*/
19 21
20#include "config.h" 22#include "config.h"
21
22extern "C" {
23# include "lzf/lzf.h"
24}
25 23
26#include <list> 24#include <list>
27 25
28#include <openssl/rand.h> 26#include <openssl/rand.h>
29#include <openssl/evp.h> 27#include <openssl/evp.h>
30#include <openssl/rsa.h> 28#include <openssl/rsa.h>
31#include <openssl/err.h> 29#include <openssl/err.h>
32
33#include "gettext.h"
34 30
35#include "conf.h" 31#include "conf.h"
36#include "slog.h" 32#include "slog.h"
37#include "device.h" 33#include "device.h"
38#include "vpn.h" 34#include "vpn.h"
… …
44# define RAND_pseudo_bytes RAND_bytes 40# define RAND_pseudo_bytes RAND_bytes
45#endif 41#endif
46 42
47#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic 43#define MAGIC "vped\xbd\xc6\xdb\x82" // 8 bytes of magic
48 44
45#define ULTRA_FAST 1
46#define HLOG 15
47#include "lzf/lzf.h"
48#include "lzf/lzf_c.c"
49#include "lzf/lzf_d.c"
50
49struct crypto_ctx 51struct crypto_ctx
50{ 52{
51 EVP_CIPHER_CTX cctx; 53 EVP_CIPHER_CTX cctx;
52 HMAC_CTX hctx; 54 HMAC_CTX hctx;
53 55
… …
56}; 58};
57 59
58crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc) 60crypto_ctx::crypto_ctx (const rsachallenge &challenge, int enc)
59{ 61{
60 EVP_CIPHER_CTX_init (&cctx); 62 EVP_CIPHER_CTX_init (&cctx);
61 EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc); 63 require (EVP_CipherInit_ex (&cctx, CIPHER, 0, &challenge[CHG_CIPHER_KEY], 0, enc));
62 HMAC_CTX_init (&hctx); 64 HMAC_CTX_init (&hctx);
63 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0); 65 HMAC_Init_ex (&hctx, &challenge[CHG_HMAC_KEY], HMAC_KEYLEN, DIGEST, 0);
64} 66}
65 67
66crypto_ctx::~crypto_ctx () 68crypto_ctx::~crypto_ctx ()
67{ 69{
68 EVP_CIPHER_CTX_cleanup (&cctx); 70 require (EVP_CIPHER_CTX_cleanup (&cctx));
69 HMAC_CTX_cleanup (&hctx); 71 HMAC_CTX_cleanup (&hctx);
70} 72}
71 73
72static void 74static void
73rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h) 75rsa_hash (const rsaid &id, const rsachallenge &chg, rsaresponse &h)
74{ 76{
75 EVP_MD_CTX ctx; 77 EVP_MD_CTX ctx;
76 78
77 EVP_MD_CTX_init (&ctx); 79 EVP_MD_CTX_init (&ctx);
78 EVP_DigestInit (&ctx, RSA_HASH); 80 require (EVP_DigestInit (&ctx, RSA_HASH));
79 EVP_DigestUpdate(&ctx, &chg, sizeof chg); 81 require (EVP_DigestUpdate(&ctx, &chg, sizeof chg));
80 EVP_DigestUpdate(&ctx, &id, sizeof id); 82 require (EVP_DigestUpdate(&ctx, &id, sizeof id));
81 EVP_DigestFinal (&ctx, (unsigned char *)&h, 0); 83 require (EVP_DigestFinal (&ctx, (unsigned char *)&h, 0));
82 EVP_MD_CTX_cleanup (&ctx); 84 EVP_MD_CTX_cleanup (&ctx);
83} 85}
84 86
85struct rsa_entry { 87struct rsa_entry
88{
86 tstamp expire; 89 tstamp expire;
87 rsaid id; 90 rsaid id;
88 rsachallenge chg; 91 rsachallenge chg;
89}; 92};
90 93
91struct rsa_cache : list<rsa_entry> 94struct rsa_cache : list<rsa_entry>
92{ 95{
93 void cleaner_cb (time_watcher &w); time_watcher cleaner; 96 void cleaner_cb (ev::timer &w, int revents); ev::timer cleaner;
94 97
95 bool find (const rsaid &id, rsachallenge &chg) 98 bool find (const rsaid &id, rsachallenge &chg)
96 { 99 {
97 for (iterator i = begin (); i != end (); ++i) 100 for (iterator i = begin (); i != end (); ++i)
98 { 101 {
99 if (!memcmp (&id, &i->id, sizeof id) && i->expire > NOW) 102 if (!memcmp (&id, &i->id, sizeof id) && i->expire > ev_now ())
100 { 103 {
101 memcpy (&chg, &i->chg, sizeof chg); 104 memcpy (&chg, &i->chg, sizeof chg);
102 105
103 erase (i); 106 erase (i);
104 return true; 107 return true;
105 } 108 }
106 } 109 }
107 110
108 if (cleaner.at < NOW) 111 if (!cleaner.is_active ())
109 cleaner.start (NOW + RSA_TTL); 112 cleaner.again ();
110 113
111 return false; 114 return false;
112 } 115 }
113 116
114 void gen (rsaid &id, rsachallenge &chg) 117 void gen (rsaid &id, rsachallenge &chg)
115 { 118 {
116 rsa_entry e; 119 rsa_entry e;
117 120
118 RAND_bytes ((unsigned char *)&id, sizeof id); 121 RAND_bytes ((unsigned char *)&id, sizeof id);
119 RAND_bytes ((unsigned char *)&chg, sizeof chg); 122 RAND_bytes ((unsigned char *)&chg, sizeof chg);
120 123
121 e.expire = NOW + RSA_TTL; 124 e.expire = ev_now () + RSA_TTL;
122 e.id = id; 125 e.id = id;
123 memcpy (&e.chg, &chg, sizeof chg); 126 memcpy (&e.chg, &chg, sizeof chg);
124 127
125 push_back (e); 128 push_back (e);
126 129
127 if (cleaner.at < NOW) 130 if (!cleaner.is_active ())
128 cleaner.start (NOW + RSA_TTL); 131 cleaner.again ();
129 } 132 }
130 133
131 rsa_cache () 134 rsa_cache ()
132 : cleaner (this, &rsa_cache::cleaner_cb) 135 : cleaner (this, &rsa_cache::cleaner_cb)
133 { } 136 {
137 cleaner.set (RSA_TTL, RSA_TTL);
138 }
134 139
135} rsa_cache; 140} rsa_cache;
136 141
137void rsa_cache::cleaner_cb (time_watcher &w) 142void rsa_cache::cleaner_cb (ev::timer &w, int revents)
138{ 143{
139 if (empty ()) 144 if (empty ())
140 w.at = TSTAMP_CANCEL; 145 w.stop ();
141 else 146 else
142 { 147 {
143 w.at = NOW + RSA_TTL;
144
145 for (iterator i = begin (); i != end (); ) 148 for (iterator i = begin (); i != end (); )
146 if (i->expire <= NOW) 149 if (i->expire <= ev_now ())
147 i = erase (i); 150 i = erase (i);
148 else 151 else
149 ++i; 152 ++i;
150 } 153 }
151} 154}
… …
189{ 192{
190 for (i = QUEUEDEPTH; --i > 0; ) 193 for (i = QUEUEDEPTH; --i > 0; )
191 delete queue[i]; 194 delete queue[i];
192} 195}
193 196
194struct net_rateinfo { 197struct net_rateinfo
198{
195 u32 host; 199 u32 host;
196 double pcnt, diff; 200 double pcnt, diff;
197 tstamp last; 201 tstamp last;
198}; 202};
199 203
200// only do action once every x seconds per host whole allowing bursts. 204// only do action once every x seconds per host whole allowing bursts.
201// this implementation ("splay list" ;) is inefficient, 205// this implementation ("splay list" ;) is inefficient,
202// but low on resources. 206// but low on resources.
203struct net_rate_limiter : list<net_rateinfo> 207struct net_rate_limiter : list<net_rateinfo>
204{ 208{
205 static const double ALPHA = 1. - 1. / 600.; // allow bursts 209# define NRL_ALPHA (1. - 1. / 600.) // allow bursts
206 static const double CUTOFF = 10.; // one event every CUTOFF seconds 210# define NRL_CUTOFF 10. // one event every CUTOFF seconds
207 static const double EXPIRE = CUTOFF * 30.; // expire entries after this time 211# define NRL_EXPIRE (NRL_CUTOFF * 30.) // expire entries after this time
208 static const double MAXDIF = CUTOFF * (1. / (1. - ALPHA)); // maximum diff /count value 212# define NRL_MAXDIF (NRL_CUTOFF * (1. / (1. - NRL_ALPHA))) // maximum diff /count value
209 213
210 bool can (const sockinfo &si) { return can((u32)si.host); } 214 bool can (const sockinfo &si) { return can((u32)si.host); }
211 bool can (u32 host); 215 bool can (u32 host);
212}; 216};
213 217
… …
218 iterator i; 222 iterator i;
219 223
220 for (i = begin (); i != end (); ) 224 for (i = begin (); i != end (); )
221 if (i->host == host) 225 if (i->host == host)
222 break; 226 break;
223 else if (i->last < NOW - EXPIRE) 227 else if (i->last < ev_now () - NRL_EXPIRE)
224 i = erase (i); 228 i = erase (i);
225 else 229 else
226 i++; 230 i++;
227 231
228 if (i == end ()) 232 if (i == end ())
229 { 233 {
230 net_rateinfo ri; 234 net_rateinfo ri;
231 235
232 ri.host = host; 236 ri.host = host;
233 ri.pcnt = 1.; 237 ri.pcnt = 1.;
234 ri.diff = MAXDIF; 238 ri.diff = NRL_MAXDIF;
235 ri.last = NOW; 239 ri.last = ev_now ();
236 240
237 push_front (ri); 241 push_front (ri);
238 242
239 return true; 243 return true;
240 } 244 }
241 else 245 else
242 { 246 {
243 net_rateinfo ri (*i); 247 net_rateinfo ri (*i);
244 erase (i); 248 erase (i);
245 249
246 ri.pcnt = ri.pcnt * ALPHA; 250 ri.pcnt = ri.pcnt * NRL_ALPHA;
247 ri.diff = ri.diff * ALPHA + (NOW - ri.last); 251 ri.diff = ri.diff * NRL_ALPHA + (ev_now () - ri.last);
248 252
249 ri.last = NOW; 253 ri.last = ev_now ();
250 254
251 double dif = ri.diff / ri.pcnt; 255 double dif = ri.diff / ri.pcnt;
252 256
253 bool send = dif > CUTOFF; 257 bool send = dif > NRL_CUTOFF;
254 258
255 if (dif > MAXDIF) 259 if (dif > NRL_MAXDIF)
256 { 260 {
257 ri.pcnt = 1.; 261 ri.pcnt = 1.;
258 ri.diff = MAXDIF; 262 ri.diff = NRL_MAXDIF;
259 } 263 }
260 else if (send) 264 else if (send)
261 ri.pcnt++; 265 ri.pcnt++;
262 266
263 push_front (ri); 267 push_front (ri);
… …
310} 314}
311 315
312#define MAXVPNDATA (MAX_MTU - 6 - 6) 316#define MAXVPNDATA (MAX_MTU - 6 - 6)
313#define DATAHDR (sizeof (u32) + RAND_SIZE) 317#define DATAHDR (sizeof (u32) + RAND_SIZE)
314 318
315struct vpndata_packet:vpn_packet 319struct vpndata_packet : vpn_packet
316 { 320 {
317 u8 data[MAXVPNDATA + DATAHDR]; // seqno 321 u8 data[MAXVPNDATA + DATAHDR]; // seqno
318 322
319 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno); 323 void setup (connection *conn, int dst, u8 *d, u32 len, u32 seqno);
320 tap_packet *unpack (connection *conn, u32 &seqno); 324 tap_packet *unpack (connection *conn, u32 &seqno);
… …
333 int outl = 0, outl2; 337 int outl = 0, outl2;
334 ptype type = PT_DATA_UNCOMPRESSED; 338 ptype type = PT_DATA_UNCOMPRESSED;
335 339
336#if ENABLE_COMPRESSION 340#if ENABLE_COMPRESSION
337 u8 cdata[MAX_MTU]; 341 u8 cdata[MAX_MTU];
338 u32 cl;
339 342
343 if (conn->features & ENABLE_COMPRESSION)
344 {
340 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7); 345 u32 cl = lzf_compress (d, l, cdata + 2, (l - 2) & ~7);
346
341 if (cl) 347 if (cl)
342 { 348 {
343 type = PT_DATA_COMPRESSED; 349 type = PT_DATA_COMPRESSED;
344 d = cdata; 350 d = cdata;
345 l = cl + 2; 351 l = cl + 2;
346 352
347 d[0] = cl >> 8; 353 d[0] = cl >> 8;
348 d[1] = cl; 354 d[1] = cl;
355 }
349 } 356 }
350#endif 357#endif
351 358
352 EVP_EncryptInit_ex (cctx, 0, 0, 0, 0); 359 require (EVP_EncryptInit_ex (cctx, 0, 0, 0, 0));
353 360
354 struct { 361 struct {
355#if RAND_SIZE 362#if RAND_SIZE
356 u8 rnd[RAND_SIZE]; 363 u8 rnd[RAND_SIZE];
357#endif 364#endif
… …
361 datahdr.seqno = ntohl (seqno); 368 datahdr.seqno = ntohl (seqno);
362#if RAND_SIZE 369#if RAND_SIZE
363 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE); 370 RAND_pseudo_bytes ((unsigned char *) datahdr.rnd, RAND_SIZE);
364#endif 371#endif
365 372
366 EVP_EncryptUpdate (cctx, 373 require (EVP_EncryptUpdate (cctx,
367 (unsigned char *) data + outl, &outl2, 374 (unsigned char *) data + outl, &outl2,
368 (unsigned char *) &datahdr, DATAHDR); 375 (unsigned char *) &datahdr, DATAHDR));
369 outl += outl2; 376 outl += outl2;
370 377
371 EVP_EncryptUpdate (cctx, 378 require (EVP_EncryptUpdate (cctx,
372 (unsigned char *) data + outl, &outl2, 379 (unsigned char *) data + outl, &outl2,
373 (unsigned char *) d, l); 380 (unsigned char *) d, l));
374 outl += outl2; 381 outl += outl2;
375 382
376 EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2); 383 require (EVP_EncryptFinal_ex (cctx, (unsigned char *) data + outl, &outl2));
377 outl += outl2; 384 outl += outl2;
378 385
379 len = outl + data_hdr_size (); 386 len = outl + data_hdr_size ();
380 387
381 set_hdr (type, dst); 388 set_hdr (type, dst);
… …
390 int outl = 0, outl2; 397 int outl = 0, outl2;
391 tap_packet *p = new tap_packet; 398 tap_packet *p = new tap_packet;
392 u8 *d; 399 u8 *d;
393 u32 l = len - data_hdr_size (); 400 u32 l = len - data_hdr_size ();
394 401
395 EVP_DecryptInit_ex (cctx, 0, 0, 0, 0); 402 require (EVP_DecryptInit_ex (cctx, 0, 0, 0, 0));
396 403
397#if ENABLE_COMPRESSION 404#if ENABLE_COMPRESSION
398 u8 cdata[MAX_MTU]; 405 u8 cdata[MAX_MTU];
399 406
400 if (type == PT_DATA_COMPRESSED) 407 if (type == PT_DATA_COMPRESSED)
… …
402 else 409 else
403#endif 410#endif
404 d = &(*p)[6 + 6 - DATAHDR]; 411 d = &(*p)[6 + 6 - DATAHDR];
405 412
406 /* this overwrites part of the src mac, but we fix that later */ 413 /* this overwrites part of the src mac, but we fix that later */
407 EVP_DecryptUpdate (cctx, 414 require (EVP_DecryptUpdate (cctx,
408 d, &outl2, 415 d, &outl2,
409 (unsigned char *)&data, len - data_hdr_size ()); 416 (unsigned char *)&data, len - data_hdr_size ()));
410 outl += outl2; 417 outl += outl2;
411 418
412 EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2); 419 require (EVP_DecryptFinal_ex (cctx, (unsigned char *)d + outl, &outl2));
413 outl += outl2; 420 outl += outl2;
414 421
415 seqno = ntohl (*(u32 *)(d + RAND_SIZE)); 422 seqno = ntohl (*(u32 *)(d + RAND_SIZE));
416 423
417 id2mac (dst () ? dst() : THISNODE->id, p->dst); 424 id2mac (dst () ? dst() : THISNODE->id, p->dst);
… …
446{ 453{
447 // actually, hmaclen cannot be checked because the hmac 454 // actually, hmaclen cannot be checked because the hmac
448 // field comes before this data, so peers with other 455 // field comes before this data, so peers with other
449 // hmacs simply will not work. 456 // hmacs simply will not work.
450 u8 prot_major, prot_minor, randsize, hmaclen; 457 u8 prot_major, prot_minor, randsize, hmaclen;
451 u8 flags, challengelen, pad2, pad3; 458 u8 flags, challengelen, features, pad3;
452 u32 cipher_nid, digest_nid, hmac_nid; 459 u32 cipher_nid, digest_nid, hmac_nid;
453
454 const u8 curflags () const
455 {
456 return 0x80
457 | (ENABLE_COMPRESSION ? 0x01 : 0x00);
458 }
459 460
460 void setup (ptype type, int dst); 461 void setup (ptype type, int dst);
461 bool chk_config () const; 462 bool chk_config () const;
463
464 static u8 get_features ()
465 {
466 u8 f = 0;
467#if ENABLE_COMPRESSION
468 f |= FEATURE_COMPRESSION;
469#endif
470#if ENABLE_ROHC
471 f |= FEATURE_ROHC;
472#endif
473#if ENABLE_BRIDGING
474 f |= FEATURE_BRIDGING;
475#endif
476 return f;
477 }
462}; 478};
463 479
464void config_packet::setup (ptype type, int dst) 480void config_packet::setup (ptype type, int dst)
465{ 481{
466 prot_major = PROTOCOL_MAJOR; 482 prot_major = PROTOCOL_MAJOR;
467 prot_minor = PROTOCOL_MINOR; 483 prot_minor = PROTOCOL_MINOR;
468 randsize = RAND_SIZE; 484 randsize = RAND_SIZE;
469 hmaclen = HMACLENGTH; 485 hmaclen = HMACLENGTH;
470 flags = curflags (); 486 flags = 0;
471 challengelen = sizeof (rsachallenge); 487 challengelen = sizeof (rsachallenge);
488 features = get_features ();
472 489
473 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER)); 490 cipher_nid = htonl (EVP_CIPHER_nid (CIPHER));
474 digest_nid = htonl (EVP_MD_type (RSA_HASH)); 491 digest_nid = htonl (EVP_MD_type (RSA_HASH));
475 hmac_nid = htonl (EVP_MD_type (DIGEST)); 492 hmac_nid = htonl (EVP_MD_type (DIGEST));
476 493
… …
484 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR); 501 slog (L_WARN, _("major version mismatch (remote %d <=> local %d)"), prot_major, PROTOCOL_MAJOR);
485 else if (randsize != RAND_SIZE) 502 else if (randsize != RAND_SIZE)
486 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE); 503 slog (L_WARN, _("rand size mismatch (remote %d <=> local %d)"), randsize, RAND_SIZE);
487 else if (hmaclen != HMACLENGTH) 504 else if (hmaclen != HMACLENGTH)
488 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH); 505 slog (L_WARN, _("hmac length mismatch (remote %d <=> local %d)"), hmaclen, HMACLENGTH);
489 else if (flags != curflags ())
490 slog (L_WARN, _("flag mismatch (remote %x <=> local %x)"), flags, curflags ());
491 else if (challengelen != sizeof (rsachallenge)) 506 else if (challengelen != sizeof (rsachallenge))
492 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge)); 507 slog (L_WARN, _("challenge length mismatch (remote %d <=> local %d)"), challengelen, sizeof (rsachallenge));
493 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER))) 508 else if (cipher_nid != htonl (EVP_CIPHER_nid (CIPHER)))
494 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER)); 509 slog (L_WARN, _("cipher mismatch (remote %x <=> local %x)"), ntohl (cipher_nid), EVP_CIPHER_nid (CIPHER));
495 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH))) 510 else if (digest_nid != htonl (EVP_MD_type (RSA_HASH)))
… …
504 519
505struct auth_req_packet : config_packet 520struct auth_req_packet : config_packet
506{ 521{
507 char magic[8]; 522 char magic[8];
508 u8 initiate; // false if this is just an automatic reply 523 u8 initiate; // false if this is just an automatic reply
509 u8 protocols; // supported protocols (will get patches on forward) 524 u8 protocols; // supported protocols (will be patched on forward)
510 u8 pad2, pad3; 525 u8 pad2, pad3;
511 rsaid id; 526 rsaid id;
512 rsaencrdata encr; 527 rsaencrdata encr;
513 528
514 auth_req_packet (int dst, bool initiate_, u8 protocols_) 529 auth_req_packet (int dst, bool initiate_, u8 protocols_)
… …
571///////////////////////////////////////////////////////////////////////////// 586/////////////////////////////////////////////////////////////////////////////
572 587
573void 588void
574connection::connection_established () 589connection::connection_established ()
575{ 590{
591 slog (L_TRACE, _("%s: possible connection establish (ictx %d, octx %d)"), conf->nodename, !!ictx, !!octx);
592
576 if (ictx && octx) 593 if (ictx && octx)
577 { 594 {
578 connectmode = conf->connectmode; 595 connectmode = conf->connectmode;
579 596
580 rekey.start (NOW + ::conf.rekey); 597 // make sure rekeying timeouts are slightly asymmetric
598 ev::tstamp rekey_interval = ::conf.rekey + (conf->id > THISNODE->id ? 10 : 0);
599 rekey.start (rekey_interval, rekey_interval);
581 keepalive.start (NOW + ::conf.keepalive); 600 keepalive.start (::conf.keepalive);
582 601
583 // send queued packets 602 // send queued packets
584 if (ictx && octx) 603 if (ictx && octx)
585 { 604 {
586 while (tap_packet *p = (tap_packet *)data_queue.get ()) 605 while (tap_packet *p = (tap_packet *)data_queue.get ())
… …
597 } 616 }
598 } 617 }
599 else 618 else
600 { 619 {
601 retry_cnt = 0; 620 retry_cnt = 0;
602 establish_connection.start (NOW + 5); 621 establish_connection.start (5);
603 keepalive.reset (); 622 keepalive.stop ();
604 rekey.reset (); 623 rekey.stop ();
605 } 624 }
606} 625}
607 626
608void 627void
609connection::reset_si () 628connection::reset_si ()
… …
611 protocol = best_protocol (THISNODE->protocols & conf->protocols); 630 protocol = best_protocol (THISNODE->protocols & conf->protocols);
612 631
613 // mask out protocols we cannot establish 632 // mask out protocols we cannot establish
614 if (!conf->udp_port) protocol &= ~PROT_UDPv4; 633 if (!conf->udp_port) protocol &= ~PROT_UDPv4;
615 if (!conf->tcp_port) protocol &= ~PROT_TCPv4; 634 if (!conf->tcp_port) protocol &= ~PROT_TCPv4;
635 if (!conf->dns_port) protocol &= ~PROT_DNSv4;
636
637 if (protocol
638 && (!conf->can_direct (THISNODE)
639 || !THISNODE->can_direct (conf)))
640 {
641 slog (L_DEBUG, _("%s: direct connection denied"), conf->nodename);
642 protocol = 0;
643 }
616 644
617 si.set (conf, protocol); 645 si.set (conf, protocol);
618} 646}
619 647
620// ensure sockinfo is valid, forward if necessary 648// ensure sockinfo is valid, forward if necessary
… …
625 { 653 {
626 connection *r = vpn->find_router (); 654 connection *r = vpn->find_router ();
627 655
628 if (r) 656 if (r)
629 { 657 {
630 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s"), 658 slog (L_DEBUG, _("%s: no common protocol, trying indirectly through %s (%s)"),
631 conf->nodename, r->conf->nodename); 659 conf->nodename, r->conf->nodename, (const char *)r->si);
632 return r->si; 660 return r->si;
633 } 661 }
634 else 662 else
635 slog (L_DEBUG, _("%s: node unreachable, no common protocol"), 663 slog (L_DEBUG, _("%s: node unreachable, no common protocol"),
636 conf->nodename); 664 conf->nodename);
… …
706} 734}
707 735
708void 736void
709connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols) 737connection::send_connect_info (int rid, const sockinfo &rsi, u8 rprotocols)
710{ 738{
711 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)\n", 739 slog (L_TRACE, ">>%d PT_CONNECT_INFO(%d,%s)",
712 conf->id, rid, (const char *)rsi); 740 conf->id, rid, (const char *)rsi);
713 741
714 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols); 742 connect_info_packet *r = new connect_info_packet (conf->id, rid, rsi, rprotocols);
715 743
716 r->hmac_set (octx); 744 r->hmac_set (octx);
… …
718 746
719 delete r; 747 delete r;
720} 748}
721 749
722void 750void
723connection::establish_connection_cb (time_watcher &w) 751connection::establish_connection_cb (ev::timer &w, int revents)
724{ 752{
725 if (ictx || conf == THISNODE 753 if (!ictx
754 && conf != THISNODE
726 || connectmode == conf_node::C_NEVER 755 && connectmode != conf_node::C_NEVER
727 || connectmode == conf_node::C_DISABLED) 756 && connectmode != conf_node::C_DISABLED
728 w.at = TSTAMP_CANCEL; 757 && !w.is_active ())
729 else if (w.at <= NOW)
730 { 758 {
731 double retry_int = double (retry_cnt & 3 ? (retry_cnt & 3) : 1 << (retry_cnt >> 2)) * 0.6; 759 ev::tstamp retry_int = ev::tstamp (retry_cnt & 3
732 760 ? (retry_cnt & 3) + 1
733 if (retry_int < 3600 * 8) 761 : 1 << (retry_cnt >> 2));
734 retry_cnt++;
735
736 w.at = NOW + retry_int;
737 762
738 reset_si (); 763 reset_si ();
739 764
765 bool slow = si.prot & PROT_SLOW;
766
740 if (si.prot && !si.host) 767 if (si.prot && !si.host)
768 {
769 slog (L_TRACE, _("%s: connection request (indirect)"), conf->nodename);
770 /*TODO*/ /* start the timer so we don't recurse endlessly */
771 w.start (1);
741 vpn->send_connect_request (conf->id); 772 vpn->send_connect_request (conf->id);
773 }
742 else 774 else
743 { 775 {
776 slog (L_TRACE, _("%s: connection request (direct)"), conf->nodename, !!ictx, !!octx);
777
744 const sockinfo &dsi = forward_si (si); 778 const sockinfo &dsi = forward_si (si);
779
780 slow = slow || (dsi.prot & PROT_SLOW);
745 781
746 if (dsi.valid () && auth_rate_limiter.can (dsi)) 782 if (dsi.valid () && auth_rate_limiter.can (dsi))
747 { 783 {
748 if (retry_cnt < 4) 784 if (retry_cnt < 4)
749 send_auth_request (dsi, true); 785 send_auth_request (dsi, true);
750 else 786 else
751 send_ping (dsi, 0); 787 send_ping (dsi, 0);
752 } 788 }
753 } 789 }
790
791 retry_int *= slow ? 8. : 0.7;
792
793 if (retry_int < conf->max_retry)
794 retry_cnt++;
795 else
796 retry_int = conf->max_retry;
797
798 w.start (retry_int);
754 } 799 }
755} 800}
756 801
757void 802void
758connection::reset_connection () 803connection::reset_connection ()
… …
761 { 806 {
762 slog (L_INFO, _("%s(%s): connection lost"), 807 slog (L_INFO, _("%s(%s): connection lost"),
763 conf->nodename, (const char *)si); 808 conf->nodename, (const char *)si);
764 809
765 if (::conf.script_node_down) 810 if (::conf.script_node_down)
766 run_script (run_script_cb (this, &connection::script_node_down), false); 811 if (!run_script (run_script_cb (this, &connection::script_node_down), false))
812 slog (L_WARN, _("node-down command execution failed, continuing."));
767 } 813 }
768 814
769 delete ictx; ictx = 0; 815 delete ictx; ictx = 0;
770 delete octx; octx = 0; 816 delete octx; octx = 0;
817#if ENABLE_DNS
818 dnsv4_reset_connection ();
819#endif
771 820
772 si.host= 0; 821 si.host = 0;
773 822
774 last_activity = 0; 823 last_activity = 0;
775 retry_cnt = 0; 824 retry_cnt = 0;
776 825
777 rekey.reset (); 826 rekey.stop ();
778 keepalive.reset (); 827 keepalive.stop ();
779 establish_connection.reset (); 828 establish_connection.stop ();
780} 829}
781 830
782void 831void
783connection::shutdown () 832connection::shutdown ()
784{ 833{
… …
787 836
788 reset_connection (); 837 reset_connection ();
789} 838}
790 839
791void 840void
792connection::rekey_cb (time_watcher &w) 841connection::rekey_cb (ev::timer &w, int revents)
793{ 842{
794 w.at = TSTAMP_CANCEL;
795
796 reset_connection (); 843 reset_connection ();
797 establish_connection (); 844 establish_connection ();
798} 845}
799 846
800void 847void
… …
821{ 868{
822 if (ictx && octx) 869 if (ictx && octx)
823 send_data_packet (pkt); 870 send_data_packet (pkt);
824 else 871 else
825 { 872 {
826 if (!broadcast)//DDDD 873 if (!broadcast)
827 data_queue.put (new tap_packet (*pkt)); 874 data_queue.put (new tap_packet (*pkt));
828 875
829 establish_connection (); 876 establish_connection ();
830 } 877 }
831} 878}
… …
834{ 881{
835 if (ictx && octx) 882 if (ictx && octx)
836 send_vpn_packet (pkt, si, tos); 883 send_vpn_packet (pkt, si, tos);
837 else 884 else
838 { 885 {
839 vpn_queue.put (new vpn_packet (*pkt)); 886 vpn_queue.put ((vpn_packet *)new data_packet (*(data_packet *)pkt));
840 887
841 establish_connection (); 888 establish_connection ();
842 } 889 }
843} 890}
844 891
845void 892void
846connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 893connection::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
847{ 894{
848 last_activity = NOW; 895 last_activity = ev_now ();
849 896
850 slog (L_NOISE, "<<%d received packet type %d from %d to %d", 897 slog (L_NOISE, "<<%d received packet type %d from %d to %d",
851 conf->id, pkt->typ (), pkt->src (), pkt->dst ()); 898 conf->id, pkt->typ (), pkt->src (), pkt->dst ());
899
900 if (connectmode == conf_node::C_DISABLED)
901 return;
852 902
853 switch (pkt->typ ()) 903 switch (pkt->typ ())
854 { 904 {
855 case vpn_packet::PT_PING: 905 case vpn_packet::PT_PING:
856 // we send pings instead of auth packets after some retries, 906 // we send pings instead of auth packets after some retries,
… …
917 967
918 octx = new crypto_ctx (k, 1); 968 octx = new crypto_ctx (k, 1);
919 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff; 969 oseqno = ntohl (*(u32 *)&k[CHG_SEQNO]) & 0x7fffffff;
920 970
921 conf->protocols = p->protocols; 971 conf->protocols = p->protocols;
972 features = p->features & config_packet::get_features ();
922 973
923 send_auth_response (rsi, p->id, k); 974 send_auth_response (rsi, p->id, k);
924 975
925 connection_established (); 976 connection_established ();
926 977
… …
962 crypto_ctx *cctx = new crypto_ctx (chg, 0); 1013 crypto_ctx *cctx = new crypto_ctx (chg, 0);
963 1014
964 if (!p->hmac_chk (cctx)) 1015 if (!p->hmac_chk (cctx))
965 { 1016 {
966 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n" 1017 slog (L_ERR, _("%s(%s): hmac authentication error on auth response, received invalid packet\n"
967 "could be an attack, or just corruption or an synchronization error"), 1018 "could be an attack, or just corruption or a synchronization error"),
968 conf->nodename, (const char *)rsi); 1019 conf->nodename, (const char *)rsi);
969 break; 1020 break;
970 } 1021 }
971 else 1022 else
972 { 1023 {
… …
990 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"), 1041 slog (L_INFO, _("%s(%s): connection established, protocol version %d.%d"),
991 conf->nodename, (const char *)rsi, 1042 conf->nodename, (const char *)rsi,
992 p->prot_major, p->prot_minor); 1043 p->prot_major, p->prot_minor);
993 1044
994 if (::conf.script_node_up) 1045 if (::conf.script_node_up)
995 run_script (run_script_cb (this, &connection::script_node_up), false); 1046 if (!run_script (run_script_cb (this, &connection::script_node_up), false))
1047 slog (L_WARN, _("node-up command execution failed, continuing."));
996 1048
997 break; 1049 break;
998 } 1050 }
999 else 1051 else
1000 slog (L_ERR, _("%s(%s): sent and received challenge do not match"), 1052 slog (L_ERR, _("%s(%s): sent and received challenge do not match"),
… …
1021 { 1073 {
1022 vpndata_packet *p = (vpndata_packet *)pkt; 1074 vpndata_packet *p = (vpndata_packet *)pkt;
1023 1075
1024 if (!p->hmac_chk (ictx)) 1076 if (!p->hmac_chk (ictx))
1025 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n" 1077 slog (L_ERR, _("%s(%s): hmac authentication error, received invalid packet\n"
1026 "could be an attack, or just corruption or an synchronization error"), 1078 "could be an attack, or just corruption or a synchronization error"),
1027 conf->nodename, (const char *)rsi); 1079 conf->nodename, (const char *)rsi);
1028 else 1080 else
1029 { 1081 {
1030 u32 seqno; 1082 u32 seqno;
1031 tap_packet *d = p->unpack (this, seqno); 1083 tap_packet *d = p->unpack (this, seqno);
… …
1034 { 1086 {
1035 vpn->tap->send (d); 1087 vpn->tap->send (d);
1036 1088
1037 if (si != rsi) 1089 if (si != rsi)
1038 { 1090 {
1039 // fast re-sync on connection changes, useful especially for tcp/ip 1091 // fast re-sync on source address changes, useful especially for tcp/ip
1040 si = rsi; 1092 si = rsi;
1041 1093
1042 slog (L_INFO, _("%s(%s): socket address changed to %s"), 1094 slog (L_INFO, _("%s(%s): socket address changed to %s"),
1043 conf->nodename, (const char *)si, (const char *)rsi); 1095 conf->nodename, (const char *)si, (const char *)rsi);
1044 } 1096 }
1045
1046 delete d;
1047
1048 break;
1049 } 1097 }
1098
1099 delete d;
1100 break;
1050 } 1101 }
1051 } 1102 }
1052 1103
1053 send_reset (rsi); 1104 send_reset (rsi);
1054 break; 1105 break;
… …
1056 case vpn_packet::PT_CONNECT_REQ: 1107 case vpn_packet::PT_CONNECT_REQ:
1057 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1108 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1058 { 1109 {
1059 connect_req_packet *p = (connect_req_packet *) pkt; 1110 connect_req_packet *p = (connect_req_packet *) pkt;
1060 1111
1061 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1112 if (p->id > 0 && p->id <= vpn->conns.size ())
1062 connection *c = vpn->conns[p->id - 1];
1063 conf->protocols = p->protocols;
1064
1065 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]\n",
1066 conf->id, p->id, c->ictx && c->octx);
1067
1068 if (c->ictx && c->octx)
1069 { 1113 {
1114 connection *c = vpn->conns[p->id - 1];
1115 conf->protocols = p->protocols;
1116
1117 slog (L_TRACE, "<<%d PT_CONNECT_REQ(%d) [%d]",
1118 conf->id, p->id, c->ictx && c->octx);
1119
1120 if (c->ictx && c->octx)
1121 {
1070 // send connect_info packets to both sides, in case one is 1122 // send connect_info packets to both sides, in case one is
1071 // behind a nat firewall (or both ;) 1123 // behind a nat firewall (or both ;)
1072 c->send_connect_info (conf->id, si, conf->protocols); 1124 c->send_connect_info (conf->id, si, conf->protocols);
1073 send_connect_info (c->conf->id, c->si, c->conf->protocols); 1125 send_connect_info (c->conf->id, c->si, c->conf->protocols);
1126 }
1127 else
1128 c->establish_connection ();
1074 } 1129 }
1075 else 1130 else
1076 c->establish_connection (); 1131 slog (L_WARN,
1132 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1133 p->id);
1077 } 1134 }
1078 1135
1079 break; 1136 break;
1080 1137
1081 case vpn_packet::PT_CONNECT_INFO: 1138 case vpn_packet::PT_CONNECT_INFO:
1082 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx)) 1139 if (ictx && octx && rsi == si && pkt->hmac_chk (ictx))
1083 { 1140 {
1084 connect_info_packet *p = (connect_info_packet *) pkt; 1141 connect_info_packet *p = (connect_info_packet *)pkt;
1085 1142
1086 assert (p->id > 0 && p->id <= vpn->conns.size ()); // hmac-auth does not mean we accept anything 1143 if (p->id > 0 && p->id <= vpn->conns.size ())
1087 1144 {
1088 connection *c = vpn->conns[p->id - 1]; 1145 connection *c = vpn->conns[p->id - 1];
1089 1146
1090 c->conf->protocols = p->protocols; 1147 c->conf->protocols = p->protocols;
1091 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf)); 1148 protocol = best_protocol (c->conf->protocols & THISNODE->protocols & p->si.supported_protocols (c->conf));
1092 p->si.upgrade_protocol (protocol, c->conf); 1149 p->si.upgrade_protocol (protocol, c->conf);
1093 1150
1094 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)", 1151 slog (L_TRACE, "<<%d PT_CONNECT_INFO(%d,%s) (%d)",
1095 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx); 1152 conf->id, p->id, (const char *)p->si, !c->ictx && !c->octx);
1096 1153
1097 const sockinfo &dsi = forward_si (p->si); 1154 const sockinfo &dsi = forward_si (p->si);
1098 1155
1099 if (dsi.valid ()) 1156 if (dsi.valid ())
1100 c->send_auth_request (dsi, true); 1157 c->send_auth_request (dsi, true);
1158 }
1159 else
1160 slog (L_WARN,
1161 _("received authenticated connection request from unknown node #%d, config file mismatch?"),
1162 p->id);
1101 } 1163 }
1102 1164
1103 break; 1165 break;
1104 1166
1105 default: 1167 default:
1106 send_reset (rsi); 1168 send_reset (rsi);
1107 break; 1169 break;
1108 } 1170 }
1109} 1171}
1110 1172
1111void connection::keepalive_cb (time_watcher &w) 1173void connection::keepalive_cb (ev::timer &w, int revents)
1112{ 1174{
1113 if (NOW >= last_activity + ::conf.keepalive + 30) 1175 if (ev_now () >= last_activity + ::conf.keepalive + 30)
1114 { 1176 {
1115 reset_connection (); 1177 reset_connection ();
1116 establish_connection (); 1178 establish_connection ();
1117 } 1179 }
1118 else if (NOW < last_activity + ::conf.keepalive) 1180 else if (ev_now () < last_activity + ::conf.keepalive)
1119 w.at = last_activity + ::conf.keepalive; 1181 w.start (last_activity + ::conf.keepalive - ev::now ());
1120 else if (conf->connectmode != conf_node::C_ONDEMAND 1182 else if (conf->connectmode != conf_node::C_ONDEMAND
1121 || THISNODE->connectmode != conf_node::C_ONDEMAND) 1183 || THISNODE->connectmode != conf_node::C_ONDEMAND)
1122 { 1184 {
1123 send_ping (si); 1185 send_ping (si);
1124 w.at = NOW + 5; 1186 w.start (5);
1125 } 1187 }
1126 else if (NOW < last_activity + ::conf.keepalive + 10) 1188 else if (ev_now () < last_activity + ::conf.keepalive + 10)
1127 // hold ondemand connections implicitly a few seconds longer 1189 // hold ondemand connections implicitly a few seconds longer
1128 // should delete octx, though, or something like that ;) 1190 // should delete octx, though, or something like that ;)
1129 w.at = last_activity + ::conf.keepalive + 10; 1191 w.start (last_activity + ::conf.keepalive + 10 - ev::now ());
1130 else 1192 else
1131 reset_connection (); 1193 reset_connection ();
1132} 1194}
1133 1195
1134void connection::send_connect_request (int id) 1196void connection::send_connect_request (int id)
… …
1140 send_vpn_packet (p, si); 1202 send_vpn_packet (p, si);
1141 1203
1142 delete p; 1204 delete p;
1143} 1205}
1144 1206
1207void connection::script_init_env (const char *ext)
1208{
1209 char *env;
1210 asprintf (&env, "IFUPDATA%s=%s", ext, conf->if_up_data); putenv (env);
1211 asprintf (&env, "NODENAME%s=%s", ext, conf->nodename); putenv (env);
1212 asprintf (&env, "MAC%s=%02x:%02x:%02x:%02x:%02x:%02x", ext,
1213 0xfe, 0xfd, 0x80, 0x00, conf->id >> 8,
1214 conf->id & 0xff); putenv (env);
1215}
1216
1145void connection::script_node () 1217void connection::script_init_connect_env ()
1146{ 1218{
1147 vpn->script_if_up (); 1219 vpn->script_init_env ();
1148 1220
1149 char *env; 1221 char *env;
1150 asprintf (&env, "DESTID=%d", conf->id); putenv (env); 1222 asprintf (&env, "DESTID=%d", conf->id); putenv (env);
1151 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env); 1223 asprintf (&env, "DESTNODE=%s", conf->nodename); putenv (env);
1152 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env); 1224 asprintf (&env, "DESTIP=%s", si.ntoa ()); putenv (env);
1153 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env); 1225 asprintf (&env, "DESTPORT=%d", ntohs (si.port)); putenv (env);
1154} 1226}
1155 1227
1156const char *connection::script_node_up () 1228const char *connection::script_node_up ()
1157{ 1229{
1158 script_node (); 1230 script_init_connect_env ();
1159 1231
1160 putenv ("STATE=up"); 1232 putenv ((char *)"STATE=up");
1161 1233
1234 char *filename;
1235 asprintf (&filename,
1236 "%s/%s",
1237 confbase,
1162 return ::conf.script_node_up ? ::conf.script_node_up : "node-up"; 1238 ::conf.script_node_up ? ::conf.script_node_up : "node-up");
1239
1240 return filename;
1163} 1241}
1164 1242
1165const char *connection::script_node_down () 1243const char *connection::script_node_down ()
1166{ 1244{
1167 script_node (); 1245 script_init_connect_env ();
1168 1246
1169 putenv ("STATE=down"); 1247 putenv ((char *)"STATE=down");
1170 1248
1171 return ::conf.script_node_up ? ::conf.script_node_down : "node-down"; 1249 char *filename;
1172} 1250 asprintf (&filename,
1251 "%s/%s",
1252 confbase,
1253 ::conf.script_node_down ? ::conf.script_node_down : "node-down");
1173 1254
1255 return filename;
1256}
1257
1174connection::connection(struct vpn *vpn_) 1258connection::connection (struct vpn *vpn, conf_node *conf)
1175: vpn(vpn_) 1259: vpn(vpn), conf(conf)
1176, rekey (this, &connection::rekey_cb) 1260, rekey (this, &connection::rekey_cb)
1177, keepalive (this, &connection::keepalive_cb) 1261, keepalive (this, &connection::keepalive_cb)
1178, establish_connection (this, &connection::establish_connection_cb) 1262, establish_connection (this, &connection::establish_connection_cb)
1263#if ENABLE_DNS
1264, dns (0)
1265#endif
1179{ 1266{
1180 octx = ictx = 0; 1267 octx = ictx = 0;
1181 retry_cnt = 0; 1268 retry_cnt = 0;
1182 1269
1270 if (!conf->protocols) // make sure some protocol is enabled
1271 conf->protocols = PROT_UDPv4;
1272
1183 connectmode = conf_node::C_ALWAYS; // initial setting 1273 connectmode = conf_node::C_ALWAYS; // initial setting
1184 reset_connection (); 1274 reset_connection ();
1185} 1275}
1186 1276
1187connection::~connection () 1277connection::~connection ()

Diff Legend

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