* tunneling and relaying of packets of any protocol.
*
*
- * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
+ * Copyright (C) 2007-2009 Othmar Gsenger, Erwin Nindl,
* Christian Pointner <satp@wirdorange.org>
*
* This file is part of Anytun.
#include "datatypes.h"
#include "threadUtils.hpp"
-typedef boost::function<void (boost::asio::ip::udp::endpoint)> UdpResolveCallback;
-typedef boost::function<void (boost::asio::ip::tcp::endpoint)> TcpResolveCallback;
+typedef boost::function<void (boost::asio::ip::udp::resolver::iterator)> UdpResolveCallback;
+typedef boost::function<void (boost::asio::ip::tcp::resolver::iterator)> TcpResolveCallback;
typedef boost::function<void (std::runtime_error const&)> ErrorCallback;
template<class Proto>
class ResolveHandler
{
public:
- ResolveHandler(const std::string& addr, const std::string& port, boost::function<void (boost::asio::ip::basic_endpoint<Proto>)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r = ANY);
- void operator()(const boost::system::error_code& e, const boost::asio::ip::basic_resolver_iterator<Proto>);
+ ResolveHandler(const std::string& addr, const std::string& port, boost::function<void (boost::asio::ip::basic_resolver_iterator<Proto>)> const& onResolve, ErrorCallback const& onError, ResolvAddrType r = ANY);
+ void operator()(const boost::system::error_code& e, boost::asio::ip::basic_resolver_iterator<Proto>);
private:
std::string addr_;
std::string port_;
- boost::function<void (boost::asio::ip::basic_endpoint<Proto>)> onResolve_;
+ boost::function<void (const boost::asio::ip::basic_resolver_iterator<Proto>)> onResolve_;
ErrorCallback onError_;
ResolvAddrType resolv_addr_type_;
};
typedef ResolveHandler<boost::asio::ip::udp> UdpResolveHandler;
typedef ResolveHandler<boost::asio::ip::tcp> TcpResolveHandler;
-class Resolver
+class Resolver
{
public:
static Resolver& instance();
private:
Resolver();
~Resolver();
- Resolver(const Resolver &r);
- void operator=(const Resolver &r);
+ Resolver(const Resolver& r);
+ void operator=(const Resolver& r);
static Resolver* inst;
static ::Mutex instMutex;
- class instanceCleaner {
- public: ~instanceCleaner() {
- if(Resolver::inst != 0)
+ class instanceCleaner
+ {
+ public:
+ ~instanceCleaner() {
+ if(Resolver::inst != 0) {
delete Resolver::inst;
+ }
}
};
friend class instanceCleaner;