--- a/src/devices/mesh/dot11s/ie-dot11s-id.cc	Wed Sep 16 14:26:46 2009 +0100
+++ b/src/devices/mesh/dot11s/ie-dot11s-id.cc	Wed Sep 16 15:03:00 2009 +0100
@@ -23,6 +23,7 @@
 
 namespace ns3 {
 namespace dot11s {
+
 IeMeshId::IeMeshId ()
 {
   for (uint8_t i = 0; i < 32; i++)
@@ -141,5 +142,17 @@
   a.Print (os);
   return os;
 }
+
+std::istream &operator >> (std::istream &is, IeMeshId &a)
+{
+  std::string str;
+  is >> str;
+  a = IeMeshId (str.c_str ());
+  return is;
+}
+
+ATTRIBUTE_HELPER_CPP (IeMeshId);
+
+
 } //namespace dot11s
 } // namespace ns3

--- a/src/devices/mesh/dot11s/ie-dot11s-id.h	Wed Sep 16 14:26:46 2009 +0100
+++ b/src/devices/mesh/dot11s/ie-dot11s-id.h	Wed Sep 16 15:03:00 2009 +0100
@@ -40,7 +40,7 @@
 
   bool IsEqual (IeMeshId const &o) const;
   bool IsBroadcast (void) const;
-  uint32_t GetLength (void) const;
+  //uint32_t GetLength (void) const;
   char *PeekString (void) const;
   /**
    * \name Inherited from WifiInformationElement

--- a/src/devices/mesh/dot11s/peer-link.h	Wed Sep 16 14:26:46 2009 +0100
+++ b/src/devices/mesh/dot11s/peer-link.h	Wed Sep 16 15:03:00 2009 +0100
@@ -74,17 +74,17 @@
   void SetPeerMeshPointAddress (Mac48Address macaddr);
   void SetInterface (uint32_t interface);
   void SetLocalLinkId (uint16_t id);
-  void SetPeerLinkId (uint16_t id);
+  //void SetPeerLinkId (uint16_t id);
   void SetLocalAid (uint16_t aid);
-  void SetPeerAid (uint16_t aid);
+  //void SetPeerAid (uint16_t aid);
   void SetBeaconTimingElement (IeBeaconTiming beaconTiming);
-  void SetPeerLinkDescriptorElement (IePeerManagement peerLinkElement);
+  //void SetPeerLinkDescriptorElement (IePeerManagement peerLinkElement);
   Mac48Address GetPeerAddress () const;
   uint16_t GetLocalAid () const;
   Time GetLastBeacon () const;
   Time GetBeaconInterval () const;
   IeBeaconTiming GetBeaconTimingElement ()const;
-  IePeerManagement GetPeerLinkDescriptorElement ()const;
+  //IePeerManagement GetPeerLinkDescriptorElement ()const;
   //\}
 
   /**

--- a/src/helper/mesh-helper.h	Wed Sep 16 14:26:46 2009 +0100
+++ b/src/helper/mesh-helper.h	Wed Sep 16 15:03:00 2009 +0100
@@ -106,7 +106,7 @@
    * Set PHY standard
    */
   void SetStandard (enum WifiPhyStandard standard);
-  void SetMeshId (std::string s);
+  //void SetMeshId (std::string s); // XXX
   /** 
    *  \brief Spread/not spread frequency channels of MP interfaces. 
    *