From: Guilherme Maciel Ferreira <guilherme.maciel.ferreira@gmail.com>
Date: Thu, 19 May 2011 23:49:54 +0000 (-0300)
Subject: Included a precondition to DnsResolver::handle_ip_address()
X-Git-Tag: v1.0~6
X-Git-Url: http://developer.intra2net.com/git/?a=commitdiff_plain;h=74b255fbb539a10f2b9060a7ce4feb1c288843e9;p=pingcheck

Included a precondition to DnsResolver::handle_ip_address()
---

diff --git a/src/dns/dnsresolver.cpp b/src/dns/dnsresolver.cpp
index 4f33a7b..37de84d 100644
--- a/src/dns/dnsresolver.cpp
+++ b/src/dns/dnsresolver.cpp
@@ -67,11 +67,13 @@ DnsResolver::~DnsResolver()
  **/
 bool DnsResolver::handle_ip_address()
 {
+    BOOST_ASSERT( !HostDnsAddress.empty() );
+
     struct in_addr dummy_conversion;
 
     // Convert string to IP address
     // Note: IPv4 only
-    if (inet_aton(HostDnsAddress.c_str(), &dummy_conversion) != 0)
+    if ( inet_aton(HostDnsAddress.c_str(), &dummy_conversion) != 0 )
     {
         std::list<HostAddress> new_host_list;
 
@@ -79,7 +81,7 @@ bool DnsResolver::handle_ip_address()
         new_host_list.push_back( ip_host );
 
         // Activate new host list
-        ResolvedHostAddressList.swap(new_host_list);
+        ResolvedHostAddressList.swap( new_host_list );
 
         GlobalLogger.info() << "host is already an IP: " << HostDnsAddress << endl;
 
@@ -100,8 +102,10 @@ bool DnsResolver::resolve()
     BOOST_ASSERT( !NameServer.empty() );
 
     // Handle IP addresses in HostDnsAddress
-    if (handle_ip_address())
+    if ( handle_ip_address() )
+    {
         return true;
+    }
 
     GlobalLogger.info() << "Resolved IP(s) for host : "
             << HostDnsAddress << endl;
@@ -200,7 +204,7 @@ void DnsResolver::fill_answers_list(
     BOOST_ASSERT( !name_server.empty() );
     BOOST_ASSERT( answers_list != NULL );
 
-    address nameServer( address::from_string( name_server) );
+    address nameServer( address::from_string( name_server ) );
     boost::net::dns::resolve resolver;
     resolver.addServer( nameServer );
     message dns_message( host_dns_address, boost::net::dns::type_a );