--- gvpe/src/vpn.C 2003/04/02 21:02:25 1.3 +++ gvpe/src/vpn.C 2003/04/06 18:12:18 1.7 @@ -40,13 +40,6 @@ #include "util.h" #include "vpn.h" -#if ENABLE_TCP -# include -# include -# include -# include -#endif - ///////////////////////////////////////////////////////////////////////////// const char *vpn::script_if_up () @@ -193,18 +186,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 +241,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,12 +252,16 @@ 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); } @@ -252,7 +279,7 @@ 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 +290,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; @@ -330,176 +357,6 @@ } } -#if ENABLE_TCP - -struct tcp_connection; - -struct lt_sockinfo -{ - bool operator()(const sockinfo *a, const sockinfo *b) const - { - return *a < *b; - } -}; - -struct tcp_si_map : public map { - void cleaner_cb (time_watcher &w); time_watcher cleaner; - - tcp_si_map () - : cleaner(this, &tcp_si_map::cleaner_cb) - { - cleaner.start (0); - } -} tcp_si; - -struct tcp_connection : io_watcher { - tstamp last_activity; - const sockinfo si; - vpn &v; - bool ok; - - void tcpv4_ev (io_watcher &w, short revents); - - operator tcp_si_map::value_type() - { - return tcp_si_map::value_type (&si, this); - } - - tcp_connection (int fd_, const sockinfo &si_, vpn &v_) - : v(v_), si(si_), io_watcher(this, &tcp_connection::tcpv4_ev), ok(false) - { - last_activity = NOW; - start (fd_, POLLOUT); - } - - ~tcp_connection () { close (fd); } -}; - -void tcp_si_map::cleaner_cb (time_watcher &w) -{ - w.at = NOW + 600; - tstamp to = NOW - ::conf.keepalive - 30; - - for (iterator i = begin (); i != end(); ) - if (i->second->last_activity >= to) - ++i; - else - { - erase (i); - i = begin (); - } -} - -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 ;) - int fd = socket (PF_INET, SOCK_STREAM, IPPROTO_TCP); - - if (fd >= 0) - { - fcntl (fd, F_SETFL, O_NONBLOCK); - - if (connect (fd, si.sav4 (), si.salenv4 ()) >= 0 - || errno == EINPROGRESS) - { - tcp_connection *i = new tcp_connection (fd, si, *this); - - tcp_si.insert (*i); - } - else - close (fd); - } - } - else - { - tcp_connection *i = info->second; - - i->last_activity = NOW; - - if (i->ok) - { - setsockopt (i->fd, SOL_IP, IP_TOS, &tos, sizeof tos); - - // we use none of the advantages of tcp - write (i->fd, (void *)pkt, pkt->len + sizeof (u32)) != pkt->len + sizeof (u32); - } - } - -#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 -tcp_connection::tcpv4_ev (io_watcher &w, short revents) -{ - last_activity = NOW; - - if (!ok) // just established? - { - ok = true; - fcntl (fd, F_SETFL, 0); - stop (); - start (fd, POLLIN); - } - - if (revents & (POLLIN | POLLERR)) - { - u32 len; - - if (sizeof (len) == read (fd, &len, sizeof (len))) - { - vpn_packet *pkt = new vpn_packet; - - if (len == read (fd, &((*pkt)[0]), len)) - { - pkt->len = len; - - v.recv_vpn_packet (pkt, si); - return; - } - - delete pkt; - } - - tcp_si.erase (&si); - stop (); - } -} - -void -vpn::tcpv4_ev (io_watcher &w, short revents) -{ - if (revents & (POLLIN | POLLERR)) - { - struct sockaddr_in sa; - socklen_t sa_len = sizeof (sa); - int len; - - int fd = accept (w.fd, (sockaddr *)&sa, &sa_len); - - if (fd >= 0) - { - fcntl (fd, F_SETFL, O_NONBLOCK); - - sockinfo si(sa, PROT_TCPv4); - tcp_connection *i = new tcp_connection (fd, si, *this); - - slog (L_ERR, "accepted %d\n", fd);//D - - tcp_si.insert (*i); - } - } -} - -#endif - void vpn::tap_ev (io_watcher &w, short revents) { @@ -642,17 +499,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