Attachment #2985 for bug #2835

View | Details | Raw Unified | Return to bug 2835
Collapse All | Expand All

(-)a/src/lte/examples/lena-deactivate-bearer.cc (-1 / +1 lines)

Lines 102-108	Link Here

102

103

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

103

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

104

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

104

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

105

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

105

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

106

107

  NodeContainer ueNodes;

107

  NodeContainer ueNodes;

108

  NodeContainer enbNodes;

108

  NodeContainer enbNodes;

(-)a/src/lte/examples/lena-distributed-ffr.cc (-1 / +1 lines)

Lines 158-164	Link Here

158

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

158

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

159

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

159

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

160

  // interface 0 is localhost, 1 is the p2p device

160

  // interface 0 is localhost, 1 is the p2p device

161

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

161

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

162

163

  // Create Nodes: eNodeB and UE

163

  // Create Nodes: eNodeB and UE

164

  NodeContainer enbNodes;

164

  NodeContainer enbNodes;

(-)a/src/lte/examples/lena-dual-stripe.cc (-1 / +1 lines)

Lines 671-677	Link Here

671

672

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

672

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

673

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

673

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

674

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

674

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

675

676

      // for internetworking purposes, consider together home UEs and macro UEs

676

      // for internetworking purposes, consider together home UEs and macro UEs

677

      ues.Add (homeUes);

677

      ues.Add (homeUes);

(-)a/src/lte/examples/lena-simple-epc-emu.cc (-1 / +1 lines)

Lines 113-119	Link Here

113

114

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

114

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

115

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

115

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

116

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

116

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

117

118

  NodeContainer ueNodes;

118

  NodeContainer ueNodes;

119

  NodeContainer enbNodes;

119

  NodeContainer enbNodes;

(-)a/src/lte/examples/lena-simple-epc.cc (-1 / +1 lines)

Lines 100-106	Link Here

100

101

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

101

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

102

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

102

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

103

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

103

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

104

105

  NodeContainer ueNodes;

105

  NodeContainer ueNodes;

106

  NodeContainer enbNodes;

106

  NodeContainer enbNodes;




/* -*-  Mode: C++; c-file-style: "gnu"; indent-tabs-mode:nil; -*- */
/*
 * Copyright (c) 2011 Centre Tecnologic de Telecomunicacions de Catalunya (CTTC)
 *
 * This program is free software; you can redistribute it and/or modify
 * it under the terms of the GNU General Public License version 2 as
 * published by the Free Software Foundation;
 *
 * This program is distributed in the hope that it will be useful,
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 * GNU General Public License for more details.
 *
 * You should have received a copy of the GNU General Public License
 * along with this program; if not, write to the Free Software
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 *
 * Author: Jaume Nin <jaume.nin@cttc.cat>
 *         Tommaso Pecorella <tommaso.pecorella@unifi.it>
 */

#include "ns3/lte-helper.h"
#include "ns3/epc-helper.h"
#include "ns3/core-module.h"
#include "ns3/network-module.h"
#include "ns3/ipv4-global-routing-helper.h"
#include "ns3/internet-module.h"
#include "ns3/mobility-module.h"
#include "ns3/lte-module.h"
#include "ns3/applications-module.h"
#include "ns3/csma-helper.h"
#include "ns3/config-store.h"
//#include "ns3/gtk-config-store.h"

using namespace ns3;

/**
 * Sample simulation script for LTE+EPC. It instantiates several eNodeB,
 * attaches one UE per eNodeB starts a flow for each UE to  and from a remote host.
 * It also  starts yet another flow between each UE pair.
 */

NS_LOG_COMPONENT_DEFINE ("EpcFirstExample");

