--- gvpe/src/vpn.C 2003/04/02 05:15:00 1.2 +++ gvpe/src/vpn.C 2003/04/07 01:28:56 1.8 @@ -40,13 +40,6 @@ #include "util.h" #include "vpn.h" -#if ENABLE_TCP -# include -# include -# include -# include -#endif - ///////////////////////////////////////////////////////////////////////////// const char *vpn::script_if_up () @@ -80,20 +73,20 @@ int vpn::setup () { - udpv4_fd = -1; + ipv4_fd = -1; - if (THISNODE->protocols & PROT_UDPv4) + if (THISNODE->protocols & PROT_IPv4 && ::conf.ip_proto) { - udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); + ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); - if (udpv4_fd < 0) + if (ipv4_fd < 0) return -1; - sockinfo si (THISNODE, PROT_UDPv4); + sockinfo si (THISNODE, PROT_IPv4); - if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) + if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) { - slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); + slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); exit (1); } @@ -103,32 +96,33 @@ // fragment for me sometimes. { int oval = IP_PMTUDISC_DONT; - setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); + setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); } #endif - // standard daemon practise... - { - int oval = 1; - setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); - } - - udpv4_ev_watcher.start (udpv4_fd, POLLIN); + ipv4_ev_watcher.start (ipv4_fd, POLLIN); } - ipv4_fd = -1; - if (THISNODE->protocols & PROT_IPv4) + udpv4_fd = -1; + + if (THISNODE->protocols & PROT_UDPv4 && THISNODE->udp_port) { - ipv4_fd = socket (PF_INET, SOCK_RAW, ::conf.ip_proto); + udpv4_fd = socket (PF_INET, SOCK_DGRAM, IPPROTO_UDP); - if (ipv4_fd < 0) + if (udpv4_fd < 0) return -1; - sockinfo si (THISNODE, PROT_IPv4); + // standard daemon practise... + { + int oval = 1; + setsockopt (udpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); + } - if (bind (ipv4_fd, si.sav4 (), si.salenv4 ())) + sockinfo si (THISNODE, PROT_UDPv4); + + if (bind (udpv4_fd, si.sav4 (), si.salenv4 ())) { - slog (L_ERR, _("can't bind ipv4 socket on %s: %s"), (const char *)si, strerror (errno)); + slog (L_ERR, _("can't bind udpv4 on %s: %s"), (const char *)si, strerror (errno)); exit (1); } @@ -138,21 +132,29 @@ // fragment for me sometimes. { int oval = IP_PMTUDISC_DONT; - setsockopt (ipv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); + setsockopt (udpv4_fd, SOL_IP, IP_MTU_DISCOVER, &oval, sizeof oval); } #endif - ipv4_ev_watcher.start (ipv4_fd, POLLIN); + udpv4_ev_watcher.start (udpv4_fd, POLLIN); } + tcpv4_fd = -1; + #if ENABLE_TCP - if (THISNODE->protocols & PROT_TCPv4) + if (THISNODE->protocols & PROT_TCPv4 && THISNODE->tcp_port) { tcpv4_fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); if (tcpv4_fd < 0) return -1; + // standard daemon practise... + { + int oval = 1; + setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); + } + sockinfo si (THISNODE, PROT_TCPv4); if (bind (tcpv4_fd, si.sav4 (), si.salenv4 ())) @@ -167,13 +169,7 @@ exit (1); } - // standard daemon practise... - { - int oval = 1; - setsockopt (tcpv4_fd, SOL_SOCKET, SO_REUSEADDR, &oval, sizeof oval); - } - - tcpv4_accept_watcher.start (tcpv4_fd, POLLIN); + tcpv4_ev_watcher.start (tcpv4_fd, POLLIN); } #endif @@ -193,18 +189,45 @@ return 0; } -void +// 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 + + 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) { setsockopt (ipv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); sendto (ipv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); + + return true; } -void +bool vpn::send_udpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) { setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); + + return true; } void @@ -221,6 +244,9 @@ || pkt->typ () >= vpn_packet::PT_MAX) slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); + else if (dst > conns.size ()) + slog (L_WARN, _("(%s): received corrupted packet type %d (src %d, dst %d)"), + (const char *)rsi, pkt->typ (), pkt->src (), pkt->dst ()); else { connection *c = conns[src - 1]; @@ -229,19 +255,23 @@ slog (L_WARN, _("%s(%s): received broadcast, but we are no router"), c->conf->nodename, (const char *)rsi); else if (dst != 0 && dst != THISNODE->id) - // FORWARDING NEEDED ;) - slog (L_WARN, - _("received frame for node %d ('%s') from %s, but this is node %d ('%s')"), - dst, conns[dst - 1]->conf->nodename, - (const char *)rsi, - THISNODE->id, THISNODE->nodename); + { + if (THISNODE->routerprio) + // the tos setting gets lost here. who cares. + conns[dst - 1]->inject_vpn_packet (pkt); + else + slog (L_WARN, + _("%s(%s): forwarding request (=> %s), but we are no router"), + c->conf->nodename, (const char *)rsi, + conns[dst - 1]->conf->nodename); + } else c->recv_vpn_packet (pkt, rsi); } } void -vpn::udpv4_ev (int fd, short revents) +vpn::udpv4_ev (io_watcher &w, short revents) { if (revents & (POLLIN | POLLERR)) { @@ -250,9 +280,9 @@ socklen_t sa_len = sizeof (sa); int len; - len = recvfrom (fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); + len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); - sockinfo si(sa); + sockinfo si(sa, PROT_UDPv4); if (len > 0) { @@ -263,7 +293,7 @@ else { // probably ECONNRESET or somesuch - slog (L_DEBUG, _("%s: %s"), (const char *)si, strerror (errno)); + slog (L_DEBUG, _("%s: fd %d, %s"), (const char *)si, w.fd, strerror (errno)); } delete pkt; @@ -284,7 +314,7 @@ } void -vpn::ipv4_ev (int fd, short revents) +vpn::ipv4_ev (io_watcher &w, short revents) { if (revents & (POLLIN | POLLERR)) { @@ -293,7 +323,7 @@ socklen_t sa_len = sizeof (sa); int len; - len = recvfrom (fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); + len = recvfrom (w.fd, &((*pkt)[0]), MAXSIZE, 0, (sockaddr *)&sa, &sa_len); sockinfo si(sa, PROT_IPv4); @@ -330,145 +360,8 @@ } } -#if ENABLE_TCP - -struct tcp_info { - int fd; - bool ok; - io_watcher r; - - tcp_info (vpn *v) - : r(v, &vpn::tcpv4_ev) - { - fd = -1; - } - - ~tcp_info () { close (fd); } -}; - -typedef map tcp_si_map; -typedef map tcp_fd_map; // unneecssary if iom would be cooler -static tcp_si_map tcp_si; -static tcp_fd_map tcp_fd; - -void -vpn::send_tcpv4_packet (vpn_packet *pkt, const sockinfo &si, int tos) -{ - tcp_si_map::iterator info = tcp_si.find (si); - - if (info == tcp_si.end ()) - { - // woaw, the first lost packet ;) - tcp_info *i = new tcp_info (this); - - i->ok = false; - i->fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); - - if (i->fd >= 0) - { - fcntl (i->fd, F_SETFL, O_NONBLOCK); - - if (connect (i->fd, si.sav4 (), si.salenv4 ()) >= 0 - || errno == EINPROGRESS) - { - tcp_si.insert (tcp_si_map::value_type (si, i)); - tcp_fd.insert (tcp_fd_map::value_type (i->fd, i)); - return; - } - - delete i; - } - } - else - { - tcp_info *i = info->second; - - if (i->ok) - { - setsockopt (i->fd, SOL_IP, IP_TOS, &tos, sizeof tos); - - if (write (i->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32)) - { - // error, close socket, forget it and retry immediately - tcp_si.erase (info); - tcp_fd.erase (i->fd); - delete i; - - // tail recursion is... better than goto(?) - send_tcpv4_packet (pkt, si, tos); - } - } - } - -#if 0 - setsockopt (udpv4_fd, SOL_IP, IP_TOS, &tos, sizeof tos); - sendto (udpv4_fd, &((*pkt)[0]), pkt->len, 0, si.sav4 (), si.salenv4 ()); -#endif -} - void -vpn::tcpv4_accept (int fd, short revents) -{ - if (revents & (POLLIN | POLLERR)) - { - struct sockaddr_in sa; - socklen_t sa_len = sizeof (sa); - int len; - - fd = accept (fd, (sockaddr *)&sa, &sa_len); - - if (fd >= 0) - { - fcntl (fd, F_SETFL, O_NONBLOCK); - - sockinfo si(sa, PROT_TCPv4); - tcp_info *i = new tcp_info (this); - - i->fd = fd; - i->ok = true; - i->r.start (fd, POLLIN); - - tcp_si.insert (tcp_si_map::value_type (si, i)); - tcp_fd.insert (tcp_fd_map::value_type (fd, i)); - } - } -} - -void -vpn::tcpv4_ev (int fd, short revents) -{ - if (revents & (POLLIN | POLLERR)) - { - tcp_fd_map::iterator info = tcp_fd.find (fd); - - if (info != tcp_fd.end ()) - { - tcp_info *i = info->second; - - if (!i->ok) // not yet established - { - i->ok = true; - fcntl (i->fd, F_SETFL, 0); - } - - u32 len; - - if (sizeof (len) == read (fd, &len, sizeof (len))) - { - slog (L_ERR, "%d bytes received\n", len); - } - - //tcp_si.erase (i); - tcp_fd.erase (fd); - delete i; - } - } -} - -#endif - -void -vpn::tap_ev (int fd, short revents) +vpn::tap_ev (io_watcher &w, short revents) { if (revents & POLLIN) { @@ -528,7 +421,7 @@ } void -vpn::event_cb (tstamp &ts) +vpn::event_cb (time_watcher &w) { if (events) { @@ -555,7 +448,7 @@ events = 0; } - ts = TSTAMP_CANCEL; + w.at = TSTAMP_CANCEL; } void @@ -609,17 +502,17 @@ return router; } -void vpn::connect_request (int id) +void vpn::send_connect_request (int id) { connection *c = find_router (); if (c) - c->connect_request (id); - //else // does not work, because all others must connect to the same router - // // no router found, aggressively connect to all routers - // for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) - // if ((*i)->conf->routerprio) - // (*i)->establish_connection (); + c->send_connect_request (id); + else + // no router found, aggressively connect to all routers + for (conns_vector::iterator i = conns.begin (); i != conns.end (); ++i) + if ((*i)->conf->routerprio) + (*i)->establish_connection (); } void @@ -651,7 +544,7 @@ , ipv4_ev_watcher (this, &vpn::ipv4_ev) , tap_ev_watcher (this, &vpn::tap_ev) #if ENABLE_TCP -, tcpv4_accept_watcher(this, &vpn::tcpv4_accept) +, tcpv4_ev_watcher(this, &vpn::tcpv4_ev) #endif { }