From f639165c84f8e341cccde7aef93d1d59f8b95336 Mon Sep 17 00:00:00 2001 From: Markus Grüneis Date: Wed, 4 Mar 2009 20:12:33 +0000 Subject: - extended gResolver: supports completion-callback --- src/anytun.cpp | 16 ++++++++++------ src/anytun.vcproj | 13 ++++++++++--- src/resolver.cpp | 27 ++++++++++++++++----------- src/resolver.h | 10 ++++++---- 4 files changed, 42 insertions(+), 24 deletions(-) diff --git a/src/anytun.cpp b/src/anytun.cpp index bd21eb3..1b71f15 100644 --- a/src/anytun.cpp +++ b/src/anytun.cpp @@ -213,7 +213,7 @@ void sender(void* p) try { param->src.send(encrypted_packet.getBuf(), encrypted_packet.getLength(), conn.remote_end_); - } catch (std::exception& e) { + } catch (std::exception&) { //TODO: do something here //cLog.msg(Log::PRIO_ERROR) << "could not send data: " << e.what(); } @@ -448,13 +448,17 @@ int main(int argc, char* argv[]) HostList connect_to = gOpt.getRemoteSyncHosts(); + + if(gOpt.getRemoteAddr() != "") { - boost::asio::io_service io_service; - UDPPacketSource::proto::resolver resolver(io_service); - UDPPacketSource::proto::resolver::query query(gOpt.getRemoteAddr(), gOpt.getRemotePort()); - UDPPacketSource::proto::endpoint endpoint = *resolver.resolve(query); - createConnection(endpoint,gOpt.getSeqWindowSize(), gOpt.getMux()); + gResolver.resolveUdp(gOpt.getRemoteAddr(), gOpt.getRemotePort(), + boost::bind(createConnection, _1, gOpt.getSeqWindowSize(), gOpt.getMux())); + ///*boost::asio::io_service io_service; + //UDPPacketSource::proto::resolver resolver(io_service); + //UDPPacketSource::proto::resolver::query query(gOpt.getRemoteAddr(), gOpt.getRemotePort()); + //UDPPacketSource::proto::endpoint endpoint = *resolver.resolve(query); + //createConnection(endpoint,gOpt.getSeqWindowSize(), gOpt.getMux());*/ } #ifndef NO_ROUTING diff --git a/src/anytun.vcproj b/src/anytun.vcproj index 7d4759a..df660cd 100644 --- a/src/anytun.vcproj +++ b/src/anytun.vcproj @@ -42,13 +42,12 @@ Name="VCCLCompilerTool" AdditionalOptions="/I "C:\Program Files\boost\boost_1_35_0\"" Optimization="0" - PreprocessorDefinitions="LOG_FILE;LOG_STDOUT;LOG_WINEVENTLOG;USE_SSL_CRYPTO;NO_DAEMON;NO_EXEC;WIN32_LEAN_AND_MEAN" + PreprocessorDefinitions="LOG_FILE;LOG_STDOUT;LOG_WINEVENTLOG;USE_SSL_CRYPTO;NO_DAEMON;NO_EXEC;WIN32_LEAN_AND_MEAN;BOOST_ALL_DYN_LINK" MinimalRebuild="true" BasicRuntimeChecks="3" RuntimeLibrary="3" UsePrecompiledHeader="0" WarningLevel="3" - Detect64BitPortabilityProblems="false" DebugInformationFormat="4" ForcedIncludeFiles="" /> @@ -116,7 +115,7 @@ /> + + @@ -616,6 +619,10 @@ RelativePath=".\win32\registryKey.cpp" > + + diff --git a/src/resolver.cpp b/src/resolver.cpp index 52d0c0b..c4df658 100644 --- a/src/resolver.cpp +++ b/src/resolver.cpp @@ -34,13 +34,18 @@ #include "resolver.h" #include "log.h" -template ResolveHandler::ResolveHandler(const std::string& addr, const std::string& port) : addr_(addr), port_(port) +template ResolveHandler::ResolveHandler(const std::string& addr, const std::string& port, boost::function const& onResolve) : addr_(addr), port_(port), callback_(onResolve) { } -template void ResolveHandler::operator()(const boost::system::error_code& e, const boost::asio::ip::basic_resolver_iterator) +template void ResolveHandler::operator()(const boost::system::error_code& e, const boost::asio::ip::basic_resolver_iterator endpointIt) { cLog.msg(Log::PRIO_DEBUG) << "ResolveHandler<" << typeid(Proto).name() << ">() called, addr='" << addr_ << "', port='" << port_ << "'"; + if(boost::system::errc:success == e) { + callback_(*endpointIt); + } else { + cLog.msg(Log::PRIO_ERROR) << << "ResolveHandler<" << typeid(Proto).name() << ">(): " << e; + } } Resolver* Resolver::inst = NULL; @@ -70,36 +75,36 @@ Resolver::~Resolver() void Resolver::init() { if(!thread_) - thread_ = new boost::thread(boost::bind(run, this)); + thread_ = new boost::thread(boost::bind(&Resolver::run, this)); } -void Resolver::run(void* s) +void Resolver::run(/*void* s*/) { - Resolver* self = reinterpret_cast(s); + //Resolver* self = reinterpret_cast(s); cLog.msg(Log::PRIO_DEBUG) << "Resolver Thread started"; while(1) { - self->io_service_.run(); - self->io_service_.reset(); + /*self->*/io_service_.run(); + /*self->*/io_service_.reset(); boost::this_thread::sleep(boost::posix_time::milliseconds(250)); } } -void Resolver::resolveUdp(const std::string& addr, const std::string& port) +void Resolver::resolveUdp(const std::string& addr, const std::string& port, boost::function const& onResolve) { cLog.msg(Log::PRIO_DEBUG) << "trying to resolv UDP: " << addr << " " << port; boost::asio::ip::udp::resolver::query query(addr, port); - UdpResolveHandler handler(addr, port); + UdpResolveHandler handler(addr, port, onResolve); udp_resolver_.async_resolve(query, handler); } -void Resolver::resolveTcp(const std::string& addr, const std::string& port) +void Resolver::resolveTcp(const std::string& addr, const std::string& port, boost::function const& onResolve) { cLog.msg(Log::PRIO_DEBUG) << "trying to resolv TCP: " << addr << " " << port; boost::asio::ip::tcp::resolver::query query(addr, port); - TcpResolveHandler handler(addr, port); + TcpResolveHandler handler(addr, port, onResolve); tcp_resolver_.async_resolve(query, handler); } diff --git a/src/resolver.h b/src/resolver.h index 7f1336f..9fe51b2 100644 --- a/src/resolver.h +++ b/src/resolver.h @@ -34,6 +34,7 @@ #include #include +#include #include "threadUtils.hpp" @@ -41,12 +42,13 @@ template class ResolveHandler { public: - ResolveHandler(const std::string& addr, const std::string& port); + ResolveHandler(const std::string& addr, const std::string& port, boost::function const& onResolve); void operator()(const boost::system::error_code& e, const boost::asio::ip::basic_resolver_iterator); private: std::string addr_; std::string port_; + boost::function callback_; }; typedef ResolveHandler UdpResolveHandler; @@ -58,10 +60,10 @@ public: static Resolver& instance(); void init(); - static void run(void* s); + /*static */void run(/*void* s*/); - void resolveUdp(const std::string& addr, const std::string& port); - void resolveTcp(const std::string& addr, const std::string& port); + void resolveUdp(const std::string& addr, const std::string& port, boost::function const& onResolve); + void resolveTcp(const std::string& addr, const std::string& port, boost::function const& onResolve); private: Resolver(); -- cgit v1.2.3