--- a/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc	Fri Jul 31 14:13:10 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-peer-management.cc	Fri Jul 31 17:08:42 2009 +0400
@@ -28,7 +28,7 @@
 namespace dot11s {
 
 IePeerManagement::IePeerManagement () :
-  m_length (0), m_subtype (PEER_OPEN), m_localLinkId (0), m_peerLinkId (0), m_reasonCode (REASON11S_RESERVED)
+  m_length (3), m_subtype (PEER_OPEN), m_localLinkId (0), m_peerLinkId (0), m_reasonCode (REASON11S_RESERVED)
 {
 }
 WifiElementId

--- a/src/devices/mesh/dot11s/peer-management-protocol-mac.cc	Fri Jul 31 14:13:10 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol-mac.cc	Fri Jul 31 17:08:42 2009 +0400
@@ -27,7 +27,7 @@
 #include "ns3/mesh-wifi-interface-mac.h"
 #include "ns3/simulator.h"
 #include "ns3/wifi-mac-header.h"
-#include "ns3/ie-vector.h"
+#include "ns3/wifi-information-element-vector.h"
 #include "ns3/log.h"
 namespace ns3 {
 namespace dot11s {

--- a/src/devices/mesh/ie-vector.cc	Fri Jul 31 14:13:10 2009 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,212 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2009 IITP RAS
- *
- * 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: Pavel Boyko <boyko@iitp.ru>
- */
-
-#include "ie-vector.h"
-#include "ns3/test.h"
-#include "ns3/packet.h"
-// All information elements:
-#include "dot11s/ie-dot11s-beacon-timing.h"
-#include "dot11s/ie-dot11s-configuration.h"
-#include "dot11s/ie-dot11s-id.h"
-#include "dot11s/ie-dot11s-metric-report.h"
-#include "dot11s/ie-dot11s-peer-management.h"
-#include "dot11s/ie-dot11s-peering-protocol.h"
-#include "dot11s/ie-dot11s-perr.h"
-#include "dot11s/ie-dot11s-prep.h"
-#include "dot11s/ie-dot11s-preq.h"
-#include "dot11s/ie-dot11s-rann.h"
-
-namespace ns3 {
-WifiInformationElementVector::WifiInformationElementVector () :
-  m_maxSize (1500)
-{
-}
-WifiInformationElementVector::~WifiInformationElementVector ()
-{
-}
-void
-WifiInformationElementVector::SetMaxSize (uint16_t size)
-{
-  m_maxSize = size;
-}
-WifiInformationElementVector::Iterator
-WifiInformationElementVector::Begin ()
-{
-  return m_elements.begin ();
-}
-WifiInformationElementVector::Iterator
-WifiInformationElementVector::End ()
-{
-  return m_elements.end ();
-}
-bool
-WifiInformationElementVector::AddInformationElement (Ptr<WifiInformationElement> element)
-{
-  if (element->GetSerializedSize () + GetSize () > m_maxSize)
-    {
-      return false;
-    }
-  m_elements.push_back (element);
-  return true;
-}
-Ptr<WifiInformationElement>
-WifiInformationElementVector::FindFirst (enum WifiElementId id) const
-{
-  for (IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i++)
-    {
-      if ((*i)->ElementId () == id)
-        {
-          return (*i);
-        }
-    }
-  return 0;
-}
-WifiInformationElementVector
-WifiInformationElementVector::DeserializePacket (Ptr<Packet> packet)
-{
-  WifiInformationElementVector retval;
-  EmptyIe ie;
-  while (packet->PeekHeader (ie))
-    {
-      Ptr<WifiInformationElement> newElement;
-      switch (ie.GetElementId ())
-        {
-      case IE11S_MESH_CONFIGURATION:
-        newElement = Create<dot11s::IeConfiguration> ();
-        break;
-      case IE11S_MESH_ID:
-        newElement = Create<dot11s::IeMeshId> ();
-        break;
-      case IE11S_LINK_METRIC_REPORT:
-        newElement = Create<dot11s::IeLinkMetricReport> ();
-        break;
-      case IE11S_PEERING_MANAGEMENT:
-        newElement = Create<dot11s::IePeerManagement> ();
-        break;
-      case IE11S_BEACON_TIMING:
-        newElement = Create<dot11s::IeBeaconTiming> ();
-        break;
-      case IE11S_RANN:
-        newElement = Create<dot11s::IeRann> ();
-        break;
-      case IE11S_PREQ:
-        newElement = Create<dot11s::IePreq> ();
-        break;
-      case IE11S_PREP:
-        newElement = Create<dot11s::IePrep> ();
-        break;
-      case IE11S_PERR:
-        newElement = Create<dot11s::IePerr> ();
-        break;
-      case IE11S_MESH_PEERING_PROTOCOL_VERSION:
-        newElement = Create<dot11s::IePeeringProtocol> ();
-        break;
-      default:
-        NS_FATAL_ERROR ("Information element " << (uint16_t) ie.GetElementId () << " is not implemented");
-        }
-      packet->RemoveHeader (*newElement);
-      if (!retval.AddInformationElement (newElement))
-        {
-          NS_FATAL_ERROR ("Check max size for information element!");
-        }
-      if (packet->GetSize () == 0)
-        {
-          return retval;
-        }
-    }
-  return retval;
-}
-Ptr<Packet>
-WifiInformationElementVector::MakePacket (bool sortByElementId)
-{
-  if (sortByElementId)
-    {
-      //TODO: sort
-    }
-  Ptr<Packet> packet = Create<Packet> ();
-  for (IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i++)
-    {
-      packet->AddHeader (**i);
-    }
-  return packet;
-}
-uint32_t
-WifiInformationElementVector::GetSize () const
-{
-  uint32_t size = 0;
-  for (IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i++)
-    {
-      size += (*i)->GetSerializedSize ();
-    }
-  return size;
-}
-WifiInformationElementVector::EmptyIe::~EmptyIe ()
-{
-}
-WifiInformationElementVector::EmptyIe::EmptyIe () :
-  m_elementId (0), m_length (0)
-{
-}
-TypeId
-WifiInformationElementVector::EmptyIe::GetTypeId ()
-{
-  static TypeId tid = TypeId ("ns3::WifiInformationElementVector::EmptyIe")
-    .SetParent<Header> ();
-  return tid;
-}
-TypeId
-WifiInformationElementVector::EmptyIe::GetInstanceTypeId () const
-{
-  return GetTypeId ();
-}
-uint8_t
-WifiInformationElementVector::EmptyIe::GetLength ()
-{
-  return m_length;
-}
-uint8_t
-WifiInformationElementVector::EmptyIe::GetElementId ()
-{
-  return m_elementId;
-}
-uint32_t
-WifiInformationElementVector::EmptyIe::GetSerializedSize () const
-{
-  return 2;
-}
-void
-WifiInformationElementVector::EmptyIe::Serialize (Buffer::Iterator start) const
-{
-  start.WriteU8 (m_elementId);
-  start.WriteU8 (m_length);
-}
-uint32_t
-WifiInformationElementVector::EmptyIe::Deserialize (Buffer::Iterator start)
-{
-  Buffer::Iterator i = start;
-  m_elementId = i.ReadU8 ();
-  m_length = i.ReadU8 ();
-  return i.GetDistanceFrom (start);
-}
-void
-WifiInformationElementVector::EmptyIe::Print (std::ostream &os) const
-{
-}
-}

--- a/src/devices/mesh/ie-vector.h	Fri Jul 31 14:13:10 2009 +0400
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,77 +0,0 @@
-/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/*
- * Copyright (c) 2009 IITP RAS
- *
- * 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: Kirill Andreev <andreev@iitp.ru>
- */
-
-#ifndef IE_VECTOR_H
-#define IE_VECTOR_H
-
-#include "ns3/wifi-information-element.h"
-
-namespace ns3 {
-class Packet;
-/**
- * \ingroup mesh
- *
- * \brief Information element vector
- *
- * Implements a vector of WifiInformationElement's
- */
-class WifiInformationElementVector
-{
-public:
-  WifiInformationElementVector ();
-  ~WifiInformationElementVector ();
-  void SetMaxSize (uint16_t size);
-  typedef std::vector<Ptr<WifiInformationElement> >::iterator Iterator;
-  Iterator Begin ();
-  Iterator End ();
-  bool AddInformationElement (Ptr<WifiInformationElement> element);
-  Ptr<WifiInformationElement> FindFirst (enum WifiElementId id) const;
-  static WifiInformationElementVector DeserializePacket (Ptr<Packet> packet);
-  Ptr<Packet> MakePacket (bool sortByElementId = true);
-private:
-  uint32_t GetSize () const;
-  /**
-   * \brief Implements an empty information element: just elementId and length.
-   * \details Needed to understand, which information element we need to deserialize now
-   */
-  class EmptyIe : public Header
-  {
-  public:
-    EmptyIe ();
-    virtual ~EmptyIe ();
-    static TypeId GetTypeId ();
-    TypeId GetInstanceTypeId () const;
-    uint8_t GetLength ();
-    uint8_t GetElementId ();
-    virtual uint32_t GetSerializedSize () const;
-    virtual void Serialize (Buffer::Iterator start) const;
-    virtual uint32_t Deserialize (Buffer::Iterator start);
-    virtual void Print (std::ostream &os) const;
-  private:
-    uint8_t m_elementId;
-    uint8_t m_length;
-  };
-  typedef std::vector<Ptr<WifiInformationElement> > IE_VECTOR;
-  IE_VECTOR m_elements;
-  /// Size in bytes (actually, max packet length)
-  uint16_t m_maxSize;
-};
-}
-#endif

--- a/src/devices/mesh/mesh-wifi-beacon.cc	Fri Jul 31 14:13:10 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-beacon.cc	Fri Jul 31 17:08:42 2009 +0400
@@ -19,7 +19,7 @@
  */
 
 #include "ns3/mesh-wifi-beacon.h"
-#include <algorithm>
+
 
 namespace ns3 {
 
@@ -32,32 +32,14 @@
 void
 MeshWifiBeacon::AddInformationElement (Ptr<WifiInformationElement> ie)
 {
-  m_elements.push_back (ie);
+  m_elements.AddInformationElement (ie);
 }
-namespace {
-/// aux sorter for Ptr<WifiInformationElement>
-struct PIEComparator
-{
-  bool
-  operator () (Ptr<WifiInformationElement> a, Ptr<WifiInformationElement> b) const
-  {
-    return ((*PeekPointer (a)) < (*PeekPointer (b)));
-  }
-};
-}
+
 
 Ptr<Packet>
 MeshWifiBeacon::CreatePacket ()
 {
-  Ptr<Packet> packet = Create<Packet> ();
-
-  std::sort (m_elements.begin (), m_elements.end (), PIEComparator ());
-
-  std::vector<Ptr<WifiInformationElement> >::const_reverse_iterator i;
-  for (i = m_elements.rbegin (); i != m_elements.rend (); ++i)
-    {
-      packet->AddHeader (**i);
-    }
+  Ptr<Packet> packet = m_elements.CreatePacket();
   packet->AddHeader (BeaconHeader ());
   return packet;
 }

--- a/src/devices/mesh/mesh-wifi-beacon.h	Fri Jul 31 14:13:10 2009 +0400
+++ b/src/devices/mesh/mesh-wifi-beacon.h	Fri Jul 31 17:08:42 2009 +0400
@@ -1,7 +1,7 @@
 /* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
-/* 
+/*
  * Copyright (c) 2009 IITP RAS
- * 
+ *
  * 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;
@@ -14,7 +14,7 @@
  * 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: Pavel Boyko <boyko@iitp.ru>
  */
 
@@ -26,6 +26,7 @@
 #include "ns3/wifi-information-element.h"
 #include "ns3/mgt-headers.h"        // from wifi module
 #include "ns3/wifi-mac-header.h"
+#include "ns3/wifi-information-element-vector.h"
 
 #include <vector>
 
@@ -33,16 +34,16 @@
 
 /**
  * \brief Beacon is beacon header + list of arbitrary information elements
- * 
+ *
  * It is supposed that distinct mesh protocols can use beacons to transport
  * their own information elements.
  */
 class MeshWifiBeacon
 {
 public:
-  /** 
+  /**
    * C-tor
-   * 
+   *
    * \param ssid is SSID for beacon header
    * \param rates is a set of supported rates
    * \param us beacon interval in microseconds
@@ -52,22 +53,22 @@
   MgtBeaconHeader BeaconHeader () const { return m_header; }
   /// Add information element
   void AddInformationElement (Ptr<WifiInformationElement> ie);
-  
-  /** 
-   * Create wifi header for beacon frame. 
-   * 
-   * \param address is sender address 
+
+  /**
+   * Create wifi header for beacon frame.
+   *
+   * \param address is sender address
    * \param mpAddress is mesh point address
    */
   WifiMacHeader CreateHeader (Mac48Address address, Mac48Address mpAddress);
   /// Create frame = { beacon header + all information elements sorted by ElementId () }
   Ptr<Packet> CreatePacket ();
-  
+
 private:
   /// Beacon header
   MgtBeaconHeader m_header;
-  /// List of information elements added 
-  std::vector< Ptr<WifiInformationElement> > m_elements;
+  /// List of information elements added
+  WifiInformationElementVector m_elements;
 };
 
 }

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/devices/mesh/wifi-information-element-vector.cc	Fri Jul 31 17:08:42 2009 +0400
@@ -0,0 +1,286 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2009 IITP RAS
+ *
+ * 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: Pavel Boyko <boyko@iitp.ru>
+ */
+
+#include "wifi-information-element-vector.h"
+#include "ns3/test.h"
+#include "ns3/packet.h"
+#include <algorithm>
+// All information elements:
+#include "dot11s/ie-dot11s-beacon-timing.h"
+#include "dot11s/ie-dot11s-configuration.h"
+#include "dot11s/ie-dot11s-id.h"
+#include "dot11s/ie-dot11s-metric-report.h"
+#include "dot11s/ie-dot11s-peer-management.h"
+#include "dot11s/ie-dot11s-peering-protocol.h"
+#include "dot11s/ie-dot11s-perr.h"
+#include "dot11s/ie-dot11s-prep.h"
+#include "dot11s/ie-dot11s-preq.h"
+#include "dot11s/ie-dot11s-rann.h"
+
+namespace ns3 {
+WifiInformationElementVector::WifiInformationElementVector () :
+  m_maxSize (1500)
+{
+}
+WifiInformationElementVector::~WifiInformationElementVector ()
+{
+}
+void
+WifiInformationElementVector::SetMaxSize (uint16_t size)
+{
+  m_maxSize = size;
+}
+WifiInformationElementVector::Iterator
+WifiInformationElementVector::Begin ()
+{
+  return m_elements.begin ();
+}
+WifiInformationElementVector::Iterator
+WifiInformationElementVector::End ()
+{
+  return m_elements.end ();
+}
+bool
+WifiInformationElementVector::AddInformationElement (Ptr<WifiInformationElement> element)
+{
+  if (element->GetSerializedSize () + GetSize () > m_maxSize)
+    {
+      return false;
+    }
+  m_elements.push_back (element);
+  return true;
+}
+Ptr<WifiInformationElement>
+WifiInformationElementVector::FindFirst (enum WifiElementId id) const
+{
+  for (IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i++)
+    {
+      if ((*i)->ElementId () == id)
+        {
+          return (*i);
+        }
+    }
+  return 0;
+}
+WifiInformationElementVector
+WifiInformationElementVector::DeserializePacket (Ptr<Packet> packet)
+{
+  WifiInformationElementVector retval;
+  EmptyIe ie;
+  while (packet->PeekHeader (ie))
+    {
+      Ptr<WifiInformationElement> newElement;
+      switch (ie.GetElementId ())
+        {
+      case IE11S_MESH_CONFIGURATION:
+        newElement = Create<dot11s::IeConfiguration> ();
+        break;
+      case IE11S_MESH_ID:
+        newElement = Create<dot11s::IeMeshId> ();
+        break;
+      case IE11S_LINK_METRIC_REPORT:
+        newElement = Create<dot11s::IeLinkMetricReport> ();
+        break;
+      case IE11S_PEERING_MANAGEMENT:
+        newElement = Create<dot11s::IePeerManagement> ();
+        break;
+      case IE11S_BEACON_TIMING:
+        newElement = Create<dot11s::IeBeaconTiming> ();
+        break;
+      case IE11S_RANN:
+        newElement = Create<dot11s::IeRann> ();
+        break;
+      case IE11S_PREQ:
+        newElement = Create<dot11s::IePreq> ();
+        break;
+      case IE11S_PREP:
+        newElement = Create<dot11s::IePrep> ();
+        break;
+      case IE11S_PERR:
+        newElement = Create<dot11s::IePerr> ();
+        break;
+      case IE11S_MESH_PEERING_PROTOCOL_VERSION:
+        newElement = Create<dot11s::IePeeringProtocol> ();
+        break;
+      default:
+        NS_FATAL_ERROR ("Information element " << (uint16_t) ie.GetElementId () << " is not implemented");
+        return retval;
+        }
+      packet->RemoveHeader (*newElement);
+      if (!retval.AddInformationElement (newElement))
+        {
+          NS_FATAL_ERROR ("Check max size for information element!");
+        }
+      if (packet->GetSize () == 0)
+        {
+          return retval;
+        }
+    }
+  return retval;
+}
+namespace {
+struct PIEComparator
+{
+  bool
+  operator () (Ptr<WifiInformationElement> a, Ptr<WifiInformationElement> b) const
+  {
+    return ((*PeekPointer (a)) < (*PeekPointer (b)));
+  }
+};
+}
+Ptr<Packet>
+WifiInformationElementVector::CreatePacket (bool sortByElementId)
+{
+  if (sortByElementId)
+    {
+      std::sort (m_elements.begin (), m_elements.end (), PIEComparator ());
+    }
+  Ptr<Packet> packet = Create<Packet> ();
+  std::vector<Ptr<WifiInformationElement> >::const_reverse_iterator i;
+  for (i = m_elements.rbegin (); i != m_elements.rend (); ++i)
+    {
+      packet->AddHeader (**i);
+    }
+  return packet;
+}
+uint32_t
+WifiInformationElementVector::GetSize () const
+{
+  uint32_t size = 0;
+  for (IE_VECTOR::const_iterator i = m_elements.begin (); i != m_elements.end (); i++)
+    {
+      size += (*i)->GetSerializedSize ();
+    }
+  return size;
+}
+WifiInformationElementVector::EmptyIe::~EmptyIe ()
+{
+}
+WifiInformationElementVector::EmptyIe::EmptyIe () :
+  m_elementId (0), m_length (0)
+{
+}
+TypeId
+WifiInformationElementVector::EmptyIe::GetTypeId ()
+{
+  static TypeId tid = TypeId ("ns3::WifiInformationElementVector::EmptyIe")
+    .SetParent<Header> ();
+  return tid;
+}
+TypeId
+WifiInformationElementVector::EmptyIe::GetInstanceTypeId () const
+{
+  return GetTypeId ();
+}
+uint8_t
+WifiInformationElementVector::EmptyIe::GetLength ()
+{
+  return m_length;
+}
+uint8_t
+WifiInformationElementVector::EmptyIe::GetElementId ()
+{
+  return m_elementId;
+}
+uint32_t
+WifiInformationElementVector::EmptyIe::GetSerializedSize () const
+{
+  return 2;
+}
+void
+WifiInformationElementVector::EmptyIe::Serialize (Buffer::Iterator start) const
+{
+  start.WriteU8 (m_elementId);
+  start.WriteU8 (m_length);
+}
+uint32_t
+WifiInformationElementVector::EmptyIe::Deserialize (Buffer::Iterator start)
+{
+  Buffer::Iterator i = start;
+  m_elementId = i.ReadU8 ();
+  m_length = i.ReadU8 ();
+  return i.GetDistanceFrom (start);
+}
+void
+WifiInformationElementVector::EmptyIe::Print (std::ostream &os) const
+{
+}
+bool
+operator== (const WifiInformationElementVector & a, const WifiInformationElementVector & b)
+{
+  if (a.m_elements.size () != b.m_elements.size ())
+    {
+      NS_ASSERT(false);
+      return false;
+    }
+  WifiInformationElementVector::IE_VECTOR::const_iterator j = b.m_elements.begin ();
+  for (WifiInformationElementVector::IE_VECTOR::const_iterator i = a.m_elements.begin (); i
+      != a.m_elements.end (); i++, j++)
+    {     
+      if ((*i)->ElementId () != (*j)->ElementId ())
+        {
+          return false;
+        }
+      if ((*i)->GetSerializedSize () != (*j)->GetSerializedSize ())
+        {
+          return false;
+        }
+    }
+  return true;
+}
+#ifdef RUN_SELF_TESTS
+
+/// Built-in self test for WifiInformationElementVector
+struct WifiInformationElementVectorBist : public IeTest
+{
+  WifiInformationElementVectorBist () :
+    IeTest ("Mesh/WifiInformationElementVector")
+  {
+  };
+  virtual bool
+  RunTests ();
+};
+
+/// Test instance
+static WifiInformationElementVectorBist g_IePrepBist;
+
+bool
+WifiInformationElementVectorBist::RunTests ()
+{
+  bool result = true;
+  WifiInformationElementVector vector;
+  vector.AddInformationElement (Create<dot11s::IeMeshId> ());
+  vector.AddInformationElement (Create<dot11s::IeConfiguration> ());
+  vector.AddInformationElement (Create<dot11s::IeLinkMetricReport> ());
+  vector.AddInformationElement (Create<dot11s::IePeerManagement> ());
+  vector.AddInformationElement (Create<dot11s::IeBeaconTiming> ());
+  vector.AddInformationElement (Create<dot11s::IeRann> ());
+  vector.AddInformationElement (Create<dot11s::IePreq> ());
+  vector.AddInformationElement (Create<dot11s::IePrep> ());
+  vector.AddInformationElement (Create<dot11s::IePerr> ());
+  Ptr<Packet> packet = vector.CreatePacket (false);
+  WifiInformationElementVector resultVector = WifiInformationElementVector::DeserializePacket (packet);
+  NS_TEST_ASSERT (vector == resultVector);
+  
+  return result;
+}
+
+#endif // RUN_SELF_TESTS
+} //namespace ns3

--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/src/devices/mesh/wifi-information-element-vector.h	Fri Jul 31 17:08:42 2009 +0400
@@ -0,0 +1,80 @@
+/* -*- Mode:C++; c-file-style:"gnu"; indent-tabs-mode:nil; -*- */
+/*
+ * Copyright (c) 2009 IITP RAS
+ *
+ * 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: Kirill Andreev <andreev@iitp.ru>
+ */
+
+#ifndef IE_VECTOR_H
+#define IE_VECTOR_H
+
+#include "ns3/wifi-information-element.h"
+
+namespace ns3 {
+class Packet;
+/**
+ * \ingroup mesh
+ *
+ * \brief Information element vector
+ *
+ * Implements a vector of WifiInformationElement's
+ */
+class WifiInformationElementVector
+{
+public:
+  WifiInformationElementVector ();
+  ~WifiInformationElementVector ();
+  void SetMaxSize (uint16_t size);
+  typedef std::vector<Ptr<WifiInformationElement> >::iterator Iterator;
+  Iterator Begin ();
+  Iterator End ();
+  bool AddInformationElement (Ptr<WifiInformationElement> element);
+  Ptr<WifiInformationElement> FindFirst (enum WifiElementId id) const;
+  static WifiInformationElementVector DeserializePacket (Ptr<Packet> packet);
+  Ptr<Packet> CreatePacket (bool sortByElementId = true);
+  void Print (std::ostream & os);
+private:
+  uint32_t GetSize () const;
+  /**
+   * \brief Implements an empty information element: just elementId and length.
+   * \details Needed to understand, which information element we need to deserialize now
+   */
+  class EmptyIe : public Header
+  {
+  public:
+    EmptyIe ();
+    virtual ~EmptyIe ();
+    static TypeId GetTypeId ();
+    TypeId GetInstanceTypeId () const;
+    uint8_t GetLength ();
+    uint8_t GetElementId ();
+    virtual uint32_t GetSerializedSize () const;
+    virtual void Serialize (Buffer::Iterator start) const;
+    virtual uint32_t Deserialize (Buffer::Iterator start);
+    virtual void Print (std::ostream &os) const;
+  private:
+    uint8_t m_elementId;
+    uint8_t m_length;
+  };
+  typedef std::vector<Ptr<WifiInformationElement> > IE_VECTOR;
+  IE_VECTOR m_elements;
+  /// Size in bytes (actually, max packet length)
+  uint16_t m_maxSize;
+  friend bool operator== (const WifiInformationElementVector & a, const WifiInformationElementVector & b);
+};
+bool operator== (const WifiInformationElementVector & a, const WifiInformationElementVector & b);
+}
+#endif

--- a/src/devices/mesh/wscript	Fri Jul 31 14:13:10 2009 +0400
+++ b/src/devices/mesh/wscript	Fri Jul 31 17:08:42 2009 +0400
@@ -5,7 +5,7 @@
 
     obj.source = [
         'wifi-information-element.cc',
-        'ie-vector.cc',
+        'wifi-information-element-vector.cc',
         'mesh-point-device.cc',
         'mesh-l2-routing-protocol.cc',
         'mesh-wifi-beacon.cc',
@@ -15,7 +15,7 @@
     headers.module = 'mesh'
     headers.source = [
         'wifi-information-element.h',
-        'ie-vector.h',
+        'wifi-information-element-vector.h',
         'mesh-point-device.h',
         'mesh-l2-routing-protocol.h',
         'mesh-wifi-beacon.h',