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.3 by pcg, Wed Apr 2 21:02:25 2003 UTC vs.
Revision 1.20 by pcg, Thu Oct 16 14:12:00 2003 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 Marc Lehmann <pcg@goof.com>
3 4
4 This program is free software; you can redistribute it and/or modify 5 This program is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 6 it under the terms of the GNU General Public License as published by
6 the Free Software Foundation; either version 2 of the License, or 7 the Free Software Foundation; either version 2 of the License, or
7 (at your option) any later version. 8 (at your option) any later version.
… …
24#include <cstring> 25#include <cstring>
25#include <cstdio> 26#include <cstdio>
26 27
27#include <sys/types.h> 28#include <sys/types.h>
28#include <sys/socket.h> 29#include <sys/socket.h>
29#include <sys/poll.h>
30#include <sys/wait.h> 30#include <sys/wait.h>
31#include <netinet/in.h>
32#include <arpa/inet.h>
33#include <errno.h> 31#include <errno.h>
34#include <time.h> 32#include <time.h>
35#include <unistd.h> 33#include <unistd.h>
34#include <fcntl.h>
35#include <sys/socket.h>
36
37#include "netcompat.h"
36 38
37#include "pidfile.h" 39#include "pidfile.h"
38 40
39#include "connection.h" 41#include "connection.h"
40#include "util.h" 42#include "util.h"
41#include "vpn.h" 43#include "vpn.h"
42 44
43#if ENABLE_TCP 45vpn network; // THE vpn (bad design...)
44# include <map>
45# include <unistd.h>
46# include <fcntl.h>
47# include <sys/poll.h>
48#endif
49 46
50///////////////////////////////////////////////////////////////////////////// 47/////////////////////////////////////////////////////////////////////////////
51 48
52const char *vpn::script_if_up () 49const char *vpn::script_if_up ()
53{ 50{
… …
78} 75}
79 76
80int 77int
81vpn::setup () 78vpn::setup ()
82{ 79{
80 ipv4_fd = -1;
81
82 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
83 {
84 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
85
86 if (ipv4_fd < 0)
87 return -1;
88
89 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
90
91#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
92 // this I really consider a linux bug. I am neither connected
93 // nor do I fragment myself. Linux still sets DF and doesn't
94 // fragment for me sometimes.
95 {
96 int oval = IP_PMTUDISC_DONT;
97 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
98 }
99#endif
100
101 sockinfo si (THISNODE, PROT_IPv4);
102
103 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
104 {
105 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
106 exit (1);
107 }
108
109 ipv4_ev_watcher.start (ipv4_fd, POLLIN);
110 }
111
83 udpv4_fd = -1; 112 udpv4_fd = -1;
84 113
85 if (THISNODE->protocols & PROT_UDPv4) 114 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
86 { 115 {
87 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 116 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
88 117
89 if (udpv4_fd < 0) 118 if (udpv4_fd < 0)
90 return -1; 119 return -1;
120
121 fcntl (udpv4_fd, F_SETFL, O_NONBLOCK);
91 122
92 // standard daemon practise... 123 // standard daemon practise...
93 { 124 {
94 int oval = 1; 125 int oval = 1;
95 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 126 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
96 } 127 }
97 128
98 sockinfo si (THISNODE, PROT_UDPv4); 129#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 130 // this I really consider a linux bug. I am neither connected
108 // nor do I fragment myself. Linux still sets DF and doesn't 131 // nor do I fragment myself. Linux still sets DF and doesn't
109 // fragment for me sometimes. 132 // fragment for me sometimes.
110 { 133 {
111 int oval = IP_PMTUDISC_DONT; 134 int oval = IP_PMTUDISC_DONT;
112 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 135 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
113 } 136 }
114#endif 137#endif
115 138
139 sockinfo si (THISNODE, PROT_UDPv4);
140
141 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
142 {
143 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
144 exit (1);
145 }
146
116 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 147 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
117 } 148 }
118 149
119 ipv4_fd = -1; 150 icmpv4_fd = -1;
151
152#if ENABLE_ICMP
120 if (THISNODE->protocols & PROT_IPv4) 153 if (THISNODE->protocols & PROT_ICMPv4)
121 { 154 {
122 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 155 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
123 156
124 if (ipv4_fd < 0) 157 if (icmpv4_fd < 0)
125 return -1; 158 return -1;
126 159
127 sockinfo si (THISNODE, PROT_IPv4); 160 fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK);
128 161
129 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) 162#ifdef ICMP_FILTER
130 { 163 {
131 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 164 icmp_filter oval;
132 exit (1); 165 oval.data = 0xffffffff;
166 if (::conf.icmp_type < 32)
167 oval.data &= ~(1 << ::conf.icmp_type);
168
169 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
133 } 170 }
171#endif
134 172
135#ifdef IP_MTU_DISCOVER 173#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
136 // this I really consider a linux bug. I am neither connected 174 // this I really consider a linux bug. I am neither connected
137 // nor do I fragment myself. Linux still sets DF and doesn't 175 // nor do I fragment myself. Linux still sets DF and doesn't
138 // fragment for me sometimes. 176 // fragment for me sometimes.
139 { 177 {
140 int oval = IP_PMTUDISC_DONT; 178 int oval = IP_PMTUDISC_DONT;
141 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 179 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
142 } 180 }
143#endif 181#endif
144 182
183 sockinfo si (THISNODE, PROT_ICMPv4);
184
185 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
186 {
187 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
188 exit (1);
189 }
190
145 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 191 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
146 } 192 }
193#endif
194
195 tcpv4_fd = -1;
147 196
148#if ENABLE_TCP 197#if ENABLE_TCP
149 if (THISNODE->protocols & PROT_TCPv4) 198 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
150 { 199 {
151 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 200 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
152 201
153 if (tcpv4_fd < 0) 202 if (tcpv4_fd < 0)
154 return -1; 203 return -1;
204
205 fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK);
155 206
156 // standard daemon practise... 207 // standard daemon practise...
157 { 208 {
158 int oval = 1; 209 int oval = 1;
159 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 210 setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
… …
191 reconnect_all (); 242 reconnect_all ();
192 243
193 return 0; 244 return 0;
194} 245}
195 246
196void 247// send a vpn packet out to other hosts
248bool
249vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos)
250{
251 switch (si.prot)
252 {
253 case PROT_IPv4:
254 return send_ipv4_packet (pkt, si, tos);
255
256 case PROT_UDPv4:
257 return send_udpv4_packet (pkt, si, tos);
258
259#if ENABLE_TCP
260 case PROT_TCPv4:
261 return send_tcpv4_packet (pkt, si, tos);
262#endif
263
264#if ENABLE_ICMP
265 case PROT_ICMPv4:
266 return send_icmpv4_packet (pkt, si, tos);
267#endif
268
269 default:
270 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
271 return false;
272 }
273}
274
275bool
197vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 276vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
198{ 277{
278#if defined(SOL_IP) && defined(IP_TOS)
199 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 279 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
280#endif
200 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 281 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
201}
202 282
203void 283 return true;
284}
285
286static u16
287ipv4_checksum (u16 *data, unsigned int len)
288{
289 // use 32 bit accumulator and fold back carry bits at the end
290 u32 sum = 0;
291
292 while (len > 1)
293 {
294 sum += *data++;
295 len -= 2;
296 }
297
298 // odd byte left?
299 if (len)
300 sum += *(u8 *)data;
301
302 // add back carry bits
303 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
304 sum += (sum >> 16); // carry
305
306 return ~sum;
307}
308
309#if ENABLE_ICMP
310bool
311vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
312{
313#if defined(SOL_IP) && defined(IP_TOS)
314 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
315#endif
316
317 pkt->unshift_hdr (4);
318
319 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
320 hdr->type = ::conf.icmp_type;
321 hdr->code = 255;
322 hdr->checksum = 0;
323 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
324
325 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
326
327 return true;
328}
329#endif
330
331bool
204vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 332vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
205{ 333{
334#if defined(SOL_IP) && defined(IP_TOS)
206 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 335 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
336#endif
207 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 337 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
338
339 return true;
340}
341
342void
343vpn::inject_data_packet (tap_packet *pkt, int dst)
344{
345 if (dst)
346 {
347 // unicast
348 if (dst != THISNODE->id)
349 conns[dst - 1]->inject_data_packet (pkt);
350 }
351 else
352 {
353 // broadcast, this is ugly, but due to the security policy
354 // we have to connect to all hosts...
355 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
356 if ((*c)->conf != THISNODE)
357 (*c)->inject_data_packet (pkt, true);
358 }
208} 359}
209 360
210void 361void
211vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) 362vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi)
212{ 363{
… …
219 if (src == 0 || src > conns.size () 370 if (src == 0 || src > conns.size ()
220 || dst > conns.size () 371 || dst > conns.size ()
221 || pkt->typ () >= vpn_packet::PT_MAX) 372 || pkt->typ () >= vpn_packet::PT_MAX)
222 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), 373 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
223 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); 374 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
375 else if (dst > conns.size ())
376 slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"),
377 (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ());
224 else 378 else
225 { 379 {
226 connection *c = conns[src - 1]; 380 connection *c = conns[src - 1];
227 381
228 if (dst == 0 && !THISNODE->routerprio) 382 if (dst == 0)
229 slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), 383 slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"),
230 c->conf->nodename, (const char *)rsi); 384 c->conf->nodename, (const char *)rsi);
231 else if (dst != 0 && dst != THISNODE->id) 385 else if (dst != THISNODE->id)
232 // FORWARDING NEEDED ;) 386 {
387 if (THISNODE->routerprio)
388 // the tos setting gets lost here. who cares.
389 conns[dst - 1]->inject_vpn_packet (pkt);
390 else
233 slog (L_WARN, 391 slog (L_WARN,
234 _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), 392 _("%s(%s): forwarding request (=> %s), but we are no router"),
393 c->conf->nodename, (const char *)rsi,
235 dst, conns[dst - 1]->conf->nodename, 394 conns[dst - 1]->conf->nodename);
236 (const char *)rsi, 395 }
237 THISNODE->id, THISNODE->nodename);
238 else 396 else
239 c->recv_vpn_packet (pkt, rsi); 397 c->recv_vpn_packet (pkt, rsi);
240 } 398 }
241} 399}
242 400
243void 401void
244vpn::udpv4_ev (io_watcher &w, short revents) 402vpn::ipv4_ev (io_watcher &w, short revents)
245{ 403{
246 if (revents & (POLLIN | POLLERR)) 404 if (revents & (POLLIN | POLLERR))
247 { 405 {
248 vpn_packet *pkt = new vpn_packet; 406 vpn_packet *pkt = new vpn_packet;
249 struct sockaddr_in sa; 407 struct sockaddr_in sa;
250 socklen_t sa_len = sizeof (sa); 408 socklen_t sa_len = sizeof (sa);
251 int len; 409 int len;
252 410
253 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 411 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
254 412
255 sockinfo si(sa); 413 sockinfo si(sa, PROT_IPv4);
256 414
257 if (len > 0) 415 if (len > 0)
258 { 416 {
259 pkt->len = len; 417 pkt->len = len;
418
419 // raw sockets deliver the ipv4, but don't expect it on sends
420 // this is slow, but...
421 pkt->skip_hdr (IP_OVERHEAD);
260 422
261 recv_vpn_packet (pkt, si); 423 recv_vpn_packet (pkt, si);
262 } 424 }
263 else 425 else
264 { 426 {
… …
269 delete pkt; 431 delete pkt;
270 } 432 }
271 else if (revents & POLLHUP) 433 else if (revents & POLLHUP)
272 { 434 {
273 // this cannot ;) happen on udp sockets 435 // this cannot ;) happen on udp sockets
274 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 436 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
275 exit (1); 437 exit (1);
276 } 438 }
277 else 439 else
278 { 440 {
279 slog (L_ERR, 441 slog (L_ERR,
… …
281 revents); 443 revents);
282 exit (1); 444 exit (1);
283 } 445 }
284} 446}
285 447
448#if ENABLE_ICMP
286void 449void
287vpn::ipv4_ev (io_watcher &w, short revents) 450vpn::icmpv4_ev (io_watcher &w, short revents)
288{ 451{
289 if (revents & (POLLIN | POLLERR)) 452 if (revents & (POLLIN | POLLERR))
290 { 453 {
291 vpn_packet *pkt = new vpn_packet; 454 vpn_packet *pkt = new vpn_packet;
292 struct sockaddr_in sa; 455 struct sockaddr_in sa;
293 socklen_t sa_len = sizeof (sa); 456 socklen_t sa_len = sizeof (sa);
294 int len; 457 int len;
295 458
296 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 459 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
297 460
298 sockinfo si(sa, PROT_IPv4); 461 sockinfo si(sa, PROT_ICMPv4);
299 462
300 if (len > 0) 463 if (len > 0)
301 { 464 {
302 pkt->len = len; 465 pkt->len = len;
303 466
467 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
468
469 if (hdr->type == ::conf.icmp_type
470 && hdr->code == 255)
471 {
304 // raw sockets deliver the ipv4, but don't expect it on sends 472 // raw sockets deliver the ipv4, but don't expect it on sends
305 // this is slow, but... 473 // this is slow, but...
306 pkt->skip_hdr (IP_OVERHEAD); 474 pkt->skip_hdr (ICMP_OVERHEAD);
307 475
308 recv_vpn_packet (pkt, si); 476 recv_vpn_packet (pkt, si);
477 }
309 } 478 }
310 else 479 else
311 { 480 {
312 // probably ECONNRESET or somesuch 481 // probably ECONNRESET or somesuch
313 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 482 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
316 delete pkt; 485 delete pkt;
317 } 486 }
318 else if (revents & POLLHUP) 487 else if (revents & POLLHUP)
319 { 488 {
320 // this cannot ;) happen on udp sockets 489 // this cannot ;) happen on udp sockets
321 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 490 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
322 exit (1); 491 exit (1);
323 } 492 }
324 else 493 else
325 { 494 {
326 slog (L_ERR, 495 slog (L_ERR,
327 _("FATAL: unknown revents %08x in socket, terminating\n"), 496 _("FATAL: unknown revents %08x in socket, terminating\n"),
328 revents); 497 revents);
329 exit (1); 498 exit (1);
330 } 499 }
331} 500}
501#endif
332 502
333#if ENABLE_TCP 503void
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 void tcpv4_ev (io_watcher &w, short revents); 504vpn::udpv4_ev (io_watcher &w, short revents)
362
363 operator tcp_si_map::value_type()
364 {
365 return tcp_si_map::value_type (&si, this);
366 }
367
368 tcp_connection (int fd_, const sockinfo &si_, vpn &v_)
369 : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev), ok(false)
370 {
371 last_activity = NOW;
372 start (fd_, POLLOUT);
373 }
374
375 ~tcp_connection () { close (fd); }
376};
377
378void tcp_si_map::cleaner_cb (time_watcher &w)
379{ 505{
380 w.at = NOW + 600;
381 tstamp to = NOW - ::conf.keepalive - 30;
382
383 for (iterator i = begin (); i != end(); )
384 if (i->second->last_activity >= to)
385 ++i;
386 else
387 {
388 erase (i);
389 i = begin ();
390 }
391}
392
393void
394vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
395{
396 tcp_si_map::iterator info = tcp_si.find (&si);
397
398 if (info == tcp_si.end ())
399 {
400 // woaw, the first lost packet ;)
401 int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
402
403 if (fd >= 0)
404 {
405 fcntl (fd, F_SETFL, O_NONBLOCK);
406
407 if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0
408 || errno == EINPROGRESS)
409 {
410 tcp_connection *i = new tcp_connection (fd, si, *this);
411
412 tcp_si.insert (*i);
413 }
414 else
415 close (fd);
416 }
417 }
418 else
419 {
420 tcp_connection *i = info->second;
421
422 i->last_activity = NOW;
423
424 if (i->ok)
425 {
426 setsockopt (i->fd, SOL_IP, IP_TOS, &tos, sizeof tos);
427
428 // we use none of the advantages of tcp
429 write (i->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32);
430 }
431 }
432
433#if 0
434 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
435 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
436#endif
437}
438
439void
440tcp_connection::tcpv4_ev (io_watcher &w, short revents)
441{
442 last_activity = NOW;
443
444 if (!ok) // just established?
445 {
446 ok = true;
447 fcntl (fd, F_SETFL, 0);
448 stop ();
449 start (fd, POLLIN);
450 }
451
452 if (revents & (POLLIN | POLLERR)) 506 if (revents & (POLLIN | POLLERR))
453 { 507 {
454 u32 len;
455
456 if (sizeof (len) == read (fd, &len, sizeof (len)))
457 {
458 vpn_packet *pkt = new vpn_packet; 508 vpn_packet *pkt = new vpn_packet;
459
460 if (len == read (fd, &((*pkt)[0]), len))
461 {
462 pkt->len = len;
463
464 v.recv_vpn_packet (pkt, si);
465 return;
466 }
467
468 delete pkt;
469 }
470
471 tcp_si.erase (&si);
472 stop ();
473 }
474}
475
476void
477vpn::tcpv4_ev (io_watcher &w, short revents)
478{
479 if (revents & (POLLIN | POLLERR))
480 {
481 struct sockaddr_in sa; 509 struct sockaddr_in sa;
482 socklen_t sa_len = sizeof (sa); 510 socklen_t sa_len = sizeof (sa);
483 int len; 511 int len;
484 512
485 int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); 513 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
486 514
487 if (fd >= 0)
488 {
489 fcntl (fd, F_SETFL, O_NONBLOCK);
490
491 sockinfo si(sa, PROT_TCPv4); 515 sockinfo si(sa, PROT_UDPv4);
492 tcp_connection *i = new tcp_connection (fd, si, *this);
493 516
494 slog (L_ERR, "accepted %d\n", fd);//D 517 if (len > 0)
495
496 tcp_si.insert (*i);
497 } 518 {
519 pkt->len = len;
520
521 recv_vpn_packet (pkt, si);
522 }
523 else
524 {
525 // probably ECONNRESET or somesuch
526 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
527 }
528
529 delete pkt;
530 }
531 else if (revents & POLLHUP)
498 } 532 {
533 // this cannot ;) happen on udp sockets
534 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
535 exit (1);
536 }
537 else
538 {
539 slog (L_ERR,
540 _("FATAL: unknown revents %08x in socket, terminating\n"),
541 revents);
542 exit (1);
543 }
499} 544}
500
501#endif
502 545
503void 546void
504vpn::tap_ev (io_watcher &w, short revents) 547vpn::tap_ev (io_watcher &w, short revents)
505{ 548{
506 if (revents & POLLIN) 549 if (revents & POLLIN)
… …
508 /* process data */ 551 /* process data */
509 tap_packet *pkt; 552 tap_packet *pkt;
510 553
511 pkt = tap->recv (); 554 pkt = tap->recv ();
512 555
556 if (!pkt)
557 return;
558
559 if (pkt->len > 14)
560 {
513 int dst = mac2id (pkt->dst); 561 int dst = mac2id (pkt->dst);
514 int src = mac2id (pkt->src); 562 int src = mac2id (pkt->src);
515 563
516 if (src != THISNODE->id) 564 if (src != THISNODE->id)
517 {
518 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating."));
519 exit (1);
520 }
521
522 if (dst == THISNODE->id)
523 {
524 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating."));
525 exit (1);
526 }
527
528 if (dst > conns.size ())
529 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
530 else
531 {
532 if (dst)
533 { 565 {
534 // unicast 566 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
535 if (dst != THISNODE->id) 567 exit (1);
536 conns[dst - 1]->inject_data_packet (pkt);
537 } 568 }
569
570 if (dst == THISNODE->id)
571 {
572 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
573 exit (1);
574 }
575
576 if (dst > conns.size ())
577 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);
538 else 578 else
539 {
540 // broadcast, first check router, then self, then english
541 connection *router = find_router ();
542
543 if (router)
544 router->inject_data_packet (pkt, true); 579 inject_data_packet (pkt, dst);
545 else
546 for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c)
547 if ((*c)->conf != THISNODE)
548 (*c)->inject_data_packet (pkt);
549 }
550 } 580 }
551 581
552 delete pkt; 582 delete pkt;
553 } 583 }
554 else if (revents & (POLLHUP | POLLERR)) 584 else if (revents & (POLLHUP | POLLERR))
… …
620 } 650 }
621} 651}
622 652
623connection *vpn::find_router () 653connection *vpn::find_router ()
624{ 654{
625 u32 prio = 0; 655 u32 prio = 1;
626 connection *router = 0; 656 connection *router = 0;
627 657
628 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 658 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
629 { 659 {
630 connection *c = *i; 660 connection *c = *i;
631 661
632 if (c->conf->routerprio > prio 662 if (c->conf->routerprio > prio
633 && c->connectmode == conf_node::C_ALWAYS 663 && c->connectmode == conf_node::C_ALWAYS // so we don't drop the connection if in use
634 && c->conf != THISNODE
635 && c->ictx && c->octx) 664 && c->ictx && c->octx
665 && c->conf != THISNODE) // redundant, since ictx==octx==0 always on thisnode
636 { 666 {
637 prio = c->conf->routerprio; 667 prio = c->conf->routerprio;
638 router = c; 668 router = c;
639 } 669 }
640 } 670 }
641 671
642 return router; 672 return router;
643} 673}
644 674
645void vpn::connect_request (int id) 675void vpn::send_connect_request (int id)
646{ 676{
647 connection *c = find_router (); 677 connection *c = find_router ();
648 678
649 if (c) 679 if (c)
650 c->connect_request (id); 680 c->send_connect_request (id);
651 //else // does not work, because all others must connect to the same router 681 else
652 // // no router found, aggressively connect to all routers 682 // no router found, aggressively connect to all routers
653 // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) 683 for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i)
654 // if ((*i)->conf->routerprio) 684 if ((*i)->conf->routerprio && (*i)->conf != THISNODE)
655 // (*i)->establish_connection (); 685 (*i)->establish_connection ();
656} 686}
657 687
658void 688void
659connection::dump_status () 689connection::dump_status ()
660{ 690{
… …
677 707
678 slog (L_NOTICE, _("END status dump")); 708 slog (L_NOTICE, _("END status dump"));
679} 709}
680 710
681vpn::vpn (void) 711vpn::vpn (void)
682: event(this, &vpn::event_cb) 712: event (this, &vpn::event_cb)
683, udpv4_ev_watcher(this, &vpn::udpv4_ev) 713, udpv4_ev_watcher (this, &vpn::udpv4_ev)
684, ipv4_ev_watcher (this, &vpn::ipv4_ev) 714, ipv4_ev_watcher (this, &vpn::ipv4_ev)
685, tap_ev_watcher (this, &vpn::tap_ev)
686#if ENABLE_TCP 715#if ENABLE_TCP
687, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 716, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
688#endif 717#endif
718#if ENABLE_ICMP
719, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
720#endif
721, tap_ev_watcher (this, &vpn::tap_ev)
689{ 722{
690} 723}
691 724
692vpn::~vpn () 725vpn::~vpn ()
693{ 726{

Diff Legend

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