|
@@ -31,12 +31,11 @@ namespace {
|
|
/// host reservation in DHCPv4.
|
|
/// host reservation in DHCPv4.
|
|
const std::set<std::string>& getSupportedParams4() {
|
|
const std::set<std::string>& getSupportedParams4() {
|
|
static const char* params[] = {
|
|
static const char* params[] = {
|
|
- "duid", "hw-address", "hostname", "ip-address"
|
|
+ "duid", "hw-address", "hostname", "ip-address", NULL
|
|
};
|
|
};
|
|
- static const size_t params_num = static_cast<const size_t>(sizeof(params) / sizeof(char*));
|
|
|
|
static std::set<std::string> params_set;
|
|
static std::set<std::string> params_set;
|
|
if (params_set.empty()) {
|
|
if (params_set.empty()) {
|
|
- for (int i = 0; i < params_num; ++i) {
|
|
+ for (int i = 0; params[i] != NULL; ++i) {
|
|
params_set.insert(std::string(params[i]));
|
|
params_set.insert(std::string(params[i]));
|
|
}
|
|
}
|
|
}
|
|
}
|
|
@@ -49,12 +48,12 @@ const std::set<std::string>& getSupportedParams4() {
|
|
/// host reservation in DHCPv6.
|
|
/// host reservation in DHCPv6.
|
|
const std::set<std::string>& getSupportedParams6() {
|
|
const std::set<std::string>& getSupportedParams6() {
|
|
static const char* params[] = {
|
|
static const char* params[] = {
|
|
- "duid", "hw-address", "hostname", "ip-addresses", "prefixes"
|
|
+ "duid", "hw-address", "hostname", "ip-addresses", "prefixes", NULL
|
|
};
|
|
};
|
|
static const size_t params_num = static_cast<const size_t>(sizeof(params) / sizeof(char*));
|
|
static const size_t params_num = static_cast<const size_t>(sizeof(params) / sizeof(char*));
|
|
static std::set<std::string> params_set;
|
|
static std::set<std::string> params_set;
|
|
if (params_set.empty()) {
|
|
if (params_set.empty()) {
|
|
- for (int i = 0; i < params_num; ++i) {
|
|
+ for (int i = 0; params[i] != NULL; ++i) {
|
|
params_set.insert(std::string(params[i]));
|
|
params_set.insert(std::string(params[i]));
|
|
}
|
|
}
|
|
}
|
|
}
|