Export header ie-dot11s-id.h, disable a few copy contructors, to make Python bindings compile.

This commit is contained in:
Gustavo J. A. M. Carneiro
2009-09-16 14:04:53 +01:00
parent 11b6f74f26
commit ffbf0e4221
10 changed files with 27 additions and 1 deletions

View File

@@ -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

View File

@@ -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);

View File

@@ -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)
{
}

View File

@@ -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

View File

@@ -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

View File

@@ -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:

View File

@@ -174,6 +174,9 @@ private:
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
*/

View File

@@ -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',
]

View File

@@ -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;
/**

View File

@@ -83,6 +83,9 @@ public:
*/
LookupResult Lookup (Mac48Address destination);
private:
FlameRtable& operator= (const FlameRtable &);
FlameRtable (const FlameRtable &);
/// Routing table entry
struct Route
{