int
main (int argc, char *argv[])
{

  uint16_t numberOfNodes = 2;
  double simTime = 1.1;
  double distance = 60.0;
  double interPacketInterval = 100;
  bool useCa = false;

//  LogComponentEnable ("PointToPointEpcHelper", LOG_LEVEL_ALL);

  // Command line arguments
  CommandLine cmd;
  cmd.AddValue("numberOfNodes", "Number of eNodeBs + UE pairs", numberOfNodes);
  cmd.AddValue("simTime", "Total duration of the simulation [s])", simTime);
  cmd.AddValue("distance", "Distance between eNBs [m]", distance);
  cmd.AddValue("interPacketInterval", "Inter packet interval [ms])", interPacketInterval);
  cmd.AddValue("useCa", "Whether to use carrier aggregation.", useCa);
  cmd.Parse(argc, argv);

  ConfigStore inputConfig;
  inputConfig.ConfigureDefaults();

  // parse again so you can override default values from the command line
  cmd.Parse(argc, argv);

  if (useCa)
    {
      Config::SetDefault ("ns3::LteHelper::UseCa", BooleanValue (useCa));
      Config::SetDefault ("ns3::LteHelper::NumberOfComponentCarriers", UintegerValue (2));
      Config::SetDefault ("ns3::LteHelper::EnbComponentCarrierManager", StringValue ("ns3::RrComponentCarrierManager"));
    }

  InternetStackHelper internet;
  Ipv4StaticRoutingHelper ipv4RoutingHelper;

  // Network A
  Ptr<LteHelper> lteAHelper = CreateObject<LteHelper> ();
  Ptr<PointToPointEpcHelper>  epcAHelper = CreateObject<PointToPointEpcHelper> ();
  lteAHelper->SetEpcHelper (epcAHelper);

  Ptr<Node> pgwA = epcAHelper->GetPgwNode ();

  NodeContainer ueNodesA;
  NodeContainer enbNodesA;
  enbNodesA.Create(numberOfNodes);
  ueNodesA.Create(numberOfNodes);

  // Install Mobility Model
  Ptr<ListPositionAllocator> positionAlloc = CreateObject<ListPositionAllocator> ();
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      positionAlloc->Add (Vector(distance * i, 0, 0));
    }
  MobilityHelper mobilityA;
  mobilityA.SetMobilityModel("ns3::ConstantPositionMobilityModel");
  mobilityA.SetPositionAllocator(positionAlloc);
  mobilityA.Install(enbNodesA);
  mobilityA.Install(ueNodesA);

  // Install LTE Devices to the nodes
  NetDeviceContainer enbLteADevs = lteAHelper->InstallEnbDevice (enbNodesA);
  NetDeviceContainer ueLteADevs = lteAHelper->InstallUeDevice (ueNodesA);

  // Install the IP stack on the UEs
  internet.Install (ueNodesA);
  Ipv4InterfaceContainer ueAIpIface;
  ueAIpIface = epcAHelper->AssignUeIpv4Address (NetDeviceContainer (ueLteADevs));
  // Assign IP address to UEs, and install applications
  for (uint32_t u = 0; u < ueNodesA.GetN (); ++u)
    {
      Ptr<Node> ueNode = ueNodesA.Get (u);
      // Set the default gateway for the UE
      Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
      ueStaticRouting->SetDefaultRoute (epcAHelper->GetUeDefaultGatewayAddress (), 1);
    }

  // Attach one UE per eNodeB
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      lteAHelper->Attach (ueLteADevs.Get(i), enbLteADevs.Get(i));
      // side effect: the default EPS bearer will be activated
    }

  // Network B
  Ptr<LteHelper> lteBHelper = CreateObject<LteHelper> ();
  lteBHelper->SetUplinkSpectrumChannel (lteAHelper->GetUplinkSpectrumChannel ());
  lteBHelper->SetDownlinkSpectrumChannel (lteAHelper->GetDownlinkSpectrumChannel ());

  Ptr<PointToPointEpcHelper>  epcBHelper = CreateObject<PointToPointEpcHelper> ();
  lteBHelper->SetEpcHelper (epcBHelper);

  Ptr<Node> pgwB = epcBHelper->GetPgwNode ();

  NodeContainer ueNodesB;
  NodeContainer enbNodesB;
  enbNodesB.Create(numberOfNodes);
  ueNodesB.Create(numberOfNodes);

  // Install Mobility Model
  Ptr<ListPositionAllocator> positionAllocB = CreateObject<ListPositionAllocator> ();
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      positionAllocB->Add (Vector(distance * i, 500, 0));
    }
  MobilityHelper mobilityB;
  mobilityB.SetMobilityModel("ns3::ConstantPositionMobilityModel");
  mobilityB.SetPositionAllocator(positionAllocB);
  mobilityB.Install(enbNodesB);
  mobilityB.Install(ueNodesB);

  // Install LTE Devices to the nodes
  NetDeviceContainer enbLteBDevs = lteBHelper->InstallEnbDevice (enbNodesB);
  NetDeviceContainer ueLteBDevs = lteBHelper->InstallUeDevice (ueNodesB);

  // Install the IP stack on the UEs
  internet.Install (ueNodesB);
  Ipv4InterfaceContainer ueBIpIface;
  ueBIpIface = epcBHelper->AssignUeIpv4Address (NetDeviceContainer (ueLteBDevs));
  // Assign IP address to UEs, and install applications
  for (uint32_t u = 0; u < ueNodesB.GetN (); ++u)
    {
      Ptr<Node> ueNode = ueNodesB.Get (u);
      // Set the default gateway for the UE
      Ptr<Ipv4StaticRouting> ueStaticRouting = ipv4RoutingHelper.GetStaticRouting (ueNode->GetObject<Ipv4> ());
      ueStaticRouting->SetDefaultRoute (epcBHelper->GetUeDefaultGatewayAddress (), 1);
    }

  // Attach one UE per eNodeB
  for (uint16_t i = 0; i < numberOfNodes; i++)
    {
      lteBHelper->Attach (ueLteBDevs.Get(i), enbLteBDevs.Get(i));
      // side effect: the default EPS bearer will be activated
    }

  // Create a single RemoteHost
  NodeContainer remoteHostContainer;
  remoteHostContainer.Create (1);
  Ptr<Node> remoteHost = remoteHostContainer.Get (0);
  internet.Install (remoteHostContainer);

  // Create the Internet
  CsmaHelper csma;
  NodeContainer internetNodes;
  internetNodes.Add (remoteHost);
  internetNodes.Add (pgwA);
  internetNodes.Add (pgwB);

  csma.SetDeviceAttribute ("Mtu", UintegerValue (1500));
  csma.SetChannelAttribute ("DataRate", DataRateValue (DataRate ("100Gb/s")));
  csma.SetChannelAttribute ("Delay", TimeValue (Seconds (0.010)));
  NetDeviceContainer internetDevices = csma.Install (internetNodes);
  Ipv4AddressHelper ipv4h;
  ipv4h.SetBase ("1.0.0.0", "255.0.0.0");
  Ipv4InterfaceContainer internetIpIfaces = ipv4h.Assign (internetDevices);
  // interface 0 is localhost, 1 is the csma device
  Ipv4Address remoteHostAddr = internetIpIfaces.GetAddress (1);

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());
  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);


  // Install and start applications on UEs and remote host
  uint16_t dlPort = 1234;
  uint16_t ulPort = 2000;
  uint16_t otherPort = 3000;
  ApplicationContainer clientApps;
  ApplicationContainer serverApps;
  for (uint32_t u = 0; u < ueNodesA.GetN (); ++u)
    {
      ++ulPort;
      ++otherPort;
      PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort));
      PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort));
      PacketSinkHelper packetSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), otherPort));
      serverApps.Add (dlPacketSinkHelper.Install (ueNodesA.Get(u)));
      serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
      serverApps.Add (packetSinkHelper.Install (ueNodesA.Get(u)));

      UdpClientHelper dlClient (ueAIpIface.GetAddress (u), dlPort);
      dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      dlClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper ulClient (remoteHostAddr, ulPort);
      ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      ulClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper client (ueAIpIface.GetAddress (u), otherPort);
      client.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      client.SetAttribute ("MaxPackets", UintegerValue(1000000));

      clientApps.Add (dlClient.Install (remoteHost));
      clientApps.Add (ulClient.Install (ueNodesA.Get(u)));
      if (u+1 < ueNodesA.GetN ())
        {
          clientApps.Add (client.Install (ueNodesA.Get(u+1)));
        }
      else
        {
          clientApps.Add (client.Install (ueNodesA.Get(0)));
        }
    }
  for (uint32_t u = 0; u < ueNodesB.GetN (); ++u)
    {
      ++ulPort;
      ++otherPort;
      PacketSinkHelper dlPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), dlPort));
      PacketSinkHelper ulPacketSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), ulPort));
      PacketSinkHelper packetSinkHelper ("ns3::UdpSocketFactory", InetSocketAddress (Ipv4Address::GetAny (), otherPort));
      serverApps.Add (dlPacketSinkHelper.Install (ueNodesB.Get(u)));
      serverApps.Add (ulPacketSinkHelper.Install (remoteHost));
      serverApps.Add (packetSinkHelper.Install (ueNodesB.Get(u)));

      UdpClientHelper dlClient (ueBIpIface.GetAddress (u), dlPort);
      dlClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      dlClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper ulClient (remoteHostAddr, ulPort);
      ulClient.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      ulClient.SetAttribute ("MaxPackets", UintegerValue(1000000));

      UdpClientHelper client (ueBIpIface.GetAddress (u), otherPort);
      client.SetAttribute ("Interval", TimeValue (MilliSeconds(interPacketInterval)));
      client.SetAttribute ("MaxPackets", UintegerValue(1000000));

      clientApps.Add (dlClient.Install (remoteHost));
      clientApps.Add (ulClient.Install (ueNodesB.Get(u)));
      if (u+1 < ueNodesB.GetN ())
        {
          clientApps.Add (client.Install (ueNodesB.Get(u+1)));
        }
      else
        {
          clientApps.Add (client.Install (ueNodesB.Get(0)));
        }
    }
  serverApps.Start (Seconds (0.01));
  clientApps.Start (Seconds (0.01));
//  lteAHelper->EnableTraces ();
//  lteBHelper->EnableTraces ();
  // Uncomment to enable PCAP tracing
  //p2ph.EnablePcapAll("lena-epc-first");

  Simulator::Stop (Seconds (simTime));
  Simulator::Run ();

  /*GtkConfigStore config;
  config.ConfigureAttributes();*/

  Simulator::Destroy();
  return 0;

}


(-)a/src/lte/examples/lena-x2-handover-measures.cc (-1 / +1 lines)

Lines 206-212	Link Here

206

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

206

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

207

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

207

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

208

  // interface 0 is localhost, 1 is the p2p device

208

  // interface 0 is localhost, 1 is the p2p device

209

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

209

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

210

211

