# HG changeset patch # User Tom Henderson # Date 1205761175 25200 # Node ID 1ef7ee05ec04b8706d81e2c9475095aa8b84fb57 # Parent 6440851b111a02eb563596bfb4d13f95ddc6636d s/HostOrder//g on Ipv4Address Getter and Setter method names diff -r 6440851b111a -r 1ef7ee05ec04 src/internet-node/ipv4-header.cc --- a/src/internet-node/ipv4-header.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/src/internet-node/ipv4-header.cc Mon Mar 17 06:39:35 2008 -0700 @@ -261,8 +261,8 @@ Ipv4Header::Serialize (Buffer::Iterator i.WriteU8 (m_ttl); i.WriteU8 (m_protocol); i.WriteHtonU16 (0); - i.WriteHtonU32 (m_source.GetHostOrder ()); - i.WriteHtonU32 (m_destination.GetHostOrder ()); + i.WriteHtonU32 (m_source.Get ()); + i.WriteHtonU32 (m_destination.Get ()); if (m_calcChecksum) { @@ -307,8 +307,8 @@ Ipv4Header::Deserialize (Buffer::Iterato m_ttl = i.ReadU8 (); m_protocol = i.ReadU8 (); i.Next (2); // checksum - m_source.SetHostOrder (i.ReadNtohU32 ()); - m_destination.SetHostOrder (i.ReadNtohU32 ()); + m_source.Set (i.ReadNtohU32 ()); + m_destination.Set (i.ReadNtohU32 ()); if (m_calcChecksum) { diff -r 6440851b111a -r 1ef7ee05ec04 src/internet-node/ipv4-interface.cc --- a/src/internet-node/ipv4-interface.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/src/internet-node/ipv4-interface.cc Mon Mar 17 06:39:35 2008 -0700 @@ -75,8 +75,8 @@ Ipv4Interface::GetBroadcast (void) const Ipv4Interface::GetBroadcast (void) const { NS_LOG_FUNCTION; - uint32_t mask = m_netmask.GetHostOrder (); - uint32_t address = m_address.GetHostOrder (); + uint32_t mask = m_netmask.Get (); + uint32_t address = m_address.Get (); Ipv4Address broadcast = Ipv4Address (address | (~mask)); return broadcast; } diff -r 6440851b111a -r 1ef7ee05ec04 src/node/address-utils.cc --- a/src/node/address-utils.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/src/node/address-utils.cc Mon Mar 17 06:39:35 2008 -0700 @@ -24,7 +24,7 @@ namespace ns3 { void WriteTo (Buffer::Iterator &i, Ipv4Address ad) { - i.WriteHtonU32 (ad.GetHostOrder ()); + i.WriteHtonU32 (ad.Get ()); } void WriteTo (Buffer::Iterator &i, const Address &ad) { @@ -41,7 +41,7 @@ void WriteTo (Buffer::Iterator &i, Mac48 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) { diff -r 6440851b111a -r 1ef7ee05ec04 src/node/ipv4-address.cc --- a/src/node/ipv4-address.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/src/node/ipv4-address.cc Mon Mar 17 06:39:35 2008 -0700 @@ -82,7 +82,7 @@ bool bool Ipv4Mask::IsMatch (Ipv4Address a, Ipv4Address b) const { - if ((a.GetHostOrder () & m_mask) == (b.GetHostOrder () & m_mask)) { + if ((a.Get () & m_mask) == (b.Get () & m_mask)) { return true; } else { return false; @@ -90,14 +90,14 @@ Ipv4Mask::IsMatch (Ipv4Address a, Ipv4Ad } uint32_t -Ipv4Mask::GetHostOrder (void) const +Ipv4Mask::Get (void) const { return m_mask; } void -Ipv4Mask::SetHostOrder (uint32_t value) -{ - m_mask = value; +Ipv4Mask::Set (uint32_t mask) +{ + m_mask = mask; } uint32_t Ipv4Mask::GetInverse (void) const @@ -140,6 +140,11 @@ Ipv4Address::Ipv4Address (char const *ad m_address = AsciiToIpv4Host (address); } +uint32_t +Ipv4Address::Get (void) const +{ + return m_address; +} void Ipv4Address::Set (uint32_t address) { @@ -154,19 +159,19 @@ Ipv4Address Ipv4Address Ipv4Address::CombineMask (Ipv4Mask const &mask) const { - return Ipv4Address (GetHostOrder () & mask.GetHostOrder ()); + return Ipv4Address (Get () & mask.Get ()); } Ipv4Address Ipv4Address::GetSubnetDirectedBroadcast (Ipv4Mask const &mask) const { - return Ipv4Address (GetHostOrder () | mask.GetInverse ()); + return Ipv4Address (Get () | mask.GetInverse ()); } bool Ipv4Address::IsSubnetDirectedBroadcast (Ipv4Mask const &mask) const { - return ( (GetHostOrder () | mask.GetInverse ()) == GetHostOrder () ); + return ( (Get () | mask.GetInverse ()) == Get () ); } bool @@ -185,16 +190,6 @@ Ipv4Address::IsMulticast (void) const 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 { @@ -288,7 +283,7 @@ Ipv4Address::GetLoopback (void) size_t Ipv4AddressHash::operator()(Ipv4Address const &x) const { - return x.GetHostOrder (); + return x.Get (); } std::ostream& operator<< (std::ostream& os, Ipv4Address const& address) diff -r 6440851b111a -r 1ef7ee05ec04 src/node/ipv4-address.h --- a/src/node/ipv4-address.h Sun Mar 16 14:35:32 2008 +0000 +++ b/src/node/ipv4-address.h Mon Mar 17 06:39:35 2008 -0700 @@ -52,7 +52,11 @@ public: * \param address C-string containing the address as described above */ 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. * \param address The host order 32-bit address @@ -68,7 +72,6 @@ public: * \param address C-string containing the address as described above */ void Set (char const *address); - /** * \brief Comparison operation between two Ipv4Addresses * \param other address to which to compare this address @@ -78,17 +81,6 @@ public: { 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 * @@ -164,13 +156,16 @@ public: bool IsMatch (Ipv4Address a, Ipv4Address b) const; bool IsEqual (Ipv4Mask other) const; - - - /* Using this method is frowned upon. - * Please, do _not_ use this method. - */ - uint32_t GetHostOrder (void) const; - void SetHostOrder (uint32_t value); + /** + * Get the host-order 32-bit IP mask + * \return the host-order 32-bit IP mask + */ + uint32_t Get (void) const; + /** + * input mask is in host order. + * \param mask The host order 32-bit mask + */ + void Set (uint32_t mask); /** * \brief Return the inverse mask in host order. */ diff -r 6440851b111a -r 1ef7ee05ec04 src/routing/global-routing/global-router-interface.cc --- a/src/routing/global-routing/global-router-interface.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/src/routing/global-routing/global-router-interface.cc Mon Mar 17 06:39:35 2008 -0700 @@ -571,7 +571,7 @@ GlobalRouter::DiscoverLSAs (void) plr->SetLinkId (addrLocal.CombineMask(maskLocal)); // Link Data is network mask; convert to Ipv4Address Ipv4Address maskLocalAddr; - maskLocalAddr.Set(maskLocal.GetHostOrder ()); + maskLocalAddr.Set(maskLocal.Get ()); plr->SetLinkData (maskLocalAddr); plr->SetMetric (metricLocal); pLSA->AddLinkRecord(plr); @@ -672,7 +672,7 @@ GlobalRouter::DiscoverLSAs (void) plr = new GlobalRoutingLinkRecord; plr->SetLinkType (GlobalRoutingLinkRecord::StubNetwork); plr->SetLinkId (addrRemote); - plr->SetLinkData (Ipv4Address(maskRemote.GetHostOrder())); // Frown + plr->SetLinkData (Ipv4Address(maskRemote.Get())); // Frown plr->SetMetric (metricLocal); pLSA->AddLinkRecord (plr); plr = 0; diff -r 6440851b111a -r 1ef7ee05ec04 src/routing/olsr/olsr-header.cc --- a/src/routing/olsr/olsr-header.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/src/routing/olsr/olsr-header.cc Mon Mar 17 06:39:35 2008 -0700 @@ -194,7 +194,7 @@ MessageHeader::Serialize (Buffer::Iterat i.WriteU8 (m_messageType); i.WriteU8 (m_vTime); i.WriteHtonU16 (GetSerializedSize ()); - i.WriteHtonU32 (m_originatorAddress.GetHostOrder ()); + i.WriteHtonU32 (m_originatorAddress.Get ()); i.WriteU8 (m_timeToLive); i.WriteU8 (m_hopCount); i.WriteHtonU16 (m_messageSequenceNumber); @@ -276,7 +276,7 @@ MessageHeader::Mid::Serialize (Buffer::I for (std::vector::const_iterator iter = this->interfaceAddresses.begin (); iter != this->interfaceAddresses.end (); iter++) { - i.WriteHtonU32 (iter->GetHostOrder ()); + i.WriteHtonU32 (iter->Get ()); } } @@ -347,7 +347,7 @@ MessageHeader::Hello::Serialize (Buffer: for (std::vector::const_iterator neigh_iter = lm.neighborInterfaceAddresses.begin (); neigh_iter != lm.neighborInterfaceAddresses.end (); neigh_iter++) { - i.WriteHtonU32 (neigh_iter->GetHostOrder ()); + i.WriteHtonU32 (neigh_iter->Get ()); } } } @@ -415,7 +415,7 @@ MessageHeader::Tc::Serialize (Buffer::It for (std::vector::const_iterator iter = this->neighborAddresses.begin (); iter != this->neighborAddresses.end (); iter++) { - i.WriteHtonU32 (iter->GetHostOrder ()); + i.WriteHtonU32 (iter->Get ()); } } @@ -461,8 +461,8 @@ MessageHeader::Hna::Serialize (Buffer::I for (size_t n = 0; n < this->associations.size (); ++n) { - i.WriteHtonU32 (this->associations[n].address.GetHostOrder ()); - i.WriteHtonU32 (this->associations[n].mask.GetHostOrder ()); + i.WriteHtonU32 (this->associations[n].address.Get ()); + i.WriteHtonU32 (this->associations[n].mask.Get ()); } } diff -r 6440851b111a -r 1ef7ee05ec04 tutorial/ipv4-address-generator.cc --- a/tutorial/ipv4-address-generator.cc Sun Mar 16 14:35:32 2008 +0000 +++ b/tutorial/ipv4-address-generator.cc Mon Mar 17 06:39:35 2008 -0700 @@ -75,8 +75,8 @@ Ipv4NetworkGeneratorImpl::Seed ( { NS_LOG_FUNCTION; - uint32_t maskBits = mask.GetHostOrder (); - uint32_t networkBits = network.GetHostOrder (); + uint32_t maskBits = mask.Get (); + uint32_t networkBits = network.Get (); for (uint32_t i = 0; i < N_BITS; ++i) { @@ -98,7 +98,7 @@ Ipv4NetworkGeneratorImpl::Allocate (cons { NS_LOG_FUNCTION; - uint32_t bits = mask.GetHostOrder (); + uint32_t bits = mask.Get (); for (uint32_t i = 0; i < N_BITS; ++i) { @@ -166,8 +166,8 @@ Ipv4AddressGeneratorImpl::Seed ( { NS_LOG_FUNCTION; - uint32_t maskBits = mask.GetHostOrder (); - uint32_t addressBits = address.GetHostOrder (); + uint32_t maskBits = mask.Get (); + uint32_t addressBits = address.Get (); for (uint32_t i = 0; i < N_BITS; ++i) { @@ -191,8 +191,8 @@ Ipv4AddressGeneratorImpl::Allocate ( { NS_LOG_FUNCTION; - uint32_t bits = mask.GetHostOrder (); - uint32_t net = network.GetHostOrder (); + uint32_t bits = mask.Get (); + uint32_t net = network.Get (); for (uint32_t i = 0; i < N_BITS; ++i) {