Commit c6e2ee63 authored by Thomas Markwalder's avatar Thomas Markwalder

[#363, !177] Addressed review comments

parent c580327c
...@@ -182,15 +182,15 @@ public: ...@@ -182,15 +182,15 @@ public:
/// and the Relay Agent Information option and END options last. This /// and the Relay Agent Information option and END options last. This
/// function is initially called to pack the options for a packet in /// function is initially called to pack the options for a packet in
/// @ref Pkt4::pack(). That call leads to it being called recursively in /// @ref Pkt4::pack(). That call leads to it being called recursively in
/// vai @ref Option::packOptions(). Thus the logic used to output the /// @ref Option::packOptions(). Thus the logic used to output the
/// message type should only be executed by the top-most. This is governed /// message type should only be executed by the top-most. This is governed
/// by the paramater top, below. /// by the paramater top, below.
/// ///
/// @param buf output buffer (assembled options will be stored here) /// @param buf output buffer (assembled options will be stored here)
/// @param options collection of options to store to /// @param options collection of options to store to
/// @param top indicates if this is the first call to pack the options. /// @param top indicates if this is the first call to pack the options.
/// When true logic to emit the message type is executed. It defaults to /// When true logic to emit the message type first is executed. It
/// false. /// defaults to false.
static void packOptions4(isc::util::OutputBuffer& buf, static void packOptions4(isc::util::OutputBuffer& buf,
const isc::dhcp::OptionCollection& options, const isc::dhcp::OptionCollection& options,
bool top = false); bool top = false);
......
...@@ -135,6 +135,8 @@ Pkt4::pack() { ...@@ -135,6 +135,8 @@ Pkt4::pack() {
// write DHCP magic cookie // write DHCP magic cookie
buffer_out_.writeUint32(DHCP_OPTIONS_COOKIE); buffer_out_.writeUint32(DHCP_OPTIONS_COOKIE);
// Call packOptions4() with parameter,"top", true. This invokes
// logic to emit the message type option first.
LibDHCP::packOptions4(buffer_out_, options_, true); LibDHCP::packOptions4(buffer_out_, options_, true);
// add END option that indicates end of options // add END option that indicates end of options
......
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