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
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
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
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
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
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
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
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
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
104
105
  NodeContainer ueNodes;
105
  NodeContainer ueNodes;
106
  NodeContainer enbNodes;
106
  NodeContainer enbNodes;
(-)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
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
191
192
  NodeContainer ueNodes;
192
  NodeContainer ueNodes;
193
  NodeContainer enbNodes;
193
  NodeContainer enbNodes;
(-)a/src/lte/helper/emu-epc-helper.cc (-3 / +22 lines)
 Lines 26-31    Link Here 
26
#include <ns3/mac48-address.h>
26
#include <ns3/mac48-address.h>
27
#include <ns3/eps-bearer.h>
27
#include <ns3/eps-bearer.h>
28
#include <ns3/ipv4-address.h>
28
#include <ns3/ipv4-address.h>
29
#include <ns3/ipv4-address-generator.h>
29
#include <ns3/internet-stack-helper.h>
30
#include <ns3/internet-stack-helper.h>
30
#include <ns3/packet-socket-helper.h>
31
#include <ns3/packet-socket-helper.h>
31
#include <ns3/packet-socket-address.h>
32
#include <ns3/packet-socket-address.h>
 Lines 91-110    Link Here 
91
                   StringValue ("00:00:00:eb:00"),
92
                   StringValue ("00:00:00:eb:00"),
92
                   MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase),
93
                   MakeStringAccessor (&EmuEpcHelper::m_enbMacAddressBase),
93
                   MakeStringChecker ())
94
                   MakeStringChecker ())
95
    .AddAttribute ("BaseIpv4Prefix",
96
                   "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.",
97
                   Ipv4AddressValue (Ipv4Address ("7.0.0.0")),
98
                   MakeIpv4AddressAccessor (&EmuEpcHelper::m_uePgwBaseIpv4Prefix),
99
                   MakeIpv4AddressChecker ())
94
    ;
100
    ;
95
  return tid;
101
  return tid;
96
}
102
}
97
103
104
TypeId
105
EmuEpcHelper::GetInstanceTypeId () const
106
{
107
  return GetTypeId ();
108
}
109
110
98
void
111
void
99
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 
70
   *  \return The object TypeId.
70
   *  \return The object TypeId.
71
   */
71
   */
72
  static TypeId GetTypeId (void);
72
  static TypeId GetTypeId (void);
73
  TypeId GetInstanceTypeId () const;
73
  virtual void DoInitialize ();
74
  virtual void DoInitialize ();
74
  virtual void DoDispose ();
75
  virtual void DoDispose ();
75
76
77
  /**
78
   * Get the IPv4 network address used by the EPC.
79
   * The EPC will use a /16 network address.
80
   *
81
   * \returns The EPC IPv4 network address.
82
   */
83
  Ipv4Address GetEpcIpv4NetworkAddress ();
84
76
  // inherited from EpcHelper
85
  // inherited from EpcHelper
77
  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);
86
  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);
78
  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
87
  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
 Lines 92-97    Link Here 
92
  Ipv4AddressHelper m_ueAddressHelper; 
101
  Ipv4AddressHelper m_ueAddressHelper; 
93
102
94
  /**
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
  /**
95
   * SGW-PGW network element
117
   * SGW-PGW network element
96
   */  
118
   */  
97
  Ptr<Node> m_sgwPgw; 
119
  Ptr<Node> m_sgwPgw; 
(-)a/src/lte/helper/point-to-point-epc-helper.cc (-7 / +28 lines)
 Lines 18-23    Link Here 
18
 * Author: Jaume Nin <jnin@cttc.es>
18
 * Author: Jaume Nin <jnin@cttc.es>
19
 *         Nicola Baldo <nbaldo@cttc.es>
19
 *         Nicola Baldo <nbaldo@cttc.es>
20
 *         Manuel Requena <manuel.requena@cttc.es>
20
 *         Manuel Requena <manuel.requena@cttc.es>
21
 *         Manoj Kumar Rana <manoj24.rana@gmail.com>
21
 */
22
 */
22
23
23
#include <ns3/point-to-point-epc-helper.h>
24
#include <ns3/point-to-point-epc-helper.h>
 Lines 26-31    Link Here 
26
#include <ns3/mac48-address.h>
27
#include <ns3/mac48-address.h>
27
#include <ns3/eps-bearer.h>
28
#include <ns3/eps-bearer.h>
28
#include <ns3/ipv4-address.h>
29
#include <ns3/ipv4-address.h>
30
#include <ns3/ipv4-address-generator.h>
29
#include <ns3/internet-stack-helper.h>
31
#include <ns3/internet-stack-helper.h>
30
#include <ns3/point-to-point-helper.h>
32
#include <ns3/point-to-point-helper.h>
31
#include <ns3/packet-socket-helper.h>
33
#include <ns3/packet-socket-helper.h>
 Lines 52-57    Link Here 
52
{
54
{
53
  NS_LOG_FUNCTION (this);
55
  NS_LOG_FUNCTION (this);
54
56
57
  // To access the attribute value within the constructor
58
  ObjectBase::ConstructSelf (AttributeConstructionList ());
59
55
  // since we use point-to-point links for all S1-U links, 
60
  // since we use point-to-point links for all S1-U links, 
56
  // we use a /30 subnet which can hold exactly two addresses 
61
  // we use a /30 subnet which can hold exactly two addresses 
57
  // (remember that net broadcast and null address are not valid)
62
  // (remember that net broadcast and null address are not valid)
 Lines 59-66    Link Here 
59
64
60
  m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252");
65
  m_x2Ipv4AddressHelper.SetBase ("12.0.0.0", "255.255.255.252");
61
66
62
  // we use a /8 net for all UEs
67
  // we use a /16 bit IPv4 net for an EPC network
63
  m_ueAddressHelper.SetBase ("7.0.0.0", "255.0.0.0");
68
  m_uePgwCurrentIpv4Prefix = m_uePgwBaseIpv4Prefix.CombineMask (Ipv4Mask ("255.0.0.0"));  //Initialize
69
  Ipv4AddressGenerator::Init (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0"));
70
71
  while (!Ipv4AddressGenerator::IsNetworkAllocated (m_uePgwCurrentIpv4Prefix, Ipv4Mask ("255.255.0.0")))
72
    {
73
      m_uePgwCurrentIpv4Prefix = Ipv4AddressGenerator::NextNetwork (Ipv4Mask ("255.255.0.0"));
74
    }
75
76
  m_ueAddressHelper.SetBase (m_uePgwCurrentIpv4Prefix, "255.255.0.0"); //The helper will assign IPv4 addresses using this 16 bit prefix
77
  //Now we get an unique 16 bit IPv4 prefix for this EPC, which not used by any other EPC
64
  
78
  
65
  // create SgwPgwNode
79
  // create SgwPgwNode
66
  m_sgwPgw = CreateObject<Node> ();
80
  m_sgwPgw = CreateObject<Node> ();
 Lines 144-153    Link Here 
144
                   UintegerValue (3000),
158
                   UintegerValue (3000),
145
                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),
159
                   MakeUintegerAccessor (&PointToPointEpcHelper::m_x2LinkMtu),
146
                   MakeUintegerChecker<uint16_t> ())
160
                   MakeUintegerChecker<uint16_t> ())
147
  ;
161
     .AddAttribute ("BaseIpv4Prefix",
162
                    "The 8 bit IPv4 prefix to be used for the assignment of IPv4 addresses to PGW and UE.",
163
                    Ipv4AddressValue (Ipv4Address ("7.0.0.0")),
164
                    MakeIpv4AddressAccessor (&PointToPointEpcHelper::m_uePgwBaseIpv4Prefix),
165
                    MakeIpv4AddressChecker ())
166
 ;
148
  return tid;
167
  return tid;
