From 5374ac7051de084e5bdafcdc4640541e33087440 Mon Sep 17 00:00:00 2001 From: Razvan Becheriu Date: Thu, 16 May 2019 10:10:50 +0300 Subject: [PATCH] formatting --- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc | 3 ++- src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc | 5 ++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc index afb6cb4900..fafed09346 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp4.cc @@ -410,6 +410,7 @@ public: last_subnet->requireClientClass(require_item->stringValue()); } } + // reservation_mode if (!out_bindings[15]->amNull()) { last_subnet->setHostReservationMode(static_cast @@ -845,7 +846,6 @@ public: conn_.insertQuery(MySqlConfigBackendDHCPv4Impl::INSERT_SUBNET4_SERVER, in_server_bindings); - } catch (const DuplicateEntry&) { deletePools4(subnet); deleteOptions4(server_selector, subnet); @@ -1053,6 +1053,7 @@ public: if (!out_bindings[2]->amNull()) { last_network->allowClientClass(out_bindings[2]->getString()); } + // interface if (!out_bindings[3]->amNull()) { last_network->setIface(out_bindings[3]->getString()); diff --git a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc index bc95a61a80..68e182bbb3 100644 --- a/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc +++ b/src/hooks/dhcp/mysql_cb/mysql_cb_dhcp6.cc @@ -960,7 +960,6 @@ public: conn_.insertQuery(MySqlConfigBackendDHCPv6Impl::INSERT_SUBNET6_SERVER, in_server_bindings); - } catch (const DuplicateEntry&) { deletePools6(subnet); deletePdPools6(subnet); @@ -1559,8 +1558,8 @@ public: MySqlTransaction transaction(conn_); OptionDescriptorPtr existing_option = - getOption(GET_OPTION6_CODE_SPACE, Option::V6, server_selector, - option->option_->getType(), option->space_name_); + getOption(GET_OPTION6_CODE_SPACE, Option::V6, server_selector, + option->option_->getType(), option->space_name_); // Create scoped audit revision. As long as this instance exists // no new audit revisions are created in any subsequent calls. -- 2.47.2