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

merge

Browse Source
This commit is contained in:
Gustavo J. A. M. Carneiro
2008-10-16 11:54:24 +01:00
parent 2073f02054 98b197de5a
commit 2e79a78db0
3 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/core/config.h
View File

@@ -17,8 +17,8 @@
*
* Authors: Mathieu Lacage <mathieu.lacage@sophia.inria.fr>
*/
#ifndef CONFIG_H
#define CONFIG_H
#ifndef NS3_CONFIG_H
#define NS3_CONFIG_H
#include "ptr.h"
#include <string>
@@ -139,4 +139,4 @@ Ptr<Object> GetRootNamespaceObject (uint32_t i);
} // namespace ns3
#endif /* CONFIG_H */
#endif /* NS3_CONFIG_H */

5
src/devices/wifi/nqsta-wifi-mac.cc
View File

@@ -479,7 +479,10 @@ NqstaWifiMac::Receive (Ptr<Packet> packet, WifiMacHeader const *hdr)
}
else if (hdr->IsData ())
{
ForwardUp (packet, hdr->GetAddr2 (), hdr->GetAddr1 ());
if (hdr->GetAddr3 () != GetAddress ())
{
ForwardUp (packet, hdr->GetAddr3 (), hdr->GetAddr1 ());
}
}
else if (hdr->IsProbeReq () ||
hdr->IsAssocReq ())

6
src/node/channel.h
View File

@@ -14,8 +14,8 @@
* Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
*/
#ifndef CHANNEL_H
#define CHANNEL_H
#ifndef NS3_CHANNEL_H
#define NS3_CHANNEL_H
#include <string>
#include <stdint.h>
@@ -69,4 +69,4 @@ private:
}; // namespace ns3
#endif /* CHANNEL_H */
#endif /* NS3_CHANNEL_H */