/*

211

/*

212

   * Network topology:

212

   * Network topology:

(-)a/src/lte/examples/lena-x2-handover.cc (-1 / +1 lines)

Lines 187-193	Link Here

187

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

187

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

188

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

188

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

189

  // interface 0 is localhost, 1 is the p2p device

189

  // interface 0 is localhost, 1 is the p2p device

190

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

190

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

191

192

  NodeContainer ueNodes;

192

  NodeContainer ueNodes;

193

  NodeContainer enbNodes;

193

  NodeContainer enbNodes;

(-)a/src/lte/examples/wscript (+3 lines)

Lines 34-39	Link Here

    obj = bld.create_ns3_program('lena-simple-epc',

    obj = bld.create_ns3_program('lena-simple-epc',

                                 ['lte'])

                                 ['lte'])

    obj.source = 'lena-simple-epc.cc'

    obj.source = 'lena-simple-epc.cc'

    obj = bld.create_ns3_program('lena-simple-two-epc',

                                 ['lte'])

    obj.source = 'lena-simple-two-epc.cc'

    obj = bld.create_ns3_program('lena-deactivate-bearer',

    obj = bld.create_ns3_program('lena-deactivate-bearer',

                                 ['lte'])

                                 ['lte'])

    obj.source = 'lena-deactivate-bearer.cc'

    obj.source = 'lena-deactivate-bearer.cc'

(-)a/src/lte/helper/emu-epc-helper.cc (-3 / +22 lines)

Lines 26-31	Link Here

#include <ns3/mac48-address.h>

#include <ns3/mac48-address.h>

#include <ns3/eps-bearer.h>

#include <ns3/eps-bearer.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address-generator.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/packet-socket-helper.h>

#include <ns3/packet-socket-helper.h>

#include <ns3/packet-socket-address.h>

#include <ns3/packet-socket-address.h>

Lines 91-110	Link Here

                   StringValue ("00:00:00:eb:00"),

                   StringValue ("00:00:00:eb:00"),

                   MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase),

                   MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase),

                   MakeStringChecker ())

                   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 ())

100

  return tid;

101

  return tid;

102

103

104

TypeId

105

EmuEpcHelper::GetInstanceTypeId () const

106

107

  return GetTypeId ();

108

109

110

void

111

void

EmuEpcHelper::DoInitialize ()

112

EmuEpcHelper::DoInitialize ()

100

113

101

  NS_LOG_LOGIC (this);

114

  NS_LOG_LOGIC (this);

102

115

116

  // we use a /16 bit IPv4 net for an EPC network

117

  m_uePgwCurrentIpv4Prefix = m_uePgwBaseIpv4Prefix.CombineMask (Ipv4Mask ("255.0.0.0"));  //Initialize

118

  Ipv4AddressGenerator::Init (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0"));

103

119

104

  // we use a /8 net for all UEs

120

  while (!Ipv4AddressGenerator::IsNetworkAllocated (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0")))

105

  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");

121

122

      m_uePgwCurrentIpv4Prefix = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

123

106

124

107

125

  m_ueAddressHelper.SetBase (m_uePgwCurrentIpv4Prefix, "255.255.0.0"); //The helper will assign IPv4 addresses using this 16 bit prefix

126

  //Now we get an unique 16 bit IPv4 prefix for this EPC, which not used by any other EPC

108

127

109

  // create SgwPgwNode

128

  // create SgwPgwNode

110

  m_sgwPgw = CreateObject<Node> ();

129

  m_sgwPgw = CreateObject<Node> ();

(-)a/src/lte/helper/emu-epc-helper.h (+22 lines)

Lines 70-78	Link Here

   *  \return The object TypeId.

   *  \return The object TypeId.

*/

*/

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  TypeId GetInstanceTypeId () const;

  virtual void DoInitialize ();

  virtual void DoInitialize ();

  virtual void DoDispose ();

  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

  // inherited from EpcHelper

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

Lines 92-97	Link Here

  Ipv4AddressHelper m_ueAddressHelper;

101

  Ipv4AddressHelper m_ueAddressHelper;

102

/**

103

/**

104

   * The common 8 bit prefix used for the IPv4 address assignment of

105

   * all the EPC networks

106

*/

107

  Ipv4Address m_uePgwBaseIpv4Prefix;

108

109

/**

110

   * The 16 bit prefix used for the IPv4 address assignment of

111

   * the UE and PGW.

112

   * The current IPv4 prefix will be the first available one in the /8 pool.

113

*/

114

  Ipv4Address m_uePgwCurrentIpv4Prefix;

115

116

/**

   * SGW-PGW network element

117

   * SGW-PGW network element

*/

118

*/

  Ptr<Node> m_sgwPgw;

119

  Ptr<Node> m_sgwPgw;

(-)a/src/lte/helper/lte-helper.cc (-27 / +111 lines)

Lines 71-84	Link Here

namespace ns3 {

namespace ns3 {

uint64_t LteHelper::m_imsiCounter = 0;

uint16_t LteHelper::m_cellIdCounter = 1;

NS_LOG_COMPONENT_DEFINE ("LteHelper");

NS_LOG_COMPONENT_DEFINE ("LteHelper");

NS_OBJECT_ENSURE_REGISTERED (LteHelper);

NS_OBJECT_ENSURE_REGISTERED (LteHelper);

LteHelper::LteHelper (void)

LteHelper::LteHelper (void)

  : m_fadingStreamsAssigned (false),

  : m_fadingStreamsAssigned (false)

    m_imsiCounter (0),

    m_cellIdCounter {1}

  NS_LOG_FUNCTION (this);

  NS_LOG_FUNCTION (this);

  m_enbNetDeviceFactory.SetTypeId (LteEnbNetDevice::GetTypeId ());

  m_enbNetDeviceFactory.SetTypeId (LteEnbNetDevice::GetTypeId ());

Lines 86-91	Link Here

  m_ueNetDeviceFactory.SetTypeId (LteUeNetDevice::GetTypeId ());

  m_ueNetDeviceFactory.SetTypeId (LteUeNetDevice::GetTypeId ());

  m_ueAntennaModelFactory.SetTypeId (IsotropicAntennaModel::GetTypeId ());

  m_ueAntennaModelFactory.SetTypeId (IsotropicAntennaModel::GetTypeId ());

  m_channelFactory.SetTypeId (MultiModelSpectrumChannel::GetTypeId ());

  m_channelFactory.SetTypeId (MultiModelSpectrumChannel::GetTypeId ());

  m_downlinkChannel = 0;

  m_uplinkChannel = 0;

void

void

Lines 98-104	Link Here

  m_phyRxStats = CreateObject<PhyRxStatsCalculator> ();

102

  m_phyRxStats = CreateObject<PhyRxStatsCalculator> ();

  m_macStats = CreateObject<MacStatsCalculator> ();

103

  m_macStats = CreateObject<MacStatsCalculator> ();

100

  Object::DoInitialize ();

104

  Object::DoInitialize ();

101

102

105

103

106

104

LteHelper::~LteHelper (void)

107

LteHelper::~LteHelper (void)

Lines 224-237	Link Here

224

227

225

228

226

void

229

void

230

LteHelper::SetUplinkSpectrumChannel (Ptr<SpectrumChannel> ulChannel)

231

232

  m_uplinkChannel = ulChannel;

233

234

235

void

236

LteHelper::SetDownlinkSpectrumChannel (Ptr<SpectrumChannel> dlChannel)

237

238

  m_downlinkChannel = dlChannel;

239

240

241

void

227

LteHelper::ChannelModelInitialization (void)

242

LteHelper::ChannelModelInitialization (void)

228

243

229

  // Channel Object (i.e. Ptr<SpectrumChannel>) are within a vector

244

  // Channel Object (i.e. Ptr<SpectrumChannel>) are within a vector

230

  // PathLossModel Objects are vectors --> in InstallSingleEnb we will set the frequency

245

  // PathLossModel Objects are vectors --> in InstallSingleEnb we will set the frequency

231

  NS_LOG_FUNCTION (this << m_noOfCcs);

246

  NS_LOG_FUNCTION (this << m_noOfCcs);

232

247

233

  m_downlinkChannel = m_channelFactory.Create<SpectrumChannel> ();

248

  if (m_downlinkChannel == 0)

234

  m_uplinkChannel = m_channelFactory.Create<SpectrumChannel> ();

249

250

      m_downlinkChannel = m_channelFactory.Create<SpectrumChannel> ();

251

252

