Another set of refactoring
diff --git a/model/fw/green-yellow-red.cc b/model/fw/green-yellow-red.cc
new file mode 100644
index 0000000..3f0653f
--- /dev/null
+++ b/model/fw/green-yellow-red.cc
@@ -0,0 +1,133 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil -*- */
+/*
+ * Copyright (c) 2011 University of California, Los Angeles
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License version 2 as
+ * published by the Free Software Foundation;
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ *
+ * Author: Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ * Ilya Moiseenko <iliamo@cs.ucla.edu>
+ */
+
+#include "green-yellow-red.h"
+
+#include "ns3/ndn-pit.h"
+#include "ns3/ndn-pit-entry.h"
+#include "ns3/ndn-interest-header.h"
+#include "ns3/ndn-content-object-header.h"
+#include "ns3/ndn-pit.h"
+#include "ns3/ndn-fib.h"
+#include "ns3/ndn-content-store.h"
+
+#include "ns3/assert.h"
+#include "ns3/ptr.h"
+#include "ns3/log.h"
+#include "ns3/simulator.h"
+#include "ns3/boolean.h"
+#include "ns3/string.h"
+
+#include <boost/ref.hpp>
+#include <boost/foreach.hpp>
+#include <boost/lambda/lambda.hpp>
+#include <boost/lambda/bind.hpp>
+#include <boost/tuple/tuple.hpp>
+namespace ll = boost::lambda;
+
+NS_LOG_COMPONENT_DEFINE ("ndn.fw.GreenYellowRed");
+
+namespace ns3 {
+namespace ndn {
+namespace fw {
+
+NS_OBJECT_ENSURE_REGISTERED (GreenYellowRed);
+
+TypeId
+GreenYellowRed::GetTypeId (void)
+{
+ static TypeId tid = TypeId ("ns3::ndn::fw::GreenYellowRed")
+ .SetGroupName ("Ndn")
+ .SetParent<Nacks> ()
+
+ ;
+ return tid;
+}
+
+bool
+GreenYellowRed::DoPropagateInterest (const Ptr<Face> &incomingFace,
+ Ptr<InterestHeader> header,
+ const Ptr<const Packet> &packet,
+ Ptr<pit::Entry> pitEntry)
+{
+ NS_LOG_FUNCTION (this);
+ NS_ASSERT_MSG (m_pit != 0, "PIT should be aggregated with forwarding strategy");
+
+ int propagatedCount = 0;
+
+ BOOST_FOREACH (const fib::FaceMetric &metricFace, pitEntry->GetFibEntry ()->m_faces.get<fib::i_metric> ())
+ {
+ if (metricFace.m_status == fib::FaceMetric::NDN_FIB_RED ||
+ metricFace.m_status == fib::FaceMetric::NDN_FIB_YELLOW)
+ break; //propagate only to green faces
+
+ if (pitEntry->GetIncoming ().find (metricFace.m_face) != pitEntry->GetIncoming ().end ())
+ continue; // don't forward to face that we received interest from
+
+ if (!WillSendOutInterest (metricFace.m_face, header, pitEntry))
+ {
+ continue;
+ }
+
+ //transmission
+ Ptr<Packet> packetToSend = packet->Copy ();
+ metricFace.m_face->Send (packetToSend);
+
+ DidSendOutInterest (metricFace.m_face, header, packet, pitEntry);
+
+ propagatedCount++;
+ break; // propagate only one interest
+ }
+
+ return propagatedCount > 0;
+}
+
+void
+GreenYellowRed::WillSatisfyPendingInterest (const Ptr<Face> &incomingFace,
+ Ptr<pit::Entry> pitEntry)
+{
+ if (incomingFace != 0)
+ {
+ // Update metric status for the incoming interface in the corresponding FIB entry
+ pitEntry->GetFibEntry ()->UpdateStatus (incomingFace, fib::FaceMetric::NDN_FIB_GREEN);
+ }
+
+ super::WillSatisfyPendingInterest (incomingFace, pitEntry);
+}
+
+void
+GreenYellowRed::DidReceiveValidNack (const Ptr<Face> &incomingFace,
+ uint32_t nackCode,
+ Ptr<pit::Entry> pitEntry)
+{
+ super::DidReceiveValidNack (incomingFace, nackCode, pitEntry);
+
+ if (incomingFace != 0 &&
+ nackCode != InterestHeader::NACK_LOOP)
+ {
+ pitEntry->GetFibEntry ()->UpdateStatus (incomingFace, fib::FaceMetric::NDN_FIB_YELLOW);
+ }
+}
+
+
+} // namespace fw
+} // namespace ndn
+} // namespace ns3