lte: (fixed #2893) GetPgw in helpers must be const

Simple const-correctness enforcing.
2018-10-24 14:59:36 +02:00
parent d3da3b8628
commit dab08d714d
6 changed files with 6 additions and 5 deletions
--- a/1
+++ b/1
@@ -32,6 +32,7 @@ Bugs fixed
 - Bug 2992 - lte: Send method of the LteUeNetDevice doesn't use protocolNumber parameter
 - Bug 2997 - lte: EpcTft::PacketFilter::Matches does not use ipv6 address to match an IP packet
 - Bug 2860 - mobility: Set Z coordinate for position-allocation classes
+- Bug 2893 - lte: GetPgw in helper should be const
 - Bug 3027 - lte: S1 signalling is done before RRC connection establishment is finished

 Known issues
--- a/src/lte/helper/emu-epc-helper.cc
+++ b/src/lte/helper/emu-epc-helper.cc
@@ -402,7 +402,7 @@ EmuEpcHelper::ActivateEpsBearer (Ptr<NetDevice> ueDevice, uint64_t imsi, Ptr<Epc


 Ptr<Node>
-EmuEpcHelper::GetPgwNode ()
+EmuEpcHelper::GetPgwNode () const
 {
  return m_sgwPgw;
 }
--- a/src/lte/helper/emu-epc-helper.h
+++ b/src/lte/helper/emu-epc-helper.h
@@ -80,7 +80,7 @@ public:
  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
  virtual void AddX2Interface (Ptr<Node> enbNode1, Ptr<Node> enbNode2);
  virtual uint8_t ActivateEpsBearer (Ptr<NetDevice> ueLteDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer);
-  virtual Ptr<Node> GetPgwNode ();
+  virtual Ptr<Node> GetPgwNode () const;
  virtual Ipv4InterfaceContainer AssignUeIpv4Address (NetDeviceContainer ueDevices);
  virtual Ipv6InterfaceContainer AssignUeIpv6Address (NetDeviceContainer ueDevices);
  virtual Ipv4Address GetUeDefaultGatewayAddress ();
--- a/src/lte/helper/epc-helper.h
+++ b/src/lte/helper/epc-helper.h
@@ -120,7 +120,7 @@ public:
   * intended for this method is to allow the user to configure the Gi
   * interface of the PGW, i.e., to connect the PGW to the internet.
   */
-  virtual Ptr<Node> GetPgwNode () = 0;
+  virtual Ptr<Node> GetPgwNode () const = 0;

  /** 
   * Assign IPv4 addresses to UE devices
--- a/src/lte/helper/point-to-point-epc-helper.cc
+++ b/src/lte/helper/point-to-point-epc-helper.cc
@@ -546,7 +546,7 @@ PointToPointEpcHelper::ActivateEpsBearer (Ptr<NetDevice> ueDevice, uint64_t imsi
 }

 Ptr<Node>
-PointToPointEpcHelper::GetPgwNode ()
+PointToPointEpcHelper::GetPgwNode () const
 {
  return m_pgw;
 }
--- a/src/lte/helper/point-to-point-epc-helper.h
+++ b/src/lte/helper/point-to-point-epc-helper.h
@@ -77,7 +77,7 @@ public:
  virtual void AddUe (Ptr<NetDevice> ueLteDevice, uint64_t imsi);
  virtual void AddX2Interface (Ptr<Node> enbNode1, Ptr<Node> enbNode2);
  virtual uint8_t ActivateEpsBearer (Ptr<NetDevice> ueLteDevice, uint64_t imsi, Ptr<EpcTft> tft, EpsBearer bearer);
-  virtual Ptr<Node> GetPgwNode ();
+  virtual Ptr<Node> GetPgwNode () const;
  virtual Ipv4InterfaceContainer AssignUeIpv4Address (NetDeviceContainer ueDevices);
  virtual Ipv6InterfaceContainer AssignUeIpv6Address (NetDeviceContainer ueDevices);
  virtual Ipv4Address GetUeDefaultGatewayAddress ();