From 380dc8bdb9d88619ed549d0dc478f9527060960e Mon Sep 17 00:00:00 2001 From: Alberto Gallegos Ramonet Date: Sun, 22 Sep 2024 11:48:33 +0900 Subject: [PATCH] lr-wpan: Add namespace to TypeId name --- src/lr-wpan/helper/lr-wpan-helper.cc | 12 ++++++------ src/lr-wpan/model/lr-wpan-csmaca.cc | 3 ++- src/lr-wpan/model/lr-wpan-error-model.cc | 3 ++- src/lr-wpan/model/lr-wpan-lqi-tag.cc | 3 ++- src/lr-wpan/model/lr-wpan-mac-base.cc | 5 ++++- src/lr-wpan/model/lr-wpan-mac-header.cc | 3 ++- src/lr-wpan/model/lr-wpan-mac-pl-headers.cc | 3 ++- src/lr-wpan/model/lr-wpan-mac-trailer.cc | 3 ++- src/lr-wpan/model/lr-wpan-mac.cc | 7 ++++--- src/lr-wpan/model/lr-wpan-net-device.cc | 3 ++- src/lr-wpan/model/lr-wpan-phy.cc | 5 +++-- 11 files changed, 31 insertions(+), 19 deletions(-) diff --git a/src/lr-wpan/helper/lr-wpan-helper.cc b/src/lr-wpan/helper/lr-wpan-helper.cc index 1eb20cc81..bfdf8e03d 100644 --- a/src/lr-wpan/helper/lr-wpan-helper.cc +++ b/src/lr-wpan/helper/lr-wpan-helper.cc @@ -346,7 +346,7 @@ LrWpanHelper::EnablePcapInternal(std::string prefix, if (!device) { NS_LOG_INFO("LrWpanHelper::EnablePcapInternal(): Device " - << device << " not of type ns3::LrWpanNetDevice"); + << device << " not of type ns3::lrwpan::LrWpanNetDevice"); return; } @@ -468,7 +468,7 @@ LrWpanHelper::EnableAsciiInternal(Ptr stream, oss.str(""); oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid - << "/$ns3::LrWpanNetDevice/Mac/MacRx"; + << "/$ns3::lrwpan::LrWpanNetDevice/Mac/MacRx"; device->GetMac()->TraceConnect( "MacRx", oss.str(), @@ -476,7 +476,7 @@ LrWpanHelper::EnableAsciiInternal(Ptr stream, oss.str(""); oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid - << "/$ns3::LrWpanNetDevice/Mac/MacTx"; + << "/$ns3::lrwpan::LrWpanNetDevice/Mac/MacTx"; device->GetMac()->TraceConnect( "MacTx", oss.str(), @@ -484,7 +484,7 @@ LrWpanHelper::EnableAsciiInternal(Ptr stream, oss.str(""); oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid - << "/$ns3::LrWpanNetDevice/Mac/MacTxEnqueue"; + << "/$ns3::lrwpan::LrWpanNetDevice/Mac/MacTxEnqueue"; device->GetMac()->TraceConnect( "MacTxEnqueue", oss.str(), @@ -492,7 +492,7 @@ LrWpanHelper::EnableAsciiInternal(Ptr stream, oss.str(""); oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid - << "/$ns3::LrWpanNetDevice/Mac/MacTxDequeue"; + << "/$ns3::lrwpan::LrWpanNetDevice/Mac/MacTxDequeue"; device->GetMac()->TraceConnect( "MacTxDequeue", oss.str(), @@ -500,7 +500,7 @@ LrWpanHelper::EnableAsciiInternal(Ptr stream, oss.str(""); oss << "/NodeList/" << nodeid << "/DeviceList/" << deviceid - << "/$ns3::LrWpanNetDevice/Mac/MacTxDrop"; + << "/$ns3::lrwpan::LrWpanNetDevice/Mac/MacTxDrop"; device->GetMac()->TraceConnect( "MacTxDrop", oss.str(), diff --git a/src/lr-wpan/model/lr-wpan-csmaca.cc b/src/lr-wpan/model/lr-wpan-csmaca.cc index 128fe2540..2144d544a 100644 --- a/src/lr-wpan/model/lr-wpan-csmaca.cc +++ b/src/lr-wpan/model/lr-wpan-csmaca.cc @@ -34,7 +34,8 @@ NS_OBJECT_ENSURE_REGISTERED(LrWpanCsmaCa); TypeId LrWpanCsmaCa::GetTypeId() { - static TypeId tid = TypeId("ns3::LrWpanCsmaCa") + static TypeId tid = TypeId("ns3::lrwpan::LrWpanCsmaCa") + .AddDeprecatedName("ns3::LrWpanCsmaCa") .SetParent() .SetGroupName("LrWpan") .AddConstructor(); diff --git a/src/lr-wpan/model/lr-wpan-error-model.cc b/src/lr-wpan/model/lr-wpan-error-model.cc index 4dea0f34a..15ed6e107 100644 --- a/src/lr-wpan/model/lr-wpan-error-model.cc +++ b/src/lr-wpan/model/lr-wpan-error-model.cc @@ -22,7 +22,8 @@ NS_OBJECT_ENSURE_REGISTERED(LrWpanErrorModel); TypeId LrWpanErrorModel::GetTypeId() { - static TypeId tid = TypeId("ns3::LrWpanErrorModel") + static TypeId tid = TypeId("ns3::lrwpan::LrWpanErrorModel") + .AddDeprecatedName("ns3::LrWpanErrorModel") .SetParent() .SetGroupName("LrWpan") .AddConstructor(); diff --git a/src/lr-wpan/model/lr-wpan-lqi-tag.cc b/src/lr-wpan/model/lr-wpan-lqi-tag.cc index 6704b8c0d..cd93302d5 100644 --- a/src/lr-wpan/model/lr-wpan-lqi-tag.cc +++ b/src/lr-wpan/model/lr-wpan-lqi-tag.cc @@ -20,7 +20,8 @@ NS_OBJECT_ENSURE_REGISTERED(LrWpanLqiTag); TypeId LrWpanLqiTag::GetTypeId() { - static TypeId tid = TypeId("ns3::LrWpanLqiTag") + static TypeId tid = TypeId("ns3::lrwpan::LrWpanLqiTag") + .AddDeprecatedName("ns3::LrWpanLqiTag") .SetParent() .SetGroupName("LrWpan") .AddConstructor() diff --git a/src/lr-wpan/model/lr-wpan-mac-base.cc b/src/lr-wpan/model/lr-wpan-mac-base.cc index 5c74d59e2..23da013b8 100644 --- a/src/lr-wpan/model/lr-wpan-mac-base.cc +++ b/src/lr-wpan/model/lr-wpan-mac-base.cc @@ -22,7 +22,10 @@ NS_OBJECT_ENSURE_REGISTERED(LrWpanMacBase); TypeId LrWpanMacBase::GetTypeId() { - static TypeId tid = TypeId("ns3::LrWpanMacBase").SetParent().SetGroupName("LrWpan"); + static TypeId tid = TypeId("ns3::lrwpan::LrWpanMacBase") + .AddDeprecatedName("ns3::LrWpanMacBase") + .SetParent() + .SetGroupName("LrWpan"); return tid; } diff --git a/src/lr-wpan/model/lr-wpan-mac-header.cc b/src/lr-wpan/model/lr-wpan-mac-header.cc index b911712ff..c51e3aa9e 100644 --- a/src/lr-wpan/model/lr-wpan-mac-header.cc +++ b/src/lr-wpan/model/lr-wpan-mac-header.cc @@ -433,7 +433,8 @@ LrWpanMacHeader::SetKeyId(uint64_t keySrc, uint8_t keyIndex) TypeId LrWpanMacHeader::GetTypeId() { - static TypeId tid = TypeId("ns3::LrWpanMacHeader") + static TypeId tid = TypeId("ns3::lrwpan::LrWpanMacHeader") + .AddDeprecatedName("ns3::LrWpanMacHeader") .SetParent
() .SetGroupName("LrWpan") .AddConstructor(); diff --git a/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc b/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc index 6469aafb8..06f1d8961 100644 --- a/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc +++ b/src/lr-wpan/model/lr-wpan-mac-pl-headers.cc @@ -29,7 +29,8 @@ NS_OBJECT_ENSURE_REGISTERED(BeaconPayloadHeader); TypeId BeaconPayloadHeader::GetTypeId() { - static TypeId tid = TypeId("ns3::BeaconPayloadHeader") + static TypeId tid = TypeId("ns3::lrwpan::BeaconPayloadHeader") + .AddDeprecatedName("ns3::BeaconPayloadHeader") .SetParent
() .SetGroupName("LrWpan") .AddConstructor(); diff --git a/src/lr-wpan/model/lr-wpan-mac-trailer.cc b/src/lr-wpan/model/lr-wpan-mac-trailer.cc index c4ec1368a..fc2235ff2 100644 --- a/src/lr-wpan/model/lr-wpan-mac-trailer.cc +++ b/src/lr-wpan/model/lr-wpan-mac-trailer.cc @@ -31,7 +31,8 @@ LrWpanMacTrailer::LrWpanMacTrailer() TypeId LrWpanMacTrailer::GetTypeId() { - static TypeId tid = TypeId("ns3::LrWpanMacTrailer") + static TypeId tid = TypeId("ns3::lrwpan::LrWpanMacTrailer") + .AddDeprecatedName("ns3::LrWpanMacTrailer") .SetParent() .SetGroupName("LrWpan") .AddConstructor(); diff --git a/src/lr-wpan/model/lr-wpan-mac.cc b/src/lr-wpan/model/lr-wpan-mac.cc index bea7b964a..cfc41f32b 100644 --- a/src/lr-wpan/model/lr-wpan-mac.cc +++ b/src/lr-wpan/model/lr-wpan-mac.cc @@ -82,7 +82,8 @@ TypeId LrWpanMac::GetTypeId() { static TypeId tid = - TypeId("ns3::LrWpanMac") + TypeId("ns3::lrwpan::LrWpanMac") + .AddDeprecatedName("ns3::LrWpanMac") .SetParent() .SetGroupName("LrWpan") .AddConstructor() @@ -176,12 +177,12 @@ LrWpanMac::GetTypeId() .AddTraceSource("MacState", "The state of LrWpan Mac", MakeTraceSourceAccessor(&LrWpanMac::m_macStateLogger), - "ns3::LrWpanMac::StateTracedCallback") + "ns3::lrwpan::LrWpanMac::StateTracedCallback") .AddTraceSource("MacSentPkt", "Trace source reporting some information about " "the sent packet", MakeTraceSourceAccessor(&LrWpanMac::m_sentPktTrace), - "ns3::LrWpanMac::SentTracedCallback") + "ns3::lrwpan::LrWpanMac::SentTracedCallback") .AddTraceSource("IfsEnd", "Trace source reporting the end of an " "Interframe space (IFS)", diff --git a/src/lr-wpan/model/lr-wpan-net-device.cc b/src/lr-wpan/model/lr-wpan-net-device.cc index be01d1ed5..e62b6084c 100644 --- a/src/lr-wpan/model/lr-wpan-net-device.cc +++ b/src/lr-wpan/model/lr-wpan-net-device.cc @@ -34,7 +34,8 @@ TypeId LrWpanNetDevice::GetTypeId() { static TypeId tid = - TypeId("ns3::LrWpanNetDevice") + TypeId("ns3::lrwpan::LrWpanNetDevice") + .AddDeprecatedName("ns3::LrWpanNetDevice") .SetParent() .SetGroupName("LrWpan") .AddConstructor() diff --git a/src/lr-wpan/model/lr-wpan-phy.cc b/src/lr-wpan/model/lr-wpan-phy.cc index be4c7d57a..8498abacc 100644 --- a/src/lr-wpan/model/lr-wpan-phy.cc +++ b/src/lr-wpan/model/lr-wpan-phy.cc @@ -136,7 +136,8 @@ TypeId LrWpanPhy::GetTypeId() { static TypeId tid = - TypeId("ns3::LrWpanPhy") + TypeId("ns3::lrwpan::LrWpanPhy") + .AddDeprecatedName("ns3::LrWpanPhy") .SetParent() .SetGroupName("LrWpan") .AddConstructor() @@ -155,7 +156,7 @@ LrWpanPhy::GetTypeId() .AddTraceSource("TrxState", "The state of the transceiver", MakeTraceSourceAccessor(&LrWpanPhy::m_trxStateLogger), - "ns3::LrWpanPhy::StateTracedCallback") + "ns3::lrwpan::LrWpanPhy::StateTracedCallback") .AddTraceSource("PhyTxBegin", "Trace source indicating a packet has " "begun transmitting over the channel medium",