commit c018a561d0f74f64cdfca01cccde0718f7dfb968
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 16:27:31 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 11 11:42:41 2016 -0700
tree ccc4ec95b4ba7032ad59862fff92a2c691b148b6
parent ca3c67e4f63cdefe9a83adb7638890bddbb00afc

model+apps: Replace AppFace with AppFaceModel and relevant changes in ndn::App

Change-Id: I59faedaadf9d054ae22d813a4ce41f1f30b9321c
Refs: #3560

apps/ndn-app.cpp

diff --git a/apps/ndn-app.cpp b/apps/ndn-app.cpp
index a1c9e80..0472550 100644
--- a/apps/ndn-app.cpp
+++ b/apps/ndn-app.cpp
@@ -23,7 +23,8 @@
 #include "ns3/packet.h"
 
 #include "model/ndn-l3-protocol.hpp"
-#include "model/ndn-app-face.hpp"
+#include "model/ndn-app-link-service.hpp"
+#include "model/null-transport.hpp"
 
 NS_LOG_COMPONENT_DEFINE("ndn.App");
 
@@ -115,6 +116,15 @@
   m_receivedDatas(data, this, m_face);
 }
 
+void
+App::OnNack(shared_ptr<const lp::Nack> nack)
+{
+  NS_LOG_FUNCTION(this << nack);
+
+  // @TODO Implement
+  // m_receivedDatas(data, this, m_face);
+}
+
 // Application Methods
 void
 App::StartApplication() // Called at time specified by Start
@@ -128,7 +138,13 @@
                 "Ndn stack should be installed on the node " << GetNode());
 
   // step 1. Create a face
-  m_face = std::make_shared<AppFace>(this);
+  auto appLink = make_unique<AppLinkService>(this);
+  auto transport = make_unique<NullTransport>("appFace://", "appFace://",
+                                              ::ndn::nfd::FACE_SCOPE_LOCAL);
+  // @TODO Consider making AppTransport instead
+  m_face = std::make_shared<Face>(std::move(appLink), std::move(transport));
+  m_appLink = static_cast<AppLinkService*>(m_face->getLinkService());
+  m_face->setMetric(1);
 
   // step 2. Add face to the Ndn stack
   GetNode()->GetObject<L3Protocol>()->addFace(m_face);