# HG changeset patch # User Manoj Kumar Rana # Date 1512438097 -3600 # Parent 267d4ec9e26cee54ac95da81a7b56ff3256f2e9b lte: add support for multiple EPC diff --git a/src/lte/examples/lena-deactivate-bearer.cc b/src/lte/examples/lena-deactivate-bearer.cc --- a/src/lte/examples/lena-deactivate-bearer.cc +++ b/src/lte/examples/lena-deactivate-bearer.cc @@ -102,7 +102,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); NodeContainer ueNodes; NodeContainer enbNodes; diff --git a/src/lte/examples/lena-distributed-ffr.cc b/src/lte/examples/lena-distributed-ffr.cc --- a/src/lte/examples/lena-distributed-ffr.cc +++ b/src/lte/examples/lena-distributed-ffr.cc @@ -158,7 +158,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // interface 0 is localhost, 1 is the p2p device - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/examples/lena-dual-stripe.cc b/src/lte/examples/lena-dual-stripe.cc --- a/src/lte/examples/lena-dual-stripe.cc +++ b/src/lte/examples/lena-dual-stripe.cc @@ -671,7 +671,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // for internetworking purposes, consider together home UEs and macro UEs ues.Add (homeUes); diff --git a/src/lte/examples/lena-simple-epc-emu.cc b/src/lte/examples/lena-simple-epc-emu.cc --- a/src/lte/examples/lena-simple-epc-emu.cc +++ b/src/lte/examples/lena-simple-epc-emu.cc @@ -113,7 +113,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); NodeContainer ueNodes; NodeContainer enbNodes; diff --git a/src/lte/examples/lena-simple-epc.cc b/src/lte/examples/lena-simple-epc.cc --- a/src/lte/examples/lena-simple-epc.cc +++ b/src/lte/examples/lena-simple-epc.cc @@ -100,7 +100,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); NodeContainer ueNodes; NodeContainer enbNodes; diff --git a/src/lte/examples/lena-x2-handover-measures.cc b/src/lte/examples/lena-x2-handover-measures.cc --- a/src/lte/examples/lena-x2-handover-measures.cc +++ b/src/lte/examples/lena-x2-handover-measures.cc @@ -206,7 +206,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // interface 0 is localhost, 1 is the p2p device - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); /* * Network topology: diff --git a/src/lte/examples/lena-x2-handover.cc b/src/lte/examples/lena-x2-handover.cc --- a/src/lte/examples/lena-x2-handover.cc +++ b/src/lte/examples/lena-x2-handover.cc @@ -187,7 +187,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // interface 0 is localhost, 1 is the p2p device - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); NodeContainer ueNodes; NodeContainer enbNodes; diff --git a/src/lte/helper/emu-epc-helper.cc b/src/lte/helper/emu-epc-helper.cc --- a/src/lte/helper/emu-epc-helper.cc +++ b/src/lte/helper/emu-epc-helper.cc @@ -26,6 +26,7 @@ #include #include #include +#include #include #include #include @@ -91,20 +92,38 @@ StringValue ("00:00:00:eb:00"), MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase), MakeStringChecker ()) + .AddAttribute ("BaseIpv4Prefix", + "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.", + Ipv4AddressValue (Ipv4Address ("7.0.0.0")), + MakeIpv4AddressAccessor (&EmuEpcHelper::m_uePgwBaseIpv4Prefix), + MakeIpv4AddressChecker ()) ; return tid; } +TypeId +EmuEpcHelper::GetInstanceTypeId () const +{ + return GetTypeId (); +} + + void EmuEpcHelper::DoInitialize () { NS_LOG_LOGIC (this); + // we use a /16 bit IPv4 net for an EPC network + m_uePgwCurrentIpv4Prefix = m_uePgwBaseIpv4Prefix.CombineMask (Ipv4Mask ("255.0.0.0")); //Initialize + Ipv4AddressGenerator::Init (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0")); - // we use a /8 net for all UEs - m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0"); + while (!(Ipv4AddressGenerator::CheckAllocated (Ipv4AddressGenerator::GetAddress (Ipv4Mask ("255.255.0.0"))))) + { + m_uePgwCurrentIpv4Prefix = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0")); + } - + m_ueAddressHelper.SetBase (m_uePgwCurrentIpv4Prefix, "255.255.0.0"); //The helper will assign IPv4 addresses using this 16 bit prefix + //Now we get an unique 16 bit IPv4 prefix for this EPC, which not used by any other EPC // create SgwPgwNode m_sgwPgw = CreateObject (); diff --git a/src/lte/helper/emu-epc-helper.h b/src/lte/helper/emu-epc-helper.h --- a/src/lte/helper/emu-epc-helper.h +++ b/src/lte/helper/emu-epc-helper.h @@ -70,9 +70,18 @@ * \return The object TypeId. */ static TypeId GetTypeId (void); + TypeId GetInstanceTypeId () const; virtual void DoInitialize (); virtual void DoDispose (); + /** + * Get the IPv4 network address used by the EPC. + * The EPC will use a /16 network address. + * + * \returns The EPC IPv4 network address. + */ + Ipv4Address GetEpcIpv4NetworkAddress (); + // inherited from EpcHelper virtual void AddEnb (Ptr enbNode, Ptr lteEnbNetDevice, uint16_t cellId); virtual void AddUe (Ptr ueLteDevice, uint64_t imsi); @@ -92,6 +101,19 @@ Ipv4AddressHelper m_ueAddressHelper; /** + * The common 8 bit prefix used for the IPv4 address assignment of + * all the EPC networks + */ + Ipv4Address m_uePgwBaseIpv4Prefix; + + /** + * The 16 bit prefix used for the IPv4 address assignment of + * the UE and PGW. + * The current IPv4 prefix will be the first available one in the /8 pool. + */ + Ipv4Address m_uePgwCurrentIpv4Prefix; + + /** * SGW-PGW network element */ Ptr m_sgwPgw; diff --git a/src/lte/helper/point-to-point-epc-helper.cc b/src/lte/helper/point-to-point-epc-helper.cc --- a/src/lte/helper/point-to-point-epc-helper.cc +++ b/src/lte/helper/point-to-point-epc-helper.cc @@ -18,6 +18,7 @@ * Author: Jaume Nin * Nicola Baldo * Manuel Requena + * Manoj Kumar Rana */ #include @@ -26,6 +27,7 @@ #include #include #include +#include #include #include #include @@ -52,6 +54,9 @@ { NS_LOG_FUNCTION (this); + // To access the attribute value within the constructor + ObjectBase::ConstructSelf (AttributeConstructionList ()); + // since we use point-to-point links for all S1-U links, // we use a /30 subnet which can hold exactly two addresses // (remember that net broadcast and null address are not valid) @@ -59,8 +64,17 @@ m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252"); - // we use a /8 net for all UEs - m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0"); + // we use a /16 bit IPv4 net for an EPC network + m_uePgwCurrentIpv4Prefix = m_uePgwBaseIpv4Prefix.CombineMask (Ipv4Mask ("255.0.0.0")); //Initialize + Ipv4AddressGenerator::Init (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0")); + + while (!(Ipv4AddressGenerator::CheckAllocated (Ipv4AddressGenerator::GetAddress (Ipv4Mask ("255.255.0.0"))))) + { + m_uePgwCurrentIpv4Prefix = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0")); + } + + m_ueAddressHelper.SetBase (m_uePgwCurrentIpv4Prefix, "255.255.0.0"); //The helper will assign IPv4 addresses using this 16 bit prefix + //Now we get an unique 16 bit IPv4 prefix for this EPC, which not used by any other EPC // create SgwPgwNode m_sgwPgw = CreateObject (); @@ -144,10 +158,21 @@ UintegerValue (3000), MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu), MakeUintegerChecker ()) - ; + .AddAttribute ("BaseIpv4Prefix", + "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.", + Ipv4AddressValue (Ipv4Address ("7.0.0.0")), + MakeIpv4AddressAccessor (&PointToPointEpcHelper::m_uePgwBaseIpv4Prefix), + MakeIpv4AddressChecker ()) + ; return tid; } +TypeId +PointToPointEpcHelper::GetInstanceTypeId () const +{ + return GetTypeId (); +} + void PointToPointEpcHelper::DoDispose () { @@ -319,22 +344,18 @@ return bearerId; } - Ptr PointToPointEpcHelper::GetPgwNode () { return m_sgwPgw; } - Ipv4InterfaceContainer PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices) { return m_ueAddressHelper.Assign (ueDevices); } - - Ipv4Address PointToPointEpcHelper::GetUeDefaultGatewayAddress () { diff --git a/src/lte/helper/point-to-point-epc-helper.h b/src/lte/helper/point-to-point-epc-helper.h --- a/src/lte/helper/point-to-point-epc-helper.h +++ b/src/lte/helper/point-to-point-epc-helper.h @@ -18,6 +18,7 @@ * Author: Jaume Nin * Nicola Baldo * Manuel Requena + * Manoj Kumar Rana */ #ifndef POINT_TO_POINT_EPC_HELPER_H @@ -68,8 +69,17 @@ * \return The object TypeId. */ static TypeId GetTypeId (void); + TypeId GetInstanceTypeId () const; virtual void DoDispose (); + /** + * Get the IPv4 network address used by the EPC. + * The EPC will use a /16 network address. + * + * \returns The EPC IPv4 network address. + */ + Ipv4Address GetEpcIpv4NetworkAddress (); + // inherited from EpcHelper virtual void AddEnb (Ptr enbNode, Ptr lteEnbNetDevice, uint16_t cellId); virtual void AddUe (Ptr ueLteDevice, uint64_t imsi); @@ -84,11 +94,24 @@ private: /** - * helper to assign addresses to UE devices as well as to the TUN device of the SGW/PGW + * helper to assign IPv4 addresses to UE devices as well as to the TUN device of the SGW/PGW */ Ipv4AddressHelper m_ueAddressHelper; /** + * The common 8 bit prefix used for the IPv4 address assignment of + * all the EPC networks + */ + Ipv4Address m_uePgwBaseIpv4Prefix; + + /** + * The 16 bit prefix used for the IPv4 address assignment of + * the UE and PGW. + * The current IPv4 prefix will be the first available one in the /8 pool. + */ + Ipv4Address m_uePgwCurrentIpv4Prefix; + + /** * SGW-PGW network element */ Ptr m_sgwPgw; diff --git a/src/lte/test/epc-test-s1u-downlink.cc b/src/lte/test/epc-test-s1u-downlink.cc --- a/src/lte/test/epc-test-s1u-downlink.cc +++ b/src/lte/test/epc-test-s1u-downlink.cc @@ -153,7 +153,7 @@ Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // hardcoded UE addresses for now - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); diff --git a/src/lte/test/epc-test-s1u-uplink.cc b/src/lte/test/epc-test-s1u-uplink.cc --- a/src/lte/test/epc-test-s1u-uplink.cc +++ b/src/lte/test/epc-test-s1u-uplink.cc @@ -370,7 +370,7 @@ Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // hardcoded UE addresses for now - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); diff --git a/src/lte/test/lte-test-cell-selection.cc b/src/lte/test/lte-test-cell-selection.cc --- a/src/lte/test/lte-test-cell-selection.cc +++ b/src/lte/test/lte-test-cell-selection.cc @@ -308,7 +308,7 @@ // Routing of the Internet Host (towards the LTE network) Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // Install the IP stack on the UEs internet.Install (ueNodes); diff --git a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc --- a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc @@ -303,7 +303,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010)); //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005)); @@ -546,7 +546,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // LogComponentDisableAll (LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-deactivate-bearer.cc b/src/lte/test/lte-test-deactivate-bearer.cc --- a/src/lte/test/lte-test-deactivate-bearer.cc +++ b/src/lte/test/lte-test-deactivate-bearer.cc @@ -164,7 +164,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc --- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc @@ -299,7 +299,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010)); //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005)); @@ -545,7 +545,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // LogComponentDisableAll (LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-frequency-reuse.cc b/src/lte/test/lte-test-frequency-reuse.cc --- a/src/lte/test/lte-test-frequency-reuse.cc +++ b/src/lte/test/lte-test-frequency-reuse.cc @@ -1464,7 +1464,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // interface 0 is localhost, 1 is the p2p device - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // Create Nodes: eNodeB and UE NodeContainer enbNodes; diff --git a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc --- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc @@ -300,7 +300,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010)); //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005)); @@ -546,7 +546,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // LogComponentDisableAll (LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc --- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc @@ -299,7 +299,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010)); //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005)); @@ -545,7 +545,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // LogComponentDisableAll (LOG_LEVEL_ALL); diff --git a/src/lte/test/lte-test-ue-measurements.cc b/src/lte/test/lte-test-ue-measurements.cc --- a/src/lte/test/lte-test-ue-measurements.cc +++ b/src/lte/test/lte-test-ue-measurements.cc @@ -1744,7 +1744,7 @@ // Routing of the Internet Host (towards the LTE network) Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // Enable layer-3 filtering Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient", diff --git a/src/lte/test/test-lte-epc-e2e-data.cc b/src/lte/test/test-lte-epc-e2e-data.cc --- a/src/lte/test/test-lte-epc-e2e-data.cc +++ b/src/lte/test/test-lte-epc-e2e-data.cc @@ -177,7 +177,7 @@ Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); // hardcoded UE addresses for now - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); NodeContainer enbs; diff --git a/src/lte/test/test-lte-handover-target.cc b/src/lte/test/test-lte-handover-target.cc --- a/src/lte/test/test-lte-handover-target.cc +++ b/src/lte/test/test-lte-handover-target.cc @@ -318,7 +318,7 @@ // Routing of the Internet Host (towards the LTE network) Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // Create Devices and install them in the Nodes (eNB and UE) NetDeviceContainer enbDevs; diff --git a/src/lte/test/test-lte-x2-handover.cc b/src/lte/test/test-lte-x2-handover.cc --- a/src/lte/test/test-lte-x2-handover.cc +++ b/src/lte/test/test-lte-x2-handover.cc @@ -280,7 +280,7 @@ Ipv4StaticRoutingHelper ipv4RoutingHelper; Ptr remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject ()); - remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1); + remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1); // Install the IP stack on the UEs internet.Install (ueNodes);