ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/gvpe/src/vpn.C
(Generate patch)

Comparing gvpe/src/vpn.C (file contents):
Revision 1.15 by pcg, Tue Oct 14 15:48:15 2003 UTC vs.
Revision 1.70 by root, Thu Oct 6 03:03:09 2022 UTC

1/* 1/*
2 vpn.C -- handle the protocol, encryption, handshaking etc. 2 vpn.C -- handle the protocol, encryption, handshaking etc.
3 Copyright (C) 2003-2008,2010,2011,2013 Marc Lehmann <gvpe@schmorp.de>
3 4
5 This file is part of GVPE.
6
4 This program is free software; you can redistribute it and/or modify 7 GVPE is free software; you can redistribute it and/or modify it
5 it under the terms of the GNU General Public License as published by 8 under the terms of the GNU General Public License as published by the
6 the Free Software Foundation; either version 2 of the License, or 9 Free Software Foundation; either version 3 of the License, or (at your
7 (at your option) any later version. 10 option) any later version.
8 11
9 This program is distributed in the hope that it will be useful, 12 This program is distributed in the hope that it will be useful, but
10 but WITHOUT ANY WARRANTY; without even the implied warranty of 13 WITHOUT ANY WARRANTY; without even the implied warranty of
11 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the 14 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General
12 GNU General Public License for more details. 15 Public License for more details.
13 16
14 You should have received a copy of the GNU General Public License 17 You should have received a copy of the GNU General Public License along
15 along with this program; if not, write to the Free Software 18 with this program; if not, see <http://www.gnu.org/licenses/>.
16 Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA 19
20 Additional permission under GNU GPL version 3 section 7
21
22 If you modify this Program, or any covered work, by linking or
23 combining it with the OpenSSL project's OpenSSL library (or a modified
24 version of that library), containing parts covered by the terms of the
25 OpenSSL or SSLeay licenses, the licensors of this Program grant you
26 additional permission to convey the resulting work. Corresponding
27 Source for a non-source form of such a combination shall include the
28 source code for the parts of OpenSSL used as well as that of the
29 covered work.
17*/ 30*/
18 31
19#include "config.h" 32#include "config.h"
20 33
21#include <list> 34#include <list>
22 35
36#include <cstdio>
37#include <cstring>
23#include <cstdlib> 38#include <cstdlib>
24#include <cstring>
25#include <cstdio>
26 39
27#include <sys/types.h> 40#include <sys/types.h>
28#include <sys/socket.h> 41#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 42#include <sys/wait.h>
43#include <sys/stat.h>
31#include <errno.h> 44#include <errno.h>
32#include <time.h> 45#include <time.h>
33#include <unistd.h> 46#include <unistd.h>
34#include <fcntl.h> 47#include <fcntl.h>
35#include <sys/socket.h> 48#include <sys/socket.h>
40 53
41#include "connection.h" 54#include "connection.h"
42#include "util.h" 55#include "util.h"
43#include "vpn.h" 56#include "vpn.h"
44 57
58using namespace std;
59
60vpn network; // THE vpn (bad design...)
61
45///////////////////////////////////////////////////////////////////////////// 62/////////////////////////////////////////////////////////////////////////////
46 63
47const char *vpn::script_if_up () 64// hopefully temporary workaround for rare buffer full conditions
65// if it happens, usually instantly retrying or retrying ~5ms later
66// is good enough with current network technologies/kernels
67
68static ssize_t
69xsendto (int fd, const void *buf, size_t len, int flags,
70 const struct sockaddr *sa, socklen_t salen)
71{
72 ssize_t res;
73
74 for (int retry = 0; retry <= 13; ++retry) // ~100ms
75 {
76 res = sendto (fd, buf, len, flags, sa, salen);
77
78 if (res >= 0 || errno != ENOBUFS)
79 break;
80
81 struct timespec ts = { 0, 1000 * retry };
82 nanosleep (&ts, 0);
83 }
84
85 return res;
86}
87
88/////////////////////////////////////////////////////////////////////////////
89
90static void inline
91set_tos (int fd, int &tos_prev, int tos)
92{
93#if defined(SOL_IP) && defined(IP_TOS)
94 if (tos_prev == tos)
95 return;
96
97 tos_prev = tos;
98 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
99#endif
100}
101
102void
103vpn::script_init_env ()
48{ 104{
49 // the tunnel device mtu should be the physical mtu - overhead 105 // the tunnel device mtu should be the physical mtu - overhead
50 // the tricky part is rounding to the cipher key blocksize 106 // the tricky part is rounding to the cipher key blocksize
51 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 107 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
52 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 108 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
53 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 109 mtu -= mtu % BLOCK_SIZE (CIPHER); // round
54 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 110 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
55 111
56 char *env; 112 char *env;
57 asprintf (&env, "CONFBASE=%s", confbase); 113 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
58 putenv (env);
59 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
60 putenv (env);
61 asprintf (&env, "NODEID=%d", THISNODE->id);
62 putenv (env);
63 asprintf (&env, "IFNAME=%s", tap->interface ()); 114 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
64 putenv (env); 115 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
116 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
65 asprintf (&env, "MTU=%d", mtu); 117 asprintf (&env, "MTU=%d", mtu); putenv (env);
66 putenv (env); 118 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
67 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 119 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
68 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
69 THISNODE->id & 0xff);
70 putenv (env);
71 120
72 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 121 conns [THISNODE->id - 1]->script_init_env ("");
122
123 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
124 {
125 char ext[16];
126 snprintf (ext, 16, "_%d", (*c)->conf->id);
127 (*c)->script_init_env (ext);
128 }
129}
130
131inline const char *
132vpn::script_if_init ()
133{
134 script_init_env ();
135
136 return tap->if_up ();
137}
138
139inline const char *
140vpn::script_if_up ()
141{
142 script_init_env ();
143
144 return conf.config_filename (::conf.script_if_up, "if-up");
145}
146
147int
148vpn::setup_socket (u8 prot, int family, int type, int proto)
149{
150 int fd = socket (family, type, proto);
151
152 if (fd < 0)
153 {
154 slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
155 return fd;
156 }
157
158 fcntl (fd, F_SETFL, O_NONBLOCK);
159 fcntl (fd, F_SETFD, FD_CLOEXEC);
160
161#ifdef SO_MARK
162 if (::conf.nfmark)
163 if (setsockopt (fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark))
164 slog (L_WARN, _("unable to set nfmark on %s socket: %s"), strprotocol (prot), strerror (errno));
165#endif
166
167 return fd;
73} 168}
74 169
75int 170int
76vpn::setup () 171vpn::setup ()
77{ 172{
173 int success = 0;
174
175 ipv4_tos = -1;
78 ipv4_fd = -1; 176 ipv4_fd = -1;
79 177
80 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) 178 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
81 { 179 {
82 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 180 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
83 181
84 if (ipv4_fd < 0) 182 if (ipv4_fd < 0)
85 return -1; 183 return -1;
86
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
88 184
89#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) 185#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90 // this I really consider a linux bug. I am neither connected 186 // this I really consider a linux bug. I am neither connected
91 // nor do I fragment myself. Linux still sets DF and doesn't 187 // nor do I fragment myself. Linux still sets DF and doesn't
92 // fragment for me sometimes. 188 // fragment for me sometimes.
98 194
99 sockinfo si (THISNODE, PROT_IPv4); 195 sockinfo si (THISNODE, PROT_IPv4);
100 196
101 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 197 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
102 { 198 {
103 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 199 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
104 exit (1); 200 return -1;
105 } 201 }
106 202
107 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 203 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
204 ++success;
108 } 205 }
206 else
207 THISNODE->protocols &= ~PROT_IPv4;
109 208
209 udpv4_tos = -1;
110 udpv4_fd = -1; 210 udpv4_fd = -1;
111 211
112 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) 212 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
113 { 213 {
114 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 214 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
115 215
116 if (udpv4_fd < 0) 216 if (udpv4_fd < 0)
117 return -1; 217 return -1;
118
119 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
120 218
121 // standard daemon practise... 219 // standard daemon practise...
122 { 220 {
123 int oval = 1; 221 int oval = 1;
124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 222 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
136 234
137 sockinfo si (THISNODE, PROT_UDPv4); 235 sockinfo si (THISNODE, PROT_UDPv4);
138 236
139 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) 237 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
140 { 238 {
141 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); 239 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
142 exit (1); 240 return -1;
143 } 241 }
144 242
145 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 243 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
244 ++success;
146 } 245 }
246 else
247 THISNODE->protocols &= ~PROT_UDPv4;
147 248
249 icmpv4_tos = -1;
148 icmpv4_fd = -1; 250 icmpv4_fd = -1;
149 251
150#if ENABLE_ICMP 252#if ENABLE_ICMP
151 if (THISNODE->protocols & PROT_ICMPv4) 253 if (THISNODE->protocols & PROT_ICMPv4)
152 { 254 {
153 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP); 255 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
154 256
155 if (icmpv4_fd < 0) 257 if (icmpv4_fd < 0)
156 return -1; 258 return -1;
157 259
158 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
159
160#ifdef ICMP_FILTER 260#ifdef ICMP_FILTER
161 { 261 {
162 icmp_filter oval; 262 icmp_filter oval;
163 oval.data = 0xffffffff; 263 oval.data = 0;
164 if (::conf.icmp_type < 32) 264 if (::conf.icmp_type < 32)
165 oval.data &= ~(1 << ::conf.icmp_type); 265 oval.data |= 1 << ::conf.icmp_type;
266 oval.data = ~oval.data;
166 267
167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 268 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
168 } 269 }
169#endif 270#endif
170 271
172 // this I really consider a linux bug. I am neither connected 273 // this I really consider a linux bug. I am neither connected
173 // nor do I fragment myself. Linux still sets DF and doesn't 274 // nor do I fragment myself. Linux still sets DF and doesn't
174 // fragment for me sometimes. 275 // fragment for me sometimes.
175 { 276 {
176 int oval = IP_PMTUDISC_DONT; 277 int oval = IP_PMTUDISC_DONT;
177 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 278 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
178 } 279 }
179#endif 280#endif
180 281
181 sockinfo si (THISNODE, PROT_ICMPv4); 282 sockinfo si (THISNODE, PROT_ICMPv4);
182 283
183 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) 284 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
184 { 285 {
185 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); 286 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
186 exit (1); 287 return -1;
187 } 288 }
188 289
189 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); 290 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
291 ++success;
190 } 292 }
191#endif 293#endif
192 294
193 tcpv4_fd = -1; 295 tcpv4_fd = -1;
194 296
195#if ENABLE_TCP 297#if ENABLE_TCP
196 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) 298 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
197 { 299 {
198 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 300 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
199 301
200 if (tcpv4_fd < 0) 302 if (tcpv4_fd < 0)
201 return -1; 303 return -1;
202 304
203 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
204
205 // standard daemon practise... 305 // standard daemon practise...
206 { 306 {
207 int oval = 1; 307 int oval = 1;
208 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 308 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
209 } 309 }
210 310
211 sockinfo si (THISNODE, PROT_TCPv4); 311 sockinfo si (THISNODE, PROT_TCPv4);
212 312
213 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 313 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
214 { 314 {
215 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 315 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
216 exit (1); 316 return -1;
217 } 317 }
218 318
219 if (listen (tcpv4_fd, 5)) 319 if (listen (tcpv4_fd, 5))
220 { 320 {
221 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 321 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
222 exit (1); 322 return -1;
323 }
324
325 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
326 ++success;
327 }
328 else
329 THISNODE->protocols &= ~PROT_TCPv4;
330#endif
331
332 dnsv4_tos = -1;
333 dnsv4_fd = -1;
334
335#if ENABLE_DNS
336 if (THISNODE->protocols & PROT_DNSv4)
337 {
338 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
339
340 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
341
342 if (dnsv4_fd < 0)
343 return -1;
344
345# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
346 // this I really consider a linux bug. I am neither connected
347 // nor do I fragment myself. Linux still sets DF and doesn't
348 // fragment for me sometimes.
349 {
350 int oval = IP_PMTUDISC_DONT;
351 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
223 } 352 }
224
225 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
226 }
227#endif 353# endif
354
355 // standard daemon practise...
356 {
357 int oval = 1;
358 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
359 }
360
361 sockinfo si (THISNODE->dns_hostname,
362 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
363 PROT_DNSv4);
364
365 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
366 {
367 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
368 return -1;
369 }
370
371 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
372 ++success;
373 }
374#endif
375
376 /////////////////////////////////////////////////////////////////////////////
377
378 if (!success)
379 {
380 slog (L_ERR, _("no protocols enabled."));
381 return -1;
382 }
383
384 reconnect_all ();
385
386 /////////////////////////////////////////////////////////////////////////////
228 387
229 tap = new tap_device (); 388 tap = new tap_device ();
230 if (!tap) //D this, of course, never catches 389 if (!tap) //D this, of course, never catches
231 { 390 {
232 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 391 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
233 exit (1); 392 return -1;
234 } 393 }
235 394
236 run_script (run_script_cb (this, &vpn::script_if_up), true); 395 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
237 396
397 run_script_cb cb;
398 cb.set<vpn, &vpn::script_if_init> (this);
399
400 if (tap->if_up () &&
401 !run_script (cb, true))
402 {
403 slog (L_ERR, _("interface initialization command '%s' failed."),
404 tap->if_up ());
405 return -1;
406 }
407
408 cb.set<vpn, &vpn::script_if_up> (this);
409 if (!run_script (cb, true))
410 {
411 slog (L_ERR, _("if-up command execution failed."));
412 return -1;
413 }
414
238 tap_ev_watcher.start (tap->fd, POLLIN); 415 tap_ev_watcher.start (tap->fd, EV_READ);
239
240 reconnect_all ();
241 416
242 return 0; 417 return 0;
243} 418}
244 419
245// send a vpn packet out to other hosts
246bool 420bool
247vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) 421vpn::drop_privileges ()
248{ 422{
249 switch (si.prot) 423 if (::conf.change_root)
424 {
425 if (!strcmp (::conf.change_root, "/"))
426 {
427 char dir [L_tmpnam];
428 if (!tmpnam (dir))
429 {
430 slog (L_CRIT, _("unable to create anonymous root path."));
431 return false;
432 }
433
434 if (mkdir (dir, 0700))
435 {
436 slog (L_CRIT, _("unable to create anonymous root directory."));
437 return false;
438 }
439
440 if (chdir (dir))
441 {
442 slog (L_CRIT, _("unable to change to anonymous root directory."));
443 return false;
444 }
445
446 if (rmdir (dir))
447 slog (L_ERR, _("unable to remove anonymous root directory, continuing."));
448 }
449 else
450 {
451 if (chdir (::conf.change_root))
452 {
453 slog (L_CRIT, _("%s: unable to change to specified root directory."), ::conf.change_root);
454 return false;
455 }
456 }
457
458 if (chroot ("."))
459 {
460 slog (L_CRIT, _("unable to set new root directory."));
461 return false;
462 }
463
464 if (chdir ("/"))
465 {
466 slog (L_CRIT, _("unable to set cwd to new root directory."));
467 return false;
468 }
469 }
470
471 if (::conf.change_gid)
472 if (setgid (::conf.change_gid))
250 { 473 {
251 case PROT_IPv4: 474 slog (L_CRIT, _("unable to change group id to %d."), ::conf.change_gid);
252 return send_ipv4_packet (pkt, si, tos);
253
254 case PROT_UDPv4:
255 return send_udpv4_packet (pkt, si, tos);
256
257#if ENABLE_TCP
258 case PROT_TCPv4:
259 return send_tcpv4_packet (pkt, si, tos);
260#endif
261
262#if ENABLE_ICMP
263 case PROT_ICMPv4:
264 return send_icmpv4_packet (pkt, si, tos);
265#endif
266
267 default:
268 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
269 return false; 475 return false;
270 } 476 }
477
478 if (::conf.change_uid)
479 if (setuid (::conf.change_uid))
480 {
481 slog (L_CRIT, _("unable to change user id to %d."), ::conf.change_uid);
482 return false;
483 }
484
485 return true;
271} 486}
272 487
273bool 488bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 489vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 490{
276#if defined(SOL_IP) && defined(IP_TOS) 491 set_tos (ipv4_fd, ipv4_tos, tos);
277 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
278#endif
279 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 492 xsendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
280 493
281 return true; 494 return true;
282} 495}
283 496
284static u16 497static u16
306 519
307#if ENABLE_ICMP 520#if ENABLE_ICMP
308bool 521bool
309vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 522vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
310{ 523{
311#if defined(SOL_IP) && defined(IP_TOS)
312 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
313#endif
314
315 pkt->unshift_hdr (4); 524 pkt->unshift_hdr (4);
316 525
317 icmp_header *hdr = (icmp_header *)&((*pkt)[0]); 526 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
318 hdr->type = ::conf.icmp_type; 527 hdr->type = ::conf.icmp_type;
319 hdr->code = 255; 528 hdr->code = 255;
320 hdr->checksum = 0; 529 hdr->checksum = 0;
321 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 530 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
322 531
532 set_tos (icmpv4_fd, icmpv4_tos, tos);
323 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 533 xsendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
324 534
325 return true; 535 return true;
326} 536}
327#endif 537#endif
328 538
329bool 539bool
330vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 540vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
331{ 541{
332#if defined(SOL_IP) && defined(IP_TOS) 542 set_tos (udpv4_fd, udpv4_tos, tos);
333 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
334#endif
335 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 543 xsendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
336 544
337 return true; 545 return true;
546}
547
548void
549vpn::inject_data_packet (tap_packet *pkt, int dst)
550{
551 if (dst)
552 {
553 // unicast
554 if (dst != THISNODE->id)
555 conns[dst - 1]->inject_data_packet (pkt);
556 }
557 else
558 {
559 // broadcast, this is ugly, but due to the security policy
560 // we have to connect to all hosts...
561 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
562 if ((*c)->conf != THISNODE)
563 (*c)->inject_data_packet (pkt);
564 }
338} 565}
339 566
340void 567void
341vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 568vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
342{ 569{
343 unsigned int src = pkt->src (); 570 unsigned int src = pkt->src ();
344 unsigned int dst = pkt->dst (); 571 unsigned int dst = pkt->dst ();
345 572
346 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 573 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
347 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 574 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
348 575
349 if (src == 0 || src > conns.size () 576 if (src == 0 || src > conns.size ()
350 || dst > conns.size () 577 || dst > conns.size ()
351 || pkt->typ () >= vpn_packet::PT_MAX) 578 || pkt->typ () >= vpn_packet::PT_MAX)
352 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 579 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
353 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
354 else if (dst > conns.size ())
355 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
356 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 580 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
357 else 581 else
358 { 582 {
359 connection *c = conns[src - 1]; 583 connection *c = conns[src - 1];
360 584
361 if (dst == 0) 585 if (dst == 0)
362 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), 586 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
363 c->conf->nodename, (const char *)rsi); 587 c->conf->nodename, (const char *)rsi);
364 else if (dst != 0 && dst != THISNODE->id) 588 else if (dst != THISNODE->id)
365 { 589 {
366 if (THISNODE->routerprio) 590 if (THISNODE->routerprio)
367 // the tos setting gets lost here. who cares. 591 // the tos setting gets lost here. who cares.
368 conns[dst - 1]->inject_vpn_packet (pkt); 592 conns[dst - 1]->inject_vpn_packet (pkt);
369 else 593 else
370 slog (L_WARN, 594 slog (L_WARN,
371 _("%s(%s): forwarding request (=> %s), but we are no router"), 595 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
372 c->conf->nodename, (const char *)rsi, 596 c->conf->nodename, (const char *)rsi,
373 conns[dst - 1]->conf->nodename); 597 conns[dst - 1]->conf->nodename);
374 } 598 }
375 else 599 else
376 c->recv_vpn_packet (pkt, rsi); 600 c->recv_vpn_packet (pkt, rsi);
377 } 601 }
378} 602}
379 603
380void 604bool
605vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
606{
607 switch (si.prot)
608 {
609 case PROT_IPv4:
610 return send_ipv4_packet (pkt, si, tos);
611
612 case PROT_UDPv4:
613 return send_udpv4_packet (pkt, si, tos);
614
615#if ENABLE_TCP
616 case PROT_TCPv4:
617 return send_tcpv4_packet (pkt, si, tos);
618#endif
619#if ENABLE_ICMP
620 case PROT_ICMPv4:
621 return send_icmpv4_packet (pkt, si, tos);
622#endif
623#if ENABLE_DNS
624 case PROT_DNSv4:
625 return send_dnsv4_packet (pkt, si, tos);
626#endif
627 default:
628 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
629 }
630
631 return false;
632}
633
634inline void
381vpn::ipv4_ev (io_watcher &w, short revents) 635vpn::ipv4_ev (ev::io &w, int revents)
382{ 636{
383 if (revents & (POLLIN | POLLERR)) 637 if (revents & EV_READ)
384 { 638 {
385 vpn_packet *pkt = new vpn_packet; 639 vpn_packet *pkt = new vpn_packet;
386 struct sockaddr_in sa; 640 struct sockaddr_in sa;
387 socklen_t sa_len = sizeof (sa); 641 socklen_t sa_len = sizeof (sa);
388 int len; 642 int len;
393 647
394 if (len > 0) 648 if (len > 0)
395 { 649 {
396 pkt->len = len; 650 pkt->len = len;
397 651
398 // raw sockets deliver the ipv4, but don't expect it on sends 652 // raw sockets deliver the ipv4 header, but don't expect it on sends
399 // this is slow, but... 653 pkt->skip_hdr (pkt->ipv4_hdr_len ());
400 pkt->skip_hdr (IP_OVERHEAD);
401 654
402 recv_vpn_packet (pkt, si); 655 recv_vpn_packet (pkt, si);
403 } 656 }
404 else 657 else
405 { 658 {
406 // probably ECONNRESET or somesuch 659 // probably ECONNRESET or somesuch
407 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 660 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
408 } 661 }
409 662
410 delete pkt; 663 delete pkt;
411 } 664 }
412 else if (revents & POLLHUP)
413 {
414 // this cannot ;) happen on udp sockets
415 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
416 exit (1);
417 }
418 else 665 else
419 { 666 {
420 slog (L_ERR, 667 slog (L_ERR,
421 _("FATAL: unknown revents %08x in socket, terminating\n"), 668 _("FATAL: unknown revents %08x in socket, exiting.\n"),
422 revents); 669 revents);
423 exit (1); 670 exit (EXIT_FAILURE);
424 } 671 }
425} 672}
426 673
427#if ENABLE_ICMP 674#if ENABLE_ICMP
428void 675inline void
429vpn::icmpv4_ev (io_watcher &w, short revents) 676vpn::icmpv4_ev (ev::io &w, int revents)
430{ 677{
431 if (revents & (POLLIN | POLLERR)) 678 if (revents & EV_READ)
432 { 679 {
433 vpn_packet *pkt = new vpn_packet; 680 vpn_packet *pkt = new vpn_packet;
434 struct sockaddr_in sa; 681 struct sockaddr_in sa;
435 socklen_t sa_len = sizeof (sa); 682 socklen_t sa_len = sizeof (sa);
436 int len; 683 int len;
448 if (hdr->type == ::conf.icmp_type 695 if (hdr->type == ::conf.icmp_type
449 && hdr->code == 255) 696 && hdr->code == 255)
450 { 697 {
451 // raw sockets deliver the ipv4, but don't expect it on sends 698 // raw sockets deliver the ipv4, but don't expect it on sends
452 // this is slow, but... 699 // this is slow, but...
453 pkt->skip_hdr (ICMP_OVERHEAD); 700 pkt->skip_hdr (pkt->ipv4_hdr_len () + (ICMP_OVERHEAD - IP_OVERHEAD));
454 701
455 recv_vpn_packet (pkt, si); 702 recv_vpn_packet (pkt, si);
456 } 703 }
457 } 704 }
458 else 705 else
459 { 706 {
460 // probably ECONNRESET or somesuch 707 // probably ECONNRESET or somesuch
461 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 708 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
462 } 709 }
463 710
464 delete pkt; 711 delete pkt;
465 } 712 }
466 else if (revents & POLLHUP)
467 {
468 // this cannot ;) happen on udp sockets
469 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
470 exit (1);
471 }
472 else 713 else
473 { 714 {
474 slog (L_ERR, 715 slog (L_ERR,
475 _("FATAL: unknown revents %08x in socket, terminating\n"), 716 _("FATAL: unknown revents %08x in socket, exiting.\n"),
476 revents); 717 revents);
477 exit (1); 718 exit (EXIT_FAILURE);
478 } 719 }
479} 720}
480#endif 721#endif
481 722
482void 723inline void
483vpn::udpv4_ev (io_watcher &w, short revents) 724vpn::udpv4_ev (ev::io &w, int revents)
484{ 725{
485 if (revents & (POLLIN | POLLERR)) 726 if (revents & EV_READ)
486 { 727 {
487 vpn_packet *pkt = new vpn_packet; 728 vpn_packet *pkt = new vpn_packet;
488 struct sockaddr_in sa; 729 struct sockaddr_in sa;
489 socklen_t sa_len = sizeof (sa); 730 socklen_t sa_len = sizeof (sa);
490 int len; 731 int len;
500 recv_vpn_packet (pkt, si); 741 recv_vpn_packet (pkt, si);
501 } 742 }
502 else 743 else
503 { 744 {
504 // probably ECONNRESET or somesuch 745 // probably ECONNRESET or somesuch
505 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 746 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
506 } 747 }
507 748
508 delete pkt; 749 delete pkt;
509 } 750 }
510 else if (revents & POLLHUP)
511 {
512 // this cannot ;) happen on udp sockets
513 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
514 exit (1);
515 }
516 else 751 else
517 { 752 {
518 slog (L_ERR, 753 slog (L_ERR,
519 _("FATAL: unknown revents %08x in socket, terminating\n"), 754 _("FATAL: unknown revents %08x in socket, exiting.\n"),
520 revents); 755 revents);
521 exit (1); 756 exit (EXIT_FAILURE);
522 } 757 }
523} 758}
524 759
525void 760inline void
526vpn::tap_ev (io_watcher &w, short revents) 761vpn::tap_ev (ev::io &w, int revents)
527{ 762{
528 if (revents & POLLIN) 763 if (revents & EV_READ)
529 { 764 {
530 /* process data */ 765 /* process data */
531 tap_packet *pkt; 766 tap_packet *pkt;
532 767
533 pkt = tap->recv (); 768 pkt = tap->recv ();
534 769
770 if (!pkt)
771 return;
772
773 if (pkt->len > 14)
774 {
535 int dst = mac2id (pkt->dst); 775 int dst = mac2id (pkt->dst);
536 int src = mac2id (pkt->src); 776 int src = mac2id (pkt->src);
537 777
538 if (src != THISNODE->id) 778 if (src != THISNODE->id)
539 {
540 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
541 exit (1);
542 }
543
544 if (dst == THISNODE->id)
545 {
546 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
547 exit (1);
548 }
549
550 if (dst > conns.size ())
551 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
552 else
553 {
554 if (dst)
555 { 779 {
556 // unicast 780 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
557 if (dst != THISNODE->id) 781 exit (EXIT_FAILURE);
558 conns[dst - 1]->inject_data_packet (pkt);
559 } 782 }
783
784 if (dst == THISNODE->id)
785 {
786 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
787 exit (EXIT_FAILURE);
788 }
789
790 if (dst > conns.size ())
791 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
560 else 792 else
561 {
562 // broadcast, this is ugly, but due to the security policy
563 // we have to connect to all hosts...
564 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
565 if ((*c)->conf != THISNODE)
566 (*c)->inject_data_packet (pkt); 793 inject_data_packet (pkt, dst);
567 }
568 } 794 }
569 795
570 delete pkt; 796 delete pkt;
571 }
572 else if (revents & (POLLHUP | POLLERR))
573 {
574 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
575 exit (1);
576 } 797 }
577 else 798 else
578 abort (); 799 abort ();
579} 800}
580 801
581void 802inline void
582vpn::event_cb (time_watcher &w) 803vpn::event_cb (ev::timer &w, int)
583{ 804{
584 if (events) 805 if (events)
585 { 806 {
586 if (events & EVENT_SHUTDOWN) 807 if (events & EVENT_SHUTDOWN)
587 { 808 {
588 slog (L_INFO, _("preparing shutdown...")); 809 slog (L_INFO, _("preparing shutdown..."));
589 810
590 shutdown_all (); 811 shutdown_all ();
591
592 remove_pid (pidfilename); 812 remove_pid (conf.pidfilename);
593
594 slog (L_INFO, _("terminating")); 813 slog (L_INFO, _("exiting."));
595 814 exit (EXIT_SUCCESS);
596 exit (0);
597 } 815 }
598 816
599 if (events & EVENT_RECONNECT) 817 if (events & EVENT_RECONNECT)
600 { 818 {
601 slog (L_INFO, _("forced reconnect")); 819 slog (L_INFO, _("forced reconnect."));
602 820
603 reconnect_all (); 821 reconnect_all ();
604 } 822 }
605 823
606 events = 0; 824 events = 0;
607 } 825 }
608
609 w.at = TSTAMP_CANCEL;
610} 826}
611 827
612void 828void
613vpn::shutdown_all () 829vpn::shutdown_all ()
614{ 830{
624 840
625 conns.clear (); 841 conns.clear ();
626 842
627 connection_init (); 843 connection_init ();
628 844
629 for (configuration::node_vector::iterator i = conf.nodes.begin (); 845 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
630 i != conf.nodes.end (); ++i) 846 conns.push_back (new connection (this, *i));
631 {
632 connection *conn = new connection (this);
633 847
634 conn->conf = *i; 848 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
635 conns.push_back (conn);
636
637 conn->establish_connection (); 849 (*c)->establish_connection ();
638 }
639} 850}
640 851
641connection *vpn::find_router () 852bool
853vpn::can_direct (conf_node *src, conf_node *dst) const
642{ 854{
643 u32 prio = 1; 855 return src != dst
856 && src->may_direct (dst)
857 && dst->may_direct (src)
858 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
859 || (src->protocols & dst->connectable_protocols ()));
860}
861
862// only works for indirect and routed connections: find a router
863// from THISNODE to dst
864connection *
865vpn::find_router_for (const connection *dst)
866{
644 connection *router = 0; 867 connection *router = 0;
645 868
869 // first try to find a router with a direct connection, route there
870 // regardless of any other considerations.
871 {
872 u32 prio = 1;
873
874 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
875 {
876 connection *c = *i;
877
878 if (c->conf->routerprio > prio
879 && c->conf != THISNODE
880 && can_direct (c->conf, dst->conf)
881 && c->ictx && c->octx)
882 {
883 prio = c->conf->routerprio;
884 router = c;
885 }
886 }
887 }
888
889 if (router)
890 return router;
891
892 // second try find the router with the highest priority, higher than ours
893 {
894 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
895
896 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
897 {
898 connection *c = *i;
899
900 if (c->conf->routerprio > prio
901 && c != dst
902 && c->conf != THISNODE
903 && c->ictx && c->octx)
904 {
905 prio = c->conf->routerprio;
906 router = c;
907 }
908 }
909 }
910
911 return router;
912}
913
914void
915vpn::connection_established (connection *c)
916{
646 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 917 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
647 { 918 {
648 connection *c = *i; 919 connection *o = *i;
649 920
650 if (c->conf->routerprio > prio 921 if (o->si.valid ()
651 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use 922 && c->si != o->si
652 && c->ictx && c->octx 923 && c == find_router_for (o)
653 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode 924 && !can_direct (THISNODE, o->conf))
654 {
655 prio = c->conf->routerprio;
656 router = c;
657 } 925 {
926 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
927 o->conf->nodename, c->conf->nodename);
928 o->rekey ();
929 }
658 } 930 }
659
660 return router;
661} 931}
662 932
933void
663void vpn::send_connect_request (int id) 934vpn::send_connect_request (connection *c)
664{ 935{
665 connection *c = find_router (); 936 connection *r = find_router_for (c);
666 937
667 if (c) 938 if (r)
939 {
940 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
941 c->conf->nodename, r->conf->nodename);
668 c->send_connect_request (id); 942 r->send_connect_request (c->conf->id);
943 }
669 else 944 else
670 // no router found, aggressively connect to all routers 945 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
671 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 946 c->conf->nodename);
672 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
673 (*i)->establish_connection ();
674} 947}
675 948
676void 949void
677connection::dump_status () 950connection::dump_status ()
678{ 951{
679 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 952 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
680 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 953 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
681 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 954 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
682 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 955 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
683 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 956 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
684 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
685 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
686} 957}
687 958
688void 959void
689vpn::dump_status () 960vpn::dump_status ()
690{ 961{
691 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 962 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
692 963
693 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 964 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
694 (*c)->dump_status (); 965 (*c)->dump_status ();
695 966
696 slog (L_NOTICE, _("END status dump")); 967 slog (L_NOTICE, _("END status dump"));
697} 968}
698 969
699vpn::vpn (void) 970vpn::vpn (void)
971{
700: event (this, &vpn::event_cb) 972 event .set<vpn, &vpn::event_cb > (this);
701, udpv4_ev_watcher (this, &vpn::udpv4_ev) 973 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
702, ipv4_ev_watcher (this, &vpn::ipv4_ev) 974 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
703#if ENABLE_TCP 975#if ENABLE_TCP
704, tcpv4_ev_watcher (this, &vpn::tcpv4_ev) 976 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
705#endif 977#endif
706#if ENABLE_ICMP 978#if ENABLE_ICMP
707, icmpv4_ev_watcher(this, &vpn::icmpv4_ev) 979 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
708#endif 980#endif
709, tap_ev_watcher (this, &vpn::tap_ev) 981#if ENABLE_DNS
710{ 982 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
983#endif
984 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
711} 985}
712 986
713vpn::~vpn () 987vpn::~vpn ()
714{ 988{
715} 989}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines