commit 946b87b9c5a9236675e5941946897a9b62bbf114
author Ilya Moiseenko <iliamo@ucla.edu> Tue Aug 23 17:37:54 2011 -0700
committer Ilya Moiseenko <iliamo@ucla.edu> Tue Aug 23 17:37:54 2011 -0700
tree 222aa19d845dcd20e9f80274cc2a001122e81c30
parent 171afe1c9d1f2feaf070f3a9a99f3eeaf38427c9

CcnxInterestSender and its helper fixes

apps/ccnx-interest-sender.cc

diff --git a/apps/ccnx-interest-sender.cc b/apps/ccnx-interest-sender.cc
index 6ca40a3..239d7cb 100644
--- a/apps/ccnx-interest-sender.cc
+++ b/apps/ccnx-interest-sender.cc
@@ -37,6 +37,10 @@
                    TimeValue (Seconds (0.1)),
                    MakeTimeAccessor (&CcnxInterestSender::m_offTime),
                    MakeTimeChecker ())
+    .AddAttribute ("Face","Local face to be used",
+                   PointerValue (CreateObject<CcnxLocalFace> ()),
+                   MakePointerAccessor (&CcnxInterestSender::m_face),
+                   MakePointerChecker<CcnxLocalFace> ())
     /*.AddAttribute ("NameComponents","CcnxName of the Interest (use CcnxNameComponents)",
                    CcnxNameComponentsValue(CcnxNameComponents()),
                    MakeCcnxNameComponentsAccessor(&CcnxInterestSender::m_interestName),
@@ -130,7 +134,7 @@
 {
     NS_LOG_FUNCTION_NOARGS ();
         
-    Time nextTime = Seconds(m_offTime); //send now
+    Time nextTime = Seconds(m_offTime);
     m_sendEvent = Simulator::Schedule (nextTime, &CcnxInterestSender::SendPacket, this);
 }
     

apps/ccnx-interest-sender.h

diff --git a/apps/ccnx-interest-sender.h b/apps/ccnx-interest-sender.h
index 345da02..04e9801 100644
--- a/apps/ccnx-interest-sender.h
+++ b/apps/ccnx-interest-sender.h
@@ -78,6 +78,7 @@
     void Construct (Ptr<Node> n,
                     std::string tid,
                     const Time& offtime,
+                    Ptr<CcnxLocalFace> face,
                     Ptr<CcnxNameComponents> nameComponents,
                     const Time& lifetime,
                     const int32_t& minSuffixComponents,