mir/kea
2
0
Fork 0
mirror of https://gitlab.isc.org/isc-projects/kea synced 2025-08-29 13:07:50 +00:00
Code Issues Releases Wiki Activity

[master] Compilation fixes after 4121 merge.

Browse Source
This commit is contained in:
Tomek Mrugalski 2015-12-01 20:08:27 +01:00
parent 286711d505
commit c8c65e108b
3 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib/dhcp/pkt4.cc
View File

@ -143,7 +143,7 @@ Pkt4::pack() {
// write DHCP magic cookie // write DHCP magic cookie
buffer_out_.writeUint32(DHCP_OPTIONS_COOKIE); buffer_out_.writeUint32(DHCP_OPTIONS_COOKIE);
LibDHCP::packOptions(buffer_out_, options_); LibDHCP::packOptions4(buffer_out_, options_);
// add END option that indicates end of options // add END option that indicates end of options
// (End option is very simple, just a 255 octet) // (End option is very simple, just a 255 octet)

2
src/lib/dhcp/pkt6.cc
View File

@ -244,7 +244,7 @@ Pkt6::packUDP() {
buffer_out_.writeUint8( (transid_) & 0xff ); buffer_out_.writeUint8( (transid_) & 0xff );
// the rest are options // the rest are options
LibDHCP::packOptions(buffer_out_, options_); LibDHCP::packOptions6(buffer_out_, options_);
} }
catch (const Exception& e) { catch (const Exception& e) {
// An exception is thrown and message will be written to Logger // An exception is thrown and message will be written to Logger

4
src/lib/dhcp/tests/libdhcp++_unittest.cc
View File

@ -396,7 +396,7 @@ TEST_F(LibDhcpTest, packOptions6) {
OutputBuffer assembled(512); OutputBuffer assembled(512);
EXPECT_NO_THROW(LibDHCP::packOptions(assembled, opts)); EXPECT_NO_THROW(LibDHCP::packOptions6(assembled, opts));
EXPECT_EQ(sizeof(v6packed), assembled.getLength()); EXPECT_EQ(sizeof(v6packed), assembled.getLength());
EXPECT_EQ(0, memcmp(assembled.getData(), v6packed, sizeof(v6packed))); EXPECT_EQ(0, memcmp(assembled.getData(), v6packed, sizeof(v6packed)));
} }
@ -591,7 +591,7 @@ TEST_F(LibDhcpTest, packOptions4) {
opts.insert(make_pair(opt1->getType(), rai)); opts.insert(make_pair(opt1->getType(), rai));
OutputBuffer buf(100); OutputBuffer buf(100);
EXPECT_NO_THROW(LibDHCP::packOptions(buf, opts)); EXPECT_NO_THROW(LibDHCP::packOptions4(buf, opts));
ASSERT_EQ(buf.getLength(), sizeof(v4_opts)); ASSERT_EQ(buf.getLength(), sizeof(v4_opts));
EXPECT_EQ(0, memcmp(v4_opts, buf.getData(), sizeof(v4_opts))); EXPECT_EQ(0, memcmp(v4_opts, buf.getData(), sizeof(v4_opts)));
} }