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.4 by pcg, Fri Apr 4 05:26:45 2003 UTC vs.
Revision 1.56 by root, Tue Feb 8 23:11:36 2011 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 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>
31#include <netinet/in.h>
32#include <arpa/inet.h>
33#include <errno.h> 43#include <errno.h>
34#include <time.h> 44#include <time.h>
35#include <unistd.h> 45#include <unistd.h>
46#include <fcntl.h>
47#include <sys/socket.h>
48
49#include "netcompat.h"
36 50
37#include "pidfile.h" 51#include "pidfile.h"
38 52
39#include "connection.h" 53#include "connection.h"
40#include "util.h" 54#include "util.h"
41#include "vpn.h" 55#include "vpn.h"
42 56
43#if ENABLE_TCP 57vpn network; // THE vpn (bad design...)
44# include <map>
45# include <unistd.h>
46# include <fcntl.h>
47# include <sys/poll.h>
48#endif
49 58
50///////////////////////////////////////////////////////////////////////////// 59/////////////////////////////////////////////////////////////////////////////
51 60
52const char *vpn::script_if_up () 61static void inline
62set_tos (int fd, int &tos_prev, int tos)
63{
64#if defined(SOL_IP) && defined(IP_TOS)
65 if (tos_prev == tos)
66 return;
67
68 tos_prev = tos;
69 setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos);
70#endif
71}
72
73void
74vpn::script_init_env ()
53{ 75{
54 // the tunnel device mtu should be the physical mtu - overhead 76 // the tunnel device mtu should be the physical mtu - overhead
55 // the tricky part is rounding to the cipher key blocksize 77 // the tricky part is rounding to the cipher key blocksize
56 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD; 78 int mtu = conf.mtu - ETH_OVERHEAD - VPE_OVERHEAD - MAX_OVERHEAD;
57 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion 79 mtu += ETH_OVERHEAD - 6 - 6; // now we have the data portion
58 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round 80 mtu -= mtu % EVP_CIPHER_block_size (CIPHER); // round
59 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again 81 mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again
60 82
61 char *env; 83 char *env;
62 asprintf (&env, "CONFBASE=%s", confbase); 84 asprintf (&env, "CONFBASE=%s", confbase); putenv (env);
63 putenv (env);
64 asprintf (&env, "NODENAME=%s", THISNODE->nodename);
65 putenv (env);
66 asprintf (&env, "NODEID=%d", THISNODE->id);
67 putenv (env);
68 asprintf (&env, "IFNAME=%s", tap->interface ()); 85 asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env);
69 putenv (env); 86 asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env);
87 asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env);
70 asprintf (&env, "MTU=%d", mtu); 88 asprintf (&env, "MTU=%d", mtu); putenv (env);
71 putenv (env); 89 asprintf (&env, "NODES=%d", conns.size ()); putenv (env);
72 asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 90 asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env);
73 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8,
74 THISNODE->id & 0xff);
75 putenv (env);
76 91
92 conns [THISNODE->id - 1]->script_init_env ("");
93
94 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
95 {
96 char ext[16];
97 snprintf (ext, 16, "_%d", (*c)->conf->id);
98 (*c)->script_init_env (ext);
99 }
100}
101
102inline const char *
103vpn::script_if_init ()
104{
105 script_init_env ();
106
107 return tap->if_up ();
108}
109
110inline const char *
111vpn::script_if_up ()
112{
113 script_init_env ();
114
115 char *filename;
116 asprintf (&filename,
117 "%s/%s",
118 confbase,
77 return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; 119 ::conf.script_if_up ? ::conf.script_if_up : "if-up");
120
121 return filename;
122}
123
124int
125vpn::setup_socket (u8 prot, int family, int type, int proto)
126{
127 int fd = socket (family, type, proto);
128
129 if (fd < 0)
130 {
131 slog (L_ERR, _("unable to create %s socket: %s."), strprotocol (prot), strerror (errno));
132 return fd;
133 }
134
135 fcntl (fd, F_SETFL, O_NONBLOCK);
136 fcntl (fd, F_SETFD, FD_CLOEXEC);
137
138#ifdef SO_MARK
139 if (::conf.nfmark)
140 if (setsockopt (fd, SOL_SOCKET, SO_MARK, &::conf.nfmark, sizeof ::conf.nfmark))
141 slog (L_WARN, _("unable to set nfmark on %s socket: %s"), strprotocol (prot), strerror (errno));
142#endif
143
144 return fd;
78} 145}
79 146
80int 147int
81vpn::setup () 148vpn::setup ()
82{ 149{
150 int success = 0;
151
152 ipv4_tos = -1;
153 ipv4_fd = -1;
154
155 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
156 {
157 ipv4_fd = setup_socket (PROT_IPv4, PF_INET, SOCK_RAW, ::conf.ip_proto);
158
159 if (ipv4_fd < 0)
160 return -1;
161
162#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
163 // this I really consider a linux bug. I am neither connected
164 // nor do I fragment myself. Linux still sets DF and doesn't
165 // fragment for me sometimes.
166 {
167 int oval = IP_PMTUDISC_DONT;
168 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
169 }
170#endif
171
172 sockinfo si (THISNODE, PROT_IPv4);
173
174 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
175 {
176 slog (L_ERR, _("can't bind ipv4 socket on %s: %s, exiting."), (const char *)si, strerror (errno));
177 return -1;
178 }
179
180 ipv4_ev_watcher.start (ipv4_fd, EV_READ);
181 ++success;
182 }
183 else
184 THISNODE->protocols &= ~PROT_IPv4;
185
186 udpv4_tos = -1;
83 udpv4_fd = -1; 187 udpv4_fd = -1;
84 188
85 if (THISNODE->protocols & PROT_UDPv4) 189 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
86 { 190 {
87 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 191 udpv4_fd = setup_socket (PROT_UDPv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
88 192
89 if (udpv4_fd < 0) 193 if (udpv4_fd < 0)
90 return -1; 194 return -1;
91 195
92 // standard daemon practise... 196 // standard daemon practise...
93 { 197 {
94 int oval = 1; 198 int oval = 1;
95 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 199 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
96 } 200 }
97 201
98 sockinfo si (THISNODE, PROT_UDPv4); 202#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
99
100 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
101 {
102 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
103 exit (1);
104 }
105
106#ifdef IP_MTU_DISCOVER
107 // this I really consider a linux bug. I am neither connected 203 // this I really consider a linux bug. I am neither connected
108 // nor do I fragment myself. Linux still sets DF and doesn't 204 // nor do I fragment myself. Linux still sets DF and doesn't
109 // fragment for me sometimes. 205 // fragment for me sometimes.
110 { 206 {
111 int oval = IP_PMTUDISC_DONT; 207 int oval = IP_PMTUDISC_DONT;
112 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 208 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
113 } 209 }
114#endif 210#endif
115 211
212 sockinfo si (THISNODE, PROT_UDPv4);
213
214 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
215 {
216 slog (L_ERR, _("can't bind udpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
217 return -1;
218 }
219
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 220 udpv4_ev_watcher.start (udpv4_fd, EV_READ);
221 ++success;
117 } 222 }
223 else
224 THISNODE->protocols &= ~PROT_UDPv4;
118 225
226 icmpv4_tos = -1;
119 ipv4_fd = -1; 227 icmpv4_fd = -1;
228
229#if ENABLE_ICMP
120 if (THISNODE->protocols & PROT_IPv4) 230 if (THISNODE->protocols & PROT_ICMPv4)
121 { 231 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 232 icmpv4_fd = setup_socket (PROT_ICMPv4, PF_INET, SOCK_RAW, IPPROTO_ICMP);
123 233
124 if (ipv4_fd < 0) 234 if (icmpv4_fd < 0)
125 return -1; 235 return -1;
126 236
127 sockinfo si (THISNODE, PROT_IPv4); 237#ifdef ICMP_FILTER
128
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
130 { 238 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 239 icmp_filter oval;
132 exit (1); 240 oval.data = 0xffffffff;
241 if (::conf.icmp_type < 32)
242 oval.data &= ~(1 << ::conf.icmp_type);
243
244 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
133 } 245 }
246#endif
134 247
135#ifdef IP_MTU_DISCOVER 248#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
136 // this I really consider a linux bug. I am neither connected 249 // this I really consider a linux bug. I am neither connected
137 // nor do I fragment myself. Linux still sets DF and doesn't 250 // nor do I fragment myself. Linux still sets DF and doesn't
138 // fragment for me sometimes. 251 // fragment for me sometimes.
139 { 252 {
140 int oval = IP_PMTUDISC_DONT; 253 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 254 setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
142 } 255 }
143#endif 256#endif
144 257
258 sockinfo si (THISNODE, PROT_ICMPv4);
259
260 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
261 {
262 slog (L_ERR, _("can't bind icmpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
263 return -1;
264 }
265
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 266 icmpv4_ev_watcher.start (icmpv4_fd, EV_READ);
267 ++success;
146 } 268 }
269#endif
270
271 tcpv4_fd = -1;
147 272
148#if ENABLE_TCP 273#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 274 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 275 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 276 tcpv4_fd = setup_socket (PROT_TCPv4, PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 277
153 if (tcpv4_fd < 0) 278 if (tcpv4_fd < 0)
154 return -1; 279 return -1;
155 280
156 // standard daemon practise... 281 // standard daemon practise...
161 286
162 sockinfo si (THISNODE, PROT_TCPv4); 287 sockinfo si (THISNODE, PROT_TCPv4);
163 288
164 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) 289 if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ()))
165 { 290 {
166 slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 291 slog (L_ERR, _("can't bind tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
167 exit (1); 292 return -1;
168 } 293 }
169 294
170 if (listen (tcpv4_fd, 5)) 295 if (listen (tcpv4_fd, 5))
171 { 296 {
172 slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); 297 slog (L_ERR, _("can't listen tcpv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
173 exit (1); 298 return -1;
299 }
300
301 tcpv4_ev_watcher.start (tcpv4_fd, EV_READ);
302 ++success;
303 }
304 else
305 THISNODE->protocols &= ~PROT_TCPv4;
306#endif
307
308 dnsv4_tos = -1;
309 dnsv4_fd = -1;
310
311#if ENABLE_DNS
312 if (THISNODE->protocols & PROT_DNSv4)
313 {
314 dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4);
315
316 dnsv4_fd = setup_socket (PROT_DNSv4, PF_INET, SOCK_DGRAM, IPPROTO_UDP);
317
318 if (dnsv4_fd < 0)
319 return -1;
320
321# if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
322 // this I really consider a linux bug. I am neither connected
323 // nor do I fragment myself. Linux still sets DF and doesn't
324 // fragment for me sometimes.
325 {
326 int oval = IP_PMTUDISC_DONT;
327 setsockopt (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
174 } 328 }
175
176 tcpv4_ev_watcher.start (tcpv4_fd, POLLIN);
177 }
178#endif 329# endif
330
331 // standard daemon practise...
332 {
333 int oval = 1;
334 setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
335 }
336
337 sockinfo si (THISNODE->dns_hostname,
338 THISNODE->dns_hostname ? THISNODE->dns_port : 0,
339 PROT_DNSv4);
340
341 if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ()))
342 {
343 slog (L_ERR, _("can't bind dnsv4 on %s: %s, exiting."), (const char *)si, strerror (errno));
344 return -1;
345 }
346
347 dnsv4_ev_watcher.start (dnsv4_fd, EV_READ);
348 ++success;
349 }
350#endif
351
352 /////////////////////////////////////////////////////////////////////////////
353
354 if (!success)
355 {
356 slog (L_ERR, _("no protocols enabled."));
357 return -1;
358 }
359
360 reconnect_all ();
361
362 /////////////////////////////////////////////////////////////////////////////
179 363
180 tap = new tap_device (); 364 tap = new tap_device ();
181 if (!tap) //D this, of course, never catches 365 if (!tap) //D this, of course, never catches
182 { 366 {
183 slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); 367 slog (L_ERR, _("cannot create network interface '%s'."), conf.ifname);
184 exit (1); 368 return -1;
185 } 369 }
186 370
187 run_script (run_script_cb (this, &vpn::script_if_up), true); 371 fcntl (tap->fd, F_SETFD, FD_CLOEXEC);
188 372
373 run_script_cb cb;
374 cb.set<vpn, &vpn::script_if_init> (this);
375
376 if (tap->if_up () &&
377 !run_script (cb, true))
378 {
379 slog (L_ERR, _("interface initialization command '%s' failed."),
380 tap->if_up ());
381 return -1;
382 }
383
384 cb.set<vpn, &vpn::script_if_up> (this);
385 if (!run_script (cb, true))
386 {
387 slog (L_ERR, _("if-up command execution failed."));
388 return -1;
389 }
390
189 tap_ev_watcher.start (tap->fd, POLLIN); 391 tap_ev_watcher.start (tap->fd, EV_READ);
190
191 reconnect_all ();
192 392
193 return 0; 393 return 0;
194} 394}
195 395
396bool
397vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
398{
399 set_tos (ipv4_fd, ipv4_tos, tos);
400 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
401
402 return true;
403}
404
405static u16
406ipv4_checksum (u16 *data, unsigned int len)
407{
408 // use 32 bit accumulator and fold back carry bits at the end
409 u32 sum = 0;
410
411 while (len > 1)
412 {
413 sum += *data++;
414 len -= 2;
415 }
416
417 // odd byte left?
418 if (len)
419 sum += *(u8 *)data;
420
421 // add back carry bits
422 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
423 sum += (sum >> 16); // carry
424
425 return ~sum;
426}
427
428#if ENABLE_ICMP
429bool
430vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
431{
432 pkt->unshift_hdr (4);
433
434 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
435 hdr->type = ::conf.icmp_type;
436 hdr->code = 255;
437 hdr->checksum = 0;
438 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
439
440 set_tos (icmpv4_fd, icmpv4_tos, tos);
441 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
442
443 return true;
444}
445#endif
446
447bool
448vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
449{
450 set_tos (udpv4_fd, udpv4_tos, tos);
451 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
452
453 return true;
454}
455
196void 456void
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 457vpn::inject_data_packet (tap_packet *pkt, int dst)
198{ 458{
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 459 if (dst)
200 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 460 {
201} 461 // unicast
202 462 if (dst != THISNODE->id)
203void 463 conns[dst - 1]->inject_data_packet (pkt);
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 464 }
205{ 465 else
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 466 {
207 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 467 // broadcast, this is ugly, but due to the security policy
468 // we have to connect to all hosts...
469 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
470 if ((*c)->conf != THISNODE)
471 (*c)->inject_data_packet (pkt);
472 }
208} 473}
209 474
210void 475void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 476vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 477{
213 unsigned int src = pkt->src (); 478 unsigned int src = pkt->src ();
214 unsigned int dst = pkt->dst (); 479 unsigned int dst = pkt->dst ();
215 480
216 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d"), 481 slog (L_NOISE, _("<<?/%s received possible vpn packet type %d from %d to %d, length %d."),
217 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len); 482 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst (), pkt->len);
218 483
219 if (src == 0 || src > conns.size () 484 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 485 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 486 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 487 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
488 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
489 else if (dst > conns.size ())
490 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)."),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 491 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 492 else
225 { 493 {
226 connection *c = conns[src - 1]; 494 connection *c = conns[src - 1];
227 495
228 if (dst == 0 && !THISNODE->routerprio) 496 if (dst == 0)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 497 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)."),
230 c->conf->nodename, (const char *)rsi); 498 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 499 else if (dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 500 {
501 if (THISNODE->routerprio)
502 // the tos setting gets lost here. who cares.
503 conns[dst - 1]->inject_vpn_packet (pkt);
504 else
233 slog (L_WARN, 505 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 506 _("%s(%s): request to forward packet to %s, but we are no router (config mismatch?)."),
507 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 508 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 509 }
237 THISNODE->id, THISNODE->nodename);
238 else 510 else
239 c->recv_vpn_packet (pkt, rsi); 511 c->recv_vpn_packet (pkt, rsi);
240 } 512 }
241} 513}
242 514
243void 515bool
244vpn::udpv4_ev (io_watcher &w, short revents) 516vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
245{ 517{
246 if (revents & (POLLIN | POLLERR)) 518 switch (si.prot)
519 {
520 case PROT_IPv4:
521 return send_ipv4_packet (pkt, si, tos);
522
523 case PROT_UDPv4:
524 return send_udpv4_packet (pkt, si, tos);
525
526#if ENABLE_TCP
527 case PROT_TCPv4:
528 return send_tcpv4_packet (pkt, si, tos);
529#endif
530#if ENABLE_ICMP
531 case PROT_ICMPv4:
532 return send_icmpv4_packet (pkt, si, tos);
533#endif
534#if ENABLE_DNS
535 case PROT_DNSv4:
536 return send_dnsv4_packet (pkt, si, tos);
537#endif
538 default:
539 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol."), (const char *)si);
540 }
541
542 return false;
543}
544
545inline void
546vpn::ipv4_ev (ev::io &w, int revents)
547{
548 if (revents & EV_READ)
247 { 549 {
248 vpn_packet *pkt = new vpn_packet; 550 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 551 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 552 socklen_t sa_len = sizeof (sa);
251 int len; 553 int len;
252 554
253 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 555 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 556
255 sockinfo si(sa); 557 sockinfo si(sa, PROT_IPv4);
256 558
257 if (len > 0) 559 if (len > 0)
258 { 560 {
259 pkt->len = len; 561 pkt->len = len;
260 562
563 // raw sockets deliver the ipv4 header, but don't expect it on sends
564 pkt->skip_hdr (IP_OVERHEAD);
565
261 recv_vpn_packet (pkt, si); 566 recv_vpn_packet (pkt, si);
262 } 567 }
263 else 568 else
264 { 569 {
265 // probably ECONNRESET or somesuch 570 // probably ECONNRESET or somesuch
266 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 571 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
267 } 572 }
268 573
269 delete pkt; 574 delete pkt;
270 } 575 }
271 else if (revents & POLLHUP)
272 {
273 // this cannot ;) happen on udp sockets
274 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
275 exit (1);
276 }
277 else 576 else
278 { 577 {
279 slog (L_ERR, 578 slog (L_ERR,
280 _("FATAL: unknown revents %08x in socket, terminating\n"), 579 _("FATAL: unknown revents %08x in socket, exiting.\n"),
281 revents); 580 revents);
282 exit (1); 581 exit (EXIT_FAILURE);
283 } 582 }
284} 583}
285 584
286void 585#if ENABLE_ICMP
586inline void
287vpn::ipv4_ev (io_watcher &w, short revents) 587vpn::icmpv4_ev (ev::io &w, int revents)
288{ 588{
289 if (revents & (POLLIN | POLLERR)) 589 if (revents & EV_READ)
290 { 590 {
291 vpn_packet *pkt = new vpn_packet; 591 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 592 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 593 socklen_t sa_len = sizeof (sa);
294 int len; 594 int len;
295 595
296 len = recvfrom (w.p->fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 596 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 597
298 sockinfo si(sa, PROT_IPv4); 598 sockinfo si(sa, PROT_ICMPv4);
299 599
300 if (len > 0) 600 if (len > 0)
301 { 601 {
302 pkt->len = len; 602 pkt->len = len;
303 603
604 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
605
606 if (hdr->type == ::conf.icmp_type
607 && hdr->code == 255)
608 {
304 // raw sockets deliver the ipv4, but don't expect it on sends 609 // raw sockets deliver the ipv4, but don't expect it on sends
305 // this is slow, but... 610 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 611 pkt->skip_hdr (ICMP_OVERHEAD);
307 612
308 recv_vpn_packet (pkt, si); 613 recv_vpn_packet (pkt, si);
614 }
309 } 615 }
310 else 616 else
311 { 617 {
312 // probably ECONNRESET or somesuch 618 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 619 slog (L_DEBUG, _("%s: %s."), (const char *)si, strerror (errno));
314 } 620 }
315 621
316 delete pkt; 622 delete pkt;
317 } 623 }
318 else if (revents & POLLHUP)
319 {
320 // this cannot ;) happen on udp sockets
321 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
322 exit (1);
323 }
324 else 624 else
325 { 625 {
326 slog (L_ERR, 626 slog (L_ERR,
327 _("FATAL: unknown revents %08x in socket, terminating\n"), 627 _("FATAL: unknown revents %08x in socket, exiting.\n"),
328 revents); 628 revents);
329 exit (1); 629 exit (EXIT_FAILURE);
330 }
331}
332
333#if ENABLE_TCP
334
335struct tcp_connection;
336
337struct lt_sockinfo
338{
339 bool operator()(const sockinfo *a, const sockinfo *b) const
340 {
341 return *a < *b;
342 }
343};
344
345struct tcp_si_map : public map<const sockinfo *, tcp_connection *, lt_sockinfo> {
346 void cleaner_cb (time_watcher &w); time_watcher cleaner;
347
348 tcp_si_map ()
349 : cleaner(this, &tcp_si_map::cleaner_cb)
350 {
351 cleaner.start (0);
352 }
353} tcp_si;
354
355struct tcp_connection : io_watcher {
356 tstamp last_activity;
357 const sockinfo si;
358 vpn &v;
359 bool ok;
360
361 vpn_packet *r_pkt;
362 u32 r_len, r_ofs;
363
364 void tcpv4_ev (io_watcher &w, short revents);
365
366 operator tcp_si_map::value_type()
367 {
368 return tcp_si_map::value_type (&si, this);
369 }
370
371 tcp_connection (int fd, const sockinfo &si_, vpn &v_)
372 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev)
373 {
374 last_activity = NOW;
375 ok = false;
376 r_pkt = 0;
377 start (fd, POLLOUT);
378 }
379
380 ~tcp_connection () { if (p) close (p->fd); }
381};
382
383void tcp_si_map::cleaner_cb (time_watcher &w)
384{
385 w.at = NOW + 600;
386 tstamp to = NOW - ::conf.keepalive - 30;
387
388 for (iterator i = begin (); i != end(); )
389 if (i->second->last_activity >= to)
390 ++i;
391 else
392 {
393 erase (i);
394 i = begin ();
395 } 630 }
396} 631}
632#endif
397 633
398void 634inline void
399vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 635vpn::udpv4_ev (ev::io &w, int revents)
400{ 636{
401 tcp_si_map::iterator info = tcp_si.find (&si); 637 if (revents & EV_READ)
402
403 if (info == tcp_si.end ())
404 {
405 // woaw, the first lost packet ;)
406 int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
407
408 if (fd >= 0)
409 {
410 fcntl (fd, F_SETFL, O_NONBLOCK);
411
412 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
413 || errno == EINPROGRESS)
414 {
415 tcp_connection *i = new tcp_connection (fd, si, *this);
416
417 tcp_si.insert (*i);
418 }
419 else
420 close (fd);
421 }
422 } 638 {
423 else
424 {
425 tcp_connection *i = info->second;
426
427 i->last_activity = NOW;
428
429 if (i->ok)
430 {
431 setsockopt (i->p->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
432
433 // we use none of the advantages of tcp
434 write (i->p->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32);
435 }
436 }
437
438#if 0
439 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
440 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
441#endif
442}
443
444void
445tcp_connection::tcpv4_ev (io_watcher &w, short revents)
446{
447 last_activity = NOW;
448
449 if (!ok) // just established?
450 {
451 ok = true;
452 set (POLLIN);
453 }
454
455 if (revents & (POLLIN | POLLERR))
456 {
457 u32 len;
458
459 if (sizeof (len) == read (p->fd, &len, sizeof (len)))
460 {
461 vpn_packet *pkt = new vpn_packet; 639 vpn_packet *pkt = new vpn_packet;
462
463 if (len == read (p->fd, &((*pkt)[0]), len))
464 {
465 pkt->len = len;
466
467 v.recv_vpn_packet (pkt, si);
468 return;
469 }
470
471 delete pkt;
472 }
473
474 tcp_si.erase (&si);
475
476 set (0);//D
477 }
478}
479
480void
481vpn::tcpv4_ev (io_watcher &w, short revents)
482{
483 if (revents & (POLLIN | POLLERR))
484 {
485 struct sockaddr_in sa; 640 struct sockaddr_in sa;
486 socklen_t sa_len = sizeof (sa); 641 socklen_t sa_len = sizeof (sa);
487 int len; 642 int len;
488 643
489 int fd = accept (w.p->fd, (sockaddr *)&sa, &sa_len); 644 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
490 645
491 if (fd >= 0)
492 {
493 fcntl (fd, F_SETFL, O_NONBLOCK);
494
495 sockinfo si(sa, PROT_TCPv4); 646 sockinfo si(sa, PROT_UDPv4);
496 tcp_connection *i = new tcp_connection (fd, si, *this);
497 647
498 slog (L_DEBUG, _("accepted tcp connection from %s\n"), (const char *)si);//D 648 if (len > 0)
499
500 tcp_si.insert (*i);
501 } 649 {
650 pkt->len = len;
651
652 recv_vpn_packet (pkt, si);
653 }
654 else
655 {
656 // probably ECONNRESET or somesuch
657 slog (L_DEBUG, _("%s: fd %d, %s."), (const char *)si, w.fd, strerror (errno));
658 }
659
660 delete pkt;
661 }
662 else
502 } 663 {
664 slog (L_ERR,
665 _("FATAL: unknown revents %08x in socket, exiting.\n"),
666 revents);
667 exit (EXIT_FAILURE);
668 }
503} 669}
504 670
505#endif 671inline void
506
507void
508vpn::tap_ev (io_watcher &w, short revents) 672vpn::tap_ev (ev::io &w, int revents)
509{ 673{
510 if (revents & POLLIN) 674 if (revents & EV_READ)
511 { 675 {
512 /* process data */ 676 /* process data */
513 tap_packet *pkt; 677 tap_packet *pkt;
514 678
515 pkt = tap->recv (); 679 pkt = tap->recv ();
516 680
681 if (!pkt)
682 return;
683
684 if (pkt->len > 14)
685 {
517 int dst = mac2id (pkt->dst); 686 int dst = mac2id (pkt->dst);
518 int src = mac2id (pkt->src); 687 int src = mac2id (pkt->src);
519 688
520 if (src != THISNODE->id) 689 if (src != THISNODE->id)
521 {
522 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
523 exit (1);
524 }
525
526 if (dst == THISNODE->id)
527 {
528 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
529 exit (1);
530 }
531
532 if (dst > conns.size ())
533 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
534 else
535 {
536 if (dst)
537 { 690 {
538 // unicast 691 slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting."));
539 if (dst != THISNODE->id) 692 exit (EXIT_FAILURE);
540 conns[dst - 1]->inject_data_packet (pkt);
541 } 693 }
694
695 if (dst == THISNODE->id)
696 {
697 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
698 exit (EXIT_FAILURE);
699 }
700
701 if (dst > conns.size ())
702 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
542 else 703 else
543 {
544 // broadcast, first check router, then self, then english
545 connection *router = find_router ();
546
547 if (router)
548 router->inject_data_packet (pkt, true); 704 inject_data_packet (pkt, dst);
549 else
550 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
551 if ((*c)->conf != THISNODE)
552 (*c)->inject_data_packet (pkt);
553 }
554 } 705 }
555 706
556 delete pkt; 707 delete pkt;
557 }
558 else if (revents & (POLLHUP | POLLERR))
559 {
560 slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating."));
561 exit (1);
562 } 708 }
563 else 709 else
564 abort (); 710 abort ();
565} 711}
566 712
567void 713inline void
568vpn::event_cb (time_watcher &w) 714vpn::event_cb (ev::timer &w, int)
569{ 715{
570 if (events) 716 if (events)
571 { 717 {
572 if (events & EVENT_SHUTDOWN) 718 if (events & EVENT_SHUTDOWN)
573 { 719 {
574 slog (L_INFO, _("preparing shutdown...")); 720 slog (L_INFO, _("preparing shutdown..."));
575 721
576 shutdown_all (); 722 shutdown_all ();
577
578 remove_pid (pidfilename); 723 remove_pid (conf.pidfilename);
579
580 slog (L_INFO, _("terminating")); 724 slog (L_INFO, _("exiting."));
581 725 exit (EXIT_SUCCESS);
582 exit (0);
583 } 726 }
584 727
585 if (events & EVENT_RECONNECT) 728 if (events & EVENT_RECONNECT)
586 { 729 {
587 slog (L_INFO, _("forced reconnect")); 730 slog (L_INFO, _("forced reconnect."));
588 731
589 reconnect_all (); 732 reconnect_all ();
590 } 733 }
591 734
592 events = 0; 735 events = 0;
593 } 736 }
594
595 w.at = TSTAMP_CANCEL;
596} 737}
597 738
598void 739void
599vpn::shutdown_all () 740vpn::shutdown_all ()
600{ 741{
610 751
611 conns.clear (); 752 conns.clear ();
612 753
613 connection_init (); 754 connection_init ();
614 755
615 for (configuration::node_vector::iterator i = conf.nodes.begin (); 756 for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i)
616 i != conf.nodes.end (); ++i) 757 conns.push_back (new connection (this, *i));
617 {
618 connection *conn = new connection (this);
619 758
620 conn->conf = *i; 759 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
621 conns.push_back (conn);
622
623 conn->establish_connection (); 760 (*c)->establish_connection ();
624 }
625} 761}
626 762
627connection *vpn::find_router () 763bool
764vpn::can_direct (conf_node *src, conf_node *dst) const
628{ 765{
629 u32 prio = 0; 766 return src != dst
767 && src->may_direct (dst)
768 && dst->may_direct (src)
769 && (((src->protocols & dst->protocols) && src->connectmode == conf_node::C_ALWAYS)
770 || (src->protocols & dst->connectable_protocols ()));
771}
772
773// only works for indirect and routed connections: find a router
774// from THISNODE to dst
775connection *
776vpn::find_router_for (const connection *dst)
777{
630 connection *router = 0; 778 connection *router = 0;
631 779
780 // first try to find a router with a direct connection, route there
781 // regardless of any other considerations.
782 {
783 u32 prio = 1;
784
785 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
786 {
787 connection *c = *i;
788
789 if (c->conf->routerprio > prio
790 && c->conf != THISNODE
791 && can_direct (c->conf, dst->conf)
792 && c->ictx && c->octx)
793 {
794 prio = c->conf->routerprio;
795 router = c;
796 }
797 }
798 }
799
800 if (router)
801 return router;
802
803 // second try find the router with the highest priority, higher than ours
804 {
805 u32 prio = THISNODE->routerprio ? THISNODE->routerprio : 1;
806
807 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
808 {
809 connection *c = *i;
810
811 if (c->conf->routerprio > prio
812 && c != dst
813 && c->conf != THISNODE
814 && c->ictx && c->octx)
815 {
816 prio = c->conf->routerprio;
817 router = c;
818 }
819 }
820 }
821
822 return router;
823}
824
825void
826vpn::connection_established (connection *c)
827{
632 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 828 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
633 { 829 {
634 connection *c = *i; 830 connection *o = *i;
635 831
636 if (c->conf->routerprio > prio 832 if (!o->is_direct
637 && c->connectmode == conf_node::C_ALWAYS 833 && o->si.valid ()
638 && c->conf != THISNODE 834 && c->si != o->si
639 && c->ictx && c->octx) 835 && c == find_router_for (o))
640 {
641 prio = c->conf->routerprio;
642 router = c;
643 } 836 {
837 slog (L_DEBUG, _("%s: can now route packets via %s, re-keying connection."),
838 o->conf->nodename, c->conf->nodename);
839 o->rekey ();
840 }
644 } 841 }
645
646 return router;
647} 842}
648 843
649void vpn::connect_request (int id) 844void
845vpn::send_connect_request (connection *c)
650{ 846{
651 connection *c = find_router (); 847 connection *r = find_router_for (c);
652 848
653 if (c) 849 if (r)
850 {
851 slog (L_TRACE, _("%s: no address known, sending mediated connection request via %s."),
852 c->conf->nodename, r->conf->nodename);
654 c->connect_request (id); 853 r->send_connect_request (c->conf->id);
655 //else // does not work, because all others must connect to the same router 854 }
656 // // no router found, aggressively connect to all routers 855 else
657 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 856 slog (L_DEBUG, _("%s: no way to connect and no router found: unable to connect at this time."),
658 // if ((*i)->conf->routerprio) 857 c->conf->nodename);
659 // (*i)->establish_connection ();
660} 858}
661 859
662void 860void
663connection::dump_status () 861connection::dump_status ()
664{ 862{
665 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id); 863 slog (L_NOTICE, _("node %s (id %d)"), conf->nodename, conf->id);
666 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"), 864 slog (L_NOTICE, _(" connectmode %d (%d) / sockaddr %s / minor %d"),
667 connectmode, conf->connectmode, (const char *)si, (int)prot_minor); 865 connectmode, conf->connectmode, (const char *)si, (int)prot_minor);
668 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"), 866 slog (L_NOTICE, _(" ictx/octx %08lx/%08lx / oseqno %d / retry_cnt %d"),
669 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt); 867 (long)ictx, (long)octx, (int)oseqno, (int)retry_cnt);
670 slog (L_NOTICE, _(" establish_conn %ld / rekey %ld / keepalive %ld"),
671 (long)(establish_connection.at), (long)(rekey.at), (long)(keepalive.at));
672} 868}
673 869
674void 870void
675vpn::dump_status () 871vpn::dump_status ()
676{ 872{
677 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); 873 slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ());
678 874
679 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) 875 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
680 (*c)->dump_status (); 876 (*c)->dump_status ();
681 877
682 slog (L_NOTICE, _("END status dump")); 878 slog (L_NOTICE, _("END status dump"));
683} 879}
684 880
685vpn::vpn (void) 881vpn::vpn (void)
686: event(this, &vpn::event_cb) 882{
883 event .set<vpn, &vpn::event_cb > (this);
687, udpv4_ev_watcher(this, &vpn::udpv4_ev) 884 udpv4_ev_watcher .set<vpn, &vpn::udpv4_ev > (this);
688, ipv4_ev_watcher (this, &vpn::ipv4_ev) 885 ipv4_ev_watcher .set<vpn, &vpn::ipv4_ev > (this);
689, tap_ev_watcher (this, &vpn::tap_ev)
690#if ENABLE_TCP 886#if ENABLE_TCP
691, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 887 tcpv4_ev_watcher .set<vpn, &vpn::tcpv4_ev > (this);
692#endif 888#endif
693{ 889#if ENABLE_ICMP
890 icmpv4_ev_watcher.set<vpn, &vpn::icmpv4_ev> (this);
891#endif
892#if ENABLE_DNS
893 dnsv4_ev_watcher .set<vpn, &vpn::dnsv4_ev > (this);
894#endif
895 tap_ev_watcher .set<vpn, &vpn::tap_ev > (this);
694} 896}
695 897
696vpn::~vpn () 898vpn::~vpn ()
697{ 899{
698} 900}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines