commit 8eb9957db6ea4afb95f10bfaa2f867db83b6e6aa
author Davide Pesavento <davide.pesavento@lip6.fr> Fri Dec 19 19:12:15 2014 +0100
committer Davide Pesavento <davide.pesavento@lip6.fr> Fri Dec 19 19:14:36 2014 +0100
tree f260221e7eb9799fa93443fcb80a3c2cdda7f4fb
parent c5173de511316987c873a3f0ce348db309f7b9ea

face: Support MTU larger than 1500 in EthernetFace (for jumbo frames)

Change-Id: Id784315569e11794dceaceffb4bb0af21b69be44
Refs: #2305

daemon/face/ethernet-face.cpp

diff --git a/daemon/face/ethernet-face.cpp b/daemon/face/ethernet-face.cpp
index 21a12a4..ed10ade 100644
--- a/daemon/face/ethernet-face.cpp
+++ b/daemon/face/ethernet-face.cpp
@@ -276,7 +276,7 @@
   // pad with zeroes if the payload is too short
   if (block.size() < ethernet::MIN_DATA_LEN)
     {
-      static const uint8_t padding[ethernet::MIN_DATA_LEN] = {0};
+      static const uint8_t padding[ethernet::MIN_DATA_LEN] = {};
       buffer.appendByteArray(padding, ethernet::MIN_DATA_LEN - block.size());
     }
 
@@ -430,24 +430,18 @@
 size_t
 EthernetFace::getInterfaceMtu() const
 {
-  size_t mtu = ethernet::MAX_DATA_LEN;
-
 #ifdef SIOCGIFMTU
   ifreq ifr{};
   std::strncpy(ifr.ifr_name, m_interfaceName.c_str(), sizeof(ifr.ifr_name) - 1);
 
-  if (::ioctl(m_socket->native_handle(), SIOCGIFMTU, &ifr) < 0)
-    {
-      NFD_LOG_WARN("[id:" << getId() << ",endpoint:" << m_interfaceName
-                   << "] Failed to get interface MTU: " << std::strerror(errno));
-    }
-  else
-    {
-      mtu = std::min(mtu, static_cast<size_t>(ifr.ifr_mtu));
-    }
+  if (::ioctl(m_socket->native_handle(), SIOCGIFMTU, &ifr) >= 0)
+    return static_cast<size_t>(ifr.ifr_mtu);
+
+  NFD_LOG_WARN("[id:" << getId() << ",endpoint:" << m_interfaceName
+               << "] Failed to get interface MTU: " << std::strerror(errno));
 #endif
 
-  return mtu;
+  return ethernet::MAX_DATA_LEN;
 }
 
 } // namespace nfd