149
}
168
}
150
169
170
TypeId
171
PointToPointEpcHelper::GetInstanceTypeId () const
172
{
173
  return GetTypeId ();
174
}
175
151
void
176
void
152
PointToPointEpcHelper::DoDispose ()
177
PointToPointEpcHelper::DoDispose ()
153
{
178
{
 Lines 319-340    Link Here 
319
  return bearerId;
344
  return bearerId;
320
}
345
}
321
346
322
323
Ptr<Node>
347
Ptr<Node>
324
PointToPointEpcHelper::GetPgwNode ()
348
PointToPointEpcHelper::GetPgwNode ()
325
{
349
{
326
  return m_sgwPgw;
350
  return m_sgwPgw;
327
}
351
}
328
352
329
330
Ipv4InterfaceContainer 
353
Ipv4InterfaceContainer 
331
PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)
354
PointToPointEpcHelper::AssignUeIpv4Address (NetDeviceContainer ueDevices)
332
{
355
{
333
  return m_ueAddressHelper.Assign (ueDevices);
356
  return m_ueAddressHelper.Assign (ueDevices);
334
}
357
}
335
358
336
337
338
Ipv4Address
359
Ipv4Address
339
PointToPointEpcHelper::GetUeDefaultGatewayAddress ()
360
PointToPointEpcHelper::GetUeDefaultGatewayAddress ()
340
{
361
{
(-)a/src/lte/helper/point-to-point-epc-helper.h (-1 / +24 lines)
 Lines 18-23    Link Here 
18
 * Author: Jaume Nin <jnin@cttc.es>
18
 * Author: Jaume Nin <jnin@cttc.es>
19
 *         Nicola Baldo <nbaldo@cttc.es>
19
 *         Nicola Baldo <nbaldo@cttc.es>
20
 *         Manuel Requena <manuel.requena@cttc.es>
20
 *         Manuel Requena <manuel.requena@cttc.es>
21
 *         Manoj Kumar Rana <manoj24.rana@gmail.com>
21
 */
22
 */
22
23
23
#ifndef POINT_TO_POINT_EPC_HELPER_H
24
#ifndef POINT_TO_POINT_EPC_HELPER_H
 Lines 68-75    Link Here 
68
   *  \return The object TypeId.
69
   *  \return The object TypeId.
69
   */
70
   */
70
  static TypeId GetTypeId (void);
71
  static TypeId GetTypeId (void);
72
  TypeId GetInstanceTypeId () const;
71
  virtual void DoDispose ();
73
  virtual void DoDispose ();
72
74
75
  /**
76
   * Get the IPv4 network address used by the EPC.
77
   * The EPC will use a /16 network address.
78
   *
79
   * \returns The EPC IPv4 network address.
80
   */
81
  Ipv4Address GetEpcIpv4NetworkAddress ();
82
73
  // inherited from EpcHelper
83
  // inherited from EpcHelper
74
  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);
84
  virtual void AddEnb (Ptr<Node> enbNode, Ptr<NetDevice> lteEnbNetDevice, uint16_t cellId);
75
  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
85
  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
 Lines 84-94    Link Here 
84
private:
94
private:
85
95
86
  /** 
96
  /** 
87
   * helper to assign addresses to UE devices as well as to the TUN device of the SGW/PGW
97
   * helper to assign IPv4 addresses to UE devices as well as to the TUN device of the SGW/PGW
88
   */
98
   */
89
  Ipv4AddressHelper m_ueAddressHelper; 
99
  Ipv4AddressHelper m_ueAddressHelper; 
90
  
100
  
91
  /**
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
  /**
92
   * SGW-PGW network element
115
   * SGW-PGW network element
93
   */
116
   */
94
  Ptr<Node> m_sgwPgw; 
117
  Ptr<Node> m_sgwPgw; 
(-)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
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
  
157
  
158
158
159
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
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
  
374
  
375
375
376
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
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
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
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
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
550
551
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
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
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
170
(-)a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc (-2 / +2 lines)
 Lines 299-305    Link Here 
299
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
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
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
549
550
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
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
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
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
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
550
551
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
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
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
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
549
550
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
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
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
  
181
  
182
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
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
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
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