From 0945bb9e1b7a1d0cce0455abab11e6f63cbbce7e Mon Sep 17 00:00:00 2001 From: Tom Henderson Date: Fri, 16 Aug 2013 09:50:18 -0700 Subject: [PATCH] bug 1723: name clash in ipv4-header.h from --- src/internet/model/ipv4-header.cc | 48 ++++++++++++------------- src/internet/model/ipv4-header.h | 50 ++++++++++++++------------- src/internet/test/ipv4-header-test.cc | 50 +++++++++++++-------------- 3 files changed, 75 insertions(+), 73 deletions(-) diff --git a/src/internet/model/ipv4-header.cc b/src/internet/model/ipv4-header.cc index 7c5cd26cd..d033ab058 100644 --- a/src/internet/model/ipv4-header.cc +++ b/src/internet/model/ipv4-header.cc @@ -117,45 +117,45 @@ Ipv4Header::DscpTypeToString (DscpType dscp) const { case DscpDefault: return "Default"; - case CS1: + case DSCP_CS1: return "CS1"; - case AF11: + case DSCP_AF11: return "AF11"; - case AF12: + case DSCP_AF12: return "AF12"; - case AF13: + case DSCP_AF13: return "AF13"; - case CS2: + case DSCP_CS2: return "CS2"; - case AF21: + case DSCP_AF21: return "AF21"; - case AF22: + case DSCP_AF22: return "AF22"; - case AF23: + case DSCP_AF23: return "AF23"; - case CS3: + case DSCP_CS3: return "CS3"; - case AF31: + case DSCP_AF31: return "AF31"; - case AF32: + case DSCP_AF32: return "AF32"; - case AF33: + case DSCP_AF33: return "AF33"; - case CS4: + case DSCP_CS4: return "CS4"; - case AF41: + case DSCP_AF41: return "AF41"; - case AF42: + case DSCP_AF42: return "AF42"; - case AF43: + case DSCP_AF43: return "AF43"; - case CS5: + case DSCP_CS5: return "CS5"; - case EF: + case DSCP_EF: return "EF"; - case CS6: + case DSCP_CS6: return "CS6"; - case CS7: + case DSCP_CS7: return "CS7"; default: return "Unrecognized DSCP"; @@ -177,13 +177,13 @@ Ipv4Header::EcnTypeToString (EcnType ecn) const NS_LOG_FUNCTION (this << ecn); switch (ecn) { - case NotECT: + case ECN_NotECT: return "Not-ECT"; - case ECT1: + case ECN_ECT1: return "ECT (1)"; - case ECT0: + case ECN_ECT0: return "ECT (0)"; - case CE: + case ECN_CE: return "CE"; default: return "Unknown ECN"; diff --git a/src/internet/model/ipv4-header.h b/src/internet/model/ipv4-header.h index 59231ce50..b07e5b33c 100644 --- a/src/internet/model/ipv4-header.h +++ b/src/internet/model/ipv4-header.h @@ -65,31 +65,32 @@ public: { DscpDefault = 0x00, - CS1 = 0x20, - AF11 = 0x28, - AF12 = 0x30, - AF13 = 0x38, + // Prefixed with "DSCP" to avoid name clash (bug 1723) + DSCP_CS1 = 0x20, + DSCP_AF11 = 0x28, + DSCP_AF12 = 0x30, + DSCP_AF13 = 0x38, - CS2 = 0x40, - AF21 = 0x48, - AF22 = 0x50, - AF23 = 0x58, + DSCP_CS2 = 0x40, + DSCP_AF21 = 0x48, + DSCP_AF22 = 0x50, + DSCP_AF23 = 0x58, - CS3 = 0x60, - AF31 = 0x68, - AF32 = 0x70, - AF33 = 0x78, + DSCP_CS3 = 0x60, + DSCP_AF31 = 0x68, + DSCP_AF32 = 0x70, + DSCP_AF33 = 0x78, - CS4 = 0x80, - AF41 = 0x88, - AF42 = 0x90, - AF43 = 0x98, + DSCP_CS4 = 0x80, + DSCP_AF41 = 0x88, + DSCP_AF42 = 0x90, + DSCP_AF43 = 0x98, - CS5 = 0xA0, - EF = 0xB8, + DSCP_CS5 = 0xA0, + DSCP_EF = 0xB8, - CS6 = 0xC0, - CS7 = 0xE0 + DSCP_CS6 = 0xC0, + DSCP_CS7 = 0xE0 }; /** @@ -104,10 +105,11 @@ public: */ enum EcnType { - NotECT = 0x00, - ECT1 = 0x01, - ECT0 = 0x02, - CE = 0x03 + // Prefixed with "ECN" to avoid name clash (bug 1723) + ECN_NotECT = 0x00, + ECN_ECT1 = 0x01, + ECN_ECT0 = 0x02, + ECN_CE = 0x03 }; /** * \brief Set ECN Field diff --git a/src/internet/test/ipv4-header-test.cc b/src/internet/test/ipv4-header-test.cc index 2fc6d309d..064e18f81 100644 --- a/src/internet/test/ipv4-header-test.cc +++ b/src/internet/test/ipv4-header-test.cc @@ -200,30 +200,30 @@ Ipv4HeaderTest::DoRun (void) std::vector vDscpTypes; vDscpTypes.push_back (Ipv4Header::DscpDefault); - vDscpTypes.push_back (Ipv4Header::CS1); - vDscpTypes.push_back (Ipv4Header::AF11); - vDscpTypes.push_back (Ipv4Header::AF12); - vDscpTypes.push_back (Ipv4Header::AF13); - vDscpTypes.push_back (Ipv4Header::CS2); - vDscpTypes.push_back (Ipv4Header::AF21); - vDscpTypes.push_back (Ipv4Header::AF22); - vDscpTypes.push_back (Ipv4Header::AF23); - vDscpTypes.push_back (Ipv4Header::CS3); - vDscpTypes.push_back (Ipv4Header::AF31); - vDscpTypes.push_back (Ipv4Header::AF32); - vDscpTypes.push_back (Ipv4Header::AF33); - vDscpTypes.push_back (Ipv4Header::CS4); - vDscpTypes.push_back (Ipv4Header::AF41); - vDscpTypes.push_back (Ipv4Header::AF42); - vDscpTypes.push_back (Ipv4Header::AF43); - vDscpTypes.push_back (Ipv4Header::CS5); - vDscpTypes.push_back (Ipv4Header::EF); - vDscpTypes.push_back (Ipv4Header::CS6); - vDscpTypes.push_back (Ipv4Header::CS7); + vDscpTypes.push_back (Ipv4Header::DSCP_CS1); + vDscpTypes.push_back (Ipv4Header::DSCP_AF11); + vDscpTypes.push_back (Ipv4Header::DSCP_AF12); + vDscpTypes.push_back (Ipv4Header::DSCP_AF13); + vDscpTypes.push_back (Ipv4Header::DSCP_CS2); + vDscpTypes.push_back (Ipv4Header::DSCP_AF21); + vDscpTypes.push_back (Ipv4Header::DSCP_AF22); + vDscpTypes.push_back (Ipv4Header::DSCP_AF23); + vDscpTypes.push_back (Ipv4Header::DSCP_CS3); + vDscpTypes.push_back (Ipv4Header::DSCP_AF31); + vDscpTypes.push_back (Ipv4Header::DSCP_AF32); + vDscpTypes.push_back (Ipv4Header::DSCP_AF33); + vDscpTypes.push_back (Ipv4Header::DSCP_CS4); + vDscpTypes.push_back (Ipv4Header::DSCP_AF41); + vDscpTypes.push_back (Ipv4Header::DSCP_AF42); + vDscpTypes.push_back (Ipv4Header::DSCP_AF43); + vDscpTypes.push_back (Ipv4Header::DSCP_CS5); + vDscpTypes.push_back (Ipv4Header::DSCP_EF); + vDscpTypes.push_back (Ipv4Header::DSCP_CS6); + vDscpTypes.push_back (Ipv4Header::DSCP_CS7); for (uint32_t i = 0; i < vDscpTypes.size (); i++) { - SendData_IpHdr_Dscp (txSocket, "10.0.0.1", vDscpTypes [i], Ipv4Header::ECT1); + SendData_IpHdr_Dscp (txSocket, "10.0.0.1", vDscpTypes [i], Ipv4Header::ECN_ECT1); NS_TEST_EXPECT_MSG_EQ (m_receivedPacket->GetSize (), 143, "recv(hdrincl): 10.0.0.1"); NS_TEST_EXPECT_MSG_EQ (m_receivedHeader.GetDscp (), vDscpTypes [i], "recv(hdrincl): 10.0.0.1"); m_receivedHeader.Print (std::cout); @@ -235,10 +235,10 @@ Ipv4HeaderTest::DoRun (void) // Ecn tests std::cout << "Ecn Test\n"; std::vector vEcnTypes; - vEcnTypes.push_back (Ipv4Header::NotECT); - vEcnTypes.push_back (Ipv4Header::ECT1); - vEcnTypes.push_back (Ipv4Header::ECT0); - vEcnTypes.push_back (Ipv4Header::CE); + vEcnTypes.push_back (Ipv4Header::ECN_NotECT); + vEcnTypes.push_back (Ipv4Header::ECN_ECT1); + vEcnTypes.push_back (Ipv4Header::ECN_ECT0); + vEcnTypes.push_back (Ipv4Header::ECN_CE); for (uint32_t i = 0; i < vEcnTypes.size (); i++) {