Solving a couple of bugs resulting from the packet format changes. Code compiles, but haven't fully tested yet
diff --git a/model/ndn-interest.cc b/model/ndn-interest.cc
new file mode 100644
index 0000000..dae23ab
--- /dev/null
+++ b/model/ndn-interest.cc
@@ -0,0 +1,241 @@
+/* -*- 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>
+ */
+
+#include "ndn-interest.h"
+
+#include "ns3/log.h"
+#include "ns3/unused.h"
+#include "ns3/packet.h"
+
+NS_LOG_COMPONENT_DEFINE ("ndn.InterestHeader");
+
+namespace ns3 {
+namespace ndn {
+
+NS_OBJECT_ENSURE_REGISTERED (InterestHeader);
+
+TypeId
+InterestHeader::GetTypeId (void)
+{
+ static TypeId tid = TypeId ("ns3::ndn::InterestHeader")
+ .SetGroupName ("Ndn")
+ .SetParent<Header> ()
+ .AddConstructor<InterestHeader> ()
+ ;
+ return tid;
+}
+
+
+InterestHeader::InterestHeader ()
+ : m_name ()
+ , m_scope (0xFF)
+ , m_interestLifetime (Seconds (0))
+ , m_nonce (0)
+ , m_nackType (NORMAL_INTEREST)
+{
+}
+
+InterestHeader::InterestHeader (const InterestHeader &interest)
+ : m_name (Create<NameComponents> (interest.GetName ()))
+ , m_scope (interest.m_scope)
+ , m_interestLifetime (interest.m_interestLifetime)
+ , m_nonce (interest.m_nonce)
+ , m_nackType (interest.m_nackType)
+{
+}
+
+Ptr<InterestHeader>
+InterestHeader::GetInterest (Ptr<Packet> packet)
+{
+ Ptr<InterestHeader> interest = Create<InterestHeader> ();
+ packet->RemoveHeader (*interest);
+
+ return interest;
+}
+
+void
+InterestHeader::SetName (Ptr<NameComponents> name)
+{
+ m_name = name;
+}
+
+const NameComponents&
+InterestHeader::GetName () const
+{
+ if (m_name==0) throw InterestHeaderException();
+ return *m_name;
+}
+
+Ptr<const NameComponents>
+InterestHeader::GetNamePtr () const
+{
+ return m_name;
+}
+
+void
+InterestHeader::SetScope (int8_t scope)
+{
+ m_scope = scope;
+}
+
+int8_t
+InterestHeader::GetScope () const
+{
+ return m_scope;
+}
+
+void
+InterestHeader::SetInterestLifetime (Time lifetime)
+{
+ m_interestLifetime = lifetime;
+}
+
+Time
+InterestHeader::GetInterestLifetime () const
+{
+ return m_interestLifetime;
+}
+
+void
+InterestHeader::SetNonce (uint32_t nonce)
+{
+ m_nonce = nonce;
+}
+
+uint32_t
+InterestHeader::GetNonce () const
+{
+ return m_nonce;
+}
+
+void
+InterestHeader::SetNack (uint8_t nackType)
+{
+ m_nackType = nackType;
+}
+
+uint8_t
+InterestHeader::GetNack () const
+{
+ return m_nackType;
+}
+
+uint32_t
+InterestHeader::GetSerializedSize (void) const
+{
+ size_t size = 2 + (1 + 4 + 2 + 1 + (m_name->GetSerializedSize ()) + (2 + 0) + (2 + 0));
+ NS_LOG_INFO ("Serialize size = " << size);
+
+ return size;
+}
+
+void
+InterestHeader::Serialize (Buffer::Iterator start) const
+{
+ start.WriteU8 (0x80); // version
+ start.WriteU8 (0x00); // packet type
+
+ start.WriteU32 (m_nonce);
+ start.WriteU8 (m_scope);
+ start.WriteU8 (m_nackType);
+
+ NS_ASSERT_MSG (0 <= m_interestLifetime.ToInteger (Time::S) && m_interestLifetime.ToInteger (Time::S) < 65535,
+ "Incorrect InterestLifetime (should not be smaller than 0 and larger than 65535");
+
+ // rounding timestamp value to seconds
+ start.WriteU16 (static_cast<uint16_t> (m_interestLifetime.ToInteger (Time::S)));
+
+ uint32_t offset = m_name->Serialize (start);
+ start.Next (offset);
+
+ start.WriteU16 (0); // no selectors
+ start.WriteU16 (0); // no options
+}
+
+uint32_t
+InterestHeader::Deserialize (Buffer::Iterator start)
+{
+ Buffer::Iterator i = start;
+
+ if (i.ReadU8 () != 0x80)
+ throw new InterestHeaderException ();
+
+ if (i.ReadU8 () != 0x00)
+ throw new InterestHeaderException ();
+
+ m_nonce = i.ReadU32 ();
+ m_scope = i.ReadU8 ();
+ m_nackType = i.ReadU8 ();
+
+ m_interestLifetime = Seconds (i.ReadU16 ());
+
+ m_name = Create<NameComponents> ();
+ uint32_t offset = m_name->Deserialize (i);
+ i.Next (offset);
+
+ i.ReadU16 ();
+ i.ReadU16 ();
+
+ NS_ASSERT (GetSerializedSize () == (i.GetDistanceFrom (start)));
+
+ return i.GetDistanceFrom (start);
+}
+
+TypeId
+InterestHeader::GetInstanceTypeId (void) const
+{
+ return GetTypeId ();
+}
+
+void
+InterestHeader::Print (std::ostream &os) const
+{
+ os << "I: " << GetName ();
+
+ return;
+ os << "<Interest>\n <Name>" << GetName () << "</Name>\n";
+ if (GetNack ()>0)
+ {
+ os << " <NACK>";
+ switch (GetNack ())
+ {
+ case NACK_LOOP:
+ os << "loop";
+ break;
+ case NACK_CONGESTION:
+ os << "congestion";
+ break;
+ default:
+ os << "unknown";
+ break;
+ }
+ os << "</NACK>\n";
+ }
+ os << " <Scope>" << GetScope () << "</Scope>\n";
+ if ( !GetInterestLifetime ().IsZero() )
+ os << " <InterestLifetime>" << GetInterestLifetime () << "</InterestLifetime>\n";
+ if (GetNonce ()>0)
+ os << " <Nonce>" << GetNonce () << "</Nonce>\n";
+ os << "</Interest>";
+}
+
+} // namespace ndn
+} // namespace ns3
+