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.15 by pcg, Tue Oct 14 15:48:15 2003 UTC

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

Diff Legend

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