diff --git a/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.cc b/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.cc index f29657da1..942538f59 100644 --- a/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.cc +++ b/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.cc @@ -34,7 +34,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (HwmpRtable); TypeId -HwmpRtable::GetTypeId(void) +HwmpRtable::GetTypeId() { static TypeId tid = TypeId ("ns3::HwmpRtable") .SetParent () diff --git a/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.h b/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.h index e497a65cb..998312bad 100644 --- a/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.h +++ b/src/devices/l2-routing/l2-routing-hwmp/hwmp-rtable.h @@ -36,7 +36,7 @@ namespace ns3 { class HwmpRtable : public Object { public: - static TypeId GetTypeId (void); + static TypeId GetTypeId (); HwmpRtable(); ~HwmpRtable(); void DoDispose(); diff --git a/src/devices/l2-routing/l2-routing-hwmp/hwmp-state.cc b/src/devices/l2-routing/l2-routing-hwmp/hwmp-state.cc index b0d28c846..18293db3c 100644 --- a/src/devices/l2-routing/l2-routing-hwmp/hwmp-state.cc +++ b/src/devices/l2-routing/l2-routing-hwmp/hwmp-state.cc @@ -28,7 +28,7 @@ namespace ns3 { NS_LOG_COMPONENT_DEFINE ("HwmpState"); TypeId -HwmpState::GetTypeId (void) +HwmpState::GetTypeId () { static TypeId tid = TypeId ("ns3::HwmpState") .SetParent () diff --git a/src/devices/l2-routing/l2-routing-hwmp/hwmp.cc b/src/devices/l2-routing/l2-routing-hwmp/hwmp.cc index bf7b110d1..a7808029b 100644 --- a/src/devices/l2-routing/l2-routing-hwmp/hwmp.cc +++ b/src/devices/l2-routing/l2-routing-hwmp/hwmp.cc @@ -87,7 +87,7 @@ HwmpTag::GetSeqno() } TypeId -HwmpTag::GetTypeId (void) +HwmpTag::GetTypeId () { static TypeId tid = TypeId ("ns3::HwmpTag") .SetParent () @@ -97,13 +97,13 @@ HwmpTag::GetTypeId (void) } TypeId -HwmpTag::GetInstanceTypeId(void) const +HwmpTag::GetInstanceTypeId() const { return GetTypeId(); } uint32_t -HwmpTag::GetSerializedSize(void) const +HwmpTag::GetSerializedSize() const { return 6 //address @@ -149,7 +149,7 @@ HwmpTag::DecrementTtl() } //Class HWMP: TypeId -Hwmp::GetTypeId (void) +Hwmp::GetTypeId () { static TypeId tid = TypeId ("ns3::Hwmp") .SetParent () diff --git a/src/devices/l2-routing/l2-routing-hwmp/hwmp.h b/src/devices/l2-routing/l2-routing-hwmp/hwmp.h index d5ecb5d81..91e1c8f3b 100644 --- a/src/devices/l2-routing/l2-routing-hwmp/hwmp.h +++ b/src/devices/l2-routing/l2-routing-hwmp/hwmp.h @@ -63,9 +63,9 @@ namespace ns3 { uint32_t GetSeqno(); void DecrementTtl(); - static TypeId GetTypeId (void); - virtual TypeId GetInstanceTypeId (void) const; - virtual uint32_t GetSerializedSize (void) const; + static TypeId GetTypeId (); + virtual TypeId GetInstanceTypeId () const; + virtual uint32_t GetSerializedSize () const; virtual void Serialize (TagBuffer i) const; virtual void Deserialize (TagBuffer i); virtual void Print (std::ostream &os) const; diff --git a/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.cc b/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.cc index af99a56d0..26b28653c 100644 --- a/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.cc +++ b/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.cc @@ -35,7 +35,7 @@ NS_OBJECT_ENSURE_REGISTERED (L2RoutingNetDevice); TypeId -L2RoutingNetDevice::GetTypeId (void) +L2RoutingNetDevice::GetTypeId () { static TypeId tid = TypeId ("ns3::L2RoutingNetDevice") .SetParent () @@ -103,7 +103,7 @@ L2RoutingNetDevice::Forward (Ptr inport, Ptr packet, } uint32_t -L2RoutingNetDevice::GetNPorts (void) const +L2RoutingNetDevice::GetNPorts () const { NS_LOG_FUNCTION_NOARGS (); return m_ports.size (); @@ -141,7 +141,7 @@ L2RoutingNetDevice::SetName(const std::string name) } std::string -L2RoutingNetDevice::GetName(void) const +L2RoutingNetDevice::GetName() const { NS_LOG_FUNCTION_NOARGS (); return m_name; @@ -155,21 +155,21 @@ L2RoutingNetDevice::SetIfIndex(const uint32_t index) } uint32_t -L2RoutingNetDevice::GetIfIndex(void) const +L2RoutingNetDevice::GetIfIndex() const { NS_LOG_FUNCTION_NOARGS (); return m_ifIndex; } Ptr -L2RoutingNetDevice::GetChannel (void) const +L2RoutingNetDevice::GetChannel () const { NS_LOG_FUNCTION_NOARGS (); return m_channel; } Address -L2RoutingNetDevice::GetAddress (void) const +L2RoutingNetDevice::GetAddress () const { NS_LOG_FUNCTION_NOARGS (); return m_address; @@ -184,7 +184,7 @@ L2RoutingNetDevice::SetMtu (const uint16_t mtu) } uint16_t -L2RoutingNetDevice::GetMtu (void) const +L2RoutingNetDevice::GetMtu () const { NS_LOG_FUNCTION_NOARGS (); return 1500; @@ -192,7 +192,7 @@ L2RoutingNetDevice::GetMtu (void) const bool -L2RoutingNetDevice::IsLinkUp (void) const +L2RoutingNetDevice::IsLinkUp () const { NS_LOG_FUNCTION_NOARGS (); return true; @@ -204,7 +204,7 @@ L2RoutingNetDevice::SetLinkChangeCallback (Callback callback) {} bool -L2RoutingNetDevice::IsBroadcast (void) const +L2RoutingNetDevice::IsBroadcast () const { NS_LOG_FUNCTION_NOARGS (); return true; @@ -212,14 +212,14 @@ L2RoutingNetDevice::IsBroadcast (void) const Address -L2RoutingNetDevice::GetBroadcast (void) const +L2RoutingNetDevice::GetBroadcast () const { NS_LOG_FUNCTION_NOARGS (); return Mac48Address ("ff:ff:ff:ff:ff:ff"); } bool -L2RoutingNetDevice::IsMulticast (void) const +L2RoutingNetDevice::IsMulticast () const { NS_LOG_FUNCTION_NOARGS (); return true; @@ -235,14 +235,14 @@ L2RoutingNetDevice::GetMulticast (Ipv4Address multicastGroup) const bool -L2RoutingNetDevice::IsPointToPoint (void) const +L2RoutingNetDevice::IsPointToPoint () const { NS_LOG_FUNCTION_NOARGS (); return false; } bool -L2RoutingNetDevice::IsBridge (void) const +L2RoutingNetDevice::IsBridge () const { NS_LOG_FUNCTION_NOARGS (); return false; @@ -267,7 +267,7 @@ L2RoutingNetDevice::SendFrom (Ptr packet, const Address& src, const Addr Ptr -L2RoutingNetDevice::GetNode (void) const +L2RoutingNetDevice::GetNode () const { NS_LOG_FUNCTION_NOARGS (); return m_node; @@ -283,7 +283,7 @@ L2RoutingNetDevice::SetNode (Ptr node) bool -L2RoutingNetDevice::NeedsArp (void) const +L2RoutingNetDevice::NeedsArp () const { NS_LOG_FUNCTION_NOARGS (); return true; diff --git a/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.h b/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.h index a09ef125b..a1d8df296 100644 --- a/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.h +++ b/src/devices/l2-routing/l2-routing-main/l2-routing-net-device.h @@ -51,7 +51,7 @@ namespace ns3 { class L2RoutingNetDevice : public NetDevice { public: - static TypeId GetTypeId (void); + static TypeId GetTypeId (); L2RoutingNetDevice (); virtual ~L2RoutingNetDevice (); /** @@ -71,7 +71,7 @@ namespace ns3 { * \returns number of ports attached to * L2RoutingNetDevice */ - uint32_t GetNPorts (void) const; + uint32_t GetNPorts () const; /** * \returns a pointer to netdevice * \param n is device ID to be returned @@ -79,31 +79,31 @@ namespace ns3 { Ptr GetPort (uint32_t n) const; //inherited from netdevice: virtual void SetName(const std::string name); - virtual std::string GetName(void) const; + virtual std::string GetName() const; virtual void SetIfIndex(const uint32_t index); - virtual uint32_t GetIfIndex(void) const; - virtual Ptr GetChannel (void) const; - virtual Address GetAddress (void) const; + virtual uint32_t GetIfIndex() const; + virtual Ptr GetChannel () const; + virtual Address GetAddress () const; virtual bool SetMtu (const uint16_t mtu); - virtual uint16_t GetMtu (void) const; - virtual bool IsLinkUp (void) const; + virtual uint16_t GetMtu () const; + virtual bool IsLinkUp () const; virtual void SetLinkChangeCallback (Callback callback); - virtual bool IsBroadcast (void) const; - virtual Address GetBroadcast (void) const; - virtual bool IsMulticast (void) const; + virtual bool IsBroadcast () const; + virtual Address GetBroadcast () const; + virtual bool IsMulticast () const; virtual Address GetMulticast (Ipv4Address multicastGroup) const; - virtual bool IsPointToPoint (void) const; - virtual bool IsBridge (void) const; + virtual bool IsPointToPoint () const; + virtual bool IsBridge () const; virtual bool Send (Ptr packet, const Address& dest, uint16_t protocolNumber); virtual bool SendFrom (Ptr packet, const Address& source, const Address& dest, uint16_t protocolNumber); - virtual Ptr GetNode (void) const; + virtual Ptr GetNode () const; virtual void SetNode (Ptr node); - virtual bool NeedsArp (void) const; + virtual bool NeedsArp () const; virtual void SetReceiveCallback (NetDevice::ReceiveCallback cb); virtual void SetPromiscReceiveCallback (NetDevice::PromiscReceiveCallback cb); virtual bool SupportsSendFrom () const; virtual Address GetMulticast (Ipv6Address addr) const; - virtual void DoDispose (void); + virtual void DoDispose (); /** * \brief Attaches protocol to a given virtual * device diff --git a/src/devices/wifi/dot11s-codes.h b/src/devices/wifi/dot11s-codes.h index 43171b3e6..b5b2a90f8 100644 --- a/src/devices/wifi/dot11s-codes.h +++ b/src/devices/wifi/dot11s-codes.h @@ -26,63 +26,63 @@ namespace ns3 { enum dot11sElementID { - MESH_CONFIGURATION = 18, - MESH_ID, - LINK_METRIC_REPORT, - CONGESTION_NOTIFICATION, - PEER_LINK_MANAGEMENT, - MESH_CHANNEL_SWITCH_ANNOUNCEMENT, - MESH_TIM, - AWAKE_WINDOW, - SYNCHRONIZATION_PROTOCOL, - BEACON_TIMING, - MDAOP_SETUP_REQUEST, - MDAOP_SETUP_REPLY, - MDAOP_ADVERTISEMENT, - MDAOP_SET_TEARDOWN, - CONNECTIVITY_REPORT, - PORTAL_ANNOUNCEMENT, - ROOT_ANNOUCEMENT, - PATH_REQUEST, - PATH_REPLY, - PATH_ERROR, - PROXY_UPDATE, - PROXY_UPDATE_CONFIRMATION, - MSCIE, - MSAIE, + IE11S_MESH_CONFIGURATION = 18, + IE11S_MESH_ID, + IE11S_LINK_METRIC_REPORT, + IE11S_CONGESTION_NOTIFICATION, + IE11S_PEER_LINK_MANAGEMENT, + IE11S_MESH_CHANNEL_SWITCH_ANNOUNCEMENT, + IE11S_MESH_TIM, + IE11S_AWAKE_WINDOW, + IE11S_SYNCHRONIZATION_PROTOCOL, + IE11S_BEACON_TIMING, + IE11S_MDAOP_SETUP_REQUEST, + IE11S_MDAOP_SETUP_REPLY, + IE11S_MDAOP_ADVERTISEMENT, + IE11S_MDAOP_SET_TEARDOWN, + IE11S_CONNECTIVITY_REPORT, + IE11S_PORTAL_ANNOUNCEMENT, + IE11S_RANN, + IE11S_PREQ, + IE11S_PREP, + IE11S_PERR, + IE11S_PROXY_UPDATE, + IE11S_PROXY_UPDATE_CONFIRMATION, + IE11S_MSCIE, + IE11S_MSAIE, }; enum dot11sReasonCode { - PEER_LINK_CANCELLED, - MESH_MAX_PEERS, - MESH_CAPABILITY_POLICY_VIOLATION, - MESH_CLOSE_RCVD, - MESH_MAX_RETRIES, - MESH_CONFIRM_TIMEOUT, - MESH_SECURITY_ROLE_NEGOTIATION_DIFFERS, - MESH_SECURITY_AUTHENTICATION_IMPOSSIBLE, - MESH_SECURITY_FAILED_VERIFICATION, - MESH_INVALID_GTK, - MESH_MISMATCH_GTK, - MESH_INCONSISTENT_PARAMETERS, - MESH_CONFIGURATION_POLICY_VIOLATION, - DOT11S_REASON_RESERVED, + REASON11S_PEER_LINK_CANCELLED, + REASON11S_MESH_MAX_PEERS, + REASON11S_MESH_CAPABILITY_POLICY_VIOLATION, + REASON11S_MESH_CLOSE_RCVD, + REASON11S_MESH_MAX_RETRIES, + REASON11S_MESH_CONFIRM_TIMEOUT, + REASON11S_MESH_SECURITY_ROLE_NEGOTIATION_DIFFERS, + REASON11S_MESH_SECURITY_AUTHENTICATION_IMPOSSIBLE, + REASON11S_MESH_SECURITY_FAILED_VERIFICATION, + REASON11S_MESH_INVALID_GTK, + REASON11S_MESH_MISMATCH_GTK, + REASON11S_MESH_INCONSISTENT_PARAMETERS, + REASON11S_MESH_CONFIGURATION_POLICY_VIOLATION, + REASON11S_RESERVED, }; enum dot11sStatusCode { - PEAR_LINK_ESTABLISHED, - PEAR_LINK_CLOSED, - NO_LISTED_KEY_HOLDER, - MESH_KEY_HANDSHAKE_MALFORMED, - PEAR_LINK_MAX_RETRIES, - PEAR_LINK_NO_PMK, - PEAR_LINK_ALT_PMK, - PEAR_LINK_NO_AKM, - PEAR_LINK_ALT_AKM, - PEAR_LINK_NO_KDF, - PEAR_LINK_SA_ESTABLISHED, - AUTHENTICATION_REJECTED_CLOGGING, - DOT11S_STATUS_RESERVED, + STATUS11S_PEAR_LINK_ESTABLISHED, + STATUS11S_PEAR_LINK_CLOSED, + STATUS11S_NO_LISTED_KEY_HOLDER, + STATUS11S_MESH_KEY_HANDSHAKE_MALFORMED, + STATUS11S_PEAR_LINK_MAX_RETRIES, + STATUS11S_PEAR_LINK_NO_PMK, + STATUS11S_PEAR_LINK_ALT_PMK, + STATUS11S_PEAR_LINK_NO_AKM, + STATUS11S_PEAR_LINK_ALT_AKM, + STATUS11S_PEAR_LINK_NO_KDF, + STATUS11S_PEAR_LINK_SA_ESTABLISHED, + STATUS11S_AUTHENTICATION_REJECTED_CLOGGING, + STATUS11S_RESERVED, }; } diff --git a/src/devices/wifi/dot11s-peer-management-element.cc b/src/devices/wifi/dot11s-peer-management-element.cc index 66e61bcc2..a027d44d5 100644 --- a/src/devices/wifi/dot11s-peer-management-element.cc +++ b/src/devices/wifi/dot11s-peer-management-element.cc @@ -33,7 +33,7 @@ PeerLinkManagementElement::PeerLinkManagementElement (): m_subtype(PEER_OPEN), m_localLinkId(0), m_peerLinkId(0), - m_reasonCode(DOT11S_REASON_RESERVED) + m_reasonCode(REASON11S_RESERVED) {} diff --git a/src/devices/wifi/dot11s-peer-management-element.h b/src/devices/wifi/dot11s-peer-management-element.h index a4a51ad40..3fe26567c 100644 --- a/src/devices/wifi/dot11s-peer-management-element.h +++ b/src/devices/wifi/dot11s-peer-management-element.h @@ -55,7 +55,7 @@ class PeerLinkManagementElement Buffer::Iterator Serialize (Buffer::Iterator i) const; Buffer::Iterator Deserialize (Buffer::Iterator i); private: - static uint8_t ElementId() { return (uint8_t)PEER_LINK_MANAGEMENT; } + static uint8_t ElementId() { return (uint8_t)IE11S_PEER_LINK_MANAGEMENT; } uint8_t m_length; uint8_t m_subtype; uint16_t m_localLinkId; //always is present diff --git a/src/devices/wifi/mesh-configuration-element.cc b/src/devices/wifi/mesh-configuration-element.cc index 85e0ca7aa..b45bb9674 100644 --- a/src/devices/wifi/mesh-configuration-element.cc +++ b/src/devices/wifi/mesh-configuration-element.cc @@ -36,7 +36,7 @@ dot11sMeshCapability::dot11sMeshCapability(): powerSaveLevel(false) {} -uint32_t dot11sMeshCapability::GetSerializedSize (void) const +uint32_t dot11sMeshCapability::GetSerializedSize () const { return 2; } @@ -86,7 +86,7 @@ MeshConfigurationElement::MeshConfigurationElement (): {} uint32_t -MeshConfigurationElement::GetSerializedSize (void) const +MeshConfigurationElement::GetSerializedSize () const { return 1 // ID + 1 // Length @@ -158,13 +158,13 @@ MeshConfigurationElement::SetMetric(dot11sPathSelectionMetric metricId) } bool -MeshConfigurationElement::IsHWMP(void) +MeshConfigurationElement::IsHWMP() { return (m_APSId == PROTOCOL_HWMP); } bool -MeshConfigurationElement::IsAirtime(void) +MeshConfigurationElement::IsAirtime() { return (m_APSMId == METRIC_AIRTIME); } diff --git a/src/devices/wifi/mesh-configuration-element.h b/src/devices/wifi/mesh-configuration-element.h index c9a71349b..1abe38995 100644 --- a/src/devices/wifi/mesh-configuration-element.h +++ b/src/devices/wifi/mesh-configuration-element.h @@ -58,7 +58,7 @@ class dot11sMeshCapability { public: dot11sMeshCapability(); - uint32_t GetSerializedSize (void) const; + uint32_t GetSerializedSize () const; Buffer::Iterator Serialize (Buffer::Iterator i) const; Buffer::Iterator Deserialize (Buffer::Iterator i); bool acceptPeerLinks; @@ -77,18 +77,18 @@ class MeshConfigurationElement MeshConfigurationElement(); void SetRouting(dot11sPathSelectionProtocol routingId); void SetMetric(dot11sPathSelectionMetric metricId); - bool IsHWMP(void); - bool IsAirtime(void); + bool IsHWMP(); + bool IsAirtime(); dot11sMeshCapability const& MeshCapability(); - uint32_t GetSerializedSize (void) const; + uint32_t GetSerializedSize () const; Buffer::Iterator Serialize (Buffer::Iterator i) const; Buffer::Iterator Deserialize (Buffer::Iterator i); // TODO: Release and fill other fields in configuration // element private: - static uint8_t ElementId() { return (uint8_t)MESH_CONFIGURATION; } + static uint8_t ElementId() { return (uint8_t)IE11S_MESH_CONFIGURATION; } /** Active Path Selection Protocol ID */ dot11sPathSelectionProtocol m_APSId; /** Active Path Metric ID */ diff --git a/src/devices/wifi/mesh-mgt-headers.cc b/src/devices/wifi/mesh-mgt-headers.cc index 1ab8fb6a7..02caa702b 100644 --- a/src/devices/wifi/mesh-mgt-headers.cc +++ b/src/devices/wifi/mesh-mgt-headers.cc @@ -59,7 +59,7 @@ MgtMeshBeaconHeader::GetWifiBeaconTimingElement() } uint32_t -MgtMeshBeaconHeader::GetSerializedSize (void) const +MgtMeshBeaconHeader::GetSerializedSize () const { uint32_t size = ( MgtBeaconHeader::GetSerializedSize() @@ -178,7 +178,7 @@ MeshMgtPeerLinkManFrame::GetPeerLinkManagementElement() } TypeId -MeshMgtPeerLinkManFrame::GetTypeId(void) +MeshMgtPeerLinkManFrame::GetTypeId() { static TypeId tid = TypeId ("ns3::MeshMgtPeerLinkManFrame") @@ -189,7 +189,7 @@ MeshMgtPeerLinkManFrame::GetTypeId(void) } TypeId -MeshMgtPeerLinkManFrame::GetInstanceTypeId(void) const +MeshMgtPeerLinkManFrame::GetInstanceTypeId() const { return GetTypeId(); } @@ -201,7 +201,7 @@ MeshMgtPeerLinkManFrame::Print(std::ostream &os) const } uint32_t -MeshMgtPeerLinkManFrame::GetSerializedSize(void) const +MeshMgtPeerLinkManFrame::GetSerializedSize() const { uint32_t size = 1; //Subtype if(MESH_MGT_HEADER_PEER_CONFIRM == Subtype) diff --git a/src/devices/wifi/mesh-mgt-headers.h b/src/devices/wifi/mesh-mgt-headers.h index e978ba3d8..2fb66604e 100644 --- a/src/devices/wifi/mesh-mgt-headers.h +++ b/src/devices/wifi/mesh-mgt-headers.h @@ -49,7 +49,7 @@ class MgtMeshBeaconHeader : public MgtBeaconHeader void SetWifiBeaconTimingElement(WifiBeaconTimingElement wifi_timing); MeshConfigurationElement GetMeshConfigurationElement(); WifiBeaconTimingElement GetWifiBeaconTimingElement(); - virtual uint32_t GetSerializedSize (void) const; + virtual uint32_t GetSerializedSize () const; virtual void Serialize (Buffer::Iterator start) const; virtual uint32_t Deserialize (Buffer::Iterator start); @@ -77,10 +77,10 @@ class MeshMgtPeerLinkManFrame : public Header MeshConfigurationElement GetMeshConfigurationElement(); PeerLinkManagementElement GetPeerLinkManagementElement(); - static TypeId GetTypeId(void); - virtual TypeId GetInstanceTypeId(void) const; + static TypeId GetTypeId(); + virtual TypeId GetInstanceTypeId() const; virtual void Print(std::ostream &os) const; - virtual uint32_t GetSerializedSize(void) const; + virtual uint32_t GetSerializedSize() const; virtual void Serialize(Buffer::Iterator start) const; virtual uint32_t Deserialize(Buffer::Iterator start); //Subtype defining methods: diff --git a/src/devices/wifi/mesh-wifi-beacon-timing-element.cc b/src/devices/wifi/mesh-wifi-beacon-timing-element.cc index b3fc2200b..94b381ec0 100644 --- a/src/devices/wifi/mesh-wifi-beacon-timing-element.cc +++ b/src/devices/wifi/mesh-wifi-beacon-timing-element.cc @@ -143,7 +143,7 @@ WifiBeaconTimingElement::ClearTimingElement() } uint32_t -WifiBeaconTimingElement::GetSerializedSize (void) const +WifiBeaconTimingElement::GetSerializedSize () const { return (2+5*m_numOfUnits > m_maxSize) ? 2+((m_maxSize-2)/5)*5 : 2+5*m_numOfUnits; } diff --git a/src/devices/wifi/mesh-wifi-beacon-timing-element.h b/src/devices/wifi/mesh-wifi-beacon-timing-element.h index 4d2952025..5eb4464fd 100644 --- a/src/devices/wifi/mesh-wifi-beacon-timing-element.h +++ b/src/devices/wifi/mesh-wifi-beacon-timing-element.h @@ -90,11 +90,11 @@ class WifiBeaconTimingElement return (uint8_t)(x&0xff); }; //Serialize-deserialize methods: - uint32_t GetSerializedSize (void) const; + uint32_t GetSerializedSize () const; Buffer::Iterator Serialize (Buffer::Iterator i) const; Buffer::Iterator Deserialize (Buffer::Iterator i); private: - static uint8_t ElementId() { return (uint8_t)BEACON_TIMING; } + static uint8_t ElementId() { return (uint8_t)IE11S_BEACON_TIMING; } NeighboursTimingUnitsList m_neighbours; //The maximum size of this element: const static uint16_t DEFAULT_MAX_SIZE = 255*5 +2; diff --git a/src/devices/wifi/mesh-wifi-mac-header.cc b/src/devices/wifi/mesh-wifi-mac-header.cc index a46076647..30dc09229 100644 --- a/src/devices/wifi/mesh-wifi-mac-header.cc +++ b/src/devices/wifi/mesh-wifi-mac-header.cc @@ -8,7 +8,7 @@ namespace ns3 { * Here Mesh Mac Header functionality is defined. ***********************************************************/ TypeId -WifiMeshHeader::GetTypeId (void) +WifiMeshHeader::GetTypeId () { static TypeId tid = TypeId ("ns3::WifiMeshHeader") .SetParent
() @@ -27,7 +27,7 @@ WifiMeshHeader::~WifiMeshHeader() } TypeId -WifiMeshHeader::GetInstanceTypeId (void) const +WifiMeshHeader::GetInstanceTypeId () const { return GetTypeId (); } @@ -108,7 +108,7 @@ WifiMeshHeader::GetAddressExt () uint32_t -WifiMeshHeader::GetSerializedSize (void) const +WifiMeshHeader::GetSerializedSize () const { return 6 + ((0xc0 & m_meshFlags) >> 6)*6; } @@ -296,7 +296,7 @@ WifiMeshMultihopActionHeader::GetAction() } TypeId -WifiMeshMultihopActionHeader::GetTypeId (void) +WifiMeshMultihopActionHeader::GetTypeId () { static TypeId tid = TypeId ("ns3::WifiMeshMultihopActionHeader") .SetParent
() @@ -306,7 +306,7 @@ WifiMeshMultihopActionHeader::GetTypeId (void) } TypeId -WifiMeshMultihopActionHeader::GetInstanceTypeId (void) const +WifiMeshMultihopActionHeader::GetInstanceTypeId () const { return GetTypeId(); } @@ -317,7 +317,7 @@ WifiMeshMultihopActionHeader::Print (std::ostream &os) const } uint32_t -WifiMeshMultihopActionHeader::GetSerializedSize (void) const +WifiMeshMultihopActionHeader::GetSerializedSize () const { return 2; } diff --git a/src/devices/wifi/mesh-wifi-mac-header.h b/src/devices/wifi/mesh-wifi-mac-header.h index 34b2bbe6d..1227bde17 100644 --- a/src/devices/wifi/mesh-wifi-mac-header.h +++ b/src/devices/wifi/mesh-wifi-mac-header.h @@ -13,8 +13,8 @@ class WifiMeshHeader : public Header //7.1.3.5b public: WifiMeshHeader (); ~WifiMeshHeader (); - static TypeId GetTypeId (void); - virtual TypeId GetInstanceTypeId (void) const; + static TypeId GetTypeId (); + virtual TypeId GetInstanceTypeId () const; virtual void Print (std::ostream &os) const; void SetAddr5 (Mac48Address address); @@ -33,7 +33,7 @@ class WifiMeshHeader : public Header //7.1.3.5b void SetAddressExt (uint8_t num_of_addresses); uint8_t GetAddressExt (); - virtual uint32_t GetSerializedSize (void) const; + virtual uint32_t GetSerializedSize () const; virtual void Serialize (Buffer::Iterator start) const; virtual uint32_t Deserialize (Buffer::Iterator start); private: @@ -110,10 +110,10 @@ class WifiMeshMultihopActionHeader : public Header //7.2.3.14 void SetAction(enum CategoryValue type,ACTION_VALUE action); enum CategoryValue GetCategory(); ACTION_VALUE GetAction(); - static TypeId GetTypeId (void); - virtual TypeId GetInstanceTypeId (void) const; + static TypeId GetTypeId (); + virtual TypeId GetInstanceTypeId () const; virtual void Print (std::ostream &os) const; - virtual uint32_t GetSerializedSize (void) const; + virtual uint32_t GetSerializedSize () const; virtual void Serialize (Buffer::Iterator start) const; virtual uint32_t Deserialize (Buffer::Iterator start); private: diff --git a/src/devices/wifi/mesh-wifi-mac.cc b/src/devices/wifi/mesh-wifi-mac.cc index a5857e58f..32e23afb6 100644 --- a/src/devices/wifi/mesh-wifi-mac.cc +++ b/src/devices/wifi/mesh-wifi-mac.cc @@ -46,7 +46,7 @@ namespace ns3 { NS_OBJECT_ENSURE_REGISTERED (MeshWifiMac); TypeId -MeshWifiMac::GetTypeId (void) +MeshWifiMac::GetTypeId () { static TypeId tid = TypeId ("ns3::MeshWifiMac") .SetParent () @@ -160,37 +160,37 @@ MeshWifiMac::SetEifsNoDifs (Time eifsNoDifs) } Time -MeshWifiMac::GetSlot (void) const +MeshWifiMac::GetSlot () const { return m_slot; } Time -MeshWifiMac::GetSifs (void) const +MeshWifiMac::GetSifs () const { return m_sifs; } Time -MeshWifiMac::GetEifsNoDifs (void) const +MeshWifiMac::GetEifsNoDifs () const { return m_eifsNoDifs; } Time -MeshWifiMac::GetAckTimeout (void) const +MeshWifiMac::GetAckTimeout () const { return m_low->GetAckTimeout (); } Time -MeshWifiMac::GetCtsTimeout (void) const +MeshWifiMac::GetCtsTimeout () const { return m_low->GetCtsTimeout (); } Time -MeshWifiMac::GetPifs (void) const +MeshWifiMac::GetPifs () const { return m_low->GetPifs (); } @@ -236,7 +236,7 @@ MeshWifiMac::Enqueue (Ptr packet, Mac48Address to) } bool -MeshWifiMac::SupportsSendFrom (void) const +MeshWifiMac::SupportsSendFrom () const { return true; } @@ -265,18 +265,18 @@ MeshWifiMac::SetLinkDownCallback (Callback linkDown) } Mac48Address -MeshWifiMac::GetAddress (void) const +MeshWifiMac::GetAddress () const { return m_address; } Mac48Address -MeshWifiMac::GetBssid (void) const +MeshWifiMac::GetBssid () const { return m_address; } Ssid -MeshWifiMac::GetSsid (void) const +MeshWifiMac::GetSsid () const { return m_MeshId; } @@ -304,7 +304,7 @@ MeshWifiMac::SetBeaconInterval (Time interval) } void -MeshWifiMac::DoDispose (void) +MeshWifiMac::DoDispose () { NS_LOG_FUNCTION (this); delete m_rxMiddle; @@ -378,7 +378,7 @@ MeshWifiMac::ForwardDown (Ptr packet, Mac48Address from, Mac48Addr } SupportedRates -MeshWifiMac::GetSupportedRates (void) const +MeshWifiMac::GetSupportedRates () const { // send the set of supported rates and make sure that we indicate // the Basic Rate set in this set of supported rates. @@ -398,7 +398,7 @@ MeshWifiMac::GetSupportedRates (void) const } void -MeshWifiMac::SendOneBeacon (void) +MeshWifiMac::SendOneBeacon () { NS_LOG_FUNCTION (this); NS_LOG_DEBUG(GetAddress()<<" is sending beacon"); @@ -466,7 +466,7 @@ MeshWifiMac::SetBeaconGeneration (bool enable) } bool -MeshWifiMac::GetBeaconGeneration (void) const +MeshWifiMac::GetBeaconGeneration () const { return m_beaconFormEvent.IsRunning (); } diff --git a/src/devices/wifi/mesh-wifi-mac.h b/src/devices/wifi/mesh-wifi-mac.h index 560026c5e..15cede9a6 100644 --- a/src/devices/wifi/mesh-wifi-mac.h +++ b/src/devices/wifi/mesh-wifi-mac.h @@ -67,7 +67,7 @@ namespace ns3 { class MeshWifiMac : public WifiMac { public: - static TypeId GetTypeId (void); + static TypeId GetTypeId (); MeshWifiMac (); ~MeshWifiMac (); @@ -78,23 +78,23 @@ namespace ns3 { virtual void SetCtsTimeout (Time ctsTimeout); virtual void SetAckTimeout (Time ackTimeout); virtual void SetEifsNoDifs (Time eifsNoDifs); - virtual Time GetSlot (void) const; - virtual Time GetSifs (void) const; - virtual Time GetPifs (void) const; - virtual Time GetCtsTimeout (void) const; - virtual Time GetAckTimeout (void) const; - virtual Time GetEifsNoDifs (void) const; + virtual Time GetSlot () const; + virtual Time GetSifs () const; + virtual Time GetPifs () const; + virtual Time GetCtsTimeout () const; + virtual Time GetAckTimeout () const; + virtual Time GetEifsNoDifs () const; virtual void SetWifiPhy (Ptr phy); virtual void SetWifiRemoteStationManager (Ptr stationManager); virtual void Enqueue (Ptr packet, Mac48Address to, Mac48Address from); virtual void Enqueue (Ptr packet, Mac48Address to); - virtual bool SupportsSendFrom (void) const; + virtual bool SupportsSendFrom () const; virtual void SetForwardUpCallback (Callback, Mac48Address, Mac48Address> upCallback); virtual void SetLinkUpCallback (Callback linkUp); virtual void SetLinkDownCallback (Callback linkDown); - virtual Mac48Address GetAddress (void) const; - virtual Mac48Address GetBssid (void) const; - virtual Ssid GetSsid (void) const; + virtual Mac48Address GetAddress () const; + virtual Mac48Address GetBssid () const; + virtual Ssid GetSsid () const; virtual void SetAddress (Mac48Address address); virtual void SetSsid (Ssid ssid); /** @@ -105,7 +105,7 @@ namespace ns3 { /** * \returns interval between two beacons */ - Time GetBeaconInterval (void) const; + Time GetBeaconInterval () const; /** * \param delay is the maximum software delay. * @@ -285,7 +285,7 @@ namespace ns3 { * beacon frame body. Then calculates software * delay and schedules QueueOneBeacon */ - void SendOneBeacon (void); + void SendOneBeacon (); /** * \brief Puts a formed beacon to the output * queue. SendOneBeacon forms a beacon and @@ -313,9 +313,9 @@ namespace ns3 { */ void QueuePathSelectionFrame(Ptr packet, const WifiMacHeader hdr); void SetBeaconGeneration (bool enable); - bool GetBeaconGeneration (void) const; - SupportedRates GetSupportedRates (void) const; - virtual void DoDispose (void); + bool GetBeaconGeneration () const; + SupportedRates GetSupportedRates () const; + virtual void DoDispose (); Ptr m_BE; Ptr m_BK; @@ -388,4 +388,4 @@ namespace ns3 { #endif /* MAC_HIGH_MESH_H */ -//\} \ No newline at end of file +//\} diff --git a/src/devices/wifi/mesh-wifi-peer-manager.cc b/src/devices/wifi/mesh-wifi-peer-manager.cc index df359a144..557cd925a 100644 --- a/src/devices/wifi/mesh-wifi-peer-manager.cc +++ b/src/devices/wifi/mesh-wifi-peer-manager.cc @@ -156,7 +156,7 @@ void WifiPeerLinkDescriptor::MLMEActivePeerLinkOpen() } void WifiPeerLinkDescriptor::MLMEPeeringRequestReject() { - StateMachine(REQ_RJCT, PEER_LINK_CANCELLED); + StateMachine(REQ_RJCT, REASON11S_PEER_LINK_CANCELLED); } #if 0 void WifiPeerLinkDescriptor::MLMEBindSecurityAssociation() @@ -303,7 +303,7 @@ WifiPeerLinkDescriptor::StateMachine(PeerEvent event,dot11sReasonCode reasoncode case CLS_ACPT: m_state = HOLDING; ClearRetryTimer(); - SendPeerLinkClose(MESH_CLOSE_RCVD); + SendPeerLinkClose(REASON11S_MESH_CLOSE_RCVD); SetHoldingTimer(); break; case OPN_RJCT: @@ -316,13 +316,13 @@ WifiPeerLinkDescriptor::StateMachine(PeerEvent event,dot11sReasonCode reasoncode case TOR2: m_state = HOLDING; ClearRetryTimer(); - SendPeerLinkClose(MESH_MAX_RETRIES); + SendPeerLinkClose(REASON11S_MESH_MAX_RETRIES); SetHoldingTimer(); break; case CNCL: m_state = HOLDING; ClearRetryTimer(); - SendPeerLinkClose(PEER_LINK_CANCELLED); + SendPeerLinkClose(REASON11S_PEER_LINK_CANCELLED); SetHoldingTimer(); break; default:{} @@ -344,7 +344,7 @@ NS_LOG_DEBUG("I am "< >::iterator i = port->second.begin(); i!= port->second.end(); i++) if((*i)->GetPeerAddress() == peerAddress) { - (*i)->MLMECancelPeerLink(MESH_CONFIGURATION_POLICY_VIOLATION); + (*i)->MLMECancelPeerLink(REASON11S_MESH_CONFIGURATION_POLICY_VIOLATION); return; } @@ -890,7 +890,7 @@ WifiPeerManager::ShouldAcceptOpen(Mac48Address portAddress, Mac48Address peerAdd { if(m_numberOfActivePeers > m_maxNumberOfPeerLinks) { - reasonCode = MESH_MAX_PEERS; + reasonCode = REASON11S_MESH_MAX_PEERS; return false; } return true; diff --git a/src/devices/wifi/mesh-wifi-peer-manager.h b/src/devices/wifi/mesh-wifi-peer-manager.h index 658f4b026..1eaa4cb91 100644 --- a/src/devices/wifi/mesh-wifi-peer-manager.h +++ b/src/devices/wifi/mesh-wifi-peer-manager.h @@ -140,7 +140,7 @@ namespace ns3 TOH, }; private: - void StateMachine(PeerEvent event,dot11sReasonCode = DOT11S_REASON_RESERVED); + void StateMachine(PeerEvent event,dot11sReasonCode = REASON11S_RESERVED); /** Events handlers */ void ClearRetryTimer(); void ClearConfirmTimer(); @@ -198,7 +198,7 @@ namespace ns3 WifiPeerManager(); WifiPeerManager(Ptr mac_pointer); ~WifiPeerManager(); - static TypeId GetTypeId (void); + static TypeId GetTypeId (); //Returns a beacon timing element stored for remote station: WifiBeaconTimingElement GetWifiBeaconTimingElementForAddress(Mac48Address portAddress, Mac48Address addr); diff --git a/src/devices/wifi/mesh-wifi-perr-information-element.cc b/src/devices/wifi/mesh-wifi-perr-information-element.cc index 254f10a91..ea7daa9ba 100644 --- a/src/devices/wifi/mesh-wifi-perr-information-element.cc +++ b/src/devices/wifi/mesh-wifi-perr-information-element.cc @@ -41,7 +41,7 @@ WifiPerrInformationElement::Print(std::ostream &os) const // FILL } TypeId -WifiPerrInformationElement::GetInstanceTypeId(void) const +WifiPerrInformationElement::GetInstanceTypeId() const { return GetTypeId(); } diff --git a/src/devices/wifi/mesh-wifi-perr-information-element.h b/src/devices/wifi/mesh-wifi-perr-information-element.h index fa4906501..62f477cc7 100644 --- a/src/devices/wifi/mesh-wifi-perr-information-element.h +++ b/src/devices/wifi/mesh-wifi-perr-information-element.h @@ -39,8 +39,8 @@ class WifiPerrInformationElement : public Header public: WifiPerrInformationElement(); ~WifiPerrInformationElement(); - static TypeId GetTypeId(void); - virtual TypeId GetInstanceTypeId(void) const; + static TypeId GetTypeId(); + virtual TypeId GetInstanceTypeId() const; virtual void Print(std::ostream &os) const; virtual void Serialize(Buffer::Iterator i) const; virtual uint32_t Deserialize(Buffer::Iterator start); @@ -58,7 +58,7 @@ class WifiPerrInformationElement : public Header void DeleteAddressUnit(Mac48Address address); void ResetPerr(); private: - static uint8_t ElementId() { return (uint8_t)PATH_ERROR; } + static uint8_t ElementId() { return (uint8_t)IE11S_PERR; } uint8_t m_numOfDest; std::vector m_addressUnits; diff --git a/src/devices/wifi/mesh-wifi-prep-information-element.cc b/src/devices/wifi/mesh-wifi-prep-information-element.cc index 32b7f84ce..691fa6479 100644 --- a/src/devices/wifi/mesh-wifi-prep-information-element.cc +++ b/src/devices/wifi/mesh-wifi-prep-information-element.cc @@ -44,7 +44,7 @@ WifiPrepInformationElement::Print(std::ostream &os) const //TODO:fill this method } TypeId -WifiPrepInformationElement::GetInstanceTypeId(void) const +WifiPrepInformationElement::GetInstanceTypeId() const { return GetTypeId(); } diff --git a/src/devices/wifi/mesh-wifi-prep-information-element.h b/src/devices/wifi/mesh-wifi-prep-information-element.h index c7db0be17..66085f6d4 100644 --- a/src/devices/wifi/mesh-wifi-prep-information-element.h +++ b/src/devices/wifi/mesh-wifi-prep-information-element.h @@ -37,8 +37,8 @@ class WifiPrepInformationElement : public Header public: WifiPrepInformationElement(); ~WifiPrepInformationElement(); - static TypeId GetTypeId(void); - virtual TypeId GetInstanceTypeId(void) const; + static TypeId GetTypeId(); + virtual TypeId GetInstanceTypeId() const; virtual void Print(std::ostream &os) const; void SetFlags(uint8_t flags); void SetHopcount(uint8_t hopcount); @@ -66,7 +66,7 @@ class WifiPrepInformationElement : public Header void DecrementTtl(); void IncrementMetric(uint32_t metric); private: - static uint8_t ElementId() { return (uint8_t)PATH_REPLY; } + static uint8_t ElementId() { return (uint8_t)IE11S_PREP; } uint8_t m_flags; uint8_t m_hopcount; uint8_t m_ttl; diff --git a/src/devices/wifi/mesh-wifi-preq-information-element.cc b/src/devices/wifi/mesh-wifi-preq-information-element.cc index fbbfe8c73..b119c4851 100644 --- a/src/devices/wifi/mesh-wifi-preq-information-element.cc +++ b/src/devices/wifi/mesh-wifi-preq-information-element.cc @@ -99,7 +99,7 @@ WifiPreqInformationElement::Print(std::ostream &os) const } TypeId -WifiPreqInformationElement::GetInstanceTypeId(void) const +WifiPreqInformationElement::GetInstanceTypeId() const { return GetTypeId(); } diff --git a/src/devices/wifi/mesh-wifi-preq-information-element.h b/src/devices/wifi/mesh-wifi-preq-information-element.h index 79867f1a3..31d5048da 100644 --- a/src/devices/wifi/mesh-wifi-preq-information-element.h +++ b/src/devices/wifi/mesh-wifi-preq-information-element.h @@ -56,9 +56,9 @@ class WifiPreqInformationElement : public Header { public: WifiPreqInformationElement(); - ~WifiPreqInformationElement (void); - static TypeId GetTypeId (void); - virtual TypeId GetInstanceTypeId(void) const; + ~WifiPreqInformationElement (); + static TypeId GetTypeId (); + virtual TypeId GetInstanceTypeId() const; virtual void Print(std::ostream &os) const; void AddDestinationAddressElement( bool doFlag, @@ -103,7 +103,7 @@ class WifiPreqInformationElement : public Header void IncrementMetric(uint32_t metric); private: - static uint8_t ElementId() { return (uint8_t)PATH_REQUEST; } + static uint8_t ElementId() { return (uint8_t)IE11S_PREQ; } //how many destinations we support uint8_t m_maxSize; //TODO: make as an attrubute //Fields: diff --git a/src/devices/wifi/mesh-wifi-rann-information-element.cc b/src/devices/wifi/mesh-wifi-rann-information-element.cc index 07e7f9c82..bbaaf01dd 100644 --- a/src/devices/wifi/mesh-wifi-rann-information-element.cc +++ b/src/devices/wifi/mesh-wifi-rann-information-element.cc @@ -36,7 +36,7 @@ WifiRannInformationElement::GetTypeId() return tid; } TypeId -WifiRannInformationElement::GetInstanceTypeId(void) const +WifiRannInformationElement::GetInstanceTypeId() const { return GetTypeId(); } diff --git a/src/devices/wifi/mesh-wifi-rann-information-element.h b/src/devices/wifi/mesh-wifi-rann-information-element.h index 4ca9d7ff9..f9be0c1b9 100644 --- a/src/devices/wifi/mesh-wifi-rann-information-element.h +++ b/src/devices/wifi/mesh-wifi-rann-information-element.h @@ -38,8 +38,8 @@ class WifiRannInformationElement public: WifiRannInformationElement(); virtual ~WifiRannInformationElement(); - static TypeId GetTypeId(void); - virtual TypeId GetInstanceTypeId(void) const; + static TypeId GetTypeId(); + virtual TypeId GetInstanceTypeId() const; virtual void Print(std::ostream &os) const; void SetFlags(uint8_t flags); void SetHopcount(uint8_t hopcount); @@ -61,7 +61,7 @@ class WifiRannInformationElement void IncrementMetric(uint32_t metric); private: - static uint8_t ElementId() { return (uint8_t)ROOT_ANNOUCEMENT; } + static uint8_t ElementId() { return (uint8_t)IE11S_RANN; } uint8_t m_flags; uint8_t m_hopcount; uint8_t m_ttl;