commit 0f83f90c13713303c143752221803999dff6f15e
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Sep 03 13:30:12 2012 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Tue Sep 04 00:01:09 2012 -0700
tree 40012424dc2657ec4c220eca56e264b1ddd6e460
parent c771961b8dab8a0bcde5bda7b44c5456cf87f800

Add option to enable/disable NACKs to notify about queue drops

model/fw/per-fib-limits.cc

diff --git a/model/fw/per-fib-limits.cc b/model/fw/per-fib-limits.cc
index ba9e81a..95fa65a 100644
--- a/model/fw/per-fib-limits.cc
+++ b/model/fw/per-fib-limits.cc
@@ -58,6 +58,11 @@
                    BooleanValue (false),
                    MakeBooleanAccessor (&PerFibLimits::m_announceLimits),
                    MakeBooleanChecker ())
+
+    .AddAttribute ("QueueDropNotifications", "Enable explicit notifications (using nacks) that packet was dropped from queue",
+                   BooleanValue (true),
+                   MakeBooleanAccessor (&PerFibLimits::m_queueDropNotifications),
+                   MakeBooleanChecker ())
     ;
   return tid;
 }
@@ -192,27 +197,30 @@
   if (pitEntry->GetOutgoing ().size () == 0)
     {
       super::DidReceiveValidNack (0, 0, pitEntry); // semi safe
-      
-      Ptr<InterestHeader> nackHeader = Create<InterestHeader> (*pitEntry->GetInterest ());
-      
-      NS_ASSERT (pitEntry->GetFwTag<PitQueueTag> () != boost::shared_ptr<PitQueueTag> ());
-      if (pitEntry->GetFwTag<PitQueueTag> ()->IsLastOneInQueues ())
+
+      if (m_queueDropNotifications)
         {
-          nackHeader->SetNack (100);
-        }
-      else
-        {
-          nackHeader->SetNack (101);
-        }
+          Ptr<InterestHeader> nackHeader = Create<InterestHeader> (*pitEntry->GetInterest ());
+      
+          NS_ASSERT (pitEntry->GetFwTag<PitQueueTag> () != boost::shared_ptr<PitQueueTag> ());
+          if (pitEntry->GetFwTag<PitQueueTag> ()->IsLastOneInQueues ())
+            {
+              nackHeader->SetNack (100);
+            }
+          else
+            {
+              nackHeader->SetNack (101);
+            }
           
-      Ptr<Packet> pkt = Create<Packet> ();
-      pkt->AddHeader (*nackHeader);
+          Ptr<Packet> pkt = Create<Packet> ();
+          pkt->AddHeader (*nackHeader);
       
-      for (pit::Entry::in_container::iterator face = pitEntry->GetIncoming ().begin ();
-           face != pitEntry->GetIncoming ().end ();
-           face ++)
-        {
-          face->m_face->Send (pkt->Copy ());
+          for (pit::Entry::in_container::iterator face = pitEntry->GetIncoming ().begin ();
+               face != pitEntry->GetIncoming ().end ();
+               face ++)
+            {
+              face->m_face->Send (pkt->Copy ());
+            }
         }
     }
   else

model/fw/per-fib-limits.h

diff --git a/model/fw/per-fib-limits.h b/model/fw/per-fib-limits.h
index b00173a..b377004 100644
--- a/model/fw/per-fib-limits.h
+++ b/model/fw/per-fib-limits.h
@@ -101,6 +101,7 @@
   PitQueueMap m_pitQueues; // per-outgoing face pit queue
 
   bool    m_announceLimits;
+  bool m_queueDropNotifications;
 
   EventId m_announceEvent;
 };