F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Backout GTUP tunnel changeset

Browse Source
This commit is contained in:
jaumenin
2011-07-11 14:20:44 +02:00
parent 908850086d 720d7d9b66
commit b57fe8799f
6 changed files with 38 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/lte/examples/wscript
View File

@@ -13,6 +13,3 @@ def build(bld):
obj = bld.create_ns3_program('profiling-reference',
['lte'])
obj.source = 'profiling-reference.cc'
obj = bld.create_ns3_program('epc-gtpu-tunnel-example',
['virtual-net-device', 'csma', 'internet', 'applications', 'lte'])
obj.source = 'epc-gtpu-tunnel-example.cc'

26
src/lte/model/epc-gtpu-header.cc → src/lte/model/epc-gtpu-v1.cc
View File

@@ -18,12 +18,9 @@
* Author: Jaume Nin <jnin@cttc.cat>
*/
#include "epc-gtpu-header.h"
#include <ns3/log.h>
#include "epc-gtpu-v1.h"
#include "ns3/packet.h"
NS_LOG_COMPONENT_DEFINE ("GtpuHeader");
namespace ns3
{
@@ -43,7 +40,7 @@ GtpuHeader::GetTypeId (void)
}
GtpuHeader::GtpuHeader () :
m_version(1), m_protocolType(true), m_extensionHeaderFlag(false),
m_sequenceNumberFlag(true), m_nPduNumberFlag(true), m_messageType(255),
m_sequenceNumberFlag(false), m_nPduNumberFlag(false), m_messageType(0),
m_length(0), m_teid(0), m_sequenceNumber(0), m_nPduNumber(0),
m_nextExtensionType(0)
{
@@ -83,25 +80,24 @@ GtpuHeader::Serialize (Buffer::Iterator start) const
uint32_t
GtpuHeader::Deserialize (Buffer::Iterator start)
{
Buffer::Iterator i = start;
uint8_t firstByte = i.ReadU8 ();
uint8_t firstByte = start.ReadU8 ();
m_version = firstByte >> 5 & 0x7;
m_protocolType = firstByte >> 4 & 0x1;
m_extensionHeaderFlag = firstByte >> 2 & 0x1;
m_sequenceNumberFlag = firstByte >> 1 & 0x1;
m_nPduNumberFlag = firstByte & 0x1;
m_messageType = i.ReadU8 ();
m_length = i.ReadNtohU16 ();
m_teid= i.ReadNtohU32 ();
m_sequenceNumber= i.ReadNtohU16 ();
m_nPduNumber= i.ReadU8 ();
m_nextExtensionType= i.ReadU8 ();
return GetSerializedSize ();
m_messageType = start.ReadU8 ();
m_length = start.ReadNtohU16 ();
m_teid= start.ReadNtohU32 ();
m_sequenceNumber= start.ReadNtohU16 ();
m_nPduNumber= start.ReadU8 ();
m_nextExtensionType= start.ReadU8 ();
return 4;
}
void
GtpuHeader::Print (std::ostream &os) const
{
os << " version=" << (uint32_t) m_version << " [";
os << "version=" << (uint32_t) m_version << " [";
if (m_protocolType)
{
os << " PT ";

0
src/lte/model/epc-gtpu-header.h → src/lte/model/epc-gtpu-v1.h
View File

38
src/lte/test/epc-test-gtpu.cc → src/lte/test/epc-test-gtpu-v1.cc
View File

@@ -23,8 +23,8 @@
#include "ns3/object.h"
#include "ns3/packet.h"
#include "ns3/epc-gtpu-header.h"
#include "ns3/epc-test-gtpu.h"
#include "ns3/epc-gtpu-v1.h"
#include "ns3/epc-test-gtpu-v1.h"
NS_LOG_COMPONENT_DEFINE ("EpcGtpuTest");
@@ -36,7 +36,7 @@ using namespace ns3;
*/
EpsGtpuTestSuite::EpsGtpuTestSuite ()
: TestSuite ("epc-gtpu", SYSTEM)
: TestSuite ("epc-gtpu-v1", SYSTEM)
{
AddTestCase (new EpsGtpuHeaderTestCase ());
}
@@ -64,23 +64,23 @@ EpsGtpuHeaderTestCase::DoRun (void)
LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);
LogComponentEnable ("EpcGtpuTest", logLevel);
GtpuHeader h1;
h1.SetExtensionHeaderFlag (true);
h1.SetLength (1234);
h1.SetMessageType (123);
h1.SetNPduNumber (123);
h1.SetNPduNumberFlag (true);
h1.SetNextExtensionType (123);
h1.SetProtocolType (true);
h1.SetSequenceNumber (1234);
h1.SetSequenceNumberFlag (true);
h1.SetTeid (1234567);
h1.SetVersion (123);
GtpuHeader header1;
header1.SetExtensionHeaderFlag (true);
header1.SetLength (1234);
header1.SetMessageType (123);
header1.SetNPduNumber (123);
header1.SetNPduNumberFlag (true);
header1.SetNextExtensionType (123);
header1.SetProtocolType (true);
header1.SetSequenceNumber (1234);
header1.SetSequenceNumberFlag (true);
header1.SetTeid (1234567);
header1.SetVersion (123);
Packet p;
GtpuHeader h2;
p.AddHeader (h1);
p.RemoveHeader (h2);
GtpuHeader header2;
p.AddHeader (header1);
p.RemoveHeader (header2);
NS_TEST_ASSERT_MSG_EQ (h1, h2, "Wrong value!");
NS_TEST_ASSERT_MSG_EQ (header1, header2, "Wrong value!");
}

8
src/lte/test/epc-test-gtpu.h → src/lte/test/epc-test-gtpu-v1.h
View File

@@ -18,10 +18,10 @@
* Author: Jaume Nin <jaume.nin@cttc.cat>
*/
#ifndef EPC_TEST_GTPU_H
#define EPC_TEST_GTPU_H
#ifndef EPC_TEST_GTPU_V1_H
#define EPC_TEST_GTPU_V1_H
#include "ns3/epc-gtpu-header.h"
#include "ns3/epc-gtpu-v1.h"
#include "ns3/test.h"
@@ -50,4 +50,4 @@ private:
};
#endif /* EPC_TEST_GTPU_H */
#endif /* EPC_TEST_GTPU_V1_H */

