diff --git a/src/devices/mesh/dot11s/hwmp-protocol.h b/src/devices/mesh/dot11s/hwmp-protocol.h index f451468bc..98f56f45a 100644 --- a/src/devices/mesh/dot11s/hwmp-protocol.h +++ b/src/devices/mesh/dot11s/hwmp-protocol.h @@ -86,6 +86,10 @@ public: void ResetStats (); private: friend class HwmpProtocolMac; + + HwmpProtocol& operator= (const HwmpProtocol &); + HwmpProtocol (const HwmpProtocol &); + /** * \brief Structure of path error: IePerr and list of receivers: * interfaces and MAC address diff --git a/src/devices/mesh/dot11s/ie-dot11s-id.h b/src/devices/mesh/dot11s/ie-dot11s-id.h index d9a62cae7..57a747b27 100644 --- a/src/devices/mesh/dot11s/ie-dot11s-id.h +++ b/src/devices/mesh/dot11s/ie-dot11s-id.h @@ -55,6 +55,7 @@ public: private: uint8_t m_meshId[33]; friend bool operator== (const IeMeshId & a, const IeMeshId & b); + }; std::ostream &operator << (std::ostream &os, const IeMeshId &meshId); diff --git a/src/devices/mesh/dot11s/peer-link-frame.cc b/src/devices/mesh/dot11s/peer-link-frame.cc index f7915a994..aa39a8da9 100644 --- a/src/devices/mesh/dot11s/peer-link-frame.cc +++ b/src/devices/mesh/dot11s/peer-link-frame.cc @@ -29,7 +29,7 @@ namespace dot11s { NS_OBJECT_ENSURE_REGISTERED (PeerLinkFrameStart); PeerLinkFrameStart::PeerLinkFrameStart () : - m_subtype (255), m_capability (0), m_aid (0), m_rates (SupportedRates ()), m_meshId (IeMeshId ()), + m_subtype (255), m_capability (0), m_aid (0), m_rates (SupportedRates ()), m_meshId (), m_config (IeConfiguration ()), m_reasonCode ((uint16_t) REASON11S_RESERVED) { } diff --git a/src/devices/mesh/dot11s/peer-link-frame.h b/src/devices/mesh/dot11s/peer-link-frame.h index 19bc4e0cd..20a24c93b 100644 --- a/src/devices/mesh/dot11s/peer-link-frame.h +++ b/src/devices/mesh/dot11s/peer-link-frame.h @@ -86,6 +86,10 @@ private: uint16_t m_reasonCode; friend bool operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b); + + PeerLinkFrameStart& operator= (const PeerLinkFrameStart &); + PeerLinkFrameStart (const PeerLinkFrameStart &); + }; bool operator== (const PeerLinkFrameStart & a, const PeerLinkFrameStart & b); } //namespace dot11s diff --git a/src/devices/mesh/dot11s/peer-link.h b/src/devices/mesh/dot11s/peer-link.h index e8b65c4a4..4bb9f03ea 100644 --- a/src/devices/mesh/dot11s/peer-link.h +++ b/src/devices/mesh/dot11s/peer-link.h @@ -198,6 +198,10 @@ private: /// Several successive beacons were lost, close link void BeaconLoss (); private: + + PeerLink& operator= (const PeerLink &); + PeerLink (const PeerLink &); + ///The number of interface I am associated with uint32_t m_interface; /// pointer to MAC plugin, which is responsible for peer management diff --git a/src/devices/mesh/dot11s/peer-management-protocol-mac.h b/src/devices/mesh/dot11s/peer-management-protocol-mac.h index c61d27c86..46c727019 100644 --- a/src/devices/mesh/dot11s/peer-management-protocol-mac.h +++ b/src/devices/mesh/dot11s/peer-management-protocol-mac.h @@ -58,6 +58,9 @@ public: uint32_t GetLinkMetric (Mac48Address peerAddress); ///\} private: + PeerManagementProtocolMac& operator= (const PeerManagementProtocolMac &); + PeerManagementProtocolMac (const PeerManagementProtocolMac &); + friend class PeerManagementProtocol; friend class PeerLink; ///\name Create peer link management frames: diff --git a/src/devices/mesh/dot11s/peer-management-protocol.h b/src/devices/mesh/dot11s/peer-management-protocol.h index 164da90fa..e0dea2664 100644 --- a/src/devices/mesh/dot11s/peer-management-protocol.h +++ b/src/devices/mesh/dot11s/peer-management-protocol.h @@ -174,6 +174,9 @@ private: typedef std::map > PeerManagementProtocolMacMap; ///\} private: + PeerManagementProtocol& operator= (const PeerManagementProtocol &); + PeerManagementProtocol (const PeerManagementProtocol &); + /** * \brief Fills information of received beacon. Needed to form own beacon timing element */ diff --git a/src/devices/mesh/dot11s/wscript b/src/devices/mesh/dot11s/wscript index 62cd0391f..74a6e9dd8 100644 --- a/src/devices/mesh/dot11s/wscript +++ b/src/devices/mesh/dot11s/wscript @@ -32,5 +32,6 @@ def build(bld): 'ie-dot11s-beacon-timing.h', 'ie-dot11s-configuration.h', 'ie-dot11s-peer-management.h', + 'ie-dot11s-id.h', 'peer-link.h', ] diff --git a/src/devices/mesh/flame/flame-protocol.h b/src/devices/mesh/flame/flame-protocol.h index 5344521ff..a787fc1b1 100644 --- a/src/devices/mesh/flame/flame-protocol.h +++ b/src/devices/mesh/flame/flame-protocol.h @@ -105,6 +105,9 @@ public: void Report (std::ostream &) const; void ResetStats (); private: + FlameProtocol& operator= (const FlameProtocol &); + FlameProtocol (const FlameProtocol &); + /// LLC protocol number reserved by flame static const uint16_t FLAME_PROTOCOL = 0x4040; /** diff --git a/src/devices/mesh/flame/flame-rtable.h b/src/devices/mesh/flame/flame-rtable.h index 1a173255c..7912ea8c3 100644 --- a/src/devices/mesh/flame/flame-rtable.h +++ b/src/devices/mesh/flame/flame-rtable.h @@ -83,6 +83,9 @@ public: */ LookupResult Lookup (Mac48Address destination); private: + FlameRtable& operator= (const FlameRtable &); + FlameRtable (const FlameRtable &); + /// Routing table entry struct Route {