Commit 58a1b310 authored by Marcin Siodelski's avatar Marcin Siodelski
Browse files

[3705] Changes as a result of the second code review.

parent 23d3c6fd
......@@ -2215,7 +2215,7 @@ TEST_F(Dhcpv6SrvTest, rsoo2relays) {
// Now the second relay.
Pkt6::RelayInfo relay2;
relay2.msg_type_ = DHCPV6_RELAY_FORW;
relay2.hop_count_ = 1;
relay2.hop_count_ = 2;
relay2.linkaddr_ = IOAddress("2001:db8::2");
relay2.peeraddr_ = IOAddress("fe80::2");
vector<uint16_t> rsoo2;
......
......@@ -327,6 +327,8 @@ const OptionDefParams OPTION_DEF_PARAMS6[] = {
RECORD_DEF(LQ_RELAY_DATA_RECORDS), "" },
{ "lq-client-link", D6O_LQ_CLIENT_LINK, OPT_IPV6_ADDRESS_TYPE, true,
NO_RECORD_DEF, "" },
{ "erp-local-domain-name", D6O_ERP_LOCAL_DOMAIN_NAME, OPT_FQDN_TYPE, false,
NO_RECORD_DEF, "" },
{ "rsoo", D6O_RSOO, OPT_EMPTY_TYPE, false, NO_RECORD_DEF, "rsoo-opts" },
{ "client-linklayer-addr", D6O_CLIENT_LINKLAYER_ADDR, OPT_BINARY_TYPE, false,
NO_RECORD_DEF, "" }
......
......@@ -1140,6 +1140,14 @@ TEST_F(LibDhcpTest, stdOptionDefs6) {
LibDhcpTest::testStdOptionDefs6(D6O_LQ_CLIENT_LINK, begin, end,
typeid(Option6AddrLst));
LibDhcpTest::testStdOptionDefs6(D6O_RSOO, begin, end,
typeid(OptionCustom),
"rsoo-opts");
LibDhcpTest::testStdOptionDefs6(D6O_ERP_LOCAL_DOMAIN_NAME,
fqdn_buf.begin(), fqdn_buf.end(),
typeid(OptionCustom));
}
// This test checks if the DHCPv6 option definition can be searched by
......
......@@ -352,14 +352,14 @@ Pkt6Ptr isc::test::PktCaptures::captureCableLabsShortVendorClass() {
/// - option 255 (len 4)
/// - option 256 (len 9)
/// - remote-id option (37)
/// - RELAY-FORW
/// - relay message option
/// - SOLICIT
/// - client-id option
/// - ia_na option
/// - elapsed time
/// - ORO
/// - interface-id option (18)
/// - remote-id option (37)
/// - interface-id option (18)
/// - remote-id option (37)
///
/// The original capture was posted to dibbler users mailing list.
///
......
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