[#3074] addressed review comments

diff --git a/src/lib/dhcp/option_classless_static_route.cc b/src/lib/dhcp/option_classless_static_route.cc
index edabeda0743697e8be32325a232be81a267704cc..6b22b7ca2a0d1d0f3f81b69c7a10a92576590d03 100644 (file)
--- a/src/lib/dhcp/option_classless_static_route.cc
+++ b/src/lib/dhcp/option_classless_static_route.cc
@@ -225,9 +225,9 @@ OptionClasslessStaticRoute::parseConfigData(const std::string& config_txt) {
         try {
             subnet_addr = IOAddress(txt_subnet_addr);
             if (!subnet_addr.isV4()) {
-                isc_throw(IOError, "This is not IPv4 address.");
+                isc_throw(BadValue, "This is not IPv4 address.");
             }
-        } catch (const IOError& e) {
+        } catch (const std::exception& e) {
             isc_throw(BadValue, "DHCPv4 OptionClasslessStaticRoute "
                                     << type_ << " has invalid value, provided subnet_addr "
                                     << txt_subnet_addr << " is not a valid IPv4 address. "
@@ -255,9 +255,9 @@ OptionClasslessStaticRoute::parseConfigData(const std::string& config_txt) {
         try {
             router_addr = IOAddress(txt_router);
             if (!router_addr.isV4()) {
-                isc_throw(IOError, "This is not IPv4 address.");
+                isc_throw(BadValue, "This is not IPv4 address.");
             }
-        } catch (const IOError& e) {
+        } catch (const std::exception& e) {
             isc_throw(BadValue, "DHCPv4 OptionClasslessStaticRoute "
                                     << type_ << " has invalid value, provided router address "
                                     << txt_router << " is not a valid IPv4 address. "

diff --git a/src/lib/dhcp/tests/option_classless_static_route_unittest.cc b/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
index 329952dc900e396005ca3f86bbd55db6803d9e1b..caa12303e6071ebd0c9bdb1bee5ce9c9fa962398 100644 (file)
--- a/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
+++ b/src/lib/dhcp/tests/option_classless_static_route_unittest.cc
@@ -46,6 +46,9 @@ TEST(OptionClasslessStaticRouteTest, bufferFromStrCtorWithOneRoute) {
 // 3 static routes are defined.
 TEST(OptionClasslessStaticRouteTest, bufferFromStrCtorWithMoreRoutes) {
     // Prepare data to decode - 3 static routes
+    // White space added/missing inconsistency is on purpose,
+    // it simulates real user typing inconsistent config.
+    // Trimming spaces in config is tested as well.
     const std::string config = "0.0.0.0/0 - 10.17.0.1,10.229.0.128/25-10.229.0.1, "
                                "10.27.129.0/24 - 10.27.129.1";
     OptionBuffer buf;