X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2FpacketSource.cpp;h=711a206f0ef4404930369997154012e19f9cc038;hb=455cf8256fa995c63374721cbf9bcd93eaa2f618;hp=0882de52f0952832bb64443e0987abffe9408f2f;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git diff --git a/src/packetSource.cpp b/src/packetSource.cpp index 0882de5..711a206 100644 --- a/src/packetSource.cpp +++ b/src/packetSource.cpp @@ -6,12 +6,12 @@ * tunnel endpoints. It has less protocol overhead than IPSec in Tunnel * mode and allows tunneling of every ETHER TYPE protocol (e.g. * ethernet, ip, arp ...). satp directly includes cryptography and - * message authentication based on the methodes used by SRTP. It is + * message authentication based on the methods used by SRTP. It is * intended to deliver a generic, scaleable and secure solution for * tunneling and relaying of packets of any protocol. * * - * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl, + * Copyright (C) 2007-2014 Markus Grüneis, Othmar Gsenger, Erwin Nindl, * Christian Pointner * * This file is part of Anytun. @@ -27,11 +27,25 @@ * GNU General Public License for more details. * * You should have received a copy of the GNU General Public License - * along with anytun. If not, see . + * along with Anytun. If not, see . + * + * In addition, as a special exception, the copyright holders give + * permission to link the code of portions of this program with the + * OpenSSL library under certain conditions as described in each + * individual source file, and distribute linked combinations + * including the two. + * You must obey the GNU General Public License in all respects + * for all of the code used other than OpenSSL. If you modify + * file(s) with this exception, you may extend this exception to your + * version of the file(s), but you are not obligated to do so. If you + * do not wish to do so, delete this exception statement from your + * version. If you delete this exception statement from all source + * files in the program, then also delete it here. */ #include #include +#include #include "datatypes.h" #include "packetSource.h" @@ -39,22 +53,78 @@ #include "resolver.h" #include "options.h" #include "signalController.h" +#include "anytunError.h" void PacketSource::waitUntilReady() { ready_sem_.down(); } -UDPPacketSource::UDPPacketSource(std::string localaddr, std::string port) : sock_(io_service_) +UDPPacketSource::UDPPacketSource(std::string localaddr, std::string port) { gResolver.resolveUdp(localaddr, port, boost::bind(&UDPPacketSource::onResolve, this, _1), boost::bind(&UDPPacketSource::onError, this, _1), gOpt.getResolvAddrType()); } -void UDPPacketSource::onResolve(const boost::asio::ip::udp::endpoint& e) +UDPPacketSource::~UDPPacketSource() { - cLog.msg(Log::PRIO_NOTICE) << "opening socket: " << e; - sock_.open(e.protocol()); - sock_.bind(e); + std::list::iterator it = sockets_.begin(); + for(; it != sockets_.end(); ++it) { + /// this might be a needed by the receiver thread, TODO cleanup + // delete[](it->buf_); + // delete(it->sem_); + // delete(it->sock_); + } +} + +void UDPPacketSource::onResolve(PacketSourceResolverIt it) +{ + while(it != PacketSourceResolverIt()) { + PacketSourceEndpoint e = *it; + cLog.msg(Log::PRIO_NOTICE) << "opening socket: " << e; + + SocketsElement sock; + sock.buf_ = NULL; + sock.len_ = 0; + sock.sem_ = NULL; + sock.sock_ = new proto::socket(io_service_); + if(!sock.sock_) { + AnytunError::throwErr() << "memory error"; + } + + sock.sock_->open(e.protocol()); +#if !defined(_MSC_VER) && !defined(MINGW) + if(e.protocol() == proto::v6()) { + sock.sock_->set_option(boost::asio::ip::v6_only(true)); + } +#endif + sock.sock_->bind(e); + sockets_.push_back(sock); + + it++; + } + + // prepare multi-socket recv + if(sockets_.size() > 1) { + std::list::iterator it = sockets_.begin(); + for(; it != sockets_.end(); ++it) { + it->len_ = MAX_PACKET_LENGTH; + it->buf_ = new uint8_t[it->len_]; + if(!it->buf_) { + AnytunError::throwErr() << "memory error"; + } + + it->sem_ = new Semaphore(); + if(!it->sem_) { + delete[](it->buf_); + AnytunError::throwErr() << "memory error"; + } + + boost::thread(boost::bind(&UDPPacketSource::recv_thread, this, it)); + it->sem_->up(); + } + + } + ready_sem_.up(); } @@ -63,13 +133,53 @@ void UDPPacketSource::onError(const std::runtime_error& e) gSignalController.inject(SIGERROR, e.what()); } -u_int32_t UDPPacketSource::recv(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint& remote) +void UDPPacketSource::recv_thread(std::list::iterator it) { - return static_cast(sock_.receive_from(boost::asio::buffer(buf, len), remote)); + cLog.msg(Log::PRIO_INFO) << "started receiver thread for " << it->sock_->local_endpoint(); + + ThreadResult result; + result.it_ = it; + for(;;) { + it->sem_->down(); + result.len_ = static_cast(it->sock_->receive_from(boost::asio::buffer(it->buf_, it->len_), result.remote_)); + { + Lock lock(thread_result_mutex_); + thread_result_queue_.push(result); + } + thread_result_sem_.up(); + } +} + +uint32_t UDPPacketSource::recv(uint8_t* buf, uint32_t len, PacketSourceEndpoint& remote) +{ + if(sockets_.size() == 1) { + return static_cast(sockets_.front().sock_->receive_from(boost::asio::buffer(buf, len), remote)); + } + + thread_result_sem_.down(); + ThreadResult result; + { + Lock lock(thread_result_mutex_); + result = thread_result_queue_.front(); + thread_result_queue_.pop(); + } + remote = result.remote_; + std::memcpy(buf, result.it_->buf_, (len < result.len_) ? len : result.len_); + len = (len < result.len_) ? len : result.len_; + result.it_->sem_->up(); + + return len; } -void UDPPacketSource::send(u_int8_t* buf, u_int32_t len, PacketSourceEndpoint remote) +void UDPPacketSource::send(uint8_t* buf, uint32_t len, PacketSourceEndpoint remote) { - sock_.send_to(boost::asio::buffer(buf, len), remote); + std::list::iterator it = sockets_.begin(); + for(; it != sockets_.end(); ++it) { + if(it->sock_->local_endpoint().protocol() == remote.protocol()) { + it->sock_->send_to(boost::asio::buffer(buf, len), remote); + return; + } + } + cLog.msg(Log::PRIO_WARNING) << "no suitable socket found for remote endpoint protocol: " << remote; }