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.7 by pcg, Sun Apr 6 18:12:18 2003 UTC vs.
Revision 1.9 by pcg, Tue Apr 8 02:00:54 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 <arpa/inet.h>
35#include <netinet/in.h>
36#include <netinet/icmp.h>
36 37
37#include "pidfile.h" 38#include "pidfile.h"
38 39
39#include "connection.h" 40#include "connection.h"
40#include "util.h" 41#include "util.h"
… …
71} 72}
72 73
73int 74int
74vpn::setup () 75vpn::setup ()
75{ 76{
77 ipv4_fd = -1;
78
79 if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto)
80 {
81 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto);
82
83 if (ipv4_fd < 0)
84 return -1;
85
86#ifdef IP_MTU_DISCOVER
87 // this I really consider a linux bug. I am neither connected
88 // nor do I fragment myself. Linux still sets DF and doesn't
89 // fragment for me sometimes.
90 {
91 int oval = IP_PMTUDISC_DONT;
92 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
93 }
94#endif
95
96 sockinfo si (THISNODE, PROT_IPv4);
97
98 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
99 {
100 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno));
101 exit (1);
102 }
103
104 ipv4_ev_watcher.start (ipv4_fd, POLLIN);
105 }
106
76 udpv4_fd = -1; 107 udpv4_fd = -1;
77 108
78 if (THISNODE->protocols & PROT_UDPv4) 109 if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port)
79 { 110 {
80 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); 111 udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP);
81 112
82 if (udpv4_fd < 0) 113 if (udpv4_fd < 0)
83 return -1; 114 return -1;
… …
85 // standard daemon practise... 116 // standard daemon practise...
86 { 117 {
87 int oval = 1; 118 int oval = 1;
88 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); 119 setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval);
89 } 120 }
90
91 sockinfo si (THISNODE, PROT_UDPv4);
92
93 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
94 {
95 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
96 exit (1);
97 }
98 121
99#ifdef IP_MTU_DISCOVER 122#ifdef IP_MTU_DISCOVER
100 // this I really consider a linux bug. I am neither connected 123 // this I really consider a linux bug. I am neither connected
101 // nor do I fragment myself. Linux still sets DF and doesn't 124 // nor do I fragment myself. Linux still sets DF and doesn't
102 // fragment for me sometimes. 125 // fragment for me sometimes.
… …
104 int oval = IP_PMTUDISC_DONT; 127 int oval = IP_PMTUDISC_DONT;
105 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 128 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
106 } 129 }
107#endif 130#endif
108 131
132 sockinfo si (THISNODE, PROT_UDPv4);
133
134 if (bind (udpv4_fd, si.sav4 (), si.salenv4 ()))
135 {
136 slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno));
137 exit (1);
138 }
139
109 udpv4_ev_watcher.start (udpv4_fd, POLLIN); 140 udpv4_ev_watcher.start (udpv4_fd, POLLIN);
110 } 141 }
111 142
112 ipv4_fd = -1; 143 icmpv4_fd = -1;
144
145#if ENABLE_ICMP
113 if (THISNODE->protocols & PROT_IPv4) 146 if (THISNODE->protocols & PROT_ICMPv4)
114 { 147 {
115 ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); 148 icmpv4_fd = socket (PF_INET, SOCK_RAW, IPPROTO_ICMP);
116 149
117 if (ipv4_fd < 0) 150 if (icmpv4_fd < 0)
118 return -1; 151 return -1;
119 152
120 sockinfo si (THISNODE, PROT_IPv4); 153#ifdef ICMP_FILTER
121
122 if (bind (ipv4_fd, si.sav4 (), si.salenv4 ()))
123 { 154 {
124 slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); 155 icmp_filter oval;
125 exit (1); 156 oval.data = 0xffffffff;
157 if (::conf.icmp_type < 32)
158 oval.data &= ~(1 << ::conf.icmp_type);
159
160 setsockopt (icmpv4_fd, SOL_RAW, ICMP_FILTER, &oval, sizeof oval);
126 } 161 }
162#endif
127 163
128#ifdef IP_MTU_DISCOVER 164#ifdef IP_MTU_DISCOVER
129 // this I really consider a linux bug. I am neither connected 165 // this I really consider a linux bug. I am neither connected
130 // nor do I fragment myself. Linux still sets DF and doesn't 166 // nor do I fragment myself. Linux still sets DF and doesn't
131 // fragment for me sometimes. 167 // fragment for me sometimes.
132 { 168 {
133 int oval = IP_PMTUDISC_DONT; 169 int oval = IP_PMTUDISC_DONT;
134 setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); 170 setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval);
135 } 171 }
136#endif 172#endif
137 173
174 sockinfo si (THISNODE, PROT_ICMPv4);
175
176 if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ()))
177 {
178 slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno));
179 exit (1);
180 }
181
138 ipv4_ev_watcher.start (ipv4_fd, POLLIN); 182 icmpv4_ev_watcher.start (icmpv4_fd, POLLIN);
139 } 183 }
184#endif
185
186 tcpv4_fd = -1;
140 187
141#if ENABLE_TCP 188#if ENABLE_TCP
142 if (THISNODE->protocols & PROT_TCPv4) 189 if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port)
143 { 190 {
144 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); 191 tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP);
145 192
146 if (tcpv4_fd < 0) 193 if (tcpv4_fd < 0)
147 return -1; 194 return -1;
… …
201#if ENABLE_TCP 248#if ENABLE_TCP
202 case PROT_TCPv4: 249 case PROT_TCPv4:
203 return send_tcpv4_packet (pkt, si, tos); 250 return send_tcpv4_packet (pkt, si, tos);
204#endif 251#endif
205 252
253#if ENABLE_ICMP
254 case PROT_ICMPv4:
255 return send_icmpv4_packet (pkt, si, tos);
256#endif
257
206 default: 258 default:
207 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); 259 slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si);
208 return false; 260 return false;
209 } 261 }
210} 262}
… …
212bool 264bool
213vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) 265vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
214{ 266{
215 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); 267 setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
216 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); 268 sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
269
270 return true;
271}
272
273static u16
274ipv4_checksum (u16 *data, unsigned int len)
275{
276 // use 32 bit accumulator and fold back carry bits at the end
277 u32 sum = 0;
278
279 while (len > 1)
280 {
281 sum += *data++;
282 len -= 2;
283 }
284
285 // odd byte left?
286 if (len)
287 sum += *(u8 *)data;
288
289 // add back carry bits
290 sum = (sum >> 16) + (sum & 0xffff); // lo += hi
291 sum += (sum >> 16); // carry
292
293 return ~sum;
294}
295
296bool
297vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos)
298{
299 setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos);
300
301 pkt->unshift_hdr (4);
302
303 icmphdr *hdr = (icmphdr *)&((*pkt)[0]);
304 hdr->type = ::conf.icmp_type;
305 hdr->code = 255;
306 hdr->checksum = 0;
307 hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len);
308
309 sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ());
217 310
218 return true; 311 return true;
219} 312}
220 313
221bool 314bool
… …
266 c->recv_vpn_packet (pkt, rsi); 359 c->recv_vpn_packet (pkt, rsi);
267 } 360 }
268} 361}
269 362
270void 363void
271vpn::udpv4_ev (io_watcher &w, short revents) 364vpn::ipv4_ev (io_watcher &w, short revents)
272{ 365{
273 if (revents & (POLLIN | POLLERR)) 366 if (revents & (POLLIN | POLLERR))
274 { 367 {
275 vpn_packet *pkt = new vpn_packet; 368 vpn_packet *pkt = new vpn_packet;
276 struct sockaddr_in sa; 369 struct sockaddr_in sa;
277 socklen_t sa_len = sizeof (sa); 370 socklen_t sa_len = sizeof (sa);
278 int len; 371 int len;
279 372
280 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 373 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
281 374
282 sockinfo si(sa, PROT_UDPv4); 375 sockinfo si(sa, PROT_IPv4);
283 376
284 if (len > 0) 377 if (len > 0)
285 { 378 {
286 pkt->len = len; 379 pkt->len = len;
287 380
381 // raw sockets deliver the ipv4, but don't expect it on sends
382 // this is slow, but...
383 pkt->skip_hdr (IP_OVERHEAD);
384
288 recv_vpn_packet (pkt, si); 385 recv_vpn_packet (pkt, si);
289 } 386 }
290 else 387 else
291 { 388 {
292 // probably ECONNRESET or somesuch 389 // probably ECONNRESET or somesuch
293 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); 390 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
294 } 391 }
295 392
296 delete pkt; 393 delete pkt;
297 } 394 }
298 else if (revents & POLLHUP) 395 else if (revents & POLLHUP)
299 { 396 {
300 // this cannot ;) happen on udp sockets 397 // this cannot ;) happen on udp sockets
301 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); 398 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating."));
302 exit (1); 399 exit (1);
303 } 400 }
304 else 401 else
305 { 402 {
306 slog (L_ERR, 403 slog (L_ERR,
… …
309 exit (1); 406 exit (1);
310 } 407 }
311} 408}
312 409
313void 410void
314vpn::ipv4_ev (io_watcher &w, short revents) 411vpn::icmpv4_ev (io_watcher &w, short revents)
315{ 412{
316 if (revents & (POLLIN | POLLERR)) 413 if (revents & (POLLIN | POLLERR))
317 { 414 {
318 vpn_packet *pkt = new vpn_packet; 415 vpn_packet *pkt = new vpn_packet;
319 struct sockaddr_in sa; 416 struct sockaddr_in sa;
320 socklen_t sa_len = sizeof (sa); 417 socklen_t sa_len = sizeof (sa);
321 int len; 418 int len;
322 419
323 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); 420 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
324 421
325 sockinfo si(sa, PROT_IPv4); 422 sockinfo si(sa, PROT_ICMPv4);
326 423
327 if (len > 0) 424 if (len > 0)
328 { 425 {
329 pkt->len = len; 426 pkt->len = len;
330 427
428 icmphdr *hdr = (icmphdr *)&((*pkt)[IP_OVERHEAD]);
429
430 if (hdr->type == ::conf.icmp_type
431 && hdr->code == 255)
432 {
331 // raw sockets deliver the ipv4, but don't expect it on sends 433 // raw sockets deliver the ipv4, but don't expect it on sends
332 // this is slow, but... 434 // this is slow, but...
333 pkt->skip_hdr (IP_OVERHEAD); 435 pkt->skip_hdr (ICMP_OVERHEAD);
334 436
335 recv_vpn_packet (pkt, si); 437 recv_vpn_packet (pkt, si);
438 }
336 } 439 }
337 else 440 else
338 { 441 {
339 // probably ECONNRESET or somesuch 442 // probably ECONNRESET or somesuch
340 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); 443 slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno));
… …
343 delete pkt; 446 delete pkt;
344 } 447 }
345 else if (revents & POLLHUP) 448 else if (revents & POLLHUP)
346 { 449 {
347 // this cannot ;) happen on udp sockets 450 // this cannot ;) happen on udp sockets
348 slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); 451 slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating."));
452 exit (1);
453 }
454 else
455 {
456 slog (L_ERR,
457 _("FATAL: unknown revents %08x in socket, terminating\n"),
458 revents);
459 exit (1);
460 }
461}
462
463void
464vpn::udpv4_ev (io_watcher &w, short revents)
465{
466 if (revents & (POLLIN | POLLERR))
467 {
468 vpn_packet *pkt = new vpn_packet;
469 struct sockaddr_in sa;
470 socklen_t sa_len = sizeof (sa);
471 int len;
472
473 len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len);
474
475 sockinfo si(sa, PROT_UDPv4);
476
477 if (len > 0)
478 {
479 pkt->len = len;
480
481 recv_vpn_packet (pkt, si);
482 }
483 else
484 {
485 // probably ECONNRESET or somesuch
486 slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno));
487 }
488
489 delete pkt;
490 }
491 else if (revents & POLLHUP)
492 {
493 // this cannot ;) happen on udp sockets
494 slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating."));
349 exit (1); 495 exit (1);
350 } 496 }
351 else 497 else
352 { 498 {
353 slog (L_ERR, 499 slog (L_ERR,
… …
534 680
535 slog (L_NOTICE, _("END status dump")); 681 slog (L_NOTICE, _("END status dump"));
536} 682}
537 683
538vpn::vpn (void) 684vpn::vpn (void)
539: event(this, &vpn::event_cb) 685: event (this, &vpn::event_cb)
540, udpv4_ev_watcher(this, &vpn::udpv4_ev) 686, udpv4_ev_watcher (this, &vpn::udpv4_ev)
541, ipv4_ev_watcher (this, &vpn::ipv4_ev) 687, ipv4_ev_watcher (this, &vpn::ipv4_ev)
542, tap_ev_watcher (this, &vpn::tap_ev)
543#if ENABLE_TCP 688#if ENABLE_TCP
544, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) 689, tcpv4_ev_watcher (this, &vpn::tcpv4_ev)
545#endif 690#endif
691#if ENABLE_ICMP
692, icmpv4_ev_watcher(this, &vpn::icmpv4_ev)
693#endif
694, tap_ev_watcher (this, &vpn::tap_ev)
546{ 695{
547} 696}
548 697
549vpn::~vpn () 698vpn::~vpn ()
550{ 699{

Diff Legend

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