From 1a0a81eb61c625be4681c5b600e07ad9adfc68d9 Mon Sep 17 00:00:00 2001 From: Marcin Siodelski Date: Tue, 5 Jun 2012 17:13:01 +0200 Subject: [PATCH] [1955] Swap output buffer and options argument in call to packOptions. --- tests/tools/perfdhcp/pkt_transform.cc | 6 +++--- tests/tools/perfdhcp/pkt_transform.h | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/tools/perfdhcp/pkt_transform.cc b/tests/tools/perfdhcp/pkt_transform.cc index fc3e1becf6..2ea28f64fc 100644 --- a/tests/tools/perfdhcp/pkt_transform.cc +++ b/tests/tools/perfdhcp/pkt_transform.cc @@ -72,7 +72,7 @@ PktTransform::pack(const Option::Universe universe, // We already have packet template stored in output buffer // but still some options have to be updated if client // 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) { cout << "Building packet failed: " << e.what() << endl; return (false); @@ -122,8 +122,8 @@ PktTransform::unpack(const Option::Universe universe, void PktTransform::packOptions(const OptionBuffer& in_buffer, - util::OutputBuffer& out_buffer, - const Option::OptionCollection& options) { + const Option::OptionCollection& options, + util::OutputBuffer& out_buffer) { try { // If there are any options on the list, we will use provided // options offsets to override them in the output buffer diff --git a/tests/tools/perfdhcp/pkt_transform.h b/tests/tools/perfdhcp/pkt_transform.h index d30af5ade8..ce2832f743 100644 --- a/tests/tools/perfdhcp/pkt_transform.h +++ b/tests/tools/perfdhcp/pkt_transform.h @@ -115,8 +115,8 @@ private: /// \param options options collection with actual data and offsets. /// \throw isc::Unexpected if options update failed. 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 /// -- GitLab