First step of refactoring code (ccnx prefix => ndn prefix)
diff --git a/model/pit/ndn-pit-entry.h b/model/pit/ndn-pit-entry.h
new file mode 100644
index 0000000..c14b93c
--- /dev/null
+++ b/model/pit/ndn-pit-entry.h
@@ -0,0 +1,267 @@
+/* -*- 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>
+ */
+
+#ifndef _NDN_PIT_ENTRY_H_
+#define _NDN_PIT_ENTRY_H_
+
+#include "ns3/ptr.h"
+#include "ns3/simple-ref-count.h"
+
+#include "ns3/ndn-fib.h"
+#include "ndn-pit-entry-incoming-face.h"
+#include "ndn-pit-entry-outgoing-face.h"
+
+#include <boost/multi_index_container.hpp>
+#include <boost/multi_index/tag.hpp>
+#include <boost/multi_index/ordered_index.hpp>
+// #include <boost/multi_index/composite_key.hpp>
+// #include <boost/multi_index/hashed_index.hpp>
+#include <boost/multi_index/member.hpp>
+// #include <boost/multi_index/mem_fun.hpp>
+#include <set>
+
+namespace ns3 {
+
+class NdnFace;
+class NdnNameComponents;
+class NdnPit;
+
+/// @cond include_hidden
+namespace __ndn_private
+{
+class i_retx {};
+}
+/// @endcond
+
+/**
+ * \ingroup ndn
+ * \brief Typedef for indexed face container of NdnPitEntryOutgoingFace
+ *
+ * Indexes:
+ * - by face (may be it will be possible to replace with just the std::map)
+ */
+struct NdnPitEntryOutgoingFaceContainer
+{
+ /// @cond include_hidden
+ typedef boost::multi_index::multi_index_container<
+ NdnPitEntryOutgoingFace,
+ boost::multi_index::indexed_by<
+ // For fast access to elements using NdnFace
+ boost::multi_index::ordered_unique<
+ boost::multi_index::tag<__ndn_private::i_face>,
+ boost::multi_index::member<NdnPitEntryOutgoingFace, Ptr<NdnFace>, &NdnPitEntryOutgoingFace::m_face>
+ >,
+ boost::multi_index::ordered_non_unique<
+ boost::multi_index::tag<__ndn_private::i_retx>,
+ boost::multi_index::member<NdnPitEntryOutgoingFace, uint32_t, &NdnPitEntryOutgoingFace::m_retxCount>
+ >
+ >
+ > type;
+ /// @endcond
+};
+
+
+/**
+ * \ingroup ndn
+ * \brief structure for PIT entry
+ *
+ * All set-methods are virtual, in case index rearrangement is necessary in the derived classes
+ */
+class NdnPitEntry : public SimpleRefCount<NdnPitEntry>
+{
+public:
+ typedef std::set< NdnPitEntryIncomingFace > in_container; ///< @brief incoming faces container type
+ typedef in_container::iterator in_iterator; ///< @brief iterator to incoming faces
+
+ typedef NdnPitEntryOutgoingFaceContainer::type out_container; ///< @brief outgoing faces container type
+ typedef out_container::iterator out_iterator; ///< @brief iterator to outgoing faces
+
+ typedef std::set< uint32_t > nonce_container; ///< @brief nonce container type
+
+ /**
+ * \brief PIT entry constructor
+ * \param prefix Prefix of the PIT entry
+ * \param offsetTime Relative time to the current moment, representing PIT entry lifetime
+ * \param fibEntry A FIB entry associated with the PIT entry
+ */
+ NdnPitEntry (NdnPit &container, Ptr<const NdnInterestHeader> header, Ptr<NdnFibEntry> fibEntry);
+
+ /**
+ * @brief Virtual destructor
+ */
+ virtual ~NdnPitEntry () {}
+
+ /**
+ * @brief Update lifetime of PIT entry
+ *
+ * This function will update PIT entry lifetime to the maximum of the current lifetime and
+ * the lifetime Simulator::Now () + offsetTime
+ *
+ * @param offsetTime Relative time to the current moment, representing PIT entry lifetime
+ */
+ virtual void
+ UpdateLifetime (const Time &offsetTime);
+
+ /**
+ * @brief Get prefix of the PIT entry
+ */
+ const NdnNameComponents &
+ GetPrefix () const
+ { return *m_prefix; }
+
+ /**
+ * @brief Get current expiration time of the record
+ *
+ * @returns current expiration time of the record
+ */
+ const Time &
+ GetExpireTime () const
+ { return m_expireTime; }
+
+ /**
+ * @brief Check if nonce `nonce` for the same prefix has already been seen
+ *
+ * @param nonce Nonce to check
+ */
+ bool
+ IsNonceSeen (uint32_t nonce) const
+ { return m_seenNonces.find (nonce) != m_seenNonces.end (); }
+
+ /**
+ * @brief Add `nonce` to the list of seen nonces
+ *
+ * @param nonce nonce to add to the list of seen nonces
+ *
+ * All nonces are stored for the lifetime of the PIT entry
+ */
+ virtual void
+ AddSeenNonce (uint32_t nonce)
+ { m_seenNonces.insert (nonce); }
+
+ /**
+ * @brief Add `face` to the list of incoming faces
+ *
+ * @param face Face to add to the list of incoming faces
+ * @returns iterator to the added entry
+ */
+ virtual in_iterator
+ AddIncoming (Ptr<NdnFace> face);
+
+ /**
+ * @brief Remove incoming entry for face `face`
+ */
+ virtual void
+ RemoveIncoming (Ptr<NdnFace> face);
+
+ /**
+ * @brief Clear all incoming faces either after all of them were satisfied or NACKed
+ */
+ virtual void
+ ClearIncoming ()
+ { m_incoming.clear (); }
+
+ /**
+ * @brief Add `face` to the list of outgoing faces
+ *
+ * @param face Face to add to the list of outgoing faces
+ * @returns iterator to the added entry
+ */
+ virtual out_iterator
+ AddOutgoing (Ptr<NdnFace> face);
+
+ /**
+ * @brief Clear all incoming faces either after all of them were satisfied or NACKed
+ */
+ virtual void
+ ClearOutgoing ()
+ { m_outgoing.clear (); }
+
+ /**
+ * @brief Remove all references to face.
+ *
+ * This method should be called before face is completely removed from the stack.
+ * Face is removed from the lists of incoming and outgoing faces
+ */
+ virtual void
+ RemoveAllReferencesToFace (Ptr<NdnFace> face);
+
+ /**
+ * @brief Flag outgoing face as hopeless
+ */
+ // virtual void
+ // SetWaitingInVain (out_iterator face);
+ virtual void
+ SetWaitingInVain (Ptr<NdnFace> face);
+
+ /**
+ * @brief Check if all outgoing faces are NACKed
+ */
+ bool
+ AreAllOutgoingInVain () const;
+
+ /**
+ * @brief Similar to AreAllOutgoingInVain, but ignores `face`
+ * \see AreAllOutgoingInVain
+ **/
+ bool
+ AreTherePromisingOutgoingFacesExcept (Ptr<NdnFace> face) const;
+
+ /**
+ * @brief Increase maximum limit of allowed retransmission per outgoing face
+ */
+ virtual void
+ IncreaseAllowedRetxCount ();
+
+ Ptr<NdnFibEntry>
+ GetFibEntry () { return m_fibEntry; };
+
+ const in_container &
+ GetIncoming () const { return m_incoming; }
+
+ const out_container &
+ GetOutgoing () const { return m_outgoing; }
+
+ uint32_t
+ GetMaxRetxCount () const { return m_maxRetxCount; }
+
+private:
+ friend std::ostream& operator<< (std::ostream& os, const NdnPitEntry &entry);
+
+protected:
+ NdnPit &m_container; ///< @brief Reference to the container (to rearrange indexes, if necessary)
+
+ Ptr<const NdnNameComponents> m_prefix; ///< \brief Prefix of the PIT entry
+ Ptr<NdnFibEntry> m_fibEntry; ///< \brief FIB entry related to this prefix
+
+ nonce_container m_seenNonces; ///< \brief map of nonces that were seen for this prefix
+ in_container m_incoming; ///< \brief container for incoming interests
+ out_container m_outgoing; ///< \brief container for outgoing interests
+
+ Time m_expireTime; ///< \brief Time when PIT entry will be removed
+
+ Time m_lastRetransmission; ///< @brief Last time when number of retransmissions were increased
+ uint32_t m_maxRetxCount; ///< @brief Maximum allowed number of retransmissions via outgoing faces
+};
+
+std::ostream& operator<< (std::ostream& os, const NdnPitEntry &entry);
+
+} // namespace ns3
+
+#endif // _NDN_PIT_ENTRY_H_