--- gvpe/src/vpn.C 2003/10/15 06:06:41 1.17 +++ gvpe/src/vpn.C 2005/03/07 01:31:26 1.32 @@ -1,7 +1,10 @@ /* vpn.C -- handle the protocol, encryption, handshaking etc. + Copyright (C) 2003-2005 Marc Lehmann - This program is free software; you can redistribute it and/or modify + This file is part of GVPE. + + GVPE is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. @@ -12,7 +15,7 @@ GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software + along with gvpe; if not, write to the Free Software Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ @@ -20,9 +23,9 @@ #include -#include -#include #include +#include +#include #include #include @@ -41,6 +44,8 @@ #include "util.h" #include "vpn.h" +vpn network; // THE vpn (bad design...) + ///////////////////////////////////////////////////////////////////////////// const char *vpn::script_if_up () @@ -53,16 +58,13 @@ mtu -= ETH_OVERHEAD - 6 - 6; // and get interface mtu again char *env; - asprintf (&env, "CONFBASE=%s", confbase); - putenv (env); - asprintf (&env, "NODENAME=%s", THISNODE->nodename); - putenv (env); - asprintf (&env, "NODEID=%d", THISNODE->id); - putenv (env); - asprintf (&env, "IFNAME=%s", tap->interface ()); - putenv (env); - asprintf (&env, "MTU=%d", mtu); - putenv (env); + asprintf (&env, "CONFBASE=%s", confbase); putenv (env); + asprintf (&env, "NODENAME=%s", THISNODE->nodename); putenv (env); + asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env); + asprintf (&env, "IFNAME=%s", tap->interface ()); putenv (env); + asprintf (&env, "IFTYPE=%s", IFTYPE); putenv (env); + asprintf (&env, "IFSUBTYPE=%s", IFSUBTYPE); putenv (env); + asprintf (&env, "MTU=%d", mtu); putenv (env); asprintf (&env, "MAC=%02x:%02x:%02x:%02x:%02x:%02x", 0xfe, 0xfd, 0x80, 0x00, THISNODE->id >> 8, THISNODE->id & 0xff); @@ -100,10 +102,10 @@ if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) { slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); - exit (1); + exit (EXIT_FAILURE); } - ipv4_ev_watcher.start (ipv4_fd, POLLIN); + ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); } udpv4_fd = -1; @@ -138,10 +140,10 @@ if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) { slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); - exit (1); + exit (EXIT_FAILURE); } - udpv4_ev_watcher.start (udpv4_fd, POLLIN); + udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); } icmpv4_fd = -1; @@ -182,10 +184,10 @@ if (bind (icmpv4_fd, si.sav4 (), si.salenv4 ())) { slog (L_ERR, _("can't bind icmpv4 on %s: %s"), (const char *)si, strerror (errno)); - exit (1); + exit (EXIT_FAILURE); } - icmpv4_ev_watcher.start (icmpv4_fd, POLLIN); + icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); } #endif @@ -212,16 +214,56 @@ if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) { slog (L_ERR, _("can't bind tcpv4 on %s: %s"), (const char *)si, strerror (errno)); - exit (1); + exit (EXIT_FAILURE); } if (listen (tcpv4_fd, 5)) { slog (L_ERR, _("can't listen tcpv4 on %s: %s"), (const char *)si, strerror (errno)); - exit (1); + exit (EXIT_FAILURE); + } + + tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); + } +#endif + +#if ENABLE_DNS + if (THISNODE->protocols & PROT_DNSv4) + { + dns_forwarder.set (::conf.dns_forw_host, ::conf.dns_forw_port, PROT_DNSv4); + + dnsv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); + + if (dnsv4_fd < 0) + return -1; + +#if defined(SOL_IP) && defined(IP_MTU_DISCOVER) + // this I really consider a linux bug. I am neither connected + // nor do I fragment myself. Linux still sets DF and doesn't + // fragment for me sometimes. + { + int oval = IP_PMTUDISC_DONT; + setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); + } +#endif + + // standard daemon practise... + { + int oval = 1; + setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); + } + + sockinfo si (THISNODE->dns_hostname, + THISNODE->dns_hostname ? THISNODE->dns_port : 0, + PROT_DNSv4); + + if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) + { + slog (L_ERR, _("can't bind dnsv4 on %s: %s"), (const char *)si, strerror (errno)); + exit (EXIT_FAILURE); } - tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); + dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); } #endif @@ -229,46 +271,18 @@ if (!tap) //D this, of course, never catches { slog (L_ERR, _("cannot create network interface '%s'"), conf.ifname); - exit (1); + exit (EXIT_FAILURE); } run_script (run_script_cb (this, &vpn::script_if_up), true); - tap_ev_watcher.start (tap->fd, POLLIN); + tap_ev_watcher.start (tap->fd, EVENT_READ); reconnect_all (); return 0; } -// send a vpn packet out to other hosts -bool -vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) -{ - switch (si.prot) - { - case PROT_IPv4: - return send_ipv4_packet (pkt, si, tos); - - case PROT_UDPv4: - return send_udpv4_packet (pkt, si, tos); - -#if ENABLE_TCP - case PROT_TCPv4: - return send_tcpv4_packet (pkt, si, tos); -#endif - -#if ENABLE_ICMP - case PROT_ICMPv4: - return send_icmpv4_packet (pkt, si, tos); -#endif - - default: - slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); - return false; - } -} - bool vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) { @@ -337,6 +351,25 @@ } void +vpn::inject_data_packet (tap_packet *pkt, int dst) +{ + if (dst) + { + // unicast + if (dst != THISNODE->id) + conns[dst - 1]->inject_data_packet (pkt); + } + else + { + // broadcast, this is ugly, but due to the security policy + // we have to connect to all hosts... + for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) + if ((*c)->conf != THISNODE) + (*c)->inject_data_packet (pkt, true); + } +} + +void vpn::recv_vpn_packet (vpn_packet *pkt, const sockinfo &rsi) { unsigned int src = pkt->src (); @@ -360,7 +393,7 @@ if (dst == 0) slog (L_WARN, _("%s(%s): received broadcast (protocol violation)"), c->conf->nodename, (const char *)rsi); - else if (dst != 0 && dst != THISNODE->id) + else if (dst != THISNODE->id) { if (THISNODE->routerprio) // the tos setting gets lost here. who cares. @@ -376,10 +409,39 @@ } } +bool +vpn::send_vpn_packet (vpn_packet *pkt, const sockinfo &si, int tos) +{ + switch (si.prot) + { + case PROT_IPv4: + return send_ipv4_packet (pkt, si, tos); + case PROT_UDPv4: + return send_udpv4_packet (pkt, si, tos); +#if ENABLE_TCP + case PROT_TCPv4: + return send_tcpv4_packet (pkt, si, tos); +#endif +#if ENABLE_ICMP + case PROT_ICMPv4: + return send_icmpv4_packet (pkt, si, tos); +#endif +#if ENABLE_DNS + case PROT_DNSv4: + return send_dnsv4_packet (pkt, si, tos); +#endif + + default: + slog (L_CRIT, _("%s: FATAL: trying to send packet with unsupported protocol"), (const char *)si); + } + + return false; +} + void vpn::ipv4_ev (io_watcher &w, short revents) { - if (revents & (POLLIN | POLLERR)) + if (revents & EVENT_READ) { vpn_packet *pkt = new vpn_packet; struct sockaddr_in sa; @@ -394,8 +456,7 @@ { pkt->len = len; - // raw sockets deliver the ipv4, but don't expect it on sends - // this is slow, but... + // raw sockets deliver the ipv4 header, but don't expect it on sends pkt->skip_hdr (IP_OVERHEAD); recv_vpn_packet (pkt, si); @@ -408,18 +469,12 @@ delete pkt; } - else if (revents & POLLHUP) - { - // this cannot ;) happen on udp sockets - slog (L_ERR, _("FATAL: POLLHUP on ipv4 fd, terminating.")); - exit (1); - } else { slog (L_ERR, - _("FATAL: unknown revents %08x in socket, terminating\n"), - revents); - exit (1); + _("FATAL: unknown revents %08x in socket, terminating\n"), + revents); + exit (EXIT_FAILURE); } } @@ -427,7 +482,7 @@ void vpn::icmpv4_ev (io_watcher &w, short revents) { - if (revents & (POLLIN | POLLERR)) + if (revents & EVENT_READ) { vpn_packet *pkt = new vpn_packet; struct sockaddr_in sa; @@ -462,18 +517,12 @@ delete pkt; } - else if (revents & POLLHUP) - { - // this cannot ;) happen on udp sockets - slog (L_ERR, _("FATAL: POLLHUP on icmpv4 fd, terminating.")); - exit (1); - } else { slog (L_ERR, _("FATAL: unknown revents %08x in socket, terminating\n"), revents); - exit (1); + exit (EXIT_FAILURE); } } #endif @@ -481,7 +530,7 @@ void vpn::udpv4_ev (io_watcher &w, short revents) { - if (revents & (POLLIN | POLLERR)) + if (revents & EVENT_READ) { vpn_packet *pkt = new vpn_packet; struct sockaddr_in sa; @@ -506,25 +555,19 @@ delete pkt; } - else if (revents & POLLHUP) - { - // this cannot ;) happen on udp sockets - slog (L_ERR, _("FATAL: POLLHUP on udp v4 fd, terminating.")); - exit (1); - } else { slog (L_ERR, _("FATAL: unknown revents %08x in socket, terminating\n"), revents); - exit (1); + exit (EXIT_FAILURE); } } void vpn::tap_ev (io_watcher &w, short revents) { - if (revents & POLLIN) + if (revents & EVENT_READ) { /* process data */ tap_packet *pkt; @@ -541,44 +584,24 @@ if (src != THISNODE->id) { - slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); - exit (1); + slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting.")); + exit (EXIT_FAILURE); } if (dst == THISNODE->id) { slog (L_ERR, _("FATAL: tap packet destined for current node received, exiting.")); - exit (1); + exit (EXIT_FAILURE); } if (dst > conns.size ()) slog (L_ERR, _("tap packet for unknown node %d received, ignoring."), dst); else - { - if (dst) - { - // unicast - if (dst != THISNODE->id) - conns[dst - 1]->inject_data_packet (pkt); - } - else - { - // broadcast, this is ugly, but due to the security policy - // we have to connect to all hosts... - for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) - if ((*c)->conf != THISNODE) - (*c)->inject_data_packet (pkt); - } - } + inject_data_packet (pkt, dst); } delete pkt; } - else if (revents & (POLLHUP | POLLERR)) - { - slog (L_ERR, _("FATAL: POLLHUP or POLLERR on network device fd, terminating.")); - exit (1); - } else abort (); } @@ -593,12 +616,9 @@ slog (L_INFO, _("preparing shutdown...")); shutdown_all (); - - remove_pid (pidfilename); - + remove_pid (conf.pidfilename); slog (L_INFO, _("terminating")); - - exit (0); + exit (EXIT_SUCCESS); } if (events & EVENT_RECONNECT) @@ -610,8 +630,6 @@ events = 0; } - - w.at = TSTAMP_CANCEL; } void @@ -634,11 +652,8 @@ for (configuration::node_vector::iterator i = conf.nodes.begin (); i != conf.nodes.end (); ++i) { - connection *conn = new connection (this); - - conn->conf = *i; + connection *conn = new connection (this, *i); conns.push_back (conn); - conn->establish_connection (); } } @@ -711,6 +726,9 @@ #if ENABLE_ICMP , icmpv4_ev_watcher(this, &vpn::icmpv4_ev) #endif +#if ENABLE_DNS +, dnsv4_ev_watcher (this, &vpn::dnsv4_ev) +#endif , tap_ev_watcher (this, &vpn::tap_ev) { }