Attachment #115 for bug #146

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




  i.WriteU8 (m_ttl);
  i.WriteU8 (m_protocol);
  i.WriteHtonU16 (0);
  i.WriteHtonU32 (m_source.Get ());
  i.WriteHtonU32 (m_destination.Get ());

  if (m_calcChecksum) 
    {

  m_ttl = i.ReadU8 ();
  m_protocol = i.ReadU8 ();
  i.Next (2); // checksum
  m_source.Set (i.ReadNtohU32 ());
  m_destination.Set (i.ReadNtohU32 ());

  if (m_calcChecksum) 
    {

(-)a/src/internet-node/ipv4-interface.cc (-2 / +2 lines)

Lines 75-82 Ipv4Interface::GetBroadcast (void) const	Link Here

Ipv4Interface::GetBroadcast (void) const

Ipv4Interface::GetBroadcast (void) const

  NS_LOG_FUNCTION;

  NS_LOG_FUNCTION;

  uint32_t mask = m_netmask.GetHostOrder ();

  uint32_t mask = m_netmask.Get ();

  uint32_t address = m_address.GetHostOrder ();

  uint32_t address = m_address.Get ();

  Ipv4Address broadcast = Ipv4Address (address | (~mask));

  Ipv4Address broadcast = Ipv4Address (address | (~mask));

  return broadcast;

  return broadcast;

(-)a/src/node/address-utils.cc (-2 / +2 lines)

Lines 24-30 namespace ns3 {	Link Here

void WriteTo (Buffer::Iterator &i, Ipv4Address ad)

void WriteTo (Buffer::Iterator &i, Ipv4Address ad)

  i.WriteHtonU32 (ad.GetHostOrder ());

  i.WriteHtonU32 (ad.Get ());

void WriteTo (Buffer::Iterator &i, const Address &ad)

void WriteTo (Buffer::Iterator &i, const Address &ad)

Lines 41-47 void WriteTo (Buffer::Iterator &i, Mac48	Link Here

void ReadFrom (Buffer::Iterator &i, Ipv4Address &ad)

void ReadFrom (Buffer::Iterator &i, Ipv4Address &ad)

  ad.SetHostOrder (i.ReadNtohU32 ());

  ad.Set (i.ReadNtohU32 ());

void ReadFrom (Buffer::Iterator &i, Address &ad, uint32_t len)

void ReadFrom (Buffer::Iterator &i, Address &ad, uint32_t len)




bool 
Ipv4Mask::IsMatch (Ipv4Address a, Ipv4Address b) const
{
  if ((a.Get () & m_mask) == (b.Get () & m_mask)) {
    return true;
  } else {
    return false;

}

uint32_t 
Ipv4Mask::Get (void) const
{
  return m_mask;
}
void 
Ipv4Mask::Set (uint32_t mask)
{
  m_mask = mask;
}
uint32_t 
Ipv4Mask::GetInverse (void) const

  m_address = AsciiToIpv4Host (address);
}

uint32_t
Ipv4Address::Get (void) const
{
  return m_address;
}
void
Ipv4Address::Set (uint32_t address)
{

Ipv4Address
Ipv4Address::CombineMask (Ipv4Mask const &mask) const
{
  return Ipv4Address (Get () & mask.Get ());
}

Ipv4Address 
Ipv4Address::GetSubnetDirectedBroadcast (Ipv4Mask const &mask) const
{
  return Ipv4Address (Get () | mask.GetInverse ());
}

bool
Ipv4Address::IsSubnetDirectedBroadcast (Ipv4Mask const &mask) const
{
  return ( (Get () | mask.GetInverse ()) == Get () );
}

bool

  return (m_address >= 0xe0000000 && m_address <= 0xefffffff);
}

uint32_t
Ipv4Address::GetHostOrder (void) const
{
  return m_address;
}
void 
Ipv4Address::SetHostOrder (uint32_t ip)
{
  m_address = ip;
}
void
Ipv4Address::Serialize (uint8_t buf[4]) const
{


size_t Ipv4AddressHash::operator()(Ipv4Address const &x) const 
{ 
  return x.Get ();
}

std::ostream& operator<< (std::ostream& os, Ipv4Address const& address)

(-)a/src/node/ipv4-address.h (-20 / +15 lines)

Lines 52-58 public:	Link Here

    * \param address C-string containing the address as described above

    * \param address C-string containing the address as described above

*/

*/

  Ipv4Address (char const *address);

  Ipv4Address (char const *address);

/**

   * Get the host-order 32-bit IP address

   * \return the host-order 32-bit IP address

*/

  uint32_t Get (void) const;

/**

/**

   * input address is in host order.

   * input address is in host order.

   * \param address The host order 32-bit address

   * \param address The host order 32-bit address

Lines 68-74 public:	Link Here

    * \param address C-string containing the address as described above

    * \param address C-string containing the address as described above

*/

*/

  void Set (char const *address);

  void Set (char const *address);

/**

/**

   * \brief Comparison operation between two Ipv4Addresses

   * \brief Comparison operation between two Ipv4Addresses

   * \param other address to which to compare this address

   * \param other address to which to compare this address

Lines 78-94 public:	Link Here

    return m_address == other.m_address;

    return m_address == other.m_address;

/**

   * \brief Get the host-order 32-bit IP address

   * Using this method is frowned upon.

   * Please, do _not_ use this method.

   * It is there only for chunk-ipv4.

   * \return the host-order 32-bit IP address

*/

  uint32_t GetHostOrder (void) const;

  void SetHostOrder (uint32_t ip);

/**

/**

   * Serialize this address to a 4-byte buffer

   * Serialize this address to a 4-byte buffer

Lines 164-176 public:	Link Here

164

  bool IsMatch (Ipv4Address a, Ipv4Address b) const;

156

  bool IsMatch (Ipv4Address a, Ipv4Address b) const;

165

157

166

  bool IsEqual (Ipv4Mask other) const;

158

  bool IsEqual (Ipv4Mask other) const;

167

159

/**

168

160

   * Get the host-order 32-bit IP mask

169

  /* Using this method is frowned upon.

161

   * \return the host-order 32-bit IP mask

170

   * Please, do _not_ use this method.

162

*/

171

*/

163

  uint32_t Get (void) const;

172

  uint32_t GetHostOrder (void) const;

164

/**

173

  void SetHostOrder (uint32_t value);

165

   * input mask is in host order.

166

   * \param mask The host order 32-bit mask

167

*/

168

  void Set (uint32_t mask);

174

/**

169

/**

175

   * \brief Return the inverse mask in host order.

170

   * \brief Return the inverse mask in host order.

176

*/

171

*/

(-)a/src/routing/global-routing/global-router-interface.cc (-2 / +2 lines)

Lines 571-577 GlobalRouter::DiscoverLSAs (void)	Link Here

571

              plr->SetLinkId (addrLocal.CombineMask(maskLocal));

571

              plr->SetLinkId (addrLocal.CombineMask(maskLocal));

572

              // Link Data is network mask; convert to Ipv4Address

572

              // Link Data is network mask; convert to Ipv4Address

573

              Ipv4Address maskLocalAddr;

573

              Ipv4Address maskLocalAddr;

574

              maskLocalAddr.Set(maskLocal.GetHostOrder ());

574

              maskLocalAddr.Set(maskLocal.Get ());

575

              plr->SetLinkData (maskLocalAddr);

575

              plr->SetLinkData (maskLocalAddr);

576

              plr->SetMetric (metricLocal);

576

              plr->SetMetric (metricLocal);

577

              pLSA->AddLinkRecord(plr);

577

              pLSA->AddLinkRecord(plr);

Lines 672-678 GlobalRouter::DiscoverLSAs (void)	Link Here

672

          plr = new GlobalRoutingLinkRecord;

672

          plr = new GlobalRoutingLinkRecord;

673

          plr->SetLinkType (GlobalRoutingLinkRecord::StubNetwork);

673

          plr->SetLinkType (GlobalRoutingLinkRecord::StubNetwork);

674

          plr->SetLinkId (addrRemote);

674

          plr->SetLinkId (addrRemote);

675

          plr->SetLinkData (Ipv4Address(maskRemote.GetHostOrder()));  // Frown

675

          plr->SetLinkData (Ipv4Address(maskRemote.Get()));  // Frown

676

          plr->SetMetric (metricLocal);

676

          plr->SetMetric (metricLocal);

677

          pLSA->AddLinkRecord (plr);

677

          pLSA->AddLinkRecord (plr);

678

          plr = 0;

678

          plr = 0;




  i.WriteU8 (m_messageType);
  i.WriteU8 (m_vTime);
  i.WriteHtonU16 (GetSerializedSize ());
  i.WriteHtonU32 (m_originatorAddress.Get ());
  i.WriteU8 (m_timeToLive);
  i.WriteU8 (m_hopCount);
  i.WriteHtonU16 (m_messageSequenceNumber);

  for (std::vector<Ipv4Address>::const_iterator iter = this->interfaceAddresses.begin ();
       iter != this->interfaceAddresses.end (); iter++)
    {
      i.WriteHtonU32 (iter->Get ());
    }
}


      for (std::vector<Ipv4Address>::const_iterator neigh_iter = lm.neighborInterfaceAddresses.begin ();
           neigh_iter != lm.neighborInterfaceAddresses.end (); neigh_iter++)
        {
          i.WriteHtonU32 (neigh_iter->Get ());
        }
    }
}

  for (std::vector<Ipv4Address>::const_iterator iter = this->neighborAddresses.begin ();
       iter != this->neighborAddresses.end (); iter++)
    {
      i.WriteHtonU32 (iter->Get ());
    }
}



  for (size_t n = 0; n < this->associations.size (); ++n)
    {
      i.WriteHtonU32 (this->associations[n].address.Get ());
      i.WriteHtonU32 (this->associations[n].mask.Get ());
    }
}





{
  NS_LOG_FUNCTION;

  uint32_t maskBits = mask.Get ();
  uint32_t networkBits = network.Get ();

  for (uint32_t i = 0; i < N_BITS; ++i)
    {

{
  NS_LOG_FUNCTION;

  uint32_t bits = mask.Get ();

  for (uint32_t i = 0; i < N_BITS; ++i)
    {

{
  NS_LOG_FUNCTION;

  uint32_t maskBits = mask.Get ();
  uint32_t addressBits = address.Get ();

  for (uint32_t i = 0; i < N_BITS; ++i)
    {

{
  NS_LOG_FUNCTION;

  uint32_t bits = mask.Get ();
  uint32_t net = network.Get ();

  for (uint32_t i = 0; i < N_BITS; ++i)
    {

Return to bug 146