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

Fixed bugs with includes

Browse Source
This commit is contained in:
Kirill Andreev
2009-03-18 16:59:09 +03:00
parent 1ec46f0906
commit f46fe50b84
22 changed files with 26 additions and 76 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/devices/mesh/802.11s/ie-dot11s-configuration.cc
View File

@@ -21,9 +21,6 @@
#include "ns3/ie-dot11s-configuration.h"
#include "ns3/assert.h"
//NS_LOG_COMPONENT_DEFINE ("IeDot11sConfiguration");
namespace ns3 {

3
src/devices/mesh/802.11s/ie-dot11s-configuration.h
View File

@@ -23,9 +23,6 @@
#ifndef MESH_CONFIGURATION_H
#define MESH_CONFIGURATION_H
#include <stdint.h>
#include "ns3/buffer.h"
#include "ns3/dot11s-codes.h"
#include "ns3/wifi-information-element.h"
namespace ns3 {

2
src/devices/mesh/802.11s/ie-dot11s-peer-management.h
View File

@@ -23,8 +23,6 @@
#ifndef MESH_PEER_MAN_ELEMENT
#define MESH_PEER_MAN_ELEMENT
#include <stdint.h>
#include "ns3/buffer.h"
#include "ns3/dot11s-codes.h"
#include "ns3/wifi-information-element.h"

1
src/devices/mesh/802.11s/ie-dot11s-perr.cc
View File

@@ -21,6 +21,7 @@
#include "ns3/ie-dot11s-perr.h"
#include "ns3/address-utils.h"
#include "ns3/node.h"
namespace ns3 {
IeDot11sPerr::~IeDot11sPerr()

4
src/devices/mesh/802.11s/ie-dot11s-perr.h
View File

@@ -22,12 +22,8 @@
#ifndef PERR_INFORMATION_ELEMENT_H
#define PERR_INFORMATION_ELEMENT_H
#include <stdint.h>
#include "ns3/node.h"
#include "ns3/buffer.h"
#include "ns3/mac48-address.h"
#include "ns3/hwmp-rtable.h"
#include "ns3/header.h"
#include "ns3/dot11s-codes.h"
#include "ns3/wifi-information-element.h"

1
src/devices/mesh/802.11s/ie-dot11s-prep.cc
View File

@@ -21,6 +21,7 @@
#include "ns3/ie-dot11s-prep.h"
#include "ns3/address-utils.h"
#include "ns3/node.h"
#include "ns3/assert.h"
namespace ns3 {
/********************************

4
src/devices/mesh/802.11s/ie-dot11s-prep.h
View File

@@ -23,11 +23,7 @@
#define WIFI_PREP_INFORMATION_ELEMENT_H
#include <stdint.h>
#include "ns3/node.h"
#include "ns3/buffer.h"
#include "ns3/mac48-address.h"
#include "ns3/header.h"
#include "ns3/dot11s-codes.h"
#include "ns3/wifi-information-element.h"

1
src/devices/mesh/802.11s/ie-dot11s-preq.cc
View File

@@ -21,6 +21,7 @@
#include "ns3/ie-dot11s-preq.h"
#include "ns3/address-utils.h"
#include "ns3/node.h"
#include "ns3/assert.h"
namespace ns3 {

4
src/devices/mesh/802.11s/ie-dot11s-preq.h
View File

@@ -22,13 +22,9 @@
#ifndef WIFI_PREQ_INFORMATION_ELEMENT_H
#define WIFI_PREQ_INFORMATION_ELEMENT_H
#include <stdint.h>
#include <vector>
#include "ns3/node.h"
#include "ns3/buffer.h"
#include "ns3/mac48-address.h"
#include "ns3/header.h"
#include "ns3/dot11s-codes.h"
#include "ns3/wifi-information-element.h"

1
src/devices/mesh/802.11s/ie-dot11s-rann.cc
View File

@@ -22,6 +22,7 @@
#include "ns3/ie-dot11s-rann.h"
#include "ns3/assert.h"
#include "ns3/address-utils.h"
#include "ns3/node.h"
namespace ns3 {

5
src/devices/mesh/802.11s/ie-dot11s-rann.h
View File

@@ -22,12 +22,7 @@
#ifndef RANN_INFORMATION_ELEMENT_H
#define RANN_INFORMATION_ELEMENT_H
#include <stdint.h>
#include "ns3/buffer.h"
#include "ns3/mac48-address.h"
#include "ns3/node.h"
#include "ns3/header.h"
#include "ns3/dot11s-codes.h"
#include "ns3/wifi-information-element.h"

4
src/devices/mesh/hwmp-state.h
View File

@@ -22,16 +22,14 @@
#ifndef HWMP_STATE_H
#define HWMP_STATE_H
#include <map>
#include "ns3/event-id.h"
#include "ns3/ptr.h"
#include "ns3/hwmp-rtable.h"
#include "ns3/packet.h"
#include "ns3/wifi-net-device.h"
#include "ns3/mesh-wifi-mac.h"
#include "ns3/ie-dot11s-preq.h"
#include "ns3/ie-dot11s-prep.h"
#include "ns3/ie-dot11s-perr.h"
#include "ns3/dot11s-parameters.h"
#include "ns3/wifi-net-device.h"
namespace ns3 {
/**
* \ingroup mesh

2
src/devices/mesh/hwmp.h
View File

@@ -23,6 +23,7 @@
#ifndef HWMP_H
#define HWMP_H
#include <map>
#include <queue>
#include "ns3/tag.h"
@@ -30,7 +31,6 @@
#include "ns3/mac48-address.h"
#include "ns3/mesh-l2-routing-protocol.h"
#include "ns3/packet.h"
#include "ns3/ptr.h"
#include "ns3/hwmp-state.h"
namespace ns3 {
class HwmpState;

1
src/devices/mesh/mesh-l2-routing-protocol.h
View File

@@ -24,7 +24,6 @@
#include "ns3/object.h"
#include "ns3/mac48-address.h"
#include "ns3/ptr.h"
namespace ns3 {

11
src/devices/mesh/mesh-mgt-headers.cc
View File

@@ -22,12 +22,7 @@
#include "ns3/mesh-mgt-headers.h"
#include "ns3/address-utils.h"
#include "ns3/simulator.h"
#include "ns3/assert.h"
#include "ns3/log.h"
NS_LOG_COMPONENT_DEFINE("MeshMgtHeaders");
namespace ns3 {
/***********************************************************
@@ -72,7 +67,6 @@ void
MgtMeshBeaconHeader::Serialize (Buffer::Iterator start) const
{
//First we pack Beacon:
NS_LOG_DEBUG("Serialization beacon");
Buffer::Iterator i = start;
MgtBeaconHeader::Serialize(i);
i.Next (MgtBeaconHeader::GetSerializedSize());
@@ -86,7 +80,6 @@ MgtMeshBeaconHeader::Serialize (Buffer::Iterator start) const
uint32_t
MgtMeshBeaconHeader::Deserialize (Buffer::Iterator start)
{
NS_LOG_DEBUG("Deserialization beacon");
Buffer::Iterator i = start;
MgtBeaconHeader::Deserialize(start);
i.Next (MgtBeaconHeader::GetSerializedSize());
@@ -138,9 +131,9 @@ MeshMgtPeerLinkManFrame::SetIeDot11sConfiguration(IeDot11sConfiguration MeshConf
}
void
MeshMgtPeerLinkManFrame::SetIeDot11sPeerManagement(IeDot11sPeerManagement MeshPeerElement)
MeshMgtPeerLinkManFrame::SetIeDot11sPeerManagement(IeDot11sPeerManagement meshPeerElement)
{
PeerLinkMan = MeshPeerElement;
PeerLinkMan = meshPeerElement;
}
uint16_t

9
src/devices/mesh/mesh-mgt-headers.h
View File

@@ -23,16 +23,9 @@
#ifndef MESH_MGT_HEADERS_H
#define MESH_MGT_HEADERS_H
#include <stdint.h>
#include "ns3/header.h"
#include "ns3/status-code.h"
#include "ns3/supported-rates.h"
#include "ns3/ie-dot11s-peer-management.h"
#include "ns3/ie-dot11s-preq.h"
#include "ns3/ie-dot11s-prep.h"
#include "ns3/ie-dot11s-perr.h"
#include "ns3/ie-dot11s-rann.h"
#include "ns3/ie-dot11s-configuration.h"
#include "ns3/ie-dot11s-beacon-timing.h"
#include "ns3/mgt-headers.h"
@@ -70,7 +63,7 @@ public:
void SetQosField(uint16_t qos);
void SetMeshId(Ssid Id);
void SetIeDot11sConfiguration(IeDot11sConfiguration MeshConf);
void SetIeDot11sPeerManagement(IeDot11sPeerManagement MeshPeerElement);
void SetIeDot11sPeerManagement(IeDot11sPeerManagement meshPeerElement);
uint16_t GetAid();
SupportedRates GetSupportedRates();

3
src/devices/mesh/mesh-point-device.cc
View File

@@ -21,11 +21,8 @@
#include "ns3/node.h"
#include "ns3/channel.h"
#include "ns3/packet.h"
#include "ns3/log.h"
#include "ns3/boolean.h"
#include "ns3/simulator.h"
#include "ns3/mesh-point-device.h"
NS_LOG_COMPONENT_DEFINE ("MeshPointDevice");

2
src/devices/mesh/mesh-point-device.h
View File

@@ -25,8 +25,6 @@
#include "ns3/net-device.h"
#include "ns3/mac48-address.h"
#include "ns3/nstime.h"
#include "ns3/bridge-net-device.h"
#include "ns3/bridge-channel.h"
#include "ns3/mesh-l2-routing-protocol.h"

2
src/devices/mesh/mesh-wifi-mac-header.h
View File

@@ -24,8 +24,6 @@
#include "ns3/header.h"
#include "ns3/mac48-address.h"
#include "ns3/nstime.h"
#include <stdint.h>
namespace ns3 {
/**

4
src/devices/mesh/mesh-wifi-mac.cc
View File

@@ -35,6 +35,10 @@
#include "ns3/mac-low.h"
#include "ns3/tx-statistics.h"
#include "ns3/hwmp.h"
#include "ns3/ie-dot11s-beacon-timing.h"
#include "ns3/mgt-headers.h"
#include "ns3/wifi-remote-station-manager.h"
#include "ns3/mesh-wifi-peer-manager.h"
NS_LOG_COMPONENT_DEFINE ("MeshWifiMac");

31
src/devices/mesh/mesh-wifi-mac.h
View File

@@ -22,18 +22,13 @@
#ifndef MAC_HIGH_MESH_H
#define MAC_HIGH_MESH_H
#include <stdint.h>
#include <map>
#include "ns3/mac48-address.h"
#include "ns3/mgt-headers.h"
#include "ns3/mesh-mgt-headers.h"
#include "ns3/callback.h"
#include "ns3/packet.h"
#include "ns3/nstime.h"
#include "ns3/ie-dot11s-beacon-timing.h"
#include "ns3/wifi-remote-station-manager.h"
#include "ns3/mesh-wifi-peer-manager.h"
#include "ns3/wifi-mac.h"
#include "ns3/ie-dot11s-preq.h"
#include "ns3/ie-dot11s-prep.h"
#include "ns3/ie-dot11s-perr.h"
namespace ns3 {
@@ -68,23 +63,23 @@ public:
void SetCtsTimeout (Time ctsTimeout);
void SetAckTimeout (Time ackTimeout);
void SetEifsNoDifs (Time eifsNoDifs);
virtual Time GetSlot () const;
virtual Time GetSifs () const;
virtual Time GetPifs () const;
virtual Time GetCtsTimeout () const;
virtual Time GetAckTimeout () const;
virtual Time GetEifsNoDifs () const;
Time GetSlot () const;
Time GetSifs () const;
Time GetPifs () const;
Time GetCtsTimeout () const;
Time GetAckTimeout () const;
Time GetEifsNoDifs () const;
void SetWifiPhy (Ptr<WifiPhy> phy);
void SetWifiRemoteStationManager (Ptr<WifiRemoteStationManager> stationManager);
void Enqueue (Ptr<const Packet> packet, Mac48Address to, Mac48Address from);
void Enqueue (Ptr<const Packet> packet, Mac48Address to);
virtual bool SupportsSendFrom () const;
bool SupportsSendFrom () const;
void SetForwardUpCallback (Callback<void,Ptr<Packet>, Mac48Address, Mac48Address> upCallback);
void SetLinkUpCallback (Callback<void> linkUp);
void SetLinkDownCallback (Callback<void> linkDown);
virtual Mac48Address GetAddress () const;
virtual Mac48Address GetBssid () const;
virtual Ssid GetSsid () const;
Mac48Address GetAddress () const;
Mac48Address GetBssid () const;
Ssid GetSsid () const;
void SetAddress (Mac48Address address);
void SetSsid (Ssid ssid);
/**

4
src/devices/mesh/mesh-wifi-peer-manager.h
View File

@@ -23,11 +23,7 @@
#ifndef WIFI_PEER_MAN_H
#define WIFI_PEER_MAN_H
#include "ns3/event-id.h"
#include "ns3/ptr.h"
#include "ns3/nstime.h"
#include "ns3/mac48-address.h"
#include "ns3/uinteger.h"
#include "ns3/wifi-net-device.h"
#include "ns3/ie-dot11s-peer-management.h"
#include "ns3/ie-dot11s-beacon-timing.h"