[3554] Changes after review:

 - eth0 => ethX in several examples
 - added @todo in Dhcp6Srv, getMAC() is now static
 - added @todo in CfgMACSource

diff --git a/doc/examples/kea4/multiple-options.json b/doc/examples/kea4/multiple-options.json
index ba8045e29cc89b48aff94368d75cd598cf0ebb49..4130e4c5e611a88d3e1009766d0b773812cb6fd1 100644 (file)
--- a/doc/examples/kea4/multiple-options.json
+++ b/doc/examples/kea4/multiple-options.json
@@ -36,7 +36,7 @@
     {
        "pools": [ { "pool":  "192.0.2.10 - 192.0.2.200" } ],
        "subnet": "192.0.2.0/24",
-       "interface": "eth0",
+       "interface": "ethX",
        "option-data": [
          {
              "name": "domain-name-servers",

diff --git a/doc/examples/kea4/single-subnet.json b/doc/examples/kea4/single-subnet.json
index 169d41c9869ef61c57ccc047c8a077fc5f10fdd2..28368939d14b059b696e42319269545f1e858e6b 100644 (file)
--- a/doc/examples/kea4/single-subnet.json
+++ b/doc/examples/kea4/single-subnet.json
@@ -35,8 +35,8 @@
     {
        "pools": [ { "pool":  "192.0.2.1 - 192.0.2.200" } ],
        "subnet": "192.0.2.0/24",
-       "interface": "eth0"
-    } 
+       "interface": "ethX"
+    }
   ]
 },
 

diff --git a/doc/examples/kea6/advanced.json b/doc/examples/kea6/advanced.json
index 8b1f340fddca81682cd7dbd7674913d5ca3d789e..19230646574669a2715e27e3f8a29db150f0b5eb 100644 (file)
--- a/doc/examples/kea6/advanced.json
+++ b/doc/examples/kea6/advanced.json
@@ -2,7 +2,7 @@
 # It attempts to showcase some of the more advanced features.
 # Topology wise, it's a basic scenario with one IPv6 subnet configured.
 # It is assumed that one subnet (2001:db8:1::/64) is available directly
-# over eth0 interface.
+# over ethX interface.
 #
 # The following features are currently showcased here:
 # 1. Configuration of MAC/hardware address sources in DHCPv6
@@ -54,7 +54,7 @@
     {
       "pools": [ { "pool": "2001:db8:1::/80" } ],
       "subnet": "2001:db8:1::/64",
-      "interface": "eth0"
+      "interface": "ethX"
     }
   ]
 },

diff --git a/doc/examples/kea6/multiple-options.json b/doc/examples/kea6/multiple-options.json
index 70f2794a73f4981fbcbdbfe882749ff3dba3a842..e30cf9d3038626f118e0526d9e94d04303373c41 100644 (file)
--- a/doc/examples/kea6/multiple-options.json
+++ b/doc/examples/kea6/multiple-options.json
@@ -32,7 +32,7 @@
     {
       "pools": [ { "pool": "2001:db8:1::/80" } ],
       "subnet": "2001:db8:1::/64",
-      "interface": "eth0",
+      "interface": "ethX",
       "option-data": [
         {
             "name": "dns-servers",

diff --git a/doc/examples/kea6/simple.json b/doc/examples/kea6/simple.json
index 7d8e80fea954f5e69414b3bcda5b7d6f94a23d60..cffec39f02b65def290ad872094f44e6c8da2777 100644 (file)
--- a/doc/examples/kea6/simple.json
+++ b/doc/examples/kea6/simple.json
@@ -1,7 +1,7 @@
 # This is an example configuration file for DHCPv6 server in Kea.
 # It's a basic scenario with one IPv6 subnet configured. It is
 # assumed that one subnet (2001:db8:1::/64 is available directly
-# over eth0 interface.
+# over ethX interface.
 
 { "Dhcp6":
 
@@ -33,7 +33,7 @@
     {
       "pools": [ { "pool": "2001:db8:1::/80" } ],
       "subnet": "2001:db8:1::/64",
-      "interface": "eth0"
+      "interface": "ethX"
     }
   ]
 },

diff --git a/src/bin/dhcp6/dhcp6_srv.h b/src/bin/dhcp6/dhcp6_srv.h
index f974cc0320ca2ee8bfac3fbc9473b11ee4936a6b..ff3ff69581279ebdc564f344352dee13825e37ed 100644 (file)
--- a/src/bin/dhcp6/dhcp6_srv.h
+++ b/src/bin/dhcp6/dhcp6_srv.h
@@ -596,15 +596,14 @@ protected:
     /// @param pkt packet to be classified
     void classifyPacket(const Pkt6Ptr& pkt);
 
-
     /// @brief Attempts to get a MAC/hardware address using configred sources
     ///
     /// Tries to extract MAC/hardware address information from the packet
-    /// using MAC sources configured in 'mac-sources' directive.
+    /// using MAC sources configured in 'mac-sources' configuration parameter.
     ///
     /// @param pkt will try to exact MAC address from this packet
     /// @return HWaddr pointer (or NULL if configured methods fail)
-    HWAddrPtr getMAC(const Pkt6Ptr& pkt);
+    static HWAddrPtr getMAC(const Pkt6Ptr& pkt);
 
     /// @brief this is a prefix added to the contend of vendor-class option
     ///

diff --git a/src/lib/dhcpsrv/cfg_mac_source.h b/src/lib/dhcpsrv/cfg_mac_source.h
index a2681254c3f6ffd6ce9ff05e460ba6dd580744c5..3b3a098a86119bf459a4da39d27cf70b985a8cc1 100644 (file)
--- a/src/lib/dhcpsrv/cfg_mac_source.h
+++ b/src/lib/dhcpsrv/cfg_mac_source.h
@@ -58,6 +58,7 @@ class CfgMACSource {
     /// @param source MAC source (see constants in Pkt::HWADDR_SOURCE_*)
     ///
     /// Specified source is being added to the mac_sources_ array.
+    /// @todo implement add(string) version of this method.
     void add(uint32_t source) {
         mac_sources_.push_back(source);
     }