IPアドレスだけだと勘違いがあったのでHOST名指定にも対応可能にしました

git-svn-id: http://10.144.169.20/repos/um/branches/l7vsd-3.x-shamshel@6979 1ed66053-1c2d-0410-8867-f7571e6e31d3

diff --git a/src/replication.cpp b/src/replication.cpp
index 7f4991a..cd1a0cb 100644 (file)
--- a/src/replication.cpp
+++ b/src/replication.cpp
@@ -1093,15 +1093,22 @@ int                     replication::check_parameter(){
        size_t sum=0;
        std::string buf;
 
-       // set address
+//std::cout << "check1 " << replication_info.ip_addr << ":" << replication_info.service_name << "\n";
+       // Whether IP and the port are effective is confirmed.
        try{
-               replication_endpoint = boost::asio::ip::udp::endpoint( boost::asio::ip::address::from_string( replication_info.ip_addr ), boost::lexical_cast<unsigned short>( replication_info.service_name ) );
+//             replication_endpoint = boost::asio::ip::udp::endpoint( boost::asio::ip::address::from_string( replication_info.ip_addr ), boost::lexical_cast<unsigned short>( replication_info.service_name ) );
+
+               boost::asio::ip::udp::resolver                          udp_resolver( service_io );
+               boost::asio::ip::udp::resolver::query           udp_query( replication_info.ip_addr, replication_info.service_name );
+               boost::asio::ip::udp::resolver::iterator        itr = udp_resolver.resolve( udp_query );
+               replication_endpoint = *itr;
        }
        catch(...){
                buf = boost::io::str( boost::format( "Failed to get IP or Service Name.(%s:%s)" ) % replication_info.ip_addr % replication_info.service_name );
                Logger::putLogError( LOG_CAT_L7VSD_REPLICATION, 1, buf, __FILE__, __LINE__ );
                goto END;
        }
+//std::cout << "check2 " << replication_endpoint.address() << ":" << replication_endpoint.port() << "\n";
 
        // Interval check
        if ((MIN_INTERVAL>replication_info.interval) || (MAX_INTERVAL<replication_info.interval)){
@@ -1269,15 +1276,21 @@ int                     replication::send_data(){
        boost::system::error_code err;
        std::string buf;
 
-       // make send socket
+       // Whether IP and the port are effective is confirmed.
        try{
-               replication_endpoint = boost::asio::ip::udp::endpoint( boost::asio::ip::address::from_string( replication_info.ip_addr ), boost::lexical_cast<unsigned short>( replication_info.service_name ) );
+//             replication_endpoint = boost::asio::ip::udp::endpoint( boost::asio::ip::address::from_string( replication_info.ip_addr ), boost::lexical_cast<unsigned short>( replication_info.service_name ) );
+
+               boost::asio::ip::udp::resolver                          udp_resolver( service_io );
+               boost::asio::ip::udp::resolver::query           udp_query( replication_info.ip_addr, replication_info.service_name );
+               boost::asio::ip::udp::resolver::iterator        itr = udp_resolver.resolve( udp_query );
+               replication_endpoint = *itr;
        }
        catch(...){
                buf = boost::io::str( boost::format( "Failed to get IP or Service Name.(%s:%s)" ) % replication_info.ip_addr % replication_info.service_name );
                Logger::putLogError( LOG_CAT_L7VSD_REPLICATION, 1, buf, __FILE__, __LINE__ );
                return -1;
        }
+
 //std::cout << "master " << replication_endpoint.address() << ":" << replication_endpoint.port() << "\n";
        replication_send_socket.connect( replication_endpoint, err );
        if ( err ){

diff --git a/unit_tests/replication_test/replication_test.cpp b/unit_tests/replication_test/replication_test.cpp
index 7d4d390..51b0039 100644 (file)
--- a/unit_tests/replication_test/replication_test.cpp
+++ b/unit_tests/replication_test/replication_test.cpp
@@ -2458,6 +2458,7 @@ void      replication_handle_receive_test(){
 
        l7vs::replication       repli1;
 
+       get_string_table[0] = "um05";                                   //      "ip_addr"
        get_int_table[1] = 1;                                                   //      "cmponent_size_00"
        get_int_table[2] = 1;                                                   //      "cmponent_size_01"
        get_int_table[3] = 1;                                                   //      "cmponent_size_02"