Attachment #2953 for bug #2819

View | Details | Raw Unified | Return to bug 2819
Collapse All | Expand All

(-)a/src/internet/model/ipv4-packet-filter.cc (-1 / +5 lines)

Lines 98-104	Link Here

  NS_LOG_FUNCTION (this << item);

  NS_LOG_FUNCTION (this << item);

  Ptr<Ipv4QueueDiscItem> ipv4Item = DynamicCast<Ipv4QueueDiscItem> (item);

  Ptr<Ipv4QueueDiscItem> ipv4Item = DynamicCast<Ipv4QueueDiscItem> (item);

100

101

  NS_ASSERT (ipv4Item != 0);

101

  if (!ipv4Item)

102

103

      NS_LOG_DEBUG ("No match");

104

      return PacketFilter::PF_NO_MATCH;

105

102

106

103

  Ipv4Header hdr = ipv4Item->GetHeader ();

107

  Ipv4Header hdr = ipv4Item->GetHeader ();

104

  Ipv4Address src = hdr.GetSource ();

108

  Ipv4Address src = hdr.GetSource ();

(-)a/src/internet/model/ipv6-packet-filter.cc (-1 / +5 lines)

Lines 98-104	Link Here

  NS_LOG_FUNCTION (this << item);

  NS_LOG_FUNCTION (this << item);

  Ptr<Ipv6QueueDiscItem> ipv6Item = DynamicCast<Ipv6QueueDiscItem> (item);

  Ptr<Ipv6QueueDiscItem> ipv6Item = DynamicCast<Ipv6QueueDiscItem> (item);

100

101

  NS_ASSERT (ipv6Item != 0);

101

  if (!ipv6Item)

102

103

      NS_LOG_DEBUG ("No match");

104

      return PacketFilter::PF_NO_MATCH;

105

102

106

103

  Ipv6Header hdr = ipv6Item->GetHeader ();

107

  Ipv6Header hdr = ipv6Item->GetHeader ();

104

  Ipv6Address src = hdr.GetSourceAddress ();

108

  Ipv6Address src = hdr.GetSourceAddress ();




  NS_LOG_FUNCTION (this << item);

  int32_t ret = Classify (item);
  uint32_t h;

  if (ret == PacketFilter::PF_NO_MATCH)
    {
      NS_LOG_WARN ("No filter has been able to classify this packet.");
      h = m_flows; // place all unfiltered packets into a separate flow queue
      return false;
    }
  else
    {
      h = ret % m_flows;
    }

  Ptr<FqCoDelFlow> flow;
  if (m_flowsIndices.find (h) == m_flowsIndices.end ())

Return to bug 2819