X-Git-Url: https://git.syn-net.org/debian/?a=blobdiff_plain;f=src%2Fresolver.cpp;h=81c30e3f3b2b0d94f1d7f31d3f92f21068372020;hb=91d2dadab8997ae23442f77dd28db9fa3aee1e7c;hp=6a17cde19ea67859d78f0be03e09f24b40a18237;hpb=ef0cacf2508418915d3f64b04003be3c13fed3cc;p=anytun.git

diff --git a/src/resolver.cpp b/src/resolver.cpp
index 6a17cde..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 <satp@wirdorange.org>
  *
  *  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 <http://www.gnu.org/licenses/>.
+ *  along with Anytun.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ *  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 <boost/bind.hpp>
@@ -80,19 +93,12 @@ void ResolveHandler<Proto>::operator()(const boost::system::error_code& e, boost
   }
 }
 
-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)
@@ -117,7 +123,7 @@ void Resolver::run()
 {
   cLog.msg(Log::PRIO_DEBUG) << "Resolver Thread started";
 
-  while(1) {
+  for(;;) {
     try {
       io_service_.run();
       io_service_.reset();
@@ -135,29 +141,29 @@ 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<udp::resolver::query> query;
+  boost::shared_ptr<udp::resolver::query> query;
   if(addr != "") {
     switch(r) {
     case IPV4_ONLY:
-      query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), addr, port));
+      query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), addr, port));
       break;
     case IPV6_ONLY:
-      query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), addr, port));
+      query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), addr, port));
       break;
     default:
-      query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(addr, port));
+      query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(addr, port));
       break;
     }
   } else {
     switch(r) {
     case IPV4_ONLY:
-      query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), port));
+      query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v4(), port));
       break;
     case IPV6_ONLY:
-      query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), port));
+      query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(udp::v6(), port));
       break;
     default:
-      query = std::auto_ptr<udp::resolver::query>(new udp::resolver::query(port));
+      query = boost::shared_ptr<udp::resolver::query>(new udp::resolver::query(port));
       break;
     }
   }
@@ -169,29 +175,29 @@ 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<tcp::resolver::query> query;
+  boost::shared_ptr<tcp::resolver::query> query;
   if(addr != "") {
     switch(r) {
     case IPV4_ONLY:
-      query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), addr, port));
+      query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), addr, port));
       break;
     case IPV6_ONLY:
-      query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), addr, port));
+      query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), addr, port));
       break;
     default:
-      query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(addr, port));
+      query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(addr, port));
       break;
     }
   } else {
     switch(r) {
     case IPV4_ONLY:
-      query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), port));
+      query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v4(), port));
       break;
     case IPV6_ONLY:
-      query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), port));
+      query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(tcp::v6(), port));
       break;
     default:
-      query = std::auto_ptr<tcp::resolver::query>(new tcp::resolver::query(port));
+      query = boost::shared_ptr<tcp::resolver::query>(new tcp::resolver::query(port));
       break;
     }
   }