--- a/src/lte/doc/source/lte-design.rst Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/doc/source/lte-design.rst Mon Dec 05 21:24:51 2011 +0100
@@ -648,7 +648,7 @@
MAC SDUs in order to achieve the simulator's equivalent of a TB,
without the corresponding implementation complexity.
The multiplexing of different logical channels to and from the RLC
-layer is performed using a dedicated packet tag (LteMacTag), which
+layer is performed using a dedicated packet tag (LteRadioBearerTag), which
performs a functionality which is partially equivalent to that of the
MAC headers specified by 3GPP.
--- a/src/lte/model/epc-enb-application.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/model/epc-enb-application.cc Mon Dec 05 21:24:51 2011 +0100
@@ -27,7 +27,7 @@
#include "ns3/inet-socket-address.h"
#include "ns3/uinteger.h"
#include "ns3/epc-gtpu-header.h"
-#include "ns3/lte-mac-tag.h"
+#include "ns3/lte-radio-bearer-tag.h"
namespace ns3 {
@@ -80,7 +80,7 @@
SocketAddressTag satag;
packet->RemovePacketTag (satag);
- LteMacTag tag;
+ LteRadioBearerTag tag;
bool found = packet->RemovePacketTag (tag);
NS_ASSERT (found);
LteFlowId_t flowId;
@@ -116,7 +116,7 @@
EpcEnbApplication::SendToLteSocket (Ptr<Packet> packet, uint16_t rnti, uint8_t lcid)
{
NS_LOG_FUNCTION (this << packet << rnti << (uint16_t) lcid);
- LteMacTag tag (rnti, lcid);
+ LteRadioBearerTag tag (rnti, lcid);
packet->AddPacketTag (tag);
int sentBytes = m_lteSocket->Send (packet);
NS_ASSERT (sentBytes > 0);
--- a/src/lte/model/lte-enb-mac.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/model/lte-enb-mac.cc Mon Dec 05 21:24:51 2011 +0100
@@ -30,7 +30,7 @@
#include "lte-ue-net-device.h"
#include <ns3/lte-enb-mac.h>
-#include <ns3/lte-mac-tag.h>
+#include <ns3/lte-radio-bearer-tag.h>
#include <ns3/lte-ue-phy.h>
#include "ns3/lte-mac-sap.h"
@@ -515,7 +515,7 @@
LteEnbMac::DoReceivePhyPdu (Ptr<Packet> p)
{
NS_LOG_FUNCTION (this);
- LteMacTag tag;
+ LteRadioBearerTag tag;
p->RemovePacketTag (tag);
// store info of the packet received
@@ -652,7 +652,7 @@
LteEnbMac::DoTransmitPdu (LteMacSapProvider::TransmitPduParameters params)
{
NS_LOG_FUNCTION (this);
- LteMacTag tag (params.rnti, params.lcid);
+ LteRadioBearerTag tag (params.rnti, params.lcid);
params.pdu->AddPacketTag (tag);
// Ptr<PacketBurst> pb = CreateObject<PacketBurst> ();
// pb->AddPacket (params.pdu);
--- a/src/lte/model/lte-enb-rrc.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/model/lte-enb-rrc.cc Mon Dec 05 21:24:51 2011 +0100
@@ -30,7 +30,7 @@
#include "lte-pdcp.h"
#include "lte-pdcp-sap.h"
#include "lte-radio-bearer-info.h"
-#include "lte-mac-tag.h"
+#include "lte-radio-bearer-tag.h"
#include "ns3/object-map.h"
@@ -386,7 +386,7 @@
{
NS_LOG_FUNCTION (this << packet);
- LteMacTag tag;
+ LteRadioBearerTag tag;
bool found = packet->RemovePacketTag (tag);
NS_ASSERT (found);
@@ -412,7 +412,7 @@
{
NS_LOG_FUNCTION (this);
// this tag is needed by the EpcEnbApplication to determine the S1 bearer that corresponds to this radio bearer
- LteMacTag tag;
+ LteRadioBearerTag tag;
tag.SetRnti (params.rnti);
tag.SetLcid (params.lcid);
params.rrcPdu->AddPacketTag (tag);
--- a/src/lte/model/lte-mac-tag.cc Mon Dec 05 21:19:59 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/* -*- 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: Marco Miozzo <marco.miozzo@cttc.es>
- */
-
-
-#include "lte-mac-tag.h"
-#include "ns3/tag.h"
-#include "ns3/uinteger.h"
-
-namespace ns3 {
-
-NS_OBJECT_ENSURE_REGISTERED (LteMacTag);
-
-TypeId
-LteMacTag::GetTypeId (void)
-{
- static TypeId tid = TypeId ("ns3::LteMacTag")
- .SetParent<Tag> ()
- .AddConstructor<LteMacTag> ()
- .AddAttribute ("rnti", "The rnti that indicates the UE which packet belongs",
- UintegerValue (0),
- MakeUintegerAccessor (&LteMacTag::GetRnti),
- MakeUintegerChecker<uint16_t> ())
- .AddAttribute ("lcid", "The LC id that indicates the UE which packet belongs",
- UintegerValue (0),
- MakeUintegerAccessor (&LteMacTag::GetLcid),
- MakeUintegerChecker<uint8_t> ())
- ;
- return tid;
-}
-
-TypeId
-LteMacTag::GetInstanceTypeId (void) const
-{
- return GetTypeId ();
-}
-
-LteMacTag::LteMacTag ()
- : m_rnti (0),
- m_lcid (0)
-{
-}
-LteMacTag::LteMacTag (uint16_t rnti, uint8_t lcid)
- : m_rnti (rnti),
- m_lcid (lcid)
-{
-}
-
-void
-LteMacTag::SetRnti (uint16_t rnti)
-{
- m_rnti = rnti;
-}
-
-void
-LteMacTag::SetLcid (uint8_t lcid)
-{
- m_lcid = lcid;
-}
-
-uint32_t
-LteMacTag::GetSerializedSize (void) const
-{
- return 3;
-}
-
-void
-LteMacTag::Serialize (TagBuffer i) const
-{
- i.WriteU16 (m_rnti);
- i.WriteU8 (m_lcid);
-}
-
-void
-LteMacTag::Deserialize (TagBuffer i)
-{
- m_rnti = (uint16_t) i.ReadU16 ();
- m_lcid = (uint8_t) i.ReadU8 ();
-}
-
-uint16_t
-LteMacTag::GetRnti () const
-{
- return m_rnti;
-}
-
-uint8_t
-LteMacTag::GetLcid () const
-{
- return m_lcid;
-}
-
-void
-LteMacTag::Print (std::ostream &os) const
-{
- os << "rnti=" << m_rnti << ", lcid=" << m_lcid;
-}
-
-} // namespace ns3
--- a/src/lte/model/lte-mac-tag.h Mon Dec 05 21:19:59 2011 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,83 +0,0 @@
-/* -*- 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: Author: Marco Miozzo <marco.miozzo@cttc.es>
- */
-#ifndef LTE_MAC_TAG_H
-#define LTE_MAC_TAG_H
-
-#include "ns3/packet.h"
-
-namespace ns3 {
-
-class Tag;
-
-
-/**
- * Tag used to define the RNTI and LC id for each MAC packet trasmitted
- */
-
-class LteMacTag : public Tag
-{
-public:
- static TypeId GetTypeId (void);
- virtual TypeId GetInstanceTypeId (void) const;
-
- /**
- * Create an empty LteMacTag
- */
- LteMacTag ();
-
- /**
- * Create a LteMacTag with the given RNTI and LC id
- */
- LteMacTag (uint16_t rnti, uint8_t lcId);
-
- /**
- * Set the RNTI to the given value.
- *
- * @param rnti the value of the RNTI to set
- */
- void SetRnti (uint16_t tid);
-
- /**
- * Set the LC id to the given value.
- *
- * @param lcid the value of the RNTI to set
- */
- void SetLcid (uint8_t lcid);
-
-
- virtual void Serialize (TagBuffer i) const;
- virtual void Deserialize (TagBuffer i);
- virtual uint32_t GetSerializedSize () const;
- virtual void Print (std::ostream &os) const;
-
- uint16_t GetRnti (void) const;
- uint8_t GetLcid (void) const;
-
-private:
- uint16_t m_rnti;
- uint8_t m_lcid;
-
-};
-
-
-
-} // namespace ns3
-
-#endif /* LTE_MAC_TAG_H */
--- a/src/lte/model/lte-net-device.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/model/lte-net-device.cc Mon Dec 05 21:24:51 2011 +0100
@@ -32,7 +32,7 @@
#include "ns3/enum.h"
#include "lte-amc.h"
#include "ns3/ipv4-header.h"
-#include <ns3/lte-mac-tag.h>
+#include <ns3/lte-radio-bearer-tag.h>
#include <ns3/ipv4-l3-protocol.h>
#include <ns3/log.h>
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lte/model/lte-radio-bearer-tag.cc Mon Dec 05 21:24:51 2011 +0100
@@ -0,0 +1,115 @@
+/* -*- 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: Marco Miozzo <marco.miozzo@cttc.es>
+ */
+
+
+#include "lte-radio-bearer-tag.h"
+#include "ns3/tag.h"
+#include "ns3/uinteger.h"
+
+namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED (LteRadioBearerTag);
+
+TypeId
+LteRadioBearerTag::GetTypeId (void)
+{
+ static TypeId tid = TypeId ("ns3::LteRadioBearerTag")
+ .SetParent<Tag> ()
+ .AddConstructor<LteRadioBearerTag> ()
+ .AddAttribute ("rnti", "The rnti that indicates the UE which packet belongs",
+ UintegerValue (0),
+ MakeUintegerAccessor (&LteRadioBearerTag::GetRnti),
+ MakeUintegerChecker<uint16_t> ())
+ .AddAttribute ("lcid", "The LC id that indicates the UE which packet belongs",
+ UintegerValue (0),
+ MakeUintegerAccessor (&LteRadioBearerTag::GetLcid),
+ MakeUintegerChecker<uint8_t> ())
+ ;
+ return tid;
+}
+
+TypeId
+LteRadioBearerTag::GetInstanceTypeId (void) const
+{
+ return GetTypeId ();
+}
+
+LteRadioBearerTag::LteRadioBearerTag ()
+ : m_rnti (0),
+ m_lcid (0)
+{
+}
+LteRadioBearerTag::LteRadioBearerTag (uint16_t rnti, uint8_t lcid)
+ : m_rnti (rnti),
+ m_lcid (lcid)
+{
+}
+
+void
+LteRadioBearerTag::SetRnti (uint16_t rnti)
+{
+ m_rnti = rnti;
+}
+
+void
+LteRadioBearerTag::SetLcid (uint8_t lcid)
+{
+ m_lcid = lcid;
+}
+
+uint32_t
+LteRadioBearerTag::GetSerializedSize (void) const
+{
+ return 3;
+}
+
+void
+LteRadioBearerTag::Serialize (TagBuffer i) const
+{
+ i.WriteU16 (m_rnti);
+ i.WriteU8 (m_lcid);
+}
+
+void
+LteRadioBearerTag::Deserialize (TagBuffer i)
+{
+ m_rnti = (uint16_t) i.ReadU16 ();
+ m_lcid = (uint8_t) i.ReadU8 ();
+}
+
+uint16_t
+LteRadioBearerTag::GetRnti () const
+{
+ return m_rnti;
+}
+
+uint8_t
+LteRadioBearerTag::GetLcid () const
+{
+ return m_lcid;
+}
+
+void
+LteRadioBearerTag::Print (std::ostream &os) const
+{
+ os << "rnti=" << m_rnti << ", lcid=" << m_lcid;
+}
+
+} // namespace ns3
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/src/lte/model/lte-radio-bearer-tag.h Mon Dec 05 21:24:51 2011 +0100
@@ -0,0 +1,83 @@
+/* -*- 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: Author: Marco Miozzo <marco.miozzo@cttc.es>
+ */
+#ifndef LTE_RADIO_BEARER_TAG_H
+#define LTE_RADIO_BEARER_TAG_H
+
+#include "ns3/packet.h"
+
+namespace ns3 {
+
+class Tag;
+
+
+/**
+ * Tag used to define the RNTI and LC id for each MAC packet trasmitted
+ */
+
+class LteRadioBearerTag : public Tag
+{
+public:
+ static TypeId GetTypeId (void);
+ virtual TypeId GetInstanceTypeId (void) const;
+
+ /**
+ * Create an empty LteRadioBearerTag
+ */
+ LteRadioBearerTag ();
+
+ /**
+ * Create a LteRadioBearerTag with the given RNTI and LC id
+ */
+ LteRadioBearerTag (uint16_t rnti, uint8_t lcId);
+
+ /**
+ * Set the RNTI to the given value.
+ *
+ * @param rnti the value of the RNTI to set
+ */
+ void SetRnti (uint16_t tid);
+
+ /**
+ * Set the LC id to the given value.
+ *
+ * @param lcid the value of the RNTI to set
+ */
+ void SetLcid (uint8_t lcid);
+
+
+ virtual void Serialize (TagBuffer i) const;
+ virtual void Deserialize (TagBuffer i);
+ virtual uint32_t GetSerializedSize () const;
+ virtual void Print (std::ostream &os) const;
+
+ uint16_t GetRnti (void) const;
+ uint8_t GetLcid (void) const;
+
+private:
+ uint16_t m_rnti;
+ uint8_t m_lcid;
+
+};
+
+
+
+} // namespace ns3
+
+#endif /* LTE_RADIO_BEARER_TAG_H */
--- a/src/lte/model/lte-spectrum-phy.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/model/lte-spectrum-phy.cc Mon Dec 05 21:24:51 2011 +0100
@@ -28,7 +28,7 @@
#include "lte-spectrum-phy.h"
#include "lte-spectrum-signal-parameters.h"
#include "lte-net-device.h"
-#include "lte-mac-tag.h"
+#include "lte-radio-bearer-tag.h"
#include "lte-sinr-chunk-processor.h"
#include "lte-phy-tag.h"
--- a/src/lte/model/lte-ue-mac.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/model/lte-ue-mac.cc Mon Dec 05 21:24:51 2011 +0100
@@ -28,7 +28,7 @@
#include "lte-ue-mac.h"
#include "lte-ue-net-device.h"
-#include "lte-mac-tag.h"
+#include "lte-radio-bearer-tag.h"
#include <ns3/ff-mac-common.h>
#include <ns3/ideal-control-messages.h>
#include <ns3/simulator.h>
@@ -243,7 +243,7 @@
{
NS_LOG_FUNCTION (this);
NS_ASSERT_MSG (m_rnti == params.rnti, "RNTI mismatch between RLC and MAC");
- LteMacTag tag (params.rnti, params.lcid);
+ LteRadioBearerTag tag (params.rnti, params.lcid);
params.pdu->AddPacketTag (tag);
// Ptr<PacketBurst> pb = CreateObject<PacketBurst> ();
// pb->AddPacket (params.pdu);
@@ -325,7 +325,7 @@
void
LteUeMac::DoReceivePhyPdu (Ptr<Packet> p)
{
- LteMacTag tag;
+ LteRadioBearerTag tag;
p->RemovePacketTag (tag);
if (tag.GetRnti () == m_rnti)
{
--- a/src/lte/test/epc-test-s1u-uplink.cc Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/test/epc-test-s1u-uplink.cc Mon Dec 05 21:24:51 2011 +0100
@@ -19,7 +19,7 @@
* The original version of UdpClient is by Amine Ismail
* <amine.ismail@sophia.inria.fr> <amine.ismail@udcast.com>
* The rest of the code (including modifying UdpClient into
- * LteMacTagUdpClient) is by Nicola Baldo <nbaldo@cttc.es>
+ * LteRadioBearerTagUdpClient) is by Nicola Baldo <nbaldo@cttc.es>
*/
@@ -41,7 +41,7 @@
#include <ns3/ipv4-interface.h>
#include <ns3/mac48-address.h>
#include "ns3/seq-ts-header.h"
-#include "ns3/lte-mac-tag.h"
+#include "ns3/lte-radio-bearer-tag.h"
#include "ns3/arp-cache.h"
#include "ns3/boolean.h"
#include "ns3/uinteger.h"
@@ -55,23 +55,23 @@
/*
* A Udp client. Sends UDP packet carrying sequence number and time
- * stamp but also including the LteMacTag. This tag is normally
+ * stamp but also including the LteRadioBearerTag. This tag is normally
* generated by the LteEnbNetDevice when forwarding packet in the
* uplink. But in this test we don't have the LteEnbNetDevice, because
* we test the S1-U interface with simpler devices to make sure it
* just works.
*
*/
-class LteMacTagUdpClient : public Application
+class LteRadioBearerTagUdpClient : public Application
{
public:
static TypeId
GetTypeId (void);
- LteMacTagUdpClient ();
- LteMacTagUdpClient (uint16_t rnti, uint8_t lcid);
+ LteRadioBearerTagUdpClient ();
+ LteRadioBearerTagUdpClient (uint16_t rnti, uint8_t lcid);
- virtual ~LteMacTagUdpClient ();
+ virtual ~LteRadioBearerTagUdpClient ();
/**
* \brief set the remote address and port
@@ -109,40 +109,40 @@
TypeId
-LteMacTagUdpClient::GetTypeId (void)
+LteRadioBearerTagUdpClient::GetTypeId (void)
{
- static TypeId tid = TypeId ("ns3::LteMacTagUdpClient")
+ static TypeId tid = TypeId ("ns3::LteRadioBearerTagUdpClient")
.SetParent<Application> ()
- .AddConstructor<LteMacTagUdpClient> ()
+ .AddConstructor<LteRadioBearerTagUdpClient> ()
.AddAttribute ("MaxPackets",
"The maximum number of packets the application will send",
UintegerValue (100),
- MakeUintegerAccessor (&LteMacTagUdpClient::m_count),
+ MakeUintegerAccessor (&LteRadioBearerTagUdpClient::m_count),
MakeUintegerChecker<uint32_t> ())
.AddAttribute ("Interval",
"The time to wait between packets", TimeValue (Seconds (1.0)),
- MakeTimeAccessor (&LteMacTagUdpClient::m_interval),
+ MakeTimeAccessor (&LteRadioBearerTagUdpClient::m_interval),
MakeTimeChecker ())
.AddAttribute (
"RemoteAddress",
"The destination Ipv4Address of the outbound packets",
Ipv4AddressValue (),
- MakeIpv4AddressAccessor (&LteMacTagUdpClient::m_peerAddress),
+ MakeIpv4AddressAccessor (&LteRadioBearerTagUdpClient::m_peerAddress),
MakeIpv4AddressChecker ())
.AddAttribute ("RemotePort", "The destination port of the outbound packets",
UintegerValue (100),
- MakeUintegerAccessor (&LteMacTagUdpClient::m_peerPort),
+ MakeUintegerAccessor (&LteRadioBearerTagUdpClient::m_peerPort),
MakeUintegerChecker<uint16_t> ())
.AddAttribute ("PacketSize",
"Size of packets generated. The minimum packet size is 12 bytes which is the size of the header carrying the sequence number and the time stamp.",
UintegerValue (1024),
- MakeUintegerAccessor (&LteMacTagUdpClient::m_size),
+ MakeUintegerAccessor (&LteRadioBearerTagUdpClient::m_size),
MakeUintegerChecker<uint32_t> (12,1500))
;
return tid;
}
-LteMacTagUdpClient::LteMacTagUdpClient ()
+LteRadioBearerTagUdpClient::LteRadioBearerTagUdpClient ()
: m_rnti (0),
m_lcid (0)
{
@@ -152,7 +152,7 @@
m_sendEvent = EventId ();
}
-LteMacTagUdpClient::LteMacTagUdpClient (uint16_t rnti, uint8_t lcid)
+LteRadioBearerTagUdpClient::LteRadioBearerTagUdpClient (uint16_t rnti, uint8_t lcid)
: m_rnti (rnti),
m_lcid (lcid)
{
@@ -162,27 +162,27 @@
m_sendEvent = EventId ();
}
-LteMacTagUdpClient::~LteMacTagUdpClient ()
+LteRadioBearerTagUdpClient::~LteRadioBearerTagUdpClient ()
{
NS_LOG_FUNCTION_NOARGS ();
}
void
-LteMacTagUdpClient::SetRemote (Ipv4Address ip, uint16_t port)
+LteRadioBearerTagUdpClient::SetRemote (Ipv4Address ip, uint16_t port)
{
m_peerAddress = ip;
m_peerPort = port;
}
void
-LteMacTagUdpClient::DoDispose (void)
+LteRadioBearerTagUdpClient::DoDispose (void)
{
NS_LOG_FUNCTION_NOARGS ();
Application::DoDispose ();
}
void
-LteMacTagUdpClient::StartApplication (void)
+LteRadioBearerTagUdpClient::StartApplication (void)
{
NS_LOG_FUNCTION_NOARGS ();
@@ -195,18 +195,18 @@
}
m_socket->SetRecvCallback (MakeNullCallback<void, Ptr<Socket> > ());
- m_sendEvent = Simulator::Schedule (Seconds (0.0), &LteMacTagUdpClient::Send, this);
+ m_sendEvent = Simulator::Schedule (Seconds (0.0), &LteRadioBearerTagUdpClient::Send, this);
}
void
-LteMacTagUdpClient::StopApplication ()
+LteRadioBearerTagUdpClient::StopApplication ()
{
NS_LOG_FUNCTION_NOARGS ();
Simulator::Cancel (m_sendEvent);
}
void
-LteMacTagUdpClient::Send (void)
+LteRadioBearerTagUdpClient::Send (void)
{
NS_LOG_FUNCTION_NOARGS ();
NS_ASSERT (m_sendEvent.IsExpired ());
@@ -215,7 +215,7 @@
Ptr<Packet> p = Create<Packet> (m_size-(8+4)); // 8+4 : the size of the seqTs header
p->AddHeader (seqTs);
- LteMacTag tag (m_rnti, m_lcid);
+ LteRadioBearerTag tag (m_rnti, m_lcid);
p->AddPacketTag (tag);
if ((m_socket->Send (p)) >= 0)
@@ -234,7 +234,7 @@
if (m_sent < m_count)
{
- m_sendEvent = Simulator::Schedule (m_interval, &LteMacTagUdpClient::Send, this);
+ m_sendEvent = Simulator::Schedule (m_interval, &LteRadioBearerTagUdpClient::Send, this);
}
}
@@ -396,7 +396,7 @@
enbit->ues[u].serverApp = sinkApp.Get (0)->GetObject<PacketSink> ();
Time interPacketInterval = Seconds (0.01);
- Ptr<LteMacTagUdpClient> client = CreateObject<LteMacTagUdpClient> (enbit->ues[u].rnti, enbit->ues[u].lcid);
+ Ptr<LteRadioBearerTagUdpClient> client = CreateObject<LteRadioBearerTagUdpClient> (enbit->ues[u].rnti, enbit->ues[u].lcid);
client->SetAttribute ("RemoteAddress", Ipv4AddressValue (internetNodesIpIfaceContainer.GetAddress (1)));
client->SetAttribute ("RemotePort", UintegerValue (udpSinkPort));
client->SetAttribute ("MaxPackets", UintegerValue (enbit->ues[u].numPkts));
--- a/src/lte/wscript Mon Dec 05 21:19:59 2011 +0100
+++ b/src/lte/wscript Mon Dec 05 21:24:51 2011 +0100
@@ -47,7 +47,7 @@
'model/rr-ff-mac-scheduler.cc',
'model/lte-enb-mac.cc',
'model/lte-ue-mac.cc',
- 'model/lte-mac-tag.cc',
+ 'model/lte-radio-bearer-tag.cc',
'model/lte-phy-tag.cc',
'model/lte-enb-phy-sap.cc',
'model/lte-ue-phy-sap.cc',
@@ -134,7 +134,7 @@
'model/rr-ff-mac-scheduler.h',
'model/lte-enb-mac.h',
'model/lte-ue-mac.h',
- 'model/lte-mac-tag.h',
+ 'model/lte-radio-bearer-tag.h',
'model/lte-phy-tag.h',
'model/lte-enb-phy-sap.h',
'model/lte-ue-phy-sap.h',