Commit 1a0a81eb authored by Marcin Siodelski's avatar Marcin Siodelski

[1955] Swap output buffer and options argument in call to packOptions.

parent 81784141
...@@ -72,7 +72,7 @@ PktTransform::pack(const Option::Universe universe, ...@@ -72,7 +72,7 @@ PktTransform::pack(const Option::Universe universe,
// We already have packet template stored in output buffer // We already have packet template stored in output buffer
// but still some options have to be updated if client // but still some options have to be updated if client
// specified them along with their offsets in the buffer. // specified them along with their offsets in the buffer.
PktTransform::packOptions(in_buffer, out_buffer, options); PktTransform::packOptions(in_buffer, options, out_buffer);
} catch (const isc::BadValue& e) { } catch (const isc::BadValue& e) {
cout << "Building packet failed: " << e.what() << endl; cout << "Building packet failed: " << e.what() << endl;
return (false); return (false);
...@@ -122,8 +122,8 @@ PktTransform::unpack(const Option::Universe universe, ...@@ -122,8 +122,8 @@ PktTransform::unpack(const Option::Universe universe,
void void
PktTransform::packOptions(const OptionBuffer& in_buffer, PktTransform::packOptions(const OptionBuffer& in_buffer,
util::OutputBuffer& out_buffer, const Option::OptionCollection& options,
const Option::OptionCollection& options) { util::OutputBuffer& out_buffer) {
try { try {
// If there are any options on the list, we will use provided // If there are any options on the list, we will use provided
// options offsets to override them in the output buffer // options offsets to override them in the output buffer
......
...@@ -115,8 +115,8 @@ private: ...@@ -115,8 +115,8 @@ private:
/// \param options options collection with actual data and offsets. /// \param options options collection with actual data and offsets.
/// \throw isc::Unexpected if options update failed. /// \throw isc::Unexpected if options update failed.
static void packOptions(const dhcp::OptionBuffer& in_buffer, static void packOptions(const dhcp::OptionBuffer& in_buffer,
util::OutputBuffer& out_buffer, const dhcp::Option::OptionCollection& options,
const dhcp::Option::OptionCollection& options); util::OutputBuffer& out_buffer);
/// \brief Reads contents of specified options from buffer /// \brief Reads contents of specified options from buffer
/// ///
......
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