Attachment #2852 for bug #2505

View | Details | Raw Unified | Return to bug 2505
Collapse All | Expand All

(-)a/src/mesh/model/dot11s/hwmp-protocol-mac.cc (-1 / +3 lines)

Lines 108-114	Link Here

108

      return true;

108

      return true;

109

110

  MeshInformationElementVector elements;

110

  MeshInformationElementVector elements;

111

  packet->RemoveHeader (elements);

111

  // To determine header size here, we can rely on the knowledge that

112

  // this is the last header to remove.

113

  packet->RemoveHeader (elements, packet->GetSize ());

112

  std::vector<HwmpProtocol::FailedDestination> failedDestinations;

114

  std::vector<HwmpProtocol::FailedDestination> failedDestinations;

113

  for (MeshInformationElementVector::Iterator i = elements.Begin (); i != elements.End (); i++)

115

  for (MeshInformationElementVector::Iterator i = elements.Begin (); i != elements.End (); i++)

114

116

(-)a/src/mesh/model/dot11s/peer-management-protocol-mac.cc (-3 / +6 lines)

Lines 76-82	Link Here

      MgtBeaconHeader beacon_hdr;

      MgtBeaconHeader beacon_hdr;

      packet->RemoveHeader (beacon_hdr);

      packet->RemoveHeader (beacon_hdr);

      MeshInformationElementVector elements;

      MeshInformationElementVector elements;

      packet->RemoveHeader (elements);

      // To determine header size here, we can rely on the knowledge that

      // this is the last header to remove.

      packet->RemoveHeader (elements, packet->GetSize ());

      Ptr<IeBeaconTiming> beaconTiming = DynamicCast<IeBeaconTiming> (elements.FindFirst (IE_BEACON_TIMING));

      Ptr<IeBeaconTiming> beaconTiming = DynamicCast<IeBeaconTiming> (elements.FindFirst (IE_BEACON_TIMING));

      Ptr<IeMeshId> meshId = DynamicCast<IeMeshId> (elements.FindFirst (IE_MESH_ID));

      Ptr<IeMeshId> meshId = DynamicCast<IeMeshId> (elements.FindFirst (IE_MESH_ID));

Lines 174-182	Link Here

174

          NS_FATAL_ERROR ("Unknown Self-protected Action type: " << actionValue.selfProtectedAction);

176

          NS_FATAL_ERROR ("Unknown Self-protected Action type: " << actionValue.selfProtectedAction);

175

177

176

      Ptr<IePeerManagement> peerElement;

178

      Ptr<IePeerManagement> peerElement;

177

      //Peer Management element is the last element in this frame - so, we can use MeshInformationElementVector

178

      MeshInformationElementVector elements;

179

      MeshInformationElementVector elements;

179

      packet->RemoveHeader (elements);

180

      // To determine header size here, we can rely on the knowledge that

181

      // this is the last header to remove.

182

      packet->RemoveHeader (elements, packet->GetSize ());

180

      peerElement = DynamicCast<IePeerManagement>(elements.FindFirst (IE_MESH_PEERING_MANAGEMENT));

183

      peerElement = DynamicCast<IePeerManagement>(elements.FindFirst (IE_MESH_PEERING_MANAGEMENT));

181

184

182

      NS_ASSERT (peerElement != 0);

185

      NS_ASSERT (peerElement != 0);

(-)a/src/mesh/test/mesh-information-element-vector-test-suite.cc (-1 / +2 lines)

Lines 145-152	Link Here

145

146

  Ptr<Packet> packet = Create<Packet> ();

146

  Ptr<Packet> packet = Create<Packet> ();

147

  packet->AddHeader (vector);

147

  packet->AddHeader (vector);

148

  uint32_t size = vector.GetSerializedSize ();

148

  MeshInformationElementVector resultVector;

149

  MeshInformationElementVector resultVector;

149

  packet->RemoveHeader (resultVector);

150

  packet->RemoveHeader (resultVector, size);

150

  NS_TEST_ASSERT_MSG_EQ (vector, resultVector, "Roundtrip serialization of all known information elements works");

151

  NS_TEST_ASSERT_MSG_EQ (vector, resultVector, "Roundtrip serialization of all known information elements works");

151

152

153




uint32_t
WifiInformationElementVector::Deserialize (Buffer::Iterator start)
{
  NS_FATAL_ERROR ("This variant should not be called on a variable-sized header");
  return 0;
}

uint32_t
WifiInformationElementVector::Deserialize (Buffer::Iterator start, Buffer::Iterator end)
{
  uint32_t size = start.GetDistanceFrom (end);
  while (size > 0)
    {
      uint32_t deserialized = DeserializeSingleIe (start);
      start.Next (deserialized);
      NS_ASSERT (deserialized <= size);
      size -= deserialized;
    }
  return size;
}

uint32_t




  virtual uint32_t GetSerializedSize () const;
  virtual void Serialize (Buffer::Iterator start) const;
  /**
   * \attention This variant should not be used but is implemented due to
   * backward compatibility reasons
   *
   * \param start buffer location to start deserializing from
   * \return number of bytes deserialized
   */
  virtual uint32_t Deserialize (Buffer::Iterator start);
  /**
   * Deserialize a number of WifiInformationElements 
   *
   * The size of this Header should equal start.GetDistanceFrom (end).
   *
   * \param start starting buffer location
   * \param end ending buffer location
   * \return number of bytes deserialized
   */
  virtual uint32_t Deserialize (Buffer::Iterator start, Buffer::Iterator end);
  virtual void Print (std::ostream &os) const;

  /**

Return to bug 2505