Export header ie-dot11s-id.h, disable a few copy contructors, to make Python bindings compile.
--- a/src/devices/mesh/dot11s/hwmp-protocol.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/hwmp-protocol.h Wed Sep 16 14:04:53 2009 +0100
@@ -86,6 +86,10 @@
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
--- a/src/devices/mesh/dot11s/ie-dot11s-id.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/ie-dot11s-id.h Wed Sep 16 14:04:53 2009 +0100
@@ -55,6 +55,7 @@
private:
uint8_t m_meshId[33];
friend bool operator== (const IeMeshId & a, const IeMeshId & b);
+
};
std::ostream &operator << (std::ostream &os, const IeMeshId &meshId);
--- a/src/devices/mesh/dot11s/peer-link-frame.cc Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-link-frame.cc Wed Sep 16 14:04:53 2009 +0100
@@ -29,7 +29,7 @@
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)
{
}
--- a/src/devices/mesh/dot11s/peer-link-frame.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-link-frame.h Wed Sep 16 14:04:53 2009 +0100
@@ -86,6 +86,10 @@
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
--- a/src/devices/mesh/dot11s/peer-link.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-link.h Wed Sep 16 14:04:53 2009 +0100
@@ -198,6 +198,10 @@
/// 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
--- a/src/devices/mesh/dot11s/peer-management-protocol-mac.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol-mac.h Wed Sep 16 14:04:53 2009 +0100
@@ -58,6 +58,9 @@
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:
--- a/src/devices/mesh/dot11s/peer-management-protocol.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/peer-management-protocol.h Wed Sep 16 14:04:53 2009 +0100
@@ -174,6 +174,9 @@
typedef std::map<uint32_t, Ptr<PeerManagementProtocolMac> > PeerManagementProtocolMacMap;
///\}
private:
+ PeerManagementProtocol& operator= (const PeerManagementProtocol &);
+ PeerManagementProtocol (const PeerManagementProtocol &);
+
/**
* \brief Fills information of received beacon. Needed to form own beacon timing element
*/
--- a/src/devices/mesh/dot11s/wscript Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/dot11s/wscript Wed Sep 16 14:04:53 2009 +0100
@@ -32,5 +32,6 @@
'ie-dot11s-beacon-timing.h',
'ie-dot11s-configuration.h',
'ie-dot11s-peer-management.h',
+ 'ie-dot11s-id.h',
'peer-link.h',
]
--- a/src/devices/mesh/flame/flame-protocol.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/flame/flame-protocol.h Wed Sep 16 14:04:53 2009 +0100
@@ -105,6 +105,9 @@
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;
/**
--- a/src/devices/mesh/flame/flame-rtable.h Wed Sep 16 13:28:06 2009 +0400
+++ b/src/devices/mesh/flame/flame-rtable.h Wed Sep 16 14:04:53 2009 +0100
@@ -83,6 +83,9 @@
*/
LookupResult Lookup (Mac48Address destination);
private:
+ FlameRtable& operator= (const FlameRtable &);
+ FlameRtable (const FlameRtable &);
+
/// Routing table entry
struct Route
{