--- gvpe/src/vpn.C 2005/03/04 04:52:38 1.29 +++ gvpe/src/vpn.C 2007/12/02 00:54:52 1.42 @@ -1,6 +1,6 @@ /* vpn.C -- handle the protocol, encryption, handshaking etc. - Copyright (C) 2003-2005 Marc Lehmann + Copyright (C) 2003-2007 Marc Lehmann This file is part of GVPE. @@ -16,7 +16,7 @@ You should have received a copy of the GNU General Public License along with gvpe; if not, write to the Free Software - Foundation, Inc. 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA + Foundation, Inc. 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA */ #include "config.h" @@ -48,7 +48,20 @@ ///////////////////////////////////////////////////////////////////////////// -const char *vpn::script_if_up () +static void inline +set_tos (int fd, int &tos_prev, int tos) +{ +#if defined(SOL_IP) && defined(IP_TOS) + if (tos_prev == tos) + return; + + tos_prev = tos; + setsockopt (fd, SOL_IP, IP_TOS, &tos, sizeof tos); +#endif +} + +void +vpn::script_init_env () { // the tunnel device mtu should be the physical mtu - overhead // the tricky part is rounding to the cipher key blocksize @@ -59,24 +72,48 @@ 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, "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); - putenv (env); + asprintf (&env, "NODES=%d", conns.size ()); putenv (env); + asprintf (&env, "NODEID=%d", THISNODE->id); putenv (env); + + conns [THISNODE->id - 1]->script_init_env (""); + + for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) + { + char ext[16]; + snprintf (ext, 16, "_%d", (*c)->conf->id); + (*c)->script_init_env (ext); + } +} + +const char *vpn::script_if_init () +{ + script_init_env (); - return ::conf.script_if_up ? ::conf.script_if_up : "if-up"; + return tap->if_up (); +} + +const char *vpn::script_if_up () +{ + script_init_env (); + + char *filename; + asprintf (&filename, + "%s/%s", + confbase, + ::conf.script_if_up ? ::conf.script_if_up : "if-up"); + + return filename; } int vpn::setup () { - ipv4_fd = -1; + ipv4_tos = -1; + ipv4_fd = -1; if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) { @@ -86,6 +123,7 @@ return -1; fcntl (ipv4_fd, F_SETFL, O_NONBLOCK); + fcntl (ipv4_fd, F_SETFD, FD_CLOEXEC); #if defined(SOL_IP) && defined(IP_MTU_DISCOVER) // this I really consider a linux bug. I am neither connected @@ -105,10 +143,11 @@ exit (EXIT_FAILURE); } - ipv4_ev_watcher.start (ipv4_fd, EVENT_READ); + ipv4_ev_watcher.start (ipv4_fd, EV_READ); } - udpv4_fd = -1; + udpv4_tos = -1; + udpv4_fd = -1; if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) { @@ -118,6 +157,7 @@ return -1; fcntl (udpv4_fd, F_SETFL, O_NONBLOCK); + fcntl (udpv4_fd, F_SETFD, FD_CLOEXEC); // standard daemon practise... { @@ -143,10 +183,11 @@ exit (EXIT_FAILURE); } - udpv4_ev_watcher.start (udpv4_fd, EVENT_READ); + udpv4_ev_watcher.start (udpv4_fd, EV_READ); } - icmpv4_fd = -1; + icmpv4_tos = -1; + icmpv4_fd = -1; #if ENABLE_ICMP if (THISNODE->protocols & PROT_ICMPv4) @@ -157,6 +198,7 @@ return -1; fcntl (icmpv4_fd, F_SETFL, O_NONBLOCK); + fcntl (icmpv4_fd, F_SETFD, FD_CLOEXEC); #ifdef ICMP_FILTER { @@ -175,7 +217,7 @@ // fragment for me sometimes. { int oval = IP_PMTUDISC_DONT; - setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); + setsockopt (icmpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); } #endif @@ -187,7 +229,7 @@ exit (EXIT_FAILURE); } - icmpv4_ev_watcher.start (icmpv4_fd, EVENT_READ); + icmpv4_ev_watcher.start (icmpv4_fd, EV_READ); } #endif @@ -202,6 +244,7 @@ return -1; fcntl (tcpv4_fd, F_SETFL, O_NONBLOCK); + fcntl (tcpv4_fd, F_SETFD, FD_CLOEXEC); // standard daemon practise... { @@ -223,10 +266,13 @@ exit (EXIT_FAILURE); } - tcpv4_ev_watcher.start (tcpv4_fd, EVENT_READ); + tcpv4_ev_watcher.start (tcpv4_fd, EV_READ); } #endif + dnsv4_tos = -1; + dnsv4_fd = -1; + #if ENABLE_DNS if (THISNODE->protocols & PROT_DNSv4) { @@ -237,13 +283,28 @@ if (dnsv4_fd < 0) return -1; + fcntl (dnsv4_fd, F_SETFL, O_NONBLOCK); + fcntl (dnsv4_fd, F_SETFD, FD_CLOEXEC); + +# 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 (dnsv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); + } +# endif + // standard daemon practise... { int oval = 1; - setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); + setsockopt (dnsv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); } - sockinfo si (THISNODE, PROT_DNSv4); + sockinfo si (THISNODE->dns_hostname, + THISNODE->dns_hostname ? THISNODE->dns_port : 0, + PROT_DNSv4); if (bind (dnsv4_fd, si.sav4 (), si.salenv4 ())) { @@ -251,10 +312,16 @@ exit (EXIT_FAILURE); } - dnsv4_ev_watcher.start (dnsv4_fd, EVENT_READ); + dnsv4_ev_watcher.start (dnsv4_fd, EV_READ); } #endif + ///////////////////////////////////////////////////////////////////////////// + + reconnect_all (); + + ///////////////////////////////////////////////////////////////////////////// + tap = new tap_device (); if (!tap) //D this, of course, never catches { @@ -262,11 +329,23 @@ exit (EXIT_FAILURE); } - run_script (run_script_cb (this, &vpn::script_if_up), true); + fcntl (tap->fd, F_SETFD, FD_CLOEXEC); - tap_ev_watcher.start (tap->fd, EVENT_READ); + if (tap->if_up () && + !run_script (run_script_cb (this, &vpn::script_if_init), true)) + { + slog (L_ERR, _("interface initialization command '%s' failed, exiting."), + tap->if_up ()); + exit (EXIT_FAILURE); + } - reconnect_all (); + if (!run_script (run_script_cb (this, &vpn::script_if_up), true)) + { + slog (L_ERR, _("if-up command execution failed, exiting.")); + exit (EXIT_FAILURE); + } + + tap_ev_watcher.start (tap->fd, EV_READ); return 0; } @@ -274,9 +353,7 @@ bool vpn::send_ipv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) { -#if defined(SOL_IP) && defined(IP_TOS) - setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); -#endif + set_tos (ipv4_fd, ipv4_tos, tos); sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); return true; @@ -309,10 +386,6 @@ bool vpn::send_icmpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) { -#if defined(SOL_IP) && defined(IP_TOS) - setsockopt (icmpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); -#endif - pkt->unshift_hdr (4); icmp_header *hdr = (icmp_header *)&((*pkt)[0]); @@ -321,6 +394,7 @@ hdr->checksum = 0; hdr->checksum = ipv4_checksum ((u16 *)hdr, pkt->len); + set_tos (icmpv4_fd, icmpv4_tos, tos); sendto (icmpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); return true; @@ -330,9 +404,7 @@ bool vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) { -#if defined(SOL_IP) && defined(IP_TOS) - setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); -#endif + set_tos (udpv4_fd, udpv4_tos, tos); sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); return true; @@ -397,10 +469,40 @@ } } +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) +vpn::ipv4_ev (ev::io &w, int revents) { - if (revents & EVENT_READ) + if (revents & EV_READ) { vpn_packet *pkt = new vpn_packet; struct sockaddr_in sa; @@ -415,8 +517,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); @@ -432,17 +533,17 @@ else { slog (L_ERR, - _("FATAL: unknown revents %08x in socket, terminating\n"), - revents); + _("FATAL: unknown revents %08x in socket, terminating\n"), + revents); exit (EXIT_FAILURE); } } #if ENABLE_ICMP void -vpn::icmpv4_ev (io_watcher &w, short revents) +vpn::icmpv4_ev (ev::io &w, int revents) { - if (revents & EVENT_READ) + if (revents & EV_READ) { vpn_packet *pkt = new vpn_packet; struct sockaddr_in sa; @@ -488,9 +589,9 @@ #endif void -vpn::udpv4_ev (io_watcher &w, short revents) +vpn::udpv4_ev (ev::io &w, int revents) { - if (revents & EVENT_READ) + if (revents & EV_READ) { vpn_packet *pkt = new vpn_packet; struct sockaddr_in sa; @@ -525,9 +626,9 @@ } void -vpn::tap_ev (io_watcher &w, short revents) +vpn::tap_ev (ev::io &w, int revents) { - if (revents & EVENT_READ) + if (revents & EV_READ) { /* process data */ tap_packet *pkt; @@ -544,7 +645,7 @@ if (src != THISNODE->id) { - slog (L_ERR, _("FATAL: tap packet not originating on current node received, exiting.")); + slog (L_ERR, _("FATAL: tap packet not originating on current node received (if-up script not working properly?), exiting.")); exit (EXIT_FAILURE); } @@ -567,7 +668,7 @@ } void -vpn::event_cb (time_watcher &w) +vpn::event_cb (ev::timer &w, int) { if (events) { @@ -668,7 +769,7 @@ void vpn::dump_status () { - slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)NOW); + slog (L_NOTICE, _("BEGIN status dump (%ld)"), (long)ev_now ()); for (conns_vector::iterator c = conns.begin (); c != conns.end (); ++c) (*c)->dump_status ();