Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Adam Osuchowski
Kea
Commits
36eabc93
Commit
36eabc93
authored
Oct 10, 2013
by
Marcin Siodelski
Browse files
[3180] Addressed additional review comments.
parent
c71753a2
Changes
3
Hide whitespace changes
Inline
Side-by-side
src/lib/dhcp/pkt6.cc
View file @
36eabc93
...
...
@@ -333,7 +333,7 @@ Pkt6::unpackMsg(OptionBuffer::const_iterator begin,
// The last two arguments hold the DHCPv6 Relay message offset and
// length. Setting them to NULL because we are dealing with the
// not-relayed message.
callback_
(
opt_buffer
,
"dhcp6"
,
options_
,
0
,
0
);
callback_
(
opt_buffer
,
"dhcp6"
,
options_
,
NULL
,
NULL
);
}
}
catch
(
const
Exception
&
e
)
{
// @todo: throw exception here once we turn this function to void.
...
...
src/lib/dhcp/tests/option_unittest.cc
View file @
36eabc93
...
...
@@ -608,6 +608,8 @@ TEST_F(OptionTest, unpackCallback) {
// Parameters from _1 to _5 are placeholders for the actual values
// to be passed to the callback function. See: boost::bind documentation
// at http://www.boost.org/doc/libs/1_54_0/libs/bind/bind.html.
// Also, see UnpackOptionsCallback in option.h for description of the
// parameter values.
option
.
setCallback
(
boost
::
bind
(
&
CustomUnpackCallback
::
execute
,
&
cb
,
_1
,
_2
,
_3
,
_4
,
_5
));
// Parse options. It should result in a call to our callback function.
...
...
src/lib/dhcp/tests/pkt6_unittest.cc
View file @
36eabc93
...
...
@@ -108,6 +108,19 @@ public:
}
/// @brief Create a wire representation of the test packet and clone it.
///
/// The purpose of this function is to create a packet to be used to
/// check that packet parsing works correctly. The unpack() function
/// requires that the data_ field of the object holds the data to be
/// parsed. This function creates an on-wire representation of the
/// packet by calling pack(). But, the pack() function stores the
/// on-wire representation into the output buffer (not the data_ field).
/// For this reason, it is not enough to return the packet on which
/// pack() is called. This function returns a clone of this packet
/// which is created using a constructor taking a buffer and buffer
/// length as an input. This constructor is normally used to parse
/// received packets. It stores the packet in a data_ field and
/// therefore unpack() can be called to parse it.
Pkt6Ptr
packAndClone
()
{
Pkt6Ptr
parent
(
new
Pkt6
(
DHCPV6_SOLICIT
,
0x020304
));
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new 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