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.13 by pcg, Sun Apr 13 16:53:36 2003 UTC vs.
Revision 1.16 by pcg, Tue Oct 14 19:59:16 2003 UTC

… …
24#include <cstring> 24#include <cstring>
25#include <cstdio> 25#include <cstdio>
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>
30#include <sys/wait.h> 29#include <sys/wait.h>
31#include <errno.h> 30#include <errno.h>
32#include <time.h> 31#include <time.h>
33#include <unistd.h> 32#include <unistd.h>
34#include <fcntl.h> 33#include <fcntl.h>
35#include <arpa/inet.h> 34#include <sys/socket.h>
36#include <netinet/in.h> 35
37#include <netinet/ip_icmp.h> 36#include "netcompat.h"
38 37
39#include "pidfile.h" 38#include "pidfile.h"
40 39
41#include "connection.h" 40#include "connection.h"
42#include "util.h" 41#include "util.h"
… …
84 if (ipv4_fd < 0) 83 if (ipv4_fd < 0)
85 return -1; 84 return -1;
86 85
87 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); 86 fcntl (ipv4_fd, F_SETFL, O_NONBLOCK);
88 87
89#ifdef IP_MTU_DISCOVER 88#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
90 // this I really consider a linux bug. I am neither connected 89 // this I really consider a linux bug. I am neither connected
91 // nor do I fragment myself. Linux still sets DF and doesn't 90 // nor do I fragment myself. Linux still sets DF and doesn't
92 // fragment for me sometimes. 91 // fragment for me sometimes.
93 { 92 {
94 int oval = IP_PMTUDISC_DONT; 93 int oval = IP_PMTUDISC_DONT;
… …
122 { 121 {
123 int oval = 1; 122 int oval = 1;
124 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 123 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
125 } 124 }
126 125
127#ifdef IP_MTU_DISCOVER 126#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
128 // this I really consider a linux bug. I am neither connected 127 // this I really consider a linux bug. I am neither connected
129 // nor do I fragment myself. Linux still sets DF and doesn't 128 // nor do I fragment myself. Linux still sets DF and doesn't
130 // fragment for me sometimes. 129 // fragment for me sometimes.
131 { 130 {
132 int oval = IP_PMTUDISC_DONT; 131 int oval = IP_PMTUDISC_DONT;
… …
166 165
167 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval); 166 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
168 } 167 }
169#endif 168#endif
170 169
171#ifdef IP_MTU_DISCOVER 170#if defined(SOL_IP) && defined(IP_MTU_DISCOVER)
172 // this I really consider a linux bug. I am neither connected 171 // this I really consider a linux bug. I am neither connected
173 // nor do I fragment myself. Linux still sets DF and doesn't 172 // nor do I fragment myself. Linux still sets DF and doesn't
174 // fragment for me sometimes. 173 // fragment for me sometimes.
175 { 174 {
176 int oval = IP_PMTUDISC_DONT; 175 int oval = IP_PMTUDISC_DONT;
… …
271} 270}
272 271
273bool 272bool
274vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 273vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
275{ 274{
275#if defined(SOL_IP) && defined(IP_TOS)
276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 276 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
277#endif
277 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 278 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
278 279
279 return true; 280 return true;
280} 281}
281 282
… …
304 305
305#if ENABLE_ICMP 306#if ENABLE_ICMP
306bool 307bool
307vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 308vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
308{ 309{
310#if defined(SOL_IP) && defined(IP_TOS)
309 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 311 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
312#endif
310 313
311 pkt->unshift_hdr (4); 314 pkt->unshift_hdr (4);
312 315
313 icmphdr *hdr = (icmphdr *)&((*pkt)[0]); 316 icmp_header *hdr = (icmp_header *)&((*pkt)[0]);
314 hdr->type = ::conf.icmp_type; 317 hdr->type = ::conf.icmp_type;
315 hdr->code = 255; 318 hdr->code = 255;
316 hdr->checksum = 0; 319 hdr->checksum = 0;
317 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); 320 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
318 321
… …
323#endif 326#endif
324 327
325bool 328bool
326vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 329vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
327{ 330{
331#if defined(SOL_IP) && defined(IP_TOS)
328 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 332 setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
333#endif
329 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 334 sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
330 335
331 return true; 336 return true;
332} 337}
333 338
… …
435 440
436 if (len > 0) 441 if (len > 0)
437 { 442 {
438 pkt->len = len; 443 pkt->len = len;
439 444
440 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]); 445 icmp_header *hdr = (icmp_header *)&((*pkt)[IP_OVERHEAD]);
441 446
442 if (hdr->type == ::conf.icmp_type 447 if (hdr->type == ::conf.icmp_type
443 && hdr->code == 255) 448 && hdr->code == 255)
444 { 449 {
445 // raw sockets deliver the ipv4, but don't expect it on sends 450 // raw sockets deliver the ipv4, but don't expect it on sends
… …
529 int dst = mac2id (pkt->dst); 534 int dst = mac2id (pkt->dst);
530 int src = mac2id (pkt->src); 535 int src = mac2id (pkt->src);
531 536
532 if (src != THISNODE->id) 537 if (src != THISNODE->id)
533 { 538 {
534 slog (L_ERR, _("FATAL: tap packet not originating on current node received, terminating.")); 539 slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting."));
535 exit (1); 540 exit (1);
536 } 541 }
537 542
538 if (dst == THISNODE->id) 543 if (dst == THISNODE->id)
539 { 544 {
540 slog (L_ERR, _("FATAL: tap packet destined for current node received, terminating.")); 545 slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting."));
541 exit (1); 546 exit (1);
542 } 547 }
543 548
544 if (dst > conns.size ()) 549 if (dst > conns.size ())
545 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); 550 slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst);

Diff Legend

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