commit 50ea1a3fbaaec187338749bd6124bc28f7ac30e9
author Alexander Afanasyev <alexander.afanasyev@ucla.edu> Thu Sep 08 15:44:08 2016 -0700
committer Alexander Afanasyev <alexander.afanasyev@ucla.edu> Sun Sep 11 11:42:41 2016 -0700
tree 260881c7438f807d43e15128fdf444ec81a7a969
parent c018a561d0f74f64cdfca01cccde0718f7dfb968

apps+examples: Adjust Face creation and Face operations for NFD 0.4+ model

Change-Id: Ib0fb0f49a550c77a9bd94729cdf6fb3b11d1e8ab
Refs: #3560

apps/ndn-consumer-cbr.cpp

diff --git a/apps/ndn-consumer-cbr.cpp b/apps/ndn-consumer-cbr.cpp
index fc5be6d..c5fbf88 100644
--- a/apps/ndn-consumer-cbr.cpp
+++ b/apps/ndn-consumer-cbr.cpp
@@ -29,8 +29,6 @@
 #include "ns3/integer.h"
 #include "ns3/double.h"
 
-#include "model/ndn-app-face.hpp"
-
 NS_LOG_COMPONENT_DEFINE("ndn.ConsumerCbr");
 
 namespace ns3 {

apps/ndn-consumer-zipf-mandelbrot.cpp

diff --git a/apps/ndn-consumer-zipf-mandelbrot.cpp b/apps/ndn-consumer-zipf-mandelbrot.cpp
index ac83022..c6358c0 100644
--- a/apps/ndn-consumer-zipf-mandelbrot.cpp
+++ b/apps/ndn-consumer-zipf-mandelbrot.cpp
@@ -21,7 +21,6 @@
 
 #include "ndn-consumer-zipf-mandelbrot.hpp"
 
-#include "model/ndn-app-face.hpp"
 #include "utils/ndn-fw-hop-count-tag.hpp"
 
 #include <math.h>
@@ -193,7 +192,7 @@
   m_rtt->SentSeq(SequenceNumber32(seq), 1);
 
   m_transmittedInterests(interest, this, m_face);
-  m_face->onReceiveInterest(*interest);
+  m_appLink->onReceiveInterest(*interest);
 
   ConsumerZipfMandelbrot::ScheduleNextPacket();
 }

apps/ndn-consumer.cpp

diff --git a/apps/ndn-consumer.cpp b/apps/ndn-consumer.cpp
index 4d39bea..3a1ec45 100644
--- a/apps/ndn-consumer.cpp
+++ b/apps/ndn-consumer.cpp
@@ -30,7 +30,6 @@
 #include "ns3/double.h"
 
 #include "utils/ndn-ns3-packet-tag.hpp"
-#include "model/ndn-app-face.hpp"
 #include "utils/ndn-rtt-mean-deviation.hpp"
 
 #include <boost/lexical_cast.hpp>
@@ -198,7 +197,7 @@
   WillSendOutInterest(seq);
 
   m_transmittedInterests(interest, this, m_face);
-  m_face->onReceiveInterest(*interest);
+  m_appLink->onReceiveInterest(*interest);
 
   ScheduleNextPacket();
 }

apps/ndn-producer.cpp

diff --git a/apps/ndn-producer.cpp b/apps/ndn-producer.cpp
index a1a63ab..5be9241 100644
--- a/apps/ndn-producer.cpp
+++ b/apps/ndn-producer.cpp
@@ -24,7 +24,6 @@
 #include "ns3/packet.h"
 #include "ns3/simulator.h"
 
-#include "model/ndn-app-face.hpp"
 #include "model/ndn-ns3.hpp"
 #include "model/ndn-l3-protocol.hpp"
 #include "helper/ndn-fib-helper.hpp"
@@ -130,7 +129,7 @@
   data->wireEncode();
 
   m_transmittedDatas(data, this, m_face);
-  m_face->onReceiveData(*data);
+  m_appLink->onReceiveData(*data);
 }
 
 } // namespace ndn