]> git.ipfire.org Git - thirdparty/kea.git/commitdiff
[master] Fixed 4o6subnetInterfaceId for not 64 bit machines (from hackathon94) trac4113_base
authorFrancis Dupont <fdupont@isc.org>
Mon, 2 Nov 2015 04:10:45 +0000 (05:10 +0100)
committerFrancis Dupont <fdupont@isc.org>
Mon, 2 Nov 2015 04:10:45 +0000 (05:10 +0100)
src/bin/dhcp4/tests/config_parser_unittest.cc

index 99a41334bf0d0b9908d6ff46621a5a4a5b60ec3b..18123e380fb6f6a83b7081987f8f594fb3a2a37a 100644 (file)
@@ -4014,13 +4014,9 @@ TEST_F(Dhcp4ParserTest, 4o6subnetInterfaceId) {
     ASSERT_TRUE(ifaceid);
 
     vector<uint8_t> data = ifaceid->getData();
-    const char *exp_data = "vlan123";
-    // Let's convert vlan123 to vector<uint8_t> format.
-    // We need to skip the last \0 byte, thuse sizeof() - 1.
-    vector<uint8_t> exp(exp_data, exp_data + sizeof(exp_data) - 1);
-
-    EXPECT_TRUE(exp == data);
+    EXPECT_EQ(7, data.size());
+    const char *exp = "vlan123";
+    EXPECT_EQ(0, memcmp(&data[0], exp, data.size()));
 }
 
-
 }