Commit 5df470d0 authored by Francis Dupont's avatar Francis Dupont
Browse files

[master] Finished trac4027 aka Pkt4o6 merge

parent 10418728
......@@ -15,7 +15,7 @@ CLEANFILES = *.gcno *.gcda
lib_LTLIBRARIES = libkea-dhcp++.la
libkea_dhcp___la_SOURCES =
libkea_dhcp___la_SOURCES += classify.cc classify.h
libkea_dhcp___la_SOURCES += dhcp6.h dhcp4.h dhcp4o6.h
libkea_dhcp___la_SOURCES += dhcp6.h dhcp4.h
libkea_dhcp___la_SOURCES += duid.cc duid.h
libkea_dhcp___la_SOURCES += hwaddr.cc hwaddr.h
libkea_dhcp___la_SOURCES += iface_mgr.cc iface_mgr.h
......
......@@ -50,10 +50,10 @@ Pkt::Pkt(const uint8_t* buf, uint32_t len, const isc::asiolink::IOAddress& local
{
if (len != 0) {
if (buf == NULL) {
isc_throw(InvalidParameter, "data buffer passed to Pkt is NULL");
}
data_.resize(len);
if (buf == NULL) {
isc_throw(InvalidParameter, "data buffer passed to Pkt is NULL");
}
data_.resize(len);
memcpy(&data_[0], buf, len);
}
}
......
......@@ -375,6 +375,14 @@ public:
/// (true) or non-relayed (false).
bool isRelayed() const;
/// @brief Checks if a DHCPv4 message has beeb transported over DHCPv6
///
/// @return Boolean value which indicates whether the message is
/// transported over DHCPv6 (true) or native DHCPv4 (false)
virtual bool isDhcp4o6() const {
return (false);
}
private:
/// @brief Generic method that validates and sets HW address.
......
......@@ -244,7 +244,7 @@ public:
/// @param option_code code of the requested option
/// @param nesting_level see description above
///
/// @return pointer to the option (or NULL if there is no such option)
/// @return pointer to the option (or NULL if there is no such option)
OptionPtr getRelayOption(uint16_t option_code, uint8_t nesting_level);
/// @brief Return first instance of a specified option
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment