From 3e4acb6921ff4e579284518a1e7fb4daeecdb113 Mon Sep 17 00:00:00 2001 From: Craig Dowell Date: Mon, 8 Oct 2007 14:50:00 -0700 Subject: [PATCH] more descriptive name --- ...-extended.cc => ipv4-address-generator.cc} | 78 +++++++++++-------- ...ss-extended.h => ipv4-address-generator.h} | 8 +- tutorial/testipv4.cc | 21 ++--- tutorial/wscript | 2 +- 4 files changed, 62 insertions(+), 47 deletions(-) rename tutorial/{ipv4-address-extended.cc => ipv4-address-generator.cc} (73%) rename tutorial/{ipv4-address-extended.h => ipv4-address-generator.h} (89%) diff --git a/tutorial/ipv4-address-extended.cc b/tutorial/ipv4-address-generator.cc similarity index 73% rename from tutorial/ipv4-address-extended.cc rename to tutorial/ipv4-address-generator.cc index b25d5b6e6..dc28b4ddc 100644 --- a/tutorial/ipv4-address-extended.cc +++ b/tutorial/ipv4-address-generator.cc @@ -19,17 +19,17 @@ #include "ns3/assert.h" #include "ns3/log.h" #include "ns3/simulation-singleton.h" -#include "ipv4-address-extended.h" +#include "ipv4-address-generator.h" -NS_LOG_COMPONENT_DEFINE("Ipv4AddressEx"); +NS_LOG_COMPONENT_DEFINE("Ipv4AddressGenerator"); namespace ns3 { -class Ipv4NetworkManager +class Ipv4NetworkGeneratorImpl { public: - Ipv4NetworkManager (); - virtual ~Ipv4NetworkManager (); + Ipv4NetworkGeneratorImpl (); + virtual ~Ipv4NetworkGeneratorImpl (); Ipv4Address Allocate (const Ipv4Mask mask); void Seed (const Ipv4Mask mask, const Ipv4Address network); @@ -45,7 +45,7 @@ private: State m_state[N_BITS]; }; -Ipv4NetworkManager::Ipv4NetworkManager () +Ipv4NetworkGeneratorImpl::Ipv4NetworkGeneratorImpl () { NS_LOG_FUNCTION; @@ -63,13 +63,15 @@ Ipv4NetworkManager::Ipv4NetworkManager () } } -Ipv4NetworkManager::~Ipv4NetworkManager () +Ipv4NetworkGeneratorImpl::~Ipv4NetworkGeneratorImpl () { NS_LOG_FUNCTION; } -void -Ipv4NetworkManager::Seed (const Ipv4Mask mask, const Ipv4Address network) + void +Ipv4NetworkGeneratorImpl::Seed ( + const Ipv4Mask mask, + const Ipv4Address network) { NS_LOG_FUNCTION; @@ -91,8 +93,8 @@ Ipv4NetworkManager::Seed (const Ipv4Mask mask, const Ipv4Address network) return; } -Ipv4Address -Ipv4NetworkManager::Allocate (const Ipv4Mask mask) + Ipv4Address +Ipv4NetworkGeneratorImpl::Allocate (const Ipv4Mask mask) { NS_LOG_FUNCTION; @@ -114,11 +116,11 @@ Ipv4NetworkManager::Allocate (const Ipv4Mask mask) return Ipv4Address (bits); } -class Ipv4AddressManager +class Ipv4AddressGeneratorImpl { public: - Ipv4AddressManager (); - virtual ~Ipv4AddressManager (); + Ipv4AddressGeneratorImpl (); + virtual ~Ipv4AddressGeneratorImpl (); Ipv4Address Allocate (const Ipv4Mask mask, const Ipv4Address network); void Seed (const Ipv4Mask mask, const Ipv4Address address); @@ -134,7 +136,7 @@ private: State m_state[N_BITS]; }; -Ipv4AddressManager::Ipv4AddressManager () +Ipv4AddressGeneratorImpl::Ipv4AddressGeneratorImpl () { NS_LOG_FUNCTION; @@ -152,13 +154,15 @@ Ipv4AddressManager::Ipv4AddressManager () } } -Ipv4AddressManager::~Ipv4AddressManager () +Ipv4AddressGeneratorImpl::~Ipv4AddressGeneratorImpl () { NS_LOG_FUNCTION; } -void -Ipv4AddressManager::Seed (const Ipv4Mask mask, const Ipv4Address address) + void +Ipv4AddressGeneratorImpl::Seed ( + const Ipv4Mask mask, + const Ipv4Address address) { NS_LOG_FUNCTION; @@ -180,8 +184,10 @@ Ipv4AddressManager::Seed (const Ipv4Mask mask, const Ipv4Address address) return; } -Ipv4Address -Ipv4AddressManager::Allocate (const Ipv4Mask mask, const Ipv4Address network) + Ipv4Address +Ipv4AddressGeneratorImpl::Allocate ( + const Ipv4Mask mask, + const Ipv4Address network) { NS_LOG_FUNCTION; @@ -197,7 +203,7 @@ Ipv4AddressManager::Allocate (const Ipv4Mask mask, const Ipv4Address network) Ipv4Address addr (net | m_state[nBits].address); ++m_state[nBits].address; NS_ASSERT_MSG((m_state[nBits].mask & m_state[nBits].address) == 0, - "Ipv4AddressManager::Allocate(): Overflow"); + "Ipv4AddressGeneratorImpl::Allocate(): Overflow"); return addr; } bits >>= 1; @@ -206,37 +212,43 @@ Ipv4AddressManager::Allocate (const Ipv4Mask mask, const Ipv4Address network) return Ipv4Address (bits); } -void -Ipv4AddressEx::SeedAddress (const Ipv4Mask mask, const Ipv4Address address) + void +Ipv4AddressGenerator::SeedAddress ( + const Ipv4Mask mask, + const Ipv4Address address) { NS_LOG_FUNCTION; - SimulationSingleton::Get ()->Seed (mask, address); + SimulationSingleton::Get ()->Seed (mask, address); } -Ipv4Address -Ipv4AddressEx::AllocateAddress (const Ipv4Mask mask, const Ipv4Address network) + Ipv4Address +Ipv4AddressGenerator::AllocateAddress ( + const Ipv4Mask mask, + const Ipv4Address network) { NS_LOG_FUNCTION; - return SimulationSingleton::Get ()-> + return SimulationSingleton::Get ()-> Allocate (mask, network); } -void -Ipv4AddressEx::SeedNetwork (const Ipv4Mask mask, const Ipv4Address address) + void +Ipv4AddressGenerator::SeedNetwork ( + const Ipv4Mask mask, + const Ipv4Address address) { NS_LOG_FUNCTION; - SimulationSingleton::Get ()->Seed (mask, address); + SimulationSingleton::Get ()->Seed (mask, address); } -Ipv4Address -Ipv4AddressEx::AllocateNetwork (const Ipv4Mask mask) + Ipv4Address +Ipv4AddressGenerator::AllocateNetwork (const Ipv4Mask mask) { NS_LOG_FUNCTION; - return SimulationSingleton::Get ()-> + return SimulationSingleton::Get ()-> Allocate (mask); } diff --git a/tutorial/ipv4-address-extended.h b/tutorial/ipv4-address-generator.h similarity index 89% rename from tutorial/ipv4-address-extended.h rename to tutorial/ipv4-address-generator.h index 0bdfc24e9..2962940d3 100644 --- a/tutorial/ipv4-address-extended.h +++ b/tutorial/ipv4-address-generator.h @@ -16,8 +16,8 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA */ -#ifndef IPV4_ADDRESS_EXTENDED_H -#define IPV4_ADDRESS_EXTENDED_H +#ifndef IPV4_ADDRESS_GENERATOR_H +#define IPV4_ADDRESS_GENERATOR_H #include #include @@ -26,7 +26,7 @@ namespace ns3 { -class Ipv4AddressEx : public Ipv4Address { +class Ipv4AddressGenerator { public: static void SeedAddress (const Ipv4Mask mask, const Ipv4Address address); @@ -42,4 +42,4 @@ public: }; // namespace ns3 -#endif /* IPV4_ADDRESS_EXTENDED_H */ +#endif /* IPV4_ADDRESS_GENERATOR_H */ diff --git a/tutorial/testipv4.cc b/tutorial/testipv4.cc index 7cee873a1..dcad2e387 100644 --- a/tutorial/testipv4.cc +++ b/tutorial/testipv4.cc @@ -15,7 +15,7 @@ */ #include "ns3/log.h" -#include "ipv4-address-extended.h" +#include "ipv4-address-generator.h" NS_LOG_COMPONENT_DEFINE ("TestIpv4"); @@ -32,19 +32,21 @@ main (int argc, char *argv[]) for (uint32_t i = 0; i < 10; ++i) { - Ipv4Address network = Ipv4AddressEx::AllocateNetwork (mask1); - Ipv4Address address = Ipv4AddressEx::AllocateAddress (mask1, network); + Ipv4Address network = Ipv4AddressGenerator::AllocateNetwork (mask1); + Ipv4Address address = Ipv4AddressGenerator::AllocateAddress (mask1, + network); NS_LOG_INFO ("address = " << address); } Ipv4Mask mask2 ("255.255.0.0"); - Ipv4AddressEx::SeedNetwork (mask2, "192.168.0.0"); - Ipv4AddressEx::SeedAddress (mask2, "0.0.0.3"); + Ipv4AddressGenerator::SeedNetwork (mask2, "192.168.0.0"); + Ipv4AddressGenerator::SeedAddress (mask2, "0.0.0.3"); - Ipv4Address network1 = Ipv4AddressEx::AllocateNetwork (mask2); + Ipv4Address network1 = Ipv4AddressGenerator::AllocateNetwork (mask2); for (uint32_t i = 0; i < 10; ++i) { - Ipv4Address address = Ipv4AddressEx::AllocateAddress (mask2, network1); + Ipv4Address address = Ipv4AddressGenerator::AllocateAddress (mask2, + network1); NS_LOG_INFO ("address = " << address); } @@ -52,8 +54,9 @@ main (int argc, char *argv[]) for (uint32_t i = 0; i < 10; ++i) { - Ipv4Address network = Ipv4AddressEx::AllocateNetwork (mask3); - Ipv4Address address = Ipv4AddressEx::AllocateAddress (mask3, network); + Ipv4Address network = Ipv4AddressGenerator::AllocateNetwork (mask3); + Ipv4Address address = Ipv4AddressGenerator::AllocateAddress (mask3, + network); NS_LOG_INFO ("address = " << address); } } diff --git a/tutorial/wscript b/tutorial/wscript index 4a22ee109..17a9597d1 100644 --- a/tutorial/wscript +++ b/tutorial/wscript @@ -23,4 +23,4 @@ def build(bld): obj = bld.create_ns3_program('testipv4', ['core']) - obj.source = ['testipv4.cc', 'ipv4-address-extended.cc'] + obj.source = ['testipv4.cc', 'ipv4-address-generator.cc']