mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-09-01 22:45:18 +00:00
Code Issues Releases Wiki Activity

Merge branch 'trac4292' Copy BOOTP flags from requets to responses

Browse Source
This commit is contained in:
Shawn Routhier
2016-03-10 19:04:51 -08:00
parent 1622d54852 5d98905f62
commit 0c05a725bb
2 changed files with 4 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/bin/dhcp4/dhcp4_srv.cc
View File

@@ -198,6 +198,8 @@ Dhcpv4Exchange::copyDefaultFields() {
if (dst_hw_addr) { if (dst_hw_addr) {
resp_->setRemoteHWAddr(dst_hw_addr); resp_->setRemoteHWAddr(dst_hw_addr);
} }
resp_->setFlags(query_->getFlags());
} }
void void

2
src/bin/dhcp4/tests/dhcp4_srv_unittest.cc
View File

@@ -395,6 +395,7 @@ TEST_F(Dhcpv4SrvTest, initResponse) {
const HWAddr& dst_hw = HWAddr::fromText("e8:ab:cd:78:9a:bc"); const HWAddr& dst_hw = HWAddr::fromText("e8:ab:cd:78:9a:bc");
HWAddrPtr dst_hw_addr(new HWAddr(dst_hw)); HWAddrPtr dst_hw_addr(new HWAddr(dst_hw));
query->setRemoteHWAddr(dst_hw_addr); query->setRemoteHWAddr(dst_hw_addr);
query->setFlags(BOOTP_BROADCAST);
// Add options which must be copied // Add options which must be copied
// client-id echo is optional // client-id echo is optional
@@ -423,6 +424,7 @@ TEST_F(Dhcpv4SrvTest, initResponse) {
EXPECT_EQ(IOAddress("10.10.10.10"), response->getGiaddr()); EXPECT_EQ(IOAddress("10.10.10.10"), response->getGiaddr());
EXPECT_TRUE(src_hw == *response->getLocalHWAddr()); EXPECT_TRUE(src_hw == *response->getLocalHWAddr());
EXPECT_TRUE(dst_hw == *response->getRemoteHWAddr()); EXPECT_TRUE(dst_hw == *response->getRemoteHWAddr());
EXPECT_TRUE(BOOTP_BROADCAST == response->getFlags());
// Check options (i.e., subnet selection option) // Check options (i.e., subnet selection option)
OptionPtr resp_sbnsel = response->getOption(DHO_SUBNET_SELECTION); OptionPtr resp_sbnsel = response->getOption(DHO_SUBNET_SELECTION);