Solving a couple of bugs resulting from the packet format changes. Code compiles, but haven't fully tested yet
diff --git a/model/ndn-content-object.cc b/model/ndn-content-object.cc
new file mode 100644
index 0000000..30a19de
--- /dev/null
+++ b/model/ndn-content-object.cc
@@ -0,0 +1,204 @@
+/* -*- 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: Ilya Moiseenko <iliamo@cs.ucla.edu>
+ * Alexander Afanasyev <alexander.afanasyev@ucla.edu>
+ */
+
+#include "ndn-content-object.h"
+
+#include "ns3/log.h"
+
+#include <boost/foreach.hpp>
+
+NS_LOG_COMPONENT_DEFINE ("ndn.ContentObjectHeader");
+
+namespace ns3 {
+namespace ndn {
+
+NS_OBJECT_ENSURE_REGISTERED (ContentObjectHeader);
+NS_OBJECT_ENSURE_REGISTERED (ContentObjectTail);
+
+TypeId
+ContentObjectHeader::GetTypeId (void)
+{
+ static TypeId tid = TypeId ("ns3::ndn::ContentObjectHeader")
+ .SetGroupName ("Ndn")
+ .SetParent<Header> ()
+ .AddConstructor<ContentObjectHeader> ()
+ ;
+ return tid;
+}
+
+ContentObjectHeader::ContentObjectHeader ()
+{
+}
+
+void
+ContentObjectHeader::SetName (const Ptr<NameComponents> &name)
+{
+ m_name = name;
+}
+
+const NameComponents&
+ContentObjectHeader::GetName () const
+{
+ if (m_name==0) throw ContentObjectHeaderException();
+ return *m_name;
+}
+
+Ptr<const NameComponents>
+ContentObjectHeader::GetNamePtr () const
+{
+ return m_name;
+}
+
+uint32_t
+ContentObjectHeader::GetSerializedSize () const
+{
+ uint32_t size = 2 + ((2 + 1) + (m_name->GetSerializedSize ()) + (2 + 2 + 4 + 2 + 2 + (2 + 0)));
+ NS_LOG_INFO ("Serialize size = " << size);
+ return size;
+}
+
+void
+ContentObjectHeader::Serialize (Buffer::Iterator start) const
+{
+ start.WriteU8 (0x80); // version
+ start.WriteU8 (0x01); // packet type
+
+ start.WriteU16 (2); // signature length
+ start.WriteU16 (0); // empty signature
+
+ // name
+ uint32_t offset = m_name->Serialize (start);
+ start.Next (offset);
+
+ // content
+ // for now assume that contentdata length is zero
+ start.WriteU16 (2 + 4 + 2 + 2 + (2 + 0));
+ start.WriteU16 (4 + 2 + 2 + (2 + 0));
+ start.WriteU32 (static_cast<uint32_t> (m_timestamp.ToInteger (Time::S)));
+ start.WriteU16 (static_cast<uint16_t> (m_freshness.ToInteger (Time::S)));
+ start.WriteU16 (0); // reserved
+ start.WriteU16 (0); // Length (ContentInfoOptions)
+
+ // that's it folks
+}
+
+
+uint32_t
+ContentObjectHeader::Deserialize (Buffer::Iterator start)
+{
+ Buffer::Iterator i = start;
+
+ if (i.ReadU8 () != 0x80)
+ throw new ContentObjectHeaderException ();
+
+ if (i.ReadU8 () != 0x01)
+ throw new ContentObjectHeaderException ();
+
+ if (i.ReadU16 () != 2) // signature length
+ throw new ContentObjectHeaderException ();
+
+ if (i.ReadU16 () != 0) // signature type
+ throw new ContentObjectHeaderException ();
+
+ m_name = Create<NameComponents> ();
+ uint32_t offset = m_name->Deserialize (i);
+ i.Next (offset);
+
+ if (i.ReadU16 () != (2 + 4 + 2 + 2 + (2 + 0))) // content length
+ throw new ContentObjectHeaderException ();
+
+ if (i.ReadU16 () != (4 + 2 + 2 + (2 + 0))) // Length (content Info)
+ throw new ContentObjectHeaderException ();
+
+ m_timestamp = Seconds (i.ReadU32 ());
+ m_freshness = Seconds (i.ReadU16 ());
+
+ if (i.ReadU16 () != 0) // Reserved
+ throw new ContentObjectHeaderException ();
+ if (i.ReadU16 () != 0) // Length (ContentInfoOptions)
+ throw new ContentObjectHeaderException ();
+
+ NS_ASSERT_MSG (i.GetDistanceFrom (start) != GetSerializedSize (),
+ "Something wrong with ContentObjectHeader::Deserialize");
+
+ return i.GetDistanceFrom (start);
+}
+
+TypeId
+ContentObjectHeader::GetInstanceTypeId (void) const
+{
+ return GetTypeId ();
+}
+
+void
+ContentObjectHeader::Print (std::ostream &os) const
+{
+ os << "D: " << GetName ();
+ // os << "<ContentObject><Name>" << GetName () << "</Name><Content>";
+}
+
+////////////////////////////////////////////////////////////////////////////////////////////////////
+
+ContentObjectTail::ContentObjectTail ()
+{
+}
+
+TypeId
+ContentObjectTail::GetTypeId (void)
+{
+ static TypeId tid = TypeId ("ns3::ndn::ContentObjectTail")
+ .SetParent<Trailer> ()
+ .AddConstructor<ContentObjectTail> ()
+ ;
+ return tid;
+}
+
+TypeId
+ContentObjectTail::GetInstanceTypeId (void) const
+{
+ return GetTypeId ();
+}
+
+void
+ContentObjectTail::Print (std::ostream &os) const
+{
+ // os << "</Content></ContentObject>";
+}
+
+uint32_t
+ContentObjectTail::GetSerializedSize (void) const
+{
+ return 0;
+}
+
+void
+ContentObjectTail::Serialize (Buffer::Iterator start) const
+{
+}
+
+uint32_t
+ContentObjectTail::Deserialize (Buffer::Iterator start)
+{
+ return 0;
+}
+
+} // namespace ndn
+} // namespace ns3