--- a/src/flow-monitor/model/ipv4-flow-probe.cc Wed Dec 11 10:00:06 2013 +0100
+++ b/src/flow-monitor/model/ipv4-flow-probe.cc Wed Dec 11 10:03:06 2013 +0100
@@ -359,10 +359,7 @@
myReason = DROP_FRAGMENT_TIMEOUT;
NS_LOG_DEBUG ("DROP_FRAGMENT_TIMEOUT");
break;
- case Ipv4L3Protocol::DROP_MTU_TOO_LITTLE:
- myReason = DROP_MTU_TOO_LITTLE;
- NS_LOG_DEBUG ("DROP_MTU_TOO_LITTLE");
- break;
+
default:
myReason = DROP_INVALID_REASON;
NS_FATAL_ERROR ("Unexpected drop reason code " << reason);
--- a/src/flow-monitor/model/ipv4-flow-probe.h Wed Dec 11 10:00:06 2013 +0100
+++ b/src/flow-monitor/model/ipv4-flow-probe.h Wed Dec 11 10:03:06 2013 +0100
@@ -69,7 +69,6 @@
DROP_INTERFACE_DOWN, /**< Interface is down so can not send packet */
DROP_ROUTE_ERROR, /**< Route error */
DROP_FRAGMENT_TIMEOUT, /**< Fragment timeout exceeded */
- DROP_MTU_TOO_LITTLE, /**< MTU (or PMTU) lower than minimum */
DROP_INVALID_REASON, /**< Fallback reason (no known reason) */
};
--- a/src/internet/model/ipv4-l3-protocol.cc Wed Dec 11 10:00:06 2013 +0100
+++ b/src/internet/model/ipv4-l3-protocol.cc Wed Dec 11 10:03:06 2013 +0100
@@ -748,15 +748,6 @@
Ptr<Ipv4Interface> outInterface = GetInterface (interface);
NS_LOG_LOGIC ("Send via NetDevice ifIndex " << outDev->GetIfIndex () << " ipv4InterfaceIndex " << interface);
- // RFC 791, pg.25:
- // Every internet module must be able to forward a datagram of 68
- // octets without further fragmentation. This is because an internet
- // header may be up to 60 octets, and the minimum fragment is 8 octets.
- if (outInterface->GetDevice ()->GetMtu () < 68)
- {
- m_dropTrace (ipHeader, packet, DROP_MTU_TOO_LITTLE, m_node->GetObject<Ipv4> (), interface);
- }
-
if (!route->GetGateway ().IsEqual (Ipv4Address ("0.0.0.0")))
{
if (outInterface->IsUp ())
--- a/src/internet/model/ipv4-l3-protocol.h Wed Dec 11 10:00:06 2013 +0100
+++ b/src/internet/model/ipv4-l3-protocol.h Wed Dec 11 10:03:06 2013 +0100
@@ -98,9 +98,8 @@
DROP_BAD_CHECKSUM, /**< Bad checksum */
DROP_INTERFACE_DOWN, /**< Interface is down so can not send packet */
DROP_ROUTE_ERROR, /**< Route error */
- DROP_FRAGMENT_TIMEOUT, /**< Fragment timeout exceeded */
- DROP_MTU_TOO_LITTLE, /**< MTU (or PMTU) lower than minimum */
- };
+ DROP_FRAGMENT_TIMEOUT /**< Fragment timeout exceeded */
+ };
/**
* \brief Set node associated with this stack.
--- a/src/internet/model/ipv6-l3-protocol.cc Wed Dec 11 10:00:06 2013 +0100
+++ b/src/internet/model/ipv6-l3-protocol.cc Wed Dec 11 10:03:06 2013 +0100
@@ -888,11 +888,6 @@
targetMtu = dev->GetMtu ();
}
- if (targetMtu<1280)
- {
- m_dropTrace (ipHeader, packet, DROP_MTU_TOO_LITTLE, m_node->GetObject<Ipv6> (), interface);
- }
-
if (packet->GetSize () > targetMtu + 40) /* 40 => size of IPv6 header */
{
// Router => drop
--- a/src/internet/model/ipv6-l3-protocol.h Wed Dec 11 10:00:06 2013 +0100
+++ b/src/internet/model/ipv6-l3-protocol.h Wed Dec 11 10:03:06 2013 +0100
@@ -81,7 +81,6 @@
DROP_INTERFACE_DOWN, /**< Interface is down so can not send packet */
DROP_ROUTE_ERROR, /**< Route error */
DROP_UNKNOWN_PROTOCOL, /**< Unknown L4 protocol */
- DROP_MTU_TOO_LITTLE, /**< MTU (or PMTU) lower than minimum */
};
/**
--- a/src/stats/doc/statistics.rst Wed Dec 11 10:00:06 2013 +0100
+++ b/src/stats/doc/statistics.rst Wed Dec 11 10:03:06 2013 +0100
@@ -242,7 +242,7 @@
.. sourcecode:: bash
- $ export NS_LOG=WiFiDistanceExperiment:WiFiDistanceApps
+ $ export NS_LOG=StatFramework:WiFiDistanceExperiment:WiFiDistanceApps
Note that this slows down the simulation extraordinarily.