private:
/// @brief Number of columns holding IPv6 reservation information.
- static const size_t RESERVATION_COLUMNS = 5;
+ static const size_t RESERVATION_COLUMNS = 7;
public:
: MySqlHostWithOptionsExchange(fetched_options, RESERVATION_COLUMNS),
reservation_id_(0),
reserv_type_(0), reserv_type_null_(MLM_FALSE),
- ipv6_address_buffer_len_(0), prefix_len_(0), iaid_(0),
+ ipv6_address_buffer_len_(0),
+ excluded_prefix_null_(MLM_FALSE), excluded_prefix_buffer_len_(0),
+ prefix_len_(0), iaid_(0),
+ excluded_prefix_len_(0),
reservation_id_index_(findAvailColumn()),
address_index_(reservation_id_index_ + 1),
prefix_len_index_(reservation_id_index_ + 2),
type_index_(reservation_id_index_ + 3),
iaid_index_(reservation_id_index_ + 4),
+ excluded_prefix_index_(reservation_id_index_ + 5),
+ excluded_prefix_len_index_(reservation_id_index_ + 6),
most_recent_reservation_id_(0) {
memset(ipv6_address_buffer_, 0, sizeof(ipv6_address_buffer_));
+ memset(excluded_prefix_buffer_, 0, sizeof(excluded_prefix_buffer_));
// Provide names of additional columns returned by the queries.
columns_[reservation_id_index_] = "reservation_id";
columns_[prefix_len_index_] = "prefix_len";
columns_[type_index_] = "type";
columns_[iaid_index_] = "dhcp6_iaid";
+ columns_[excluded_prefix_index_] = "excluded_prefix";
+ columns_[excluded_prefix_len_index_] = "excluded_prefix_len";
}
/// @brief Returns last fetched reservation id.
IOAddress addr6 = IOAddress::fromBytes(AF_INET6, ipv6_address_buffer_);
IPv6Resrv r(type, addr6, prefix_len_);
+
+ if (excluded_prefix_null_ == MLM_FALSE) {
+ IOAddress prefix =
+ IOAddress::fromBytes(AF_INET6, excluded_prefix_buffer_);
+ r.setPDExclude(prefix, excluded_prefix_len_);
+ }
+
return (r);
}
bind_[iaid_index_].buffer = reinterpret_cast<char*>(&iaid_);
bind_[iaid_index_].is_unsigned = MLM_TRUE;
+ // excluded_prefix BINARY(16)
+ excluded_prefix_null_ = MLM_FALSE;
+ excluded_prefix_buffer_len_ = isc::asiolink::V6ADDRESS_LEN;
+ bind_[excluded_prefix_index_].buffer_type = MYSQL_TYPE_BLOB;
+ bind_[excluded_prefix_index_].buffer =
+ reinterpret_cast<char*>(excluded_prefix_buffer_);
+ bind_[excluded_prefix_index_].buffer_length = excluded_prefix_buffer_len_;
+ bind_[excluded_prefix_index_].length = &excluded_prefix_buffer_len_;
+ bind_[excluded_prefix_index_].is_null = &excluded_prefix_null_;
+
+ // excluded_prefix_len : TINYINT
+ bind_[excluded_prefix_len_index_].buffer_type = MYSQL_TYPE_TINY;
+ bind_[excluded_prefix_len_index_].buffer =
+ reinterpret_cast<char*>(&excluded_prefix_len_);
+ bind_[excluded_prefix_len_index_].is_unsigned = MLM_TRUE;
+
// Add the error flags
setErrorIndicators(bind_, error_);
/// @brief Length of the textual address representation.
unsigned long ipv6_address_buffer_len_;
+ /// @brief Boolean flag indicating if excluded prefix field is null.
+ my_bool excluded_prefix_null_;
+
+ /// @brief Buffer holding excluded prefix in textual format.
+ uint8_t excluded_prefix_buffer_[isc::asiolink::V6ADDRESS_LEN];
+
+ /// @brief Length of the excluded prefix.
+ unsigned long excluded_prefix_buffer_len_;
+
/// @brief Length of the prefix (128 for addresses)
uint8_t prefix_len_;
/// @brief IAID.
uint32_t iaid_;
+ /// @brief Length of the excluded prefix (default 0)
+ uint8_t excluded_prefix_len_;
+
/// @name Indexes of columns holding information about IPv6 reservations.
//@{
/// @brief Index of reservation_id column.
/// @brief Index of IAID column.
size_t iaid_index_;
+ /// @brief Index of excluded_prefix column.
+ size_t excluded_prefix_index_;
+
+ /// @brief Index of excluded_prefix_len column.
+ size_t excluded_prefix_len_index_;
+
//@}
/// @brief Reservation id for last processed row.
private:
/// @brief Set number of columns for ipv6_reservation table.
- static const size_t RESRV_COLUMNS = 6;
+ static const size_t RESRV_COLUMNS = 8;
public:
///
/// Initialize class members representing a single IPv6 reservation.
MySqlIPv6ReservationExchange()
- : host_id_(0), prefix_len_(0), type_(0),
- iaid_(0), resv_(IPv6Resrv::TYPE_NA, asiolink::IOAddress("::"), 128) {
+ : host_id_(0), prefix_len_(0), type_(0), iaid_(0),
+ resv_(IPv6Resrv::TYPE_NA, asiolink::IOAddress("::"), 128),
+ excluded_prefix_len_(0) {
// Reset error table.
std::fill(&error_[0], &error_[RESRV_COLUMNS], MLM_FALSE);
columns_[2] = "prefix_len";
columns_[3] = "type";
columns_[4] = "dhcp6_iaid";
+ columns_[5] = "excluded_prefix";
+ columns_[6] = "excluded_prefix_len";
- BOOST_STATIC_ASSERT(4 < RESRV_COLUMNS);
+ BOOST_STATIC_ASSERT(6 < RESRV_COLUMNS);
}
/// @brief Create MYSQL_BIND objects for IPv6 Reservation.
bind_[3].buffer = reinterpret_cast<char*>(&iaid_);
bind_[3].is_unsigned = MLM_TRUE;
+ // excluded_prefix BINARY(16) NULL
+ Option6PDExcludePtr opt = resv.getPDExclude();
+ IOAddress excluded_prefix("::");
+ if (opt) {
+ excluded_prefix = opt->getExcludedPrefix(resv.getPrefix(),
+ resv.getPrefixLen());
+ excluded_prefix_ = excluded_prefix.toBytes();
+ if (excluded_prefix_.size() != isc::asiolink::V6ADDRESS_LEN) {
+ isc_throw(DbOperationError, "createBindForSend() - "
+ << "excluded prefix is not "
+ << isc::asiolink::V6ADDRESS_LEN
+ << " bytes long");
+ }
+ excluded_prefix_length_ = isc::asiolink::V6ADDRESS_LEN;
+ bind_[4].buffer_type = MYSQL_TYPE_BLOB;
+ bind_[4].buffer = reinterpret_cast<char*>(&excluded_prefix_[0]);
+ bind_[4].buffer_length = excluded_prefix_length_;
+ bind_[4].length = &excluded_prefix_length_;
+ excluded_prefix_len_ = opt->getExcludedPrefixLength();
+ } else {
+ bind_[4].buffer_type = MYSQL_TYPE_NULL;
+ excluded_prefix_len_ = 0;
+ }
+
+ // excluded_prefix_len TINYINT UNSIGNED
+ bind_[5].buffer_type = MYSQL_TYPE_TINY;
+ bind_[5].buffer = reinterpret_cast<char*>(&excluded_prefix_len_);
+ bind_[5].is_unsigned = MLM_TRUE;
+
// host_id INT UNSIGNED NOT NULL
- bind_[4].buffer_type = MYSQL_TYPE_LONG;
- bind_[4].buffer = reinterpret_cast<char*>(&host_id_);
- bind_[4].is_unsigned = MLM_TRUE;
+ bind_[6].buffer_type = MYSQL_TYPE_LONG;
+ bind_[6].buffer = reinterpret_cast<char*>(&host_id_);
+ bind_[6].is_unsigned = MLM_TRUE;
} catch (const std::exception& ex) {
isc_throw(DbOperationError,
/// @brief Binary address length.
unsigned long addr6_length_;
+
+ /// @brief Binary excluded prefix data.
+ std::vector<uint8_t> excluded_prefix_;
+
+ /// @brief Binary excluded prefix length.
+ unsigned long excluded_prefix_length_;
+
+ /// @brief Excluded prefix length.
+ uint8_t excluded_prefix_len_;
};
/// @brief This class is used for inserting options into a database.
"o6.option_id, o6.code, o6.value, o6.formatted_value, o6.space, "
"o6.persistent, o6.cancelled, o6.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp4_options AS o4 "
"ON h.host_id = o4.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o "
"ON h.host_id = o.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context,"
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o "
"ON h.host_id = o.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o "
"ON h.host_id = o.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o "
"ON h.host_id = o.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o "
"ON h.host_id = o.host_id "
"o6.option_id, o6.code, o6.value, o6.formatted_value, o6.space, "
"o6.persistent, o6.cancelled, o6.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp4_options AS o4 "
"ON h.host_id = o4.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o "
"ON h.host_id = o.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM ( SELECT * FROM hosts AS h "
"WHERE h.dhcp6_subnet_id = ? AND h.host_id > ? "
"ORDER BY h.host_id "
"o.option_id, o.code, o.value, o.formatted_value, o.space, "
"o.persistent, o.cancelled, o.user_context, "
"r.reservation_id, r.address, r.prefix_len, r.type, "
- "r.dhcp6_iaid "
+ "r.dhcp6_iaid, r.excluded_prefix, r.excluded_prefix_len "
"FROM ( SELECT * FROM hosts AS h "
"WHERE h.host_id > ? "
"ORDER BY h.host_id "
// checking that the inserted reservation is unique.
{MySqlHostDataSourceImpl::INSERT_V6_RESRV_NON_UNIQUE,
"INSERT INTO ipv6_reservations(address, prefix_len, type, "
- "dhcp6_iaid, host_id) "
- "VALUES (?, ?, ?, ?, ?)"},
+ "dhcp6_iaid, excluded_prefix, excluded_prefix_len, host_id) "
+ "VALUES (?, ?, ?, ?, ?, ?, ?)"},
// Inserts a single IPv6 reservation into 'reservations' table with
// checking that the inserted reservation is unique.
{MySqlHostDataSourceImpl::INSERT_V6_RESRV_UNIQUE,
"INSERT INTO ipv6_reservations(address, prefix_len, type, "
- "dhcp6_iaid, host_id) "
- "SELECT ?, ?, ?, ?, ? FROM DUAL "
+ "dhcp6_iaid, excluded_prefix, excluded_prefix_len, host_id) "
+ "SELECT ?, ?, ?, ?, ?, ?, ? FROM DUAL "
"WHERE NOT EXISTS ("
"SELECT 1 FROM ipv6_reservations "
"WHERE address = ? AND prefix_len = ? "
private:
/// @brief Number of columns holding IPv6 reservation information.
- static const size_t RESERVATION_COLUMNS = 5;
+ static const size_t RESERVATION_COLUMNS = 7;
public:
prefix_len_index_(reservation_id_index_ + 2),
type_index_(reservation_id_index_ + 3),
iaid_index_(reservation_id_index_ + 4),
+ excluded_prefix_index_(reservation_id_index_ + 5),
+ excluded_prefix_len_index_(reservation_id_index_ + 6),
most_recent_reservation_id_(0) {
// Provide names of additional columns returned by the queries.
columns_[prefix_len_index_] = "prefix_len";
columns_[type_index_] = "type";
columns_[iaid_index_] = "dhcp6_iaid";
+ columns_[excluded_prefix_index_] = "excluded_prefix";
+ columns_[excluded_prefix_len_index_] = "excluded_prefix_len";
- BOOST_STATIC_ASSERT(4 < RESERVATION_COLUMNS);
+ BOOST_STATIC_ASSERT(6 < RESERVATION_COLUMNS);
}
/// @brief Reinitializes state information
// Create the reservation.
IPv6Resrv reservation(resv_type, IOAddress(address), prefix_len);
+
+ // excluded_prefix and excluded_prefix_len
+ if (!isColumnNull(r, row, excluded_prefix_index_)) {
+ isc::asiolink::IOAddress prefix(getIPv6Value(r, row,
+ excluded_prefix_index_));
+ uint16_t excluded_prefix_len;
+ getColumnValue(r, row, excluded_prefix_len_index_,
+ excluded_prefix_len);
+ reservation.setPDExclude(prefix, excluded_prefix_len);
+ }
return (reservation);
};
/// @brief Index of IAID column.
size_t iaid_index_;
+ /// @brief Index of excluded prefix column.
+ size_t excluded_prefix_index_;
+
+ /// @brief Index of excluded prefix length column.
+ size_t excluded_prefix_len_index_;
+
//@}
/// @brief Reservation id for last processed row.
private:
/// @brief Set number of columns for ipv6_reservation table.
- static const size_t RESRV_COLUMNS = 6;
+ static const size_t RESRV_COLUMNS = 8;
public:
columns_[2] = "prefix_len";
columns_[3] = "type";
columns_[4] = "dhcp6_iaid";
+ columns_[5] = "excluded_prefix";
+ columns_[6] = "excluded_prefix_len";
- BOOST_STATIC_ASSERT(5 < RESRV_COLUMNS);
+ BOOST_STATIC_ASSERT(7 < RESRV_COLUMNS);
}
/// @brief Populate a bind array representing an IPv6 reservation
/// @todo: We don't support iaid in the IPv6Resrv yet.
bind_array->addNull();
+ // excluded_prefix INET NOT NULL.
+ Option6PDExcludePtr opt = resv.getPDExclude();
+ if (opt) {
+ IOAddress excluded_prefix =
+ opt->getExcludedPrefix(resv.getPrefix(),
+ resv.getPrefixLen());
+ bind_array->add(excluded_prefix);
+ } else {
+ bind_array->addNull();
+ }
+ uint16_t excluded_prefix_len(opt ? opt->getExcludedPrefixLength() : 0);
+ bind_array->add(excluded_prefix_len);
+
// host_id: BIGINT NOT NULL
bind_array->add(host_id);
" o4.persistent, o4.cancelled, o4.user_context, "
" o6.option_id, o6.code, o6.value, o6.formatted_value, o6.space, "
" o6.persistent, o6.cancelled, o6.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp4_options AS o4 ON h.host_id = o4.host_id "
"LEFT JOIN dhcp6_options AS o6 ON h.host_id = o6.host_id "
" h.dhcp4_boot_file_name, h.auth_key, "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o ON h.host_id = o.host_id "
"LEFT JOIN ipv6_reservations AS r ON h.host_id = r.host_id "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
" r.reservation_id, host(r.address), r.prefix_len, r.type, "
- " r.dhcp6_iaid "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o ON h.host_id = o.host_id "
"LEFT JOIN ipv6_reservations AS r ON h.host_id = r.host_id "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
" r.reservation_id, host(r.address), r.prefix_len, r.type, "
- " r.dhcp6_iaid "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o ON h.host_id = o.host_id "
"LEFT JOIN ipv6_reservations AS r ON h.host_id = r.host_id "
" h.dhcp4_boot_file_name, h.auth_key, "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
- " r.reservation_id, r.address, r.prefix_len, r.type, "
- " r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o ON h.host_id = o.host_id "
"LEFT JOIN ipv6_reservations AS r ON h.host_id = r.host_id "
" h.dhcp4_boot_file_name, h.auth_key, "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o ON h.host_id = o.host_id "
"LEFT JOIN ipv6_reservations AS r ON h.host_id = r.host_id "
" o4.persistent, o4.cancelled, o4.user_context, "
" o6.option_id, o6.code, o6.value, o6.formatted_value, o6.space, "
" o6.persistent, o6.cancelled, o6.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp4_options AS o4 ON h.host_id = o4.host_id "
"LEFT JOIN dhcp6_options AS o6 ON h.host_id = o6.host_id "
" h.dhcp4_boot_file_name, h.auth_key, "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM hosts AS h "
"LEFT JOIN dhcp6_options AS o ON h.host_id = o.host_id "
"LEFT JOIN ipv6_reservations AS r ON h.host_id = r.host_id "
" h.dhcp4_boot_file_name, h.auth_key, "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM ( SELECT * FROM hosts AS h "
" WHERE h.dhcp6_subnet_id = $1 AND h.host_id > $2 "
" ORDER BY h.host_id "
" h.dhcp4_boot_file_name, h.auth_key, "
" o.option_id, o.code, o.value, o.formatted_value, o.space, "
" o.persistent, o.cancelled, o.user_context, "
- " r.reservation_id, host(r.address), r.prefix_len, r.type, r.dhcp6_iaid "
+ " r.reservation_id, host(r.address), r.prefix_len, r.type, "
+ " r.dhcp6_iaid, host(r.excluded_prefix), r.excluded_prefix_len "
"FROM ( SELECT * FROM hosts AS h "
" WHERE h.host_id > $1 "
" ORDER BY h.host_id "
// PgSqlHostDataSourceImpl::INSERT_V6_RESRV_NON_UNIQUE
// Inserts a single IPv6 reservation into 'reservations' table without
// checking that the inserted reservation is unique.
- {5,
- { OID_VARCHAR, OID_INT2, OID_INT4, OID_INT4, OID_INT4 },
+ {7,
+ { OID_VARCHAR, OID_INT2, OID_INT4, OID_INT4, OID_VARCHAR, OID_INT2, OID_INT4 },
"insert_v6_resrv_non_unique",
"INSERT INTO ipv6_reservations(address, prefix_len, type, "
- " dhcp6_iaid, host_id) "
- "VALUES (cast($1 as inet), $2, $3, $4, $5)"
+ " dhcp6_iaid, excluded_prefix, excluded_prefix_len, host_id) "
+ "VALUES (cast($1 as inet), $2, $3, $4, cast($5 as inet), $6, $7)"
},
// PgSqlHostDataSourceImpl::INSERT_V6_RESRV_UNIQUE
// Inserts a single IPv6 reservation into 'reservations' table with
// checking that the inserted reservation is unique.
- {7,
- { OID_VARCHAR, OID_INT2, OID_INT4, OID_INT4, OID_INT4, OID_VARCHAR, OID_INT2 },
+ {9,
+ { OID_VARCHAR, OID_INT2, OID_INT4, OID_INT4, OID_VARCHAR, OID_INT2,
+ OID_INT4, OID_VARCHAR, OID_INT2 },
"insert_v6_resrv_unique",
"INSERT INTO ipv6_reservations(address, prefix_len, type, "
- " dhcp6_iaid, host_id) "
- "SELECT cast($1 as inet), $2, $3, $4, $5 "
+ " dhcp6_iaid, excluded_prefix, excluded_prefix_len, host_id) "
+ "SELECT cast($1 as inet), $2, $3, $4, cast($5 as inet), $6, $7 "
" WHERE NOT EXISTS ("
" SELECT 1 FROM ipv6_reservations"
- " WHERE address = cast($6 as inet) AND prefix_len = $7"
+ " WHERE address = cast($8 as inet) AND prefix_len = $9"
" LIMIT 1"
" )"
},
projects / thirdparty / kea.git / commitdiff
