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

Fixed peer management state machine

Browse Source
This commit is contained in:
Kirill Andreev
2009-06-15 18:14:06 +04:00
parent ac436ea5d3
commit 2f09fc13dd
3 changed files with 3 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/devices/mesh/dot11s/peer-link.cc
View File

@@ -171,11 +171,6 @@ PeerLink::MLMECancelPeerLink (PmpReasonCode reason)
StateMachine (CNCL,reason);
}
void
PeerLink::MLMEPassivePeerLinkOpen ()
{
StateMachine (PASOPN);
}
void
PeerLink::MLMEActivePeerLinkOpen ()
{
StateMachine (ACTOPN);

7
src/devices/mesh/dot11s/peer-link.h
View File

@@ -83,8 +83,6 @@ public:
*/
/// MLME-CancelPeerLink.request
void MLMECancelPeerLink (PmpReasonCode reason);
/// MLME-PassivePeerLinkOpen.request
void MLMEPassivePeerLinkOpen ();
/// MLME-ActivePeerLinkOpen.request
void MLMEActivePeerLinkOpen ();
/// MLME-PeeringRequestReject
@@ -151,9 +149,8 @@ private:
/// Peer link events, see 802.11s draft 11B.3.3.2
enum PeerEvent
{
CNCL, ///< MLME-CancelPeerLink
PASOPN, ///< MLME-PassivePeerLinkOpen
ACTOPN, ///< MLME-ActivePeerLinkOpen
CNCL, ///< Cancel peer link
ACTOPN, ///< Active peer link open
CLS_ACPT, ///< PeerLinkClose_Accept
OPN_ACPT, ///< PeerLinkOpen_Accept
OPN_RJCT, ///< PeerLinkOpen_Reject

5
src/devices/mesh/dot11s/peer-management-protocol.cc
View File

@@ -229,10 +229,7 @@ PeerManagementProtocol::ReceivePeerLinkFrame (
if (peerLink == 0)
peerLink = InitiateLink (interface, peerAddress, peerMeshPointAddress, Simulator::Now (), Seconds(1.0));
if(!reject)
{
peerLink->MLMEPassivePeerLinkOpen ();
peerLink->OpenAccept (peerManagementElement.GetLocalLinkId(), meshConfig, peerMeshPointAddress);
}
peerLink->OpenAccept (peerManagementElement.GetLocalLinkId(), meshConfig, peerMeshPointAddress);
else
peerLink->OpenReject (peerManagementElement.GetLocalLinkId(), meshConfig, peerMeshPointAddress, reasonCode);
}