[3553] Compilation fixes after rebase, other small changes.

src/lib/dhcp/pkt.cc

@@ -182,11 +182,11 @@ Pkt::getMAC(uint32_t hw_addr_src) {
     // Method 6: From subscriber-id option inserted by a relay
 
     // Method 7: From docsis options
-    if (hw_addr_src & HWADDR_SOURCE_DOCSIS_CMTS) {
+    if (hw_addr_src & HWAddr::HWADDR_SOURCE_DOCSIS_CMTS) {
         mac = getMACFromDocsisCMTS();
         if (mac) {
             return (mac);
-        } else if (hw_addr_src == HWADDR_SOURCE_DOCSIS_CMTS) {
+        } else if (hw_addr_src == HWAddr::HWADDR_SOURCE_DOCSIS_CMTS) {
             // If we're interested only in CMTS options as a source of that
             // info, there's no point in trying other options.
             return (HWAddrPtr());
@@ -194,11 +194,11 @@ Pkt::getMAC(uint32_t hw_addr_src) {
     }
 
     // Method 8: From docsis options
-    if (hw_addr_src & HWADDR_SOURCE_DOCSIS_MODEM) {
+    if (hw_addr_src & HWAddr::HWADDR_SOURCE_DOCSIS_MODEM) {
         mac = getMACFromDocsisModem();
         if (mac) {
             return (mac);
-        } else if (hw_addr_src == HWADDR_SOURCE_DOCSIS_MODEM) {
+        } else if (hw_addr_src == HWAddr::HWADDR_SOURCE_DOCSIS_MODEM) {
             // If we're interested only in CMTS options as a source of that
             // info, there's no point in trying other options.
             return (HWAddrPtr());

src/lib/dhcp/tests/pkt6_unittest.cc

@@ -1197,7 +1197,7 @@ TEST_F(Pkt6Test, getMAC_DOCSIS_Modem) {
 
     // The method should return MAC based on the vendor-specific info,
     // suboption 36, which is inserted by the modem itself.
-    HWAddrPtr found = pkt->getMAC(Pkt::HWADDR_SOURCE_DOCSIS_MODEM);
+    HWAddrPtr found = pkt->getMAC(HWAddr::HWADDR_SOURCE_DOCSIS_MODEM);
     ASSERT_TRUE(found);
 
     // Let's check the info.
@@ -1210,7 +1210,7 @@ TEST_F(Pkt6Test, getMAC_DOCSIS_Modem) {
     ASSERT_TRUE(vendor->delOption(DOCSIS3_V6_DEVICE_ID));
 
     // Ok, there's no more suboption 36. Now getMAC() should fail.
-    EXPECT_FALSE(pkt->getMAC(Pkt::HWADDR_SOURCE_DOCSIS_MODEM));
+    EXPECT_FALSE(pkt->getMAC(HWAddr::HWADDR_SOURCE_DOCSIS_MODEM));
 }
 
 // Test checks whether getMAC(DOCSIS_CMTS) is working properly.
@@ -1225,7 +1225,7 @@ TEST_F(Pkt6Test, getMAC_DOCSIS_CMTS) {
 
     // The method should return MAC based on the vendor-specific info,
     // suboption 36, which is inserted by the modem itself.
-    HWAddrPtr found = pkt->getMAC(Pkt::HWADDR_SOURCE_DOCSIS_CMTS);
+    HWAddrPtr found = pkt->getMAC(HWAddr::HWADDR_SOURCE_DOCSIS_CMTS);
     ASSERT_TRUE(found);
 
     // Let's check the info.
@@ -1239,7 +1239,7 @@ TEST_F(Pkt6Test, getMAC_DOCSIS_CMTS) {
     ASSERT_TRUE(vendor);
     EXPECT_TRUE(vendor->delOption(DOCSIS3_V6_CMTS_CM_MAC));
 
-    EXPECT_FALSE(pkt->getMAC(Pkt::HWADDR_SOURCE_DOCSIS_CMTS));
+    EXPECT_FALSE(pkt->getMAC(HWAddr::HWADDR_SOURCE_DOCSIS_CMTS));
 }
 
 }

src/lib/dhcpsrv/cfg_mac_source.cc

@@ -42,7 +42,8 @@ uint32_t CfgMACSource::MACSourceFromText(const std::string& name) {
         { "rfc4649", HWAddr::HWADDR_SOURCE_REMOTE_ID },
         { "subscriber-id", HWAddr::HWADDR_SOURCE_SUBSCRIBER_ID },
         { "rfc4580", HWAddr::HWADDR_SOURCE_SUBSCRIBER_ID },
-        { "docsis", HWAddr::HWADDR_SOURCE_DOCSIS }
+        { "docsis-cmts", HWAddr::HWADDR_SOURCE_DOCSIS_CMTS },
+        { "docsis-modem", HWAddr::HWADDR_SOURCE_DOCSIS_MODEM }
     };
 
     for (int i=0; i < sizeof(sources)/sizeof(sources[0]); ++i) {

src/lib/dhcpsrv/tests/cfg_mac_source_unittest.cc

@@ -46,9 +46,10 @@ TEST(CfgMACSourceTest, MACSourceFromText) {
               CfgMACSource::MACSourceFromText("subscriber-id"));
     EXPECT_EQ(HWAddr::HWADDR_SOURCE_SUBSCRIBER_ID,
               CfgMACSource::MACSourceFromText("rfc4580"));
-    EXPECT_EQ(HWAddr::HWADDR_SOURCE_DOCSIS,
-              CfgMACSource::MACSourceFromText("docsis"));
-
+    EXPECT_EQ(HWAddr::HWADDR_SOURCE_DOCSIS_CMTS,
+              CfgMACSource::MACSourceFromText("docsis-cmts"));
+    EXPECT_EQ(HWAddr::HWADDR_SOURCE_DOCSIS_MODEM,
+              CfgMACSource::MACSourceFromText("docsis-modem"));
 }
 
 };