From d7289c1901af483f8a3d9024a77320ab60a6edaa Mon Sep 17 00:00:00 2001
From: Tom Henderson <tomh@tomh.org>
Date: Sun, 21 Jun 2009 22:36:43 -0700
Subject: [PATCH] Remove Ipv4Interface::GetMtu ()

---
 CHANGES.html                           | 6 ++++++
 src/internet-stack/ipv4-interface.cc   | 7 -------
 src/internet-stack/ipv4-interface.h    | 9 ---------
 src/internet-stack/ipv4-l3-protocol.cc | 6 +++---
 4 files changed, 9 insertions(+), 19 deletions(-)

diff --git a/CHANGES.html b/CHANGES.html
index 7c958d24e..ece6a99c1 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -79,6 +79,12 @@ fragmentation and reassembly.
 <h2>Changes to existing API:</h2>
 <ul>
 
+<li><b>Ipv4Interface::GetMtu () deleted</b>
+  <p>The Ipv4Interface API is private to internet-stack module; this method
+was just a pass-through to GetDevice ()->GetMtu ().
+  </p>
+</li>
+
 <li><b>CalcChecksum attribute changes</b>
   <p>Four IPv4 CalcChecksum attributes (which enable the computation of 
 checksums that are disabled by default) have been collapsed into one global 
diff --git a/src/internet-stack/ipv4-interface.cc b/src/internet-stack/ipv4-interface.cc
index f00cb7a46..b7fbd7828 100644
--- a/src/internet-stack/ipv4-interface.cc
+++ b/src/internet-stack/ipv4-interface.cc
@@ -127,13 +127,6 @@ Ipv4Interface::GetMetric (void) const
   return m_metric;
 }
 
-uint16_t 
-Ipv4Interface::GetMtu (void) const
-{
-  NS_LOG_FUNCTION_NOARGS ();
-  return m_device->GetMtu ();
-}
-
 /**
  * These are IP interface states and may be distinct from 
  * NetDevice states, such as found in real implementations
diff --git a/src/internet-stack/ipv4-interface.h b/src/internet-stack/ipv4-interface.h
index 896f05e08..f3041a780 100644
--- a/src/internet-stack/ipv4-interface.h
+++ b/src/internet-stack/ipv4-interface.h
@@ -80,15 +80,6 @@ public:
    */
   uint16_t GetMetric (void) const;
 
-  /**
-   * This function a pass-through to NetDevice GetMtu, modulo
-   * the  LLC/SNAP header i.e., ipv4MTU = NetDeviceMtu - LLCSNAPSIZE
-   * \returns the Maximum Transmission Unit associated to this interface.
-   *
-   * XXX deprecated?  This is duplicate API to GetDevice ()->GetMtu ()
-   */
-  uint16_t GetMtu (void) const;
-
   /**
    * These are IP interface states and may be distinct from 
    * NetDevice states, such as found in real implementations
diff --git a/src/internet-stack/ipv4-l3-protocol.cc b/src/internet-stack/ipv4-l3-protocol.cc
index a356f45c8..d5e6981ea 100644
--- a/src/internet-stack/ipv4-l3-protocol.cc
+++ b/src/internet-stack/ipv4-l3-protocol.cc
@@ -478,7 +478,7 @@ Ipv4L3Protocol::Send (Ptr<Packet> packet,
           Ptr<Ipv4Interface> outInterface = *ifaceIter;
           Ptr<Packet> packetCopy = packet->Copy ();
 
-          NS_ASSERT (packetCopy->GetSize () <= outInterface->GetMtu ());
+          NS_ASSERT (packetCopy->GetSize () <= outInterface->GetDevice()->GetMtu ());
           packetCopy->AddHeader (ipHeader);
           m_txTrace (packetCopy, ifaceIndex);
           outInterface->Send (packetCopy, destination);
@@ -608,7 +608,7 @@ Ipv4L3Protocol::SendRealOut (Ptr<Ipv4Route> route,
   Ptr<Ipv4Interface> outInterface = GetInterface (interface);
   NS_LOG_LOGIC ("Send via NetDevice ifIndex " << outDev->GetIfIndex () << " ipv4InterfaceIndex " << interface);
 
-  NS_ASSERT (packet->GetSize () <= outInterface->GetMtu ());
+  NS_ASSERT (packet->GetSize () <= outInterface->GetDevice ()->GetMtu ());
   if (!route->GetGateway ().IsEqual (Ipv4Address ("0.0.0.0"))) 
     {
       if (outInterface->IsUp ())
@@ -810,7 +810,7 @@ Ipv4L3Protocol::GetMtu (uint32_t i) const
 {
   NS_LOG_FUNCTION (this << i);
   Ptr<Ipv4Interface> interface = GetInterface (i);
-  return interface->GetMtu ();
+  return interface->GetDevice ()->GetMtu ();
 }
 
 bool