Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Kea
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
446
Issues
446
List
Boards
Labels
Service Desk
Milestones
Merge Requests
72
Merge Requests
72
Operations
Operations
Incidents
Packages & Registries
Packages & Registries
Container Registry
Analytics
Analytics
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Commits
Issue Boards
Open sidebar
ISC Open Source Projects
Kea
Commits
1a0a81eb
Commit
1a0a81eb
authored
Jun 05, 2012
by
Marcin Siodelski
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[1955] Swap output buffer and options argument in call to packOptions.
parent
81784141
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
5 additions
and
5 deletions
+5
-5
tests/tools/perfdhcp/pkt_transform.cc
tests/tools/perfdhcp/pkt_transform.cc
+3
-3
tests/tools/perfdhcp/pkt_transform.h
tests/tools/perfdhcp/pkt_transform.h
+2
-2
No files found.
tests/tools/perfdhcp/pkt_transform.cc
View file @
1a0a81eb
...
@@ -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
,
o
ut_buffer
,
options
);
PktTransform
::
packOptions
(
in_buffer
,
o
ptions
,
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
...
...
tests/tools/perfdhcp/pkt_transform.h
View file @
1a0a81eb
...
@@ -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
///
///
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment