X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fresolver.cpp;h=81c30e3f3b2b0d94f1d7f31d3f92f21068372020;hb=91d2dadab8997ae23442f77dd28db9fa3aee1e7c;hp=66f1e7eced8085fc290da0143be69d8f7e737ceb;hpb=bb834fe0ed7a38b724f49b944adb801634eb6194;p=anytun.git diff --git a/src/resolver.cpp b/src/resolver.cpp index 66f1e7e..81c30e3 100644 --- a/src/resolver.cpp +++ b/src/resolver.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,7 +27,20 @@ * 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 @@ -40,20 +53,20 @@ using ::boost::asio::ip::udp; using ::boost::asio::ip::tcp; template -void waitAndEnqueue(u_int32_t s, const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) +void waitAndEnqueue(uint32_t s, const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) { cLog.msg(Log::PRIO_ERROR) << "the resolver only supports udp and tcp"; } template<> -void waitAndEnqueue(u_int32_t s, const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) +void waitAndEnqueue(uint32_t s, const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) { boost::this_thread::sleep(boost::posix_time::milliseconds(s * 1000)); gResolver.resolveUdp(addr, port, onResolve, onError, r); } template<> -void waitAndEnqueue(u_int32_t s, const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) +void waitAndEnqueue(uint32_t s, const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) { boost::this_thread::sleep(boost::posix_time::milliseconds(s * 1000)); gResolver.resolveTcp(addr, port, onResolve, onError, r); @@ -61,19 +74,17 @@ void waitAndEnqueue(u_int32_t s, const std::string& addr, const std::string& por template -ResolveHandler::ResolveHandler(const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) : addr_(addr), port_(port), onResolve_(onResolve), onError_(onError), resolv_addr_type_(r) +ResolveHandler::ResolveHandler(const std::string& addr, const std::string& port, boost::function)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r) : addr_(addr), port_(port), onResolve_(onResolve), onError_(onError), resolv_addr_type_(r) { } template -void ResolveHandler::operator()(const boost::system::error_code& e, const boost::asio::ip::basic_resolver_iterator endpointIt) +void ResolveHandler::operator()(const boost::system::error_code& e, boost::asio::ip::basic_resolver_iterator endpointIt) { if(boost::system::posix_error::success == e) { try { - onResolve_(*endpointIt); - } - catch(const std::runtime_error& e) - { + onResolve_(endpointIt); + } catch(const std::runtime_error& e) { onError_(e); } } else { @@ -82,18 +93,12 @@ void ResolveHandler::operator()(const boost::system::error_code& e, const } } -Resolver* Resolver::inst = NULL; -Mutex Resolver::instMutex; Resolver& gResolver = Resolver::instance(); Resolver& Resolver::instance() { - Lock lock(instMutex); - static instanceCleaner c; - if(!inst) - inst = new Resolver(); - - return *inst; + static Resolver instance; + return instance; } Resolver::Resolver() : udp_resolver_(io_service_), tcp_resolver_(io_service_), thread_(NULL) @@ -102,32 +107,30 @@ Resolver::Resolver() : udp_resolver_(io_service_), tcp_resolver_(io_service_), t Resolver::~Resolver() { - if(thread_) + if(thread_) { delete thread_; + } } void Resolver::init() { - if(!thread_) - thread_ = new boost::thread(boost::bind(&Resolver::run, this)); + if(!thread_) { + thread_ = new boost::thread(boost::bind(&Resolver::run, this)); + } } void Resolver::run() { cLog.msg(Log::PRIO_DEBUG) << "Resolver Thread started"; - while(1) { + for(;;) { try { io_service_.run(); io_service_.reset(); boost::this_thread::sleep(boost::posix_time::milliseconds(250)); - } - catch(const std::runtime_error& e) - { + } catch(const std::runtime_error& e) { cLog.msg(Log::PRIO_ERROR) << "resolver caught runtime error, restarting: " << e.what(); - } - catch(const std::exception& e) - { + } catch(const std::exception& e) { cLog.msg(Log::PRIO_ERROR) << "resolver caught exception, restarting: " << e.what(); } } @@ -138,19 +141,30 @@ void Resolver::resolveUdp(const std::string& addr, const std::string& port, UdpR { cLog.msg(Log::PRIO_DEBUG) << "trying to resolv UDP: '" << addr << "' '" << port << "'"; - std::auto_ptr query; + boost::shared_ptr query; if(addr != "") { switch(r) { - case IPV4_ONLY: query = std::auto_ptr(new udp::resolver::query(udp::v4(), addr, port)); break; - case IPV6_ONLY: query = std::auto_ptr(new udp::resolver::query(udp::v6(), addr, port)); break; - default: query = std::auto_ptr(new udp::resolver::query(addr, port)); break; + case IPV4_ONLY: + query = boost::shared_ptr(new udp::resolver::query(udp::v4(), addr, port)); + break; + case IPV6_ONLY: + query = boost::shared_ptr(new udp::resolver::query(udp::v6(), addr, port)); + break; + default: + query = boost::shared_ptr(new udp::resolver::query(addr, port)); + break; } - } - else { + } else { switch(r) { - case IPV4_ONLY: query = std::auto_ptr(new udp::resolver::query(udp::v4(), port)); break; - case IPV6_ONLY: query = std::auto_ptr(new udp::resolver::query(udp::v6(), port)); break; - default: query = std::auto_ptr(new udp::resolver::query(port)); break; + case IPV4_ONLY: + query = boost::shared_ptr(new udp::resolver::query(udp::v4(), port)); + break; + case IPV6_ONLY: + query = boost::shared_ptr(new udp::resolver::query(udp::v6(), port)); + break; + default: + query = boost::shared_ptr(new udp::resolver::query(port)); + break; } } UdpResolveHandler handler(addr, port, onResolve, onError, r); @@ -161,21 +175,32 @@ void Resolver::resolveTcp(const std::string& addr, const std::string& port, TcpR { cLog.msg(Log::PRIO_DEBUG) << "trying to resolv TCP: '" << addr << "' '" << port << "'"; - std::auto_ptr query; + boost::shared_ptr query; if(addr != "") { switch(r) { - case IPV4_ONLY: query = std::auto_ptr(new tcp::resolver::query(tcp::v4(), addr, port)); break; - case IPV6_ONLY: query = std::auto_ptr(new tcp::resolver::query(tcp::v6(), addr, port)); break; - default: query = std::auto_ptr(new tcp::resolver::query(addr, port)); break; + case IPV4_ONLY: + query = boost::shared_ptr(new tcp::resolver::query(tcp::v4(), addr, port)); + break; + case IPV6_ONLY: + query = boost::shared_ptr(new tcp::resolver::query(tcp::v6(), addr, port)); + break; + default: + query = boost::shared_ptr(new tcp::resolver::query(addr, port)); + break; } - } - else { + } else { switch(r) { - case IPV4_ONLY: query = std::auto_ptr(new tcp::resolver::query(tcp::v4(), port)); break; - case IPV6_ONLY: query = std::auto_ptr(new tcp::resolver::query(tcp::v6(), port)); break; - default: query = std::auto_ptr(new tcp::resolver::query(port)); break; + case IPV4_ONLY: + query = boost::shared_ptr(new tcp::resolver::query(tcp::v4(), port)); + break; + case IPV6_ONLY: + query = boost::shared_ptr(new tcp::resolver::query(tcp::v6(), port)); + break; + default: + query = boost::shared_ptr(new tcp::resolver::query(port)); + break; } } TcpResolveHandler handler(addr, port, onResolve, onError, r); - tcp_resolver_.async_resolve(*query, handler); + tcp_resolver_.async_resolve(*query, handler); }