14
src/lte/wscript
View File

@@ -28,7 +28,6 @@ def build(bld):
'model/lte-ue-net-device.cc',
'model/ideal-control-messages.cc',
'helper/lena-helper.cc',
'helper/epc-helper.cc',
'helper/rlc-stats-calculator.cc',
'helper/mac-stats-calculator.cc',
'model/ff-mac-csched-sap.cc',
@@ -47,9 +46,7 @@ def build(bld):
'model/lte-interference.cc',
'model/lte-sinr-chunk-processor.cc',
'model/pf-ff-mac-scheduler.cc',
'model/epc-gtpu-header.cc',
'model/epc-gtpu-l5-protocol.cc',
'model/epc-gtpu-tunnel.cc',
'model/epc-gtpu-v1.cc',
]
module_test = bld.create_ns3_module_test_library('lte')
@@ -64,7 +61,7 @@ def build(bld):
'test/lte-test-pf-ff-mac-scheduler.cc',
'test/lte-test-earfcn.cc',
'test/lte-test-spectrum-value-helper.cc',
'test/epc-test-gtpu.cc',
'test/epc-test-gtpu-v1.cc',
]
headers = bld.new_task_gen('ns3header')
@@ -94,7 +91,6 @@ def build(bld):
'model/lte-ue-net-device.h',
'model/ideal-control-messages.h',
'helper/lena-helper.h',
'helper/epc-helper.h',
'helper/mac-stats-calculator.h',
'helper/rlc-stats-calculator.h',
'model/ff-mac-common.h',
@@ -114,9 +110,7 @@ def build(bld):
'model/lte-interference.h',
'model/lte-sinr-chunk-processor.h',
'model/pf-ff-mac-scheduler.h',
'model/epc-gtpu-header.h',
'model/epc-gtpu-l5-protocol.h',
'model/epc-gtpu-tunnel.h',
'model/epc-gtpu-v1.h',
'test/lte-test-downlink-sinr.h',
'test/lte-test-uplink-sinr.h',
'test/lte-test-link-adaptation.h',
@@ -126,7 +120,7 @@ def build(bld):
'test/lte-test-rr-ff-mac-scheduler.h',
'test/lte-test-pf-ff-mac-scheduler.h',
'test/lte-test-pf-ff-mac-scheduler.h',
'test/epc-test-gtpu.h',
'test/epc-test-gtpu-v1.h',
]
if (bld.env['ENABLE_EXAMPLES']):