F5/unison
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wifi: Cleanup duplicated code in WifiNetDevice

Browse Source
This commit is contained in:
Sébastien Deronne
2024-01-02 10:52:56 +01:00
committed by Sébastien Deronne
parent 098fcb35ec
commit b921650795
2 changed files with 44 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

45
src/wifi/model/wifi-net-device.cc
View File

@@ -478,17 +478,7 @@ bool
WifiNetDevice::Send(Ptr<Packet> packet, const Address& dest, uint16_t protocolNumber)
{
NS_LOG_FUNCTION(this << packet << dest << protocolNumber);
NS_ASSERT(Mac48Address::IsMatchingType(dest));
Mac48Address realTo = Mac48Address::ConvertFrom(dest);
LlcSnapHeader llc;
llc.SetType(protocolNumber);
packet->AddHeader(llc);
m_mac->NotifyTx(packet);
m_mac->Enqueue(packet, realTo);
return true;
return DoSend(packet, std::nullopt, dest, protocolNumber);
}
Ptr<Node>
@@ -579,18 +569,41 @@ WifiNetDevice::SendFrom(Ptr<Packet> packet,
uint16_t protocolNumber)
{
NS_LOG_FUNCTION(this << packet << source << dest << protocolNumber);
NS_ASSERT(Mac48Address::IsMatchingType(dest));
NS_ASSERT(Mac48Address::IsMatchingType(source));
return DoSend(packet, source, dest, protocolNumber);
}
Mac48Address realTo = Mac48Address::ConvertFrom(dest);
Mac48Address realFrom = Mac48Address::ConvertFrom(source);
bool
WifiNetDevice::DoSend(Ptr<Packet> packet,
std::optional<Address> source,
const Address& dest,
uint16_t protocolNumber)
{
NS_LOG_FUNCTION(this << packet << dest << protocolNumber << source.value_or(Address()));
if (source)
{
NS_ASSERT_MSG(Mac48Address::IsMatchingType(*source),
*source << " is not compatible with a Mac48Address");
}
NS_ASSERT_MSG(Mac48Address::IsMatchingType(dest),
dest << " is not compatible with a Mac48Address");
auto realTo = Mac48Address::ConvertFrom(dest);
LlcSnapHeader llc;
llc.SetType(protocolNumber);
packet->AddHeader(llc);
m_mac->NotifyTx(packet);
m_mac->Enqueue(packet, realTo, realFrom);
if (source)
{
auto realFrom = Mac48Address::ConvertFrom(*source);
m_mac->Enqueue(packet, realTo, realFrom);
}
else
{
m_mac->Enqueue(packet, realTo);
}
return true;
}

15
src/wifi/model/wifi-net-device.h
View File

@@ -25,6 +25,7 @@
#include "ns3/net-device.h"
#include "ns3/traced-callback.h"
#include <optional>
#include <vector>
namespace ns3
@@ -239,6 +240,20 @@ class WifiNetDevice : public NetDevice
*/
void CompleteConfig();
/**
* Send a packet
*
* \param packet packet sent from upper layers
* \param source source mac address (if provided)
* \param dest destination mac address
* \param protocolNumber type of payload contained in this packet
* \returns true if successful, false otherwise
*/
bool DoSend(Ptr<Packet> packet,
std::optional<Address> source,
const Address& dest,
uint16_t protocolNumber);
Ptr<Node> m_node; //!< the node
std::vector<Ptr<WifiPhy>> m_phys; //!< the phy objects
Ptr<WifiMac> m_mac; //!< the MAC