--- a/src/common/packet-metadata.cc	Fri Aug 03 09:23:41 2007 +0200
+++ b/src/common/packet-metadata.cc	Fri Aug 03 10:39:55 2007 +0200
@@ -977,7 +977,7 @@
                          Buffer data, uint32_t offset, const PacketPrinter &printer,
                          std::ostream &os) const
 {
-  uint32_t uid = item->typeUid & 0xfffffffe;
+  uint32_t uid = (item->typeUid & 0xfffffffe) >> 1;
   if (uid == 0)
     {
       // payload.
@@ -1112,6 +1112,7 @@
 class HistoryHeader : public Header
 {
 public:
+  static const char *GetUid (void);
   HistoryHeader ();
   bool IsOk (void) const;
 private:
@@ -1124,6 +1125,15 @@
 };
 
 template <int N>
+const char *
+HistoryHeader<N>::GetUid (void)
+{
+  std::ostringstream oss;
+  oss << N << "HistoryHeader.ns3";
+  return oss.str ().c_str ();
+}
+
+template <int N>
 HistoryHeader<N>::HistoryHeader ()
   : m_ok (false)
 {}
@@ -1181,6 +1191,7 @@
 class HistoryTrailer : public Trailer
 {
 public:
+  static const char *GetUid (void);
   HistoryTrailer ();
   bool IsOk (void) const;
 private:
@@ -1193,6 +1204,16 @@
 };
 
 template <int N>
+const char *
+HistoryTrailer<N>::GetUid (void)
+{
+  std::ostringstream oss;
+  oss << N << "HistoryTrailer.ns3";
+  return oss.str ().c_str ();
+}
+
+
+template <int N>
 HistoryTrailer<N>::HistoryTrailer ()
   : m_ok (false)
 {}