Commit c8c65e10 authored by Tomek Mrugalski's avatar Tomek Mrugalski 🛰
Browse files

[master] Compilation fixes after 4121 merge.

parent 286711d5
......@@ -143,7 +143,7 @@ Pkt4::pack() {
// write DHCP magic 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
// (End option is very simple, just a 255 octet)
......
......@@ -244,7 +244,7 @@ Pkt6::packUDP() {
buffer_out_.writeUint8( (transid_) & 0xff );
// the rest are options
LibDHCP::packOptions(buffer_out_, options_);
LibDHCP::packOptions6(buffer_out_, options_);
}
catch (const Exception& e) {
// An exception is thrown and message will be written to Logger
......
......@@ -396,7 +396,7 @@ TEST_F(LibDhcpTest, packOptions6) {
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(0, memcmp(assembled.getData(), v6packed, sizeof(v6packed)));
}
......@@ -591,7 +591,7 @@ TEST_F(LibDhcpTest, packOptions4) {
opts.insert(make_pair(opt1->getType(), rai));
OutputBuffer buf(100);
EXPECT_NO_THROW(LibDHCP::packOptions(buf, opts));
EXPECT_NO_THROW(LibDHCP::packOptions4(buf, opts));
ASSERT_EQ(buf.getLength(), sizeof(v4_opts));
EXPECT_EQ(0, memcmp(v4_opts, buf.getData(), sizeof(v4_opts)));
}
......
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