commit 3ffe66d4efafd2e659e1371b22790c633c28a848
author Junxiao Shi <git@mail1.yoursunny.com> Thu Nov 06 15:37:59 2014 -0700
committer Junxiao Shi <sunnylandh@gmail.com> Thu Nov 06 20:27:23 2014 -0800
tree d63ed56153ae93137620bdbf733cbf762c1aad10
parent 6990e4c7b8d817de7cdf96d2ea483cbd0eecc598

core: use ethernet::Address from ndn-cxx

refs #2142

Change-Id: I1258a0a1cadbedb31c506c69c84b7906a61fc761

daemon/face/ethernet-face.cpp

diff --git a/daemon/face/ethernet-face.cpp b/daemon/face/ethernet-face.cpp
index 66957db..fe110ad 100644
--- a/daemon/face/ethernet-face.cpp
+++ b/daemon/face/ethernet-face.cpp
@@ -21,7 +21,7 @@
  *
  * You should have received a copy of the GNU General Public License along with
  * NFD, e.g., in COPYING.md file.  If not, see <http://www.gnu.org/licenses/>.
- **/
+ */
 
 #include "ethernet-face.hpp"
 #include "core/logger.hpp"
@@ -78,7 +78,7 @@
   char filter[100];
   ::snprintf(filter, sizeof(filter),
              "(ether proto 0x%x) && (ether dst %s) && (not ether src %s)",
-             ETHERTYPE_NDN,
+             ethernet::ETHERTYPE_NDN,
              m_destAddress.toString().c_str(),
              m_srcAddress.toString().c_str());
   setPacketFilter(filter);
@@ -199,7 +199,7 @@
     }
 
   // construct and prepend the ethernet header
-  static uint16_t ethertype = htons(ETHERTYPE_NDN);
+  static uint16_t ethertype = htons(ethernet::ETHERTYPE_NDN);
   buffer.prependByteArray(reinterpret_cast<const uint8_t*>(&ethertype), ethernet::TYPE_LEN);
   buffer.prependByteArray(m_srcAddress.data(), m_srcAddress.size());
   buffer.prependByteArray(m_destAddress.data(), m_destAddress.size());
@@ -245,7 +245,7 @@
         throw Error("Received packet is too short");
 
       const ether_header* eh = reinterpret_cast<const ether_header*>(packet);
-      if (ntohs(eh->ether_type) != ETHERTYPE_NDN)
+      if (ntohs(eh->ether_type) != ethernet::ETHERTYPE_NDN)
         throw Error("Unrecognized ethertype");
 
       packet += ethernet::HDR_LEN;

daemon/face/ethernet-face.hpp

diff --git a/daemon/face/ethernet-face.hpp b/daemon/face/ethernet-face.hpp
index 8fd2b08..7530648 100644
--- a/daemon/face/ethernet-face.hpp
+++ b/daemon/face/ethernet-face.hpp
@@ -27,7 +27,6 @@
 #define NFD_DAEMON_FACE_ETHERNET_FACE_HPP
 
 #include "config.hpp"
-#include "ethernet.hpp"
 #include "face.hpp"
 
 #ifndef HAVE_LIBPCAP