  if (m_uplinkChannel == 0)

253

254

      m_uplinkChannel = m_channelFactory.Create<SpectrumChannel> ();

255

235

256

236

  m_downlinkPathlossModel = m_pathlossModelFactory.Create ();

257

  m_downlinkPathlossModel = m_pathlossModelFactory.Create ();

237

  Ptr<SpectrumPropagationLossModel> dlSplm = m_downlinkPathlossModel->GetObject<SpectrumPropagationLossModel> ();

258

  Ptr<SpectrumPropagationLossModel> dlSplm = m_downlinkPathlossModel->GetObject<SpectrumPropagationLossModel> ();

Lines 756-761	Link Here

756

      rrc->SetEpcX2SapProvider (x2->GetEpcX2SapProvider ());

777

      rrc->SetEpcX2SapProvider (x2->GetEpcX2SapProvider ());

757

778

758

779

780

  m_enbNetDevices.push_back (dev);

759

  return dev;

781

  return dev;

760

782

761

783

Lines 935-940	Link Here

935

957

936

  dev->Initialize ();

958

  dev->Initialize ();

937

959

960

  m_ueNetDevices.push_back (dev);

938

  return dev;

961

  return dev;

939

962

940

963

Lines 1351-1357	Link Here

1351

1374

1352

  NS_ASSERT_MSG (m_rlcStats == 0, "please make sure that LteHelper::EnableRlcTraces is called at most once");

1375

  NS_ASSERT_MSG (m_rlcStats == 0, "please make sure that LteHelper::EnableRlcTraces is called at most once");

1353

  m_rlcStats = CreateObject<RadioBearerStatsCalculator> ("RLC");

1376

  m_rlcStats = CreateObject<RadioBearerStatsCalculator> ("RLC");

1354

  m_radioBearerStatsConnector.EnableRlcStats (m_rlcStats);

1377

  m_radioBearerStatsConnector.EnableRlcStats (m_rlcStats, m_ueNetDevices, m_enbNetDevices);

1355

1378

1356

1379

1357

int64_t

1380

int64_t

Lines 1414-1442	Link Here

1414

void

1437

void

1415

LteHelper::EnableDlTxPhyTraces (void)

1438

LteHelper::EnableDlTxPhyTraces (void)

1416

1439

1417

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMap/*/LteEnbPhy/DlPhyTransmission",

1440

  std::list<Ptr<LteEnbNetDevice> >::iterator iter;

1418

                   MakeBoundCallback (&PhyTxStatsCalculator::DlPhyTransmissionCallback, m_phyTxStats));

1441

  for (iter = m_enbNetDevices.begin (); iter != m_enbNetDevices.end (); iter ++)

1442

1443

      std::ostringstream path;

1444

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1445

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1446

           << "/ComponentCarrierMap/*/LteEnbPhy/DlPhyTransmission";

1447

      Config::Connect (path.str (),

1448

                       MakeBoundCallback (&PhyTxStatsCalculator::DlPhyTransmissionCallback, m_phyTxStats));

1449

1419

1450

1420

1451

1421

void

1452

void

1422

LteHelper::EnableUlTxPhyTraces (void)

1453

LteHelper::EnableUlTxPhyTraces (void)

1423

1454

1424

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMapUe/*/LteUePhy/UlPhyTransmission",

1455

  std::list<Ptr<LteUeNetDevice> >::iterator iter;

1425

                   MakeBoundCallback (&PhyTxStatsCalculator::UlPhyTransmissionCallback, m_phyTxStats));

1456

  for (iter = m_ueNetDevices.begin (); iter != m_ueNetDevices.end (); iter ++)

1457

1458

      std::ostringstream path;

1459

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1460

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1461

           << "/ComponentCarrierMapUe/*/LteUePhy/UlPhyTransmission";

1462

      Config::Connect (path.str (),

1463

                       MakeBoundCallback (&PhyTxStatsCalculator::UlPhyTransmissionCallback, m_phyTxStats));

1464

1426

1465

1427

1466

1428

void

1467

void

1429

LteHelper::EnableDlRxPhyTraces (void)

1468

LteHelper::EnableDlRxPhyTraces (void)

1430

1469

1431

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMapUe/*/LteUePhy/DlSpectrumPhy/DlPhyReception",

1470

  std::list<Ptr<LteUeNetDevice> >::iterator iter;

1432

                   MakeBoundCallback (&PhyRxStatsCalculator::DlPhyReceptionCallback, m_phyRxStats));

1471

  for (iter = m_ueNetDevices.begin (); iter != m_ueNetDevices.end (); iter ++)

1472

1473

      std::ostringstream path;

1474

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1475

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1476

           << "/ComponentCarrierMapUe/*/LteUePhy/DlSpectrumPhy/DlPhyReception";

1477

      Config::Connect (path.str (),

1478

                       MakeBoundCallback (&PhyRxStatsCalculator::DlPhyReceptionCallback, m_phyRxStats));

1479

1433

1480

1434

1481

1435

void

1482

void

1436

LteHelper::EnableUlRxPhyTraces (void)

1483

LteHelper::EnableUlRxPhyTraces (void)

1437

1484

1438

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMap/*/LteEnbPhy/UlSpectrumPhy/UlPhyReception",

1485

  std::list<Ptr<LteEnbNetDevice> >::iterator iter;

1439

                   MakeBoundCallback (&PhyRxStatsCalculator::UlPhyReceptionCallback, m_phyRxStats));

1486

  for (iter = m_enbNetDevices.begin (); iter != m_enbNetDevices.end (); iter ++)

1487

1488

      std::ostringstream path;

1489

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1490

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1491

           << "/ComponentCarrierMap/*/LteEnbPhy/UlSpectrumPhy/UlPhyReception";

1492

      Config::Connect (path.str (),

1493

                       MakeBoundCallback (&PhyRxStatsCalculator::UlPhyReceptionCallback, m_phyRxStats));

1494

1440

1495

1441

1496

1442

1497

Lines 1452-1486	Link Here

1452

LteHelper::EnableDlMacTraces (void)

1507

LteHelper::EnableDlMacTraces (void)

1453

1508

1454

  NS_LOG_FUNCTION_NOARGS ();

1509

  NS_LOG_FUNCTION_NOARGS ();

1455

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMap/*/LteEnbMac/DlScheduling",

1510

  std::list<Ptr<LteEnbNetDevice> >::iterator iter;

1456

                   MakeBoundCallback (&MacStatsCalculator::DlSchedulingCallback, m_macStats));

1511

  for (iter = m_enbNetDevices.begin (); iter != m_enbNetDevices.end (); iter ++)

1512

1513

      std::ostringstream path;

1514

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1515

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1516

           << "/ComponentCarrierMap/*/LteEnbMac/DlScheduling";

1517

      Config::Connect (path.str (),

1518

                       MakeBoundCallback (&MacStatsCalculator::DlSchedulingCallback, m_macStats));

1519

1457

1520

1458

1521

1459

void

1522

void

1460

LteHelper::EnableUlMacTraces (void)

1523

LteHelper::EnableUlMacTraces (void)

1461

1524

1462

  NS_LOG_FUNCTION_NOARGS ();

1525

  NS_LOG_FUNCTION_NOARGS ();

1463

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMap/*/LteEnbMac/UlScheduling",

1526

  std::list<Ptr<LteEnbNetDevice> >::iterator iter;

1464

                   MakeBoundCallback (&MacStatsCalculator::UlSchedulingCallback, m_macStats));

1527

  for (iter = m_enbNetDevices.begin (); iter != m_enbNetDevices.end (); iter ++)

1528

1529

      std::ostringstream path;

1530

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1531

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1532

           << "/ComponentCarrierMap/*/LteEnbMac/UlScheduling";

1533

