commit a4e7428dc3c983ca96cb0382b7a7f7b04e3597b3
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Jul 11 15:23:20 2013 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Mon Jul 15 19:29:16 2013 -0700
tree 7e5d1de1c0d7275ace4c9effcfd0a691d7a73bc0
parent 7960606cf266c3e63b260e41773d36ffe763bdaf

model+ndn.cxx+test: Finishing implementation of ApiFace (now timeouts are working as well)

Also, adding a basic test case to test ApiFace

Refs #1005 (http://redmine.named-data.net/)

examples/custom-apps/ndn-api-app.cc

diff --git a/examples/custom-apps/ndn-api-app.cc b/examples/custom-apps/ndn-api-app.cc
index 886a0b8..3346b52 100644
--- a/examples/custom-apps/ndn-api-app.cc
+++ b/examples/custom-apps/ndn-api-app.cc
@@ -77,7 +77,7 @@
 void
 ApiApp::StartApplication ()
 {
-  m_face = Create<ApiFace> (GetNode ());
+  m_face = CreateObject<ApiFace> (GetNode ());
   
   Simulator::Schedule (Seconds (1), &::ns3::ndn::ApiApp::RequestData, this);
 }
@@ -85,6 +85,9 @@
 void
 ApiApp::StopApplication ()
 {
+  NS_LOG_FUNCTION (this);
+  m_face->Shutdown ();
+  m_face = 0;
 }
 
 } // namespace ndn

examples/ndn-simple-api.cc

diff --git a/examples/ndn-simple-api.cc b/examples/ndn-simple-api.cc
index 587ca55..5fb4dd9 100644
--- a/examples/ndn-simple-api.cc
+++ b/examples/ndn-simple-api.cc
@@ -76,7 +76,8 @@
   // Consumer
   ndn::AppHelper consumerHelper ("ns3::ndn::ApiApp");
   consumerHelper.SetPrefix ("/prefix");
-  consumerHelper.Install (nodes.Get (0)); // first node
+  ApplicationContainer app = consumerHelper.Install (nodes.Get (0)); // first node
+  app.Stop (Seconds (10.0));
 
   // Producer
   ndn::AppHelper producerHelper ("ns3::ndn::Producer");