commit aa1154b230b734b550e6da9515ac7341d9b66710
author Ilya Moiseenko <iliamo@ucla.edu> Wed Nov 16 16:30:11 2011 -0800
committer Ilya Moiseenko <iliamo@ucla.edu> Wed Nov 16 16:30:11 2011 -0800
tree 555cb73a26003ebb95b16f2b56d78f6665059a50
parent 8c193dc9c0a63ec9b1e2f31776578145b7a2c1fa

fix of best route strategy

model/ccnx-bestroute-strategy.cc

diff --git a/model/ccnx-bestroute-strategy.cc b/model/ccnx-bestroute-strategy.cc
index e27564e..625b6d7 100644
--- a/model/ccnx-bestroute-strategy.cc
+++ b/model/ccnx-bestroute-strategy.cc
@@ -59,8 +59,8 @@
                                           const Ptr<const Packet> &packet,
                                           SendCallback ucb)
 {
-  NS_LOG_FUNCTION(this);
-  NS_LOG_INFO(*fibEntry);
+  //NS_LOG_FUNCTION(this);
+  //NS_LOG_INFO(*fibEntry);
     
   Ptr<CcnxFace> bestFace = fibEntry->FindBestCandidate(0);
    
@@ -73,7 +73,21 @@
       bool tryResult = GetPit ()->TryAddOutgoing (pitEntry, bestFace);
       if (tryResult == false)
       {
-        return false;
+          NS_LOG_INFO("!!!!!!!!!!!!!Trying different face!!!!!!!!!!!!!!!!");
+          for(uint32_t i = 1; i<fibEntry->m_faces.size(); i++ )
+          {
+            bestFace = fibEntry->FindBestCandidate(i);
+            tryResult = GetPit ()->TryAddOutgoing (pitEntry, bestFace);
+            if(tryResult == true)
+              break;
+              NS_LOG_INFO("Trying different face");
+          }
+          
+          if(tryResult == false)
+          {
+              NS_LOG_INFO("FAILURE");
+              return false;
+          }
       }
           
       ucb (bestFace, header, packet->Copy());

model/ccnx-pit.cc

diff --git a/model/ccnx-pit.cc b/model/ccnx-pit.cc
index 8fd21e0..7e57b19 100644
--- a/model/ccnx-pit.cc
+++ b/model/ccnx-pit.cc
@@ -140,6 +140,7 @@
     if((face->IsLocal() == false) 
        && (m_bucketsPerFace[face->GetId()]+1.0 >= maxBucketsPerFace[face->GetId()] ))
 	{
+        NS_LOG_INFO("********LIMIT**************");
 		return false;
 	}