      Config::Connect (path.str (),

1534

                       MakeBoundCallback (&MacStatsCalculator::UlSchedulingCallback, m_macStats));

1535

1465

1536

1466

1537

1467

void

1538

void

1468

LteHelper::EnableDlPhyTraces (void)

1539

LteHelper::EnableDlPhyTraces (void)

1469

1540

1470

  NS_LOG_FUNCTION_NOARGS ();

1541

  NS_LOG_FUNCTION_NOARGS ();

1471

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMapUe/*/LteUePhy/ReportCurrentCellRsrpSinr",

1542

  std::list<Ptr<LteUeNetDevice> >::iterator iter;

1472

                   MakeBoundCallback (&PhyStatsCalculator::ReportCurrentCellRsrpSinrCallback, m_phyStats));

1543

  for (iter = m_ueNetDevices.begin (); iter != m_ueNetDevices.end (); iter ++)

1544

1545

      std::ostringstream path;

1546

      path << "/NodeList/" << (*iter)->GetNode ()->GetId ()

1547

           << "/DeviceList/" << (*iter)->GetIfIndex ()

1548

           << "/ComponentCarrierMapUe/*/LteUePhy/ReportCurrentCellRsrpSinr";

1549

      Config::Connect (path.str (),

1550

                       MakeBoundCallback (&PhyStatsCalculator::ReportCurrentCellRsrpSinrCallback, m_phyStats));

1551

1473

1552

1474

1553

1475

void

1554

void

1476

LteHelper::EnableUlPhyTraces (void)

1555

LteHelper::EnableUlPhyTraces (void)

1477

1556

1478

  NS_LOG_FUNCTION_NOARGS ();

1557

  NS_LOG_FUNCTION_NOARGS ();

1479

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMap/*/LteEnbPhy/ReportUeSinr",

1558

  std::list<Ptr<LteEnbNetDevice> >::iterator iter;

1480

                   MakeBoundCallback (&PhyStatsCalculator::ReportUeSinr, m_phyStats));

1559

  for (iter = m_enbNetDevices.begin (); iter != m_enbNetDevices.end (); iter ++)

1481

  Config::Connect ("/NodeList/*/DeviceList/*/ComponentCarrierMap/*/LteEnbPhy/ReportInterference",

1560

1482

                   MakeBoundCallback (&PhyStatsCalculator::ReportInterference, m_phyStats));

1561

      std::string basePath;

1483

1562

      basePath = "/NodeList/" + std::to_string ((*iter)->GetNode ()->GetId ()) + "/DeviceList/" + std::to_string ((*iter)->GetIfIndex ());

1563

      Config::Connect (basePath + "/ComponentCarrierMap/*/LteEnbPhy/ReportUeSinr",

1564

                       MakeBoundCallback (&PhyStatsCalculator::ReportUeSinr, m_phyStats));

1565

      Config::Connect (basePath + "/ComponentCarrierMap/*/LteEnbPhy/ReportInterference",

1566

                       MakeBoundCallback (&PhyStatsCalculator::ReportInterference, m_phyStats));

1567

1484

1568

1485

1569

1486

Ptr<RadioBearerStatsCalculator>

1570

Ptr<RadioBearerStatsCalculator>

Lines 1494-1500	Link Here

1494

1578

1495

  NS_ASSERT_MSG (m_pdcpStats == 0, "please make sure that LteHelper::EnablePdcpTraces is called at most once");

1579

  NS_ASSERT_MSG (m_pdcpStats == 0, "please make sure that LteHelper::EnablePdcpTraces is called at most once");

1496

  m_pdcpStats = CreateObject<RadioBearerStatsCalculator> ("PDCP");

1580

  m_pdcpStats = CreateObject<RadioBearerStatsCalculator> ("PDCP");

1497

  m_radioBearerStatsConnector.EnablePdcpStats (m_pdcpStats);

1581

  m_radioBearerStatsConnector.EnablePdcpStats (m_pdcpStats, m_ueNetDevices, m_enbNetDevices);

1498

1582

1499

1583

1500

Ptr<RadioBearerStatsCalculator>

1584

Ptr<RadioBearerStatsCalculator>

(-)a/src/lte/helper/lte-helper.h (-2 / +28 lines)

Lines 42-47	Link Here

#include <ns3/component-carrier-enb.h>

#include <ns3/component-carrier-enb.h>

#include <ns3/cc-helper.h>

#include <ns3/cc-helper.h>

#include <map>

#include <map>

#include <list>

namespace ns3 {

namespace ns3 {

Lines 52-57	Link Here

class EpcHelper;

class EpcHelper;

class PropagationLossModel;

class PropagationLossModel;

class SpectrumPropagationLossModel;

class SpectrumPropagationLossModel;

class LteUeNetDevice;

/**

/**

 * \ingroup lte

 * \ingroup lte

Lines 677-682	Link Here

677

*/

680

*/

678

  Ptr<SpectrumChannel> GetDownlinkSpectrumChannel (void) const;

681

  Ptr<SpectrumChannel> GetDownlinkSpectrumChannel (void) const;

679

682

683

/**

684

   * Set the SpectrumChannel instance used for the uplink

685

   * \param ulChannel a pointer to the SpectrumChannel instance used for the uplink

686

*/

687

  void SetUplinkSpectrumChannel (Ptr<SpectrumChannel> ulChannel);

688

689

690

/**

691

   * Set the SpectrumChannel instance used for the downlink

692

   * \param dlChannel a pointer to the SpectrumChannel instance used for the downlink

693

*/

694

  void SetDownlinkSpectrumChannel (Ptr<SpectrumChannel> dlChannel);

695

680

696

681

protected:

697

protected:

682

  // inherited from Object

698

  // inherited from Object

Lines 812-824	Link Here

812

   * new UE is installed (by InstallSingleUeDevice()). The first UE will have

828

   * new UE is installed (by InstallSingleUeDevice()). The first UE will have

813

   * an IMSI of 1. The maximum number of UE is 2^64 (~4.2e9).

829

   * an IMSI of 1. The maximum number of UE is 2^64 (~4.2e9).

814

*/

830

*/

815

  uint64_t m_imsiCounter;

831

  static uint64_t m_imsiCounter;

816

/**

832

/**

817

   * Keep track of the number of cell ID allocated. Increases by one every time

833

   * Keep track of the number of cell ID allocated. Increases by one every time

818

   * a new eNodeB is installed (by InstallSingleEnbDevice()). The first eNodeB

834

   * a new eNodeB is installed (by InstallSingleEnbDevice()). The first eNodeB

819

   * will have a cell ID of 1. The maximum number of eNodeB is 65535.

835

   * will have a cell ID of 1. The maximum number of eNodeB is 65535.

820

*/

836

*/

821

  uint16_t m_cellIdCounter;

837

  static uint16_t m_cellIdCounter;

822

838

823

/**

839

/**

824

   * The `UseIdealRrc` attribute. If true, LteRrcProtocolIdeal will be used for

840

   * The `UseIdealRrc` attribute. If true, LteRrcProtocolIdeal will be used for

Lines 855-860	Link Here

855

*/

871

*/

856

  uint16_t m_noOfCcs;

872

  uint16_t m_noOfCcs;

857

873

874

/**

875

   * List of the UEs installed by this helper

876

*/

877

  std::list<Ptr<LteUeNetDevice> > m_ueNetDevices;

878

879

/**

880

   * List of the eNB installed by this helper

881

*/

882

  std::list<Ptr<LteEnbNetDevice> > m_enbNetDevices;

883

858

};   // end of `class LteHelper`

884

};   // end of `class LteHelper`

859

885

860

886

(-)a/src/lte/helper/point-to-point-epc-helper.cc (-13 / +46 lines)

Lines 18-23	Link Here

 * Author: Jaume Nin <jnin@cttc.es>

 * Author: Jaume Nin <jnin@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manoj Kumar Rana <manoj24.rana@gmail.com>

*/

*/

#include <ns3/point-to-point-epc-helper.h>

#include <ns3/point-to-point-epc-helper.h>

Lines 26-31	Link Here

#include <ns3/mac48-address.h>

#include <ns3/mac48-address.h>

#include <ns3/eps-bearer.h>

#include <ns3/eps-bearer.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address.h>

#include <ns3/ipv4-address-generator.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/internet-stack-helper.h>

#include <ns3/point-to-point-helper.h>

#include <ns3/point-to-point-helper.h>

#include <ns3/packet-socket-helper.h>

#include <ns3/packet-socket-helper.h>

Lines 52-67	Link Here

  NS_LOG_FUNCTION (this);

  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,

  // since we use point-to-point links for all S1-U links,

  // we use a /30 subnet which can hold exactly two addresses

  // we use a /30 subnet which can hold exactly two addresses

  // (remember that net broadcast and null address are not valid)

  // (remember that net broadcast and null address are not valid)

  m_s1uIpv4AddressHelper.SetBase ("10.0.0.0", "255.255.255.252");

  Ipv4Address s1uIpv4AddressNet = Ipv4Address ("10.0.0.0");

  Ipv4AddressGenerator::Init (s1uIpv4AddressNet, Ipv4Mask ("255.255.0.0"));

  m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252");

  while (!Ipv4AddressGenerator::IsNetworkAllocated (s1uIpv4AddressNet, Ipv4Mask ("255.255.0.0")))

      s1uIpv4AddressNet = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

  m_s1uIpv4AddressHelper.SetBase (s1uIpv4AddressNet, "255.255.255.252");

  // we use a /8 net for all UEs

  Ipv4Address x2Ipv4AddressNet = Ipv4Address ("12.0.0.0");

  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");

  Ipv4AddressGenerator::Init (x2Ipv4AddressNet, Ipv4Mask ("255.255.0.0"));

  while (!Ipv4AddressGenerator::IsNetworkAllocated (x2Ipv4AddressNet, Ipv4Mask ("255.255.0.0")))

      x2Ipv4AddressNet = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));

  m_x2Ipv4AddressHelper.SetBase (x2Ipv4AddressNet, "255.255.255.252");

  // 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::IsNetworkAllocated (m_uePgwCurrentIpv4Prefix, 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

  // create SgwPgwNode

  m_sgwPgw = CreateObject<Node> ();

  m_sgwPgw = CreateObject<Node> ();

  InternetStackHelper internet;

  InternetStackHelper internet;

Lines 144-153	Link Here

144

                   UintegerValue (3000),

170

                   UintegerValue (3000),

145

                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),

171

                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),

146

                   MakeUintegerChecker<uint16_t> ())

172

                   MakeUintegerChecker<uint16_t> ())

147

173

     .AddAttribute ("BaseIpv4Prefix",

174

                    "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.",

175

                    Ipv4AddressValue (Ipv4Address ("7.0.0.0")),

176

                    MakeIpv4AddressAccessor (&PointToPointEpcHelper::m_uePgwBaseIpv4Prefix),

177

                    MakeIpv4AddressChecker ())

178

148

  return tid;

179

  return tid;

149

180

150

181

182

TypeId

183

PointToPointEpcHelper::GetInstanceTypeId () const

184

185

  return GetTypeId ();

186

187

151

void

188

void

152

PointToPointEpcHelper::DoDispose ()

189

PointToPointEpcHelper::DoDispose ()

153

190

Lines 184-191	Link Here

184

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after installing p2p dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

221

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after installing p2p dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

185

  Ptr<NetDevice> enbDev = enbSgwDevices.Get (0);

222

  Ptr<NetDevice> enbDev = enbSgwDevices.Get (0);

186

  Ptr<NetDevice> sgwDev = enbSgwDevices.Get (1);

223

  Ptr<NetDevice> sgwDev = enbSgwDevices.Get (1);

224

  Ipv4InterfaceContainer enbSgwIpIfaces = m_s1uIpv4AddressHelper.Assign (enbSgwDevices);

187

  m_s1uIpv4AddressHelper.NewNetwork ();

225

  m_s1uIpv4AddressHelper.NewNetwork ();

188

  Ipv4InterfaceContainer enbSgwIpIfaces = m_s1uIpv4AddressHelper.Assign (enbSgwDevices);

189

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after assigning Ipv4 addr to S1 dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

226

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB after assigning Ipv4 addr to S1 dev: " << enb->GetObject<Ipv4> ()->GetNInterfaces ());

190

227

191

  Ipv4Address enbAddress = enbSgwIpIfaces.GetAddress (0);

228

  Ipv4Address enbAddress = enbSgwIpIfaces.GetAddress (0);

Lines 255-262	Link Here

255

  Ptr<NetDevice> enb1Dev = enbDevices.Get (0);

292

  Ptr<NetDevice> enb1Dev = enbDevices.Get (0);

256

  Ptr<NetDevice> enb2Dev = enbDevices.Get (1);

293

  Ptr<NetDevice> enb2Dev = enbDevices.Get (1);

257

294

295

  Ipv4InterfaceContainer enbIpIfaces = m_x2Ipv4AddressHelper.Assign (enbDevices);

258

  m_x2Ipv4AddressHelper.NewNetwork ();

296

  m_x2Ipv4AddressHelper.NewNetwork ();

259

  Ipv4InterfaceContainer enbIpIfaces = m_x2Ipv4AddressHelper.Assign (enbDevices);

260

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after assigning Ipv4 addr to X2 dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());

297

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #1 after assigning Ipv4 addr to X2 dev: " << enb1->GetObject<Ipv4> ()->GetNInterfaces ());

261

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after assigning Ipv4 addr to X2 dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());

298

  NS_LOG_LOGIC ("number of Ipv4 ifaces of the eNB #2 after assigning Ipv4 addr to X2 dev: " << enb2->GetObject<Ipv4> ()->GetNInterfaces ());

262

299

Lines 319-340	Link Here

319

  return bearerId;

356

  return bearerId;

320

357

321

358

322

323

Ptr<Node>

359

Ptr<Node>

324

PointToPointEpcHelper::GetPgwNode ()

360

PointToPointEpcHelper::GetPgwNode ()

325

361

326

  return m_sgwPgw;

362

  return m_sgwPgw;

327

363

328

364

329

330

Ipv4InterfaceContainer

365

Ipv4InterfaceContainer

331

PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)

366

PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)

332

367

333

  return m_ueAddressHelper.Assign (ueDevices);

368

  return m_ueAddressHelper.Assign (ueDevices);

334

369

335

370

336

337

338

Ipv4Address

371

Ipv4Address

339

PointToPointEpcHelper::GetUeDefaultGatewayAddress ()

372

PointToPointEpcHelper::GetUeDefaultGatewayAddress ()

340

373

(-)a/src/lte/helper/point-to-point-epc-helper.h (-1 / +24 lines)

Lines 18-23	Link Here

 * Author: Jaume Nin <jnin@cttc.es>

 * Author: Jaume Nin <jnin@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Nicola Baldo <nbaldo@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manuel Requena <manuel.requena@cttc.es>

 *         Manoj Kumar Rana <manoj24.rana@gmail.com>

*/

*/

#ifndef POINT_TO_POINT_EPC_HELPER_H

#ifndef POINT_TO_POINT_EPC_HELPER_H

Lines 68-75	Link Here

   *  \return The object TypeId.

   *  \return The object TypeId.

*/

*/

  static TypeId GetTypeId (void);

  static TypeId GetTypeId (void);

  TypeId GetInstanceTypeId () const;

  virtual void DoDispose ();

  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

  // inherited from EpcHelper

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);

Lines 84-94	Link Here

private:

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;

  Ipv4AddressHelper m_ueAddressHelper;

100

/**

101

/**

102

   * The common 8 bit prefix used for the IPv4 address assignment of

103

   * all the EPC networks

104

*/

105

  Ipv4Address m_uePgwBaseIpv4Prefix;

106

107

/**

108

   * The 16 bit prefix used for the IPv4 address assignment of

109

   * the UE and PGW.

110

   * The current IPv4 prefix will be the first available one in the /8 pool.

111

*/

112

  Ipv4Address m_uePgwCurrentIpv4Prefix;

113

114

/**

   * SGW-PGW network element

115

   * SGW-PGW network element

*/

116

*/

  Ptr<Node> m_sgwPgw;

117

  Ptr<Node> m_sgwPgw;

(-)a/src/lte/helper/radio-bearer-stats-connector.cc (-21 / +42 lines)

Lines 28-33	Link Here

#include <ns3/lte-enb-net-device.h>

#include <ns3/lte-enb-net-device.h>

#include <ns3/lte-ue-rrc.h>

#include <ns3/lte-ue-rrc.h>

#include <ns3/lte-ue-net-device.h>

#include <ns3/lte-ue-net-device.h>

#include <ns3/node.h>

#include <string>

namespace ns3 {

namespace ns3 {

Lines 132-172	Link Here

132

134

133

135

134

void

136

void

135

RadioBearerStatsConnector::EnableRlcStats (Ptr<RadioBearerStatsCalculator> rlcStats)

137

RadioBearerStatsConnector::EnableRlcStats (Ptr<RadioBearerStatsCalculator> rlcStats,

138

                                           std::list<Ptr<LteUeNetDevice> > ueNetDevices,

139

                                           std::list<Ptr<LteEnbNetDevice> > enbNetDevices)

136

140

137

  m_rlcStats = rlcStats;

141

  m_rlcStats = rlcStats;

138

  EnsureConnected ();

142

  EnsureConnected (ueNetDevices, enbNetDevices);

139

143

140

144

141

void

145

void

142

RadioBearerStatsConnector::EnablePdcpStats (Ptr<RadioBearerStatsCalculator> pdcpStats)

146

RadioBearerStatsConnector::EnablePdcpStats (Ptr<RadioBearerStatsCalculator> pdcpStats,

147

                                            std::list<Ptr<LteUeNetDevice> > ueNetDevices,

148

                                            std::list<Ptr<LteEnbNetDevice> > enbNetDevices)

143

149

144

  m_pdcpStats = pdcpStats;

150

  m_pdcpStats = pdcpStats;

145

  EnsureConnected ();

151

  EnsureConnected (ueNetDevices, enbNetDevices);

146

152

147

153

148

void

154

void

149

RadioBearerStatsConnector::EnsureConnected ()

155

RadioBearerStatsConnector::EnsureConnected (std::list<Ptr<LteUeNetDevice> > ueNetDevices,

156

                                            std::list<Ptr<LteEnbNetDevice> > enbNetDevices)

150

157

151

  NS_LOG_FUNCTION (this);

158

  NS_LOG_FUNCTION (this);

152

  if (!m_connected)

159

  if (!m_connected)

153

160

154

      Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/NewUeContext",

161

      for (std::list<Ptr<LteEnbNetDevice> >::iterator iter = enbNetDevices.begin ();

155

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyNewUeContextEnb, this));

162

          iter != enbNetDevices.end ();

156

      Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/RandomAccessSuccessful",

163

          iter ++)

157

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyRandomAccessSuccessfulUe, this));

164

158

      Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/ConnectionReconfiguration",

165

          std::string basePath;

159

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyConnectionReconfigurationEnb, this));

166

          basePath = "/NodeList/" + std::to_string ((*iter)->GetNode ()->GetId ()) + "/DeviceList/" + std::to_string ((*iter)->GetIfIndex ());

160

      Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/ConnectionReconfiguration",

167

          Config::Connect (basePath + "/LteEnbRrc/NewUeContext",

161

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyConnectionReconfigurationUe, this));

168

                           MakeBoundCallback (&RadioBearerStatsConnector::NotifyNewUeContextEnb, this));

162

      Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverStart",

169

          Config::Connect (basePath + "/LteEnbRrc/ConnectionReconfiguration",

163

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverStartEnb, this));

170

                           MakeBoundCallback (&RadioBearerStatsConnector::NotifyConnectionReconfigurationEnb, this));

164

      Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverStart",

171

          Config::Connect (basePath + "/LteEnbRrc/HandoverStart",

165

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverStartUe, this));

172

                            MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverStartEnb, this));

166

      Config::Connect ("/NodeList/*/DeviceList/*/LteEnbRrc/HandoverEndOk",

173

          Config::Connect (basePath + "/LteEnbRrc/HandoverEndOk",

167

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverEndOkEnb, this));

174

                            MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverEndOkEnb, this));

168

      Config::Connect ("/NodeList/*/DeviceList/*/LteUeRrc/HandoverEndOk",

175

169

		       MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverEndOkUe, this));

176

      for (std::list<Ptr<LteUeNetDevice> >::iterator iter = ueNetDevices.begin ();

177

          iter != ueNetDevices.end ();

178

          iter ++)

179

180

          std::string basePath;

181

          basePath = "/NodeList/" + std::to_string ((*iter)->GetNode ()->GetId ()) + "/DeviceList/" + std::to_string ((*iter)->GetIfIndex ());

182

          Config::Connect (basePath + "/LteUeRrc/RandomAccessSuccessful",

183

                           MakeBoundCallback (&RadioBearerStatsConnector::NotifyRandomAccessSuccessfulUe, this));

184

          Config::Connect (basePath + "/LteUeRrc/ConnectionReconfiguration",

185

                           MakeBoundCallback (&RadioBearerStatsConnector::NotifyConnectionReconfigurationUe, this));

186

          Config::Connect (basePath + "/LteUeRrc/HandoverStart",

187

                           MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverStartUe, this));

188

          Config::Connect (basePath + "/LteUeRrc/HandoverEndOk",

189

                           MakeBoundCallback (&RadioBearerStatsConnector::NotifyHandoverEndOkUe, this));

190

170

      m_connected = true;

191

      m_connected = true;

171

192

172

193

(-)a/src/lte/helper/radio-bearer-stats-connector.h (-4 / +16 lines)

Lines 35-40	Link Here

namespace ns3 {

namespace ns3 {

class RadioBearerStatsCalculator;

class RadioBearerStatsCalculator;

class LteUeNetDevice;

class LteEnbNetDevice;

/**

/**

 * \ingroup lte

 * \ingroup lte

Lines 57-76	Link Here

   * Enables trace sinks for RLC layer. Usually, this function

   * Enables trace sinks for RLC layer. Usually, this function

   * is called by LteHelper::EnableRlcTraces().

   * is called by LteHelper::EnableRlcTraces().

   * \param rlcStats statistics calculator for RLC layer

   * \param rlcStats statistics calculator for RLC layer

   * \param ueNetDevices list of the UE to connect

   * \param enbNetDevices list of the eNB to connect

*/

*/

  void EnableRlcStats (Ptr<RadioBearerStatsCalculator> rlcStats);

  void EnableRlcStats (Ptr<RadioBearerStatsCalculator> rlcStats,

                       std::list<Ptr<LteUeNetDevice> > ueNetDevices,

                       std::list<Ptr<LteEnbNetDevice> > enbNetDevices);

/**

/**

   * Enables trace sinks for PDCP layer. Usually, this function

   * Enables trace sinks for PDCP layer. Usually, this function

   * is called by LteHelper::EnablePdcpTraces().

   * is called by LteHelper::EnablePdcpTraces().

   * \param pdcpStats statistics calculator for PDCP layer

   * \param pdcpStats statistics calculator for PDCP layer

   * \param ueNetDevices list of the UE to connect

   * \param enbNetDevices list of the eNB to connect

*/

*/

  void EnablePdcpStats (Ptr<RadioBearerStatsCalculator> pdcpStats);

  void EnablePdcpStats (Ptr<RadioBearerStatsCalculator> pdcpStats,

                        std::list<Ptr<LteUeNetDevice> > ueNetDevices,

                        std::list<Ptr<LteEnbNetDevice> > enbNetDevices);

/**

/**

   * Connects trace sinks to appropriate trace sources

   * Connects trace sinks to appropriate trace sources

   * \param ueNetDevices list of the UE to connect

   * \param enbNetDevices list of the eNB to connect

*/

*/

  void EnsureConnected ();

  void EnsureConnected (std::list<Ptr<LteUeNetDevice> > ueNetDevices,

                        std::list<Ptr<LteEnbNetDevice> > enbNetDevices);

  // trace sinks, to be used with MakeBoundCallback

  // trace sinks, to be used with MakeBoundCallback

(-)a/src/lte/model/lte-enb-rrc.cc (+2 lines)

Lines 857-862	Link Here

857

UeManager::RecvRrcConnectionRequest (LteRrcSap::RrcConnectionRequest msg)

857

UeManager::RecvRrcConnectionRequest (LteRrcSap::RrcConnectionRequest msg)

858

859

  NS_LOG_FUNCTION (this);

859

  NS_LOG_FUNCTION (this);

860

  switch (m_state)

861

  switch (m_state)

861

862

    case INITIAL_RANDOM_ACCESS:

863

    case INITIAL_RANDOM_ACCESS:

Lines 910-915	Link Here

910

UeManager::RecvRrcConnectionSetupCompleted (LteRrcSap::RrcConnectionSetupCompleted msg)

911

UeManager::RecvRrcConnectionSetupCompleted (LteRrcSap::RrcConnectionSetupCompleted msg)

911

912

  NS_LOG_FUNCTION (this);

913

  NS_LOG_FUNCTION (this);

914

913

  switch (m_state)

915

  switch (m_state)

914

916

915

    case CONNECTION_SETUP:

917

    case CONNECTION_SETUP:

(-)a/src/lte/test/epc-test-s1u-downlink.cc (-1 / +1 lines)

Lines 153-159	Link Here

153

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

153

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

154

155

  // hardcoded UE addresses for now

155

  // hardcoded UE addresses for now

156

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1);

156

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

157

158

159

(-)a/src/lte/test/epc-test-s1u-uplink.cc (-1 / +1 lines)

Lines 370-376	Link Here

370

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

370

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

371

372

  // hardcoded UE addresses for now

372

  // hardcoded UE addresses for now

373

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1);

373

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

374

375

376

(-)a/src/lte/test/lte-test-cell-selection.cc (-1 / +1 lines)

Lines 308-314	Link Here

308

      // Routing of the Internet Host (towards the LTE network)

308

      // Routing of the Internet Host (towards the LTE network)

309

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

309

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

310

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

310

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

311

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

311

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

312

313

      // Install the IP stack on the UEs

313

      // Install the IP stack on the UEs

314

      internet.Install (ueNodes);

314

      internet.Install (ueNodes);

(-)a/src/lte/test/lte-test-cqa-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 303-309	Link Here

303

304

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

304

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

305

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

305

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

306

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

306

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

307

308

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

308

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

309

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

309

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 546-552	Link Here

546

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

550

551

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-deactivate-bearer.cc (-1 / +1 lines)

Lines 164-170	Link Here

164

165

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

165

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

166

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

166

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

167

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

167

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

168

169

  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);

169

  // LogLevel logLevel = (LogLevel)(LOG_PREFIX_FUNC | LOG_PREFIX_TIME | LOG_LEVEL_ALL);

170

(-)a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 299-305	Link Here

299

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

303

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 545-551	Link Here

545

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

549

550

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-frequency-reuse.cc (-1 / +1 lines)

Lines 1464-1470	Link Here

1464

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1464

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1465

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1465

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1466

  // interface 0 is localhost, 1 is the p2p device

1466

  // interface 0 is localhost, 1 is the p2p device

1467

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

1467

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

1468

1469

  // Create Nodes: eNodeB and UE

1469

  // Create Nodes: eNodeB and UE

1470

  NodeContainer enbNodes;

1470

  NodeContainer enbNodes;

(-)a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 300-306	Link Here

300

301

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

301

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

302

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

302

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

303

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

303

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

304

305

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

305

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

306

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

306

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 546-552	Link Here

546

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

549

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

550

551

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

552

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc (-2 / +2 lines)

Lines 299-305	Link Here

299

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

300

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

301

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

302

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

303

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

304

  //Config::SetDefault ("ns3::LteAmc::AmcModel", EnumValue (LteAmc::PiroEW2010));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

305

  //Config::SetDefault ("ns3::LteAmc::Ber", DoubleValue (0.00005));

Lines 545-551	Link Here

545

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

546

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

547

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

548

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

549

550

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

551

//   LogComponentDisableAll (LOG_LEVEL_ALL);

(-)a/src/lte/test/lte-test-ue-measurements.cc (-1 / +1 lines)

Lines 1744-1750	Link Here

1744

  // Routing of the Internet Host (towards the LTE network)

1744

  // Routing of the Internet Host (towards the LTE network)

1745

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1745

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

1746

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1746

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

1747

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

1747

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

1748

1749

  // Enable layer-3 filtering

1749

  // Enable layer-3 filtering

1750

  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",

1750

  Config::SetDefault ("ns3::LteEnbRrc::RsrpFilterCoefficient",

(-)a/src/lte/test/test-lte-epc-e2e-data.cc (-1 / +1 lines)

Lines 177-183	Link Here

177

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

177

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

178

179

  // hardcoded UE addresses for now

179

  // hardcoded UE addresses for now

180

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.255.0"), 1);

180

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

181

182

183

  NodeContainer enbs;

183

  NodeContainer enbs;

(-)a/src/lte/test/test-lte-handover-target.cc (-1 / +1 lines)

Lines 318-324	Link Here

318

  // Routing of the Internet Host (towards the LTE network)

318

  // Routing of the Internet Host (towards the LTE network)

319

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

319

  Ipv4StaticRoutingHelper ipv4RoutingHelper;

320

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

320

  Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

321

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

321

  remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

322

323

  // Create Devices and install them in the Nodes (eNB and UE)

323

  // Create Devices and install them in the Nodes (eNB and UE)

324

  NetDeviceContainer enbDevs;

324

  NetDeviceContainer enbDevs;

(-)a/src/lte/test/test-lte-x2-handover.cc (-1 / +1 lines)

Lines 280-286	Link Here

280

281

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

281

      Ipv4StaticRoutingHelper ipv4RoutingHelper;

282

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

282

      Ptr<Ipv4StaticRouting> remoteHostStaticRouting = ipv4RoutingHelper.GetStaticRouting (remoteHost->GetObject<Ipv4> ());

283

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.0.0.0"), 1);

283

      remoteHostStaticRouting->AddNetworkRouteTo (Ipv4Address ("7.0.0.0"), Ipv4Mask ("255.255.0.0"), 1);

284

285

      // Install the IP stack on the UEs

285

      // Install the IP stack on the UEs

286

      internet.Install (ueNodes);

286

      internet.Install (ueNodes);

Return to bug 2835