--- a/examples/wifi-adhoc.cc Fri Apr 17 15:11:07 2009 +0100
+++ b/examples/wifi-adhoc.cc Fri Apr 17 15:11:38 2009 +0100
@@ -263,6 +263,12 @@
dataset = experiment.Run (wifi, wifiPhy, wifiChannel);
gnuplot.AddDataset (dataset);
+ NS_LOG_DEBUG ("rraa");
+ experiment = Experiment ("rraa");
+ wifi.SetRemoteStationManager ("ns3::RraaWifiManager");
+ dataset = experiment.Run (wifi, wifiPhy, wifiChannel);
+ gnuplot.AddDataset (dataset);
+
NS_LOG_DEBUG ("ideal");
experiment = Experiment ("ideal");
wifi.SetRemoteStationManager ("ns3::IdealWifiManager");
--- a/src/core/log.h Fri Apr 17 15:11:07 2009 +0100
+++ b/src/core/log.h Fri Apr 17 15:11:38 2009 +0100
@@ -23,6 +23,7 @@
#include <string>
#include <iostream>
+#include <stdint.h>
namespace ns3 {
--- a/src/devices/emu/emu-encode-decode.cc Fri Apr 17 15:11:07 2009 +0100
+++ b/src/devices/emu/emu-encode-decode.cc Fri Apr 17 15:11:38 2009 +0100
@@ -20,6 +20,7 @@
#include <iostream>
#include <iomanip>
#include <sstream>
+#include <stdint.h>
namespace ns3 {
--- a/src/devices/tap-bridge/tap-creator.cc Fri Apr 17 15:11:07 2009 +0100
+++ b/src/devices/tap-bridge/tap-creator.cc Fri Apr 17 15:11:38 2009 +0100
@@ -138,13 +138,17 @@
}
}
-static void
-SetInetAddress (sockaddr *ad, uint32_t networkOrder)
+static sockaddr
+CreateInetAddress (uint32_t networkOrder)
{
- struct sockaddr_in *sin = (struct sockaddr_in*)ad;
- sin->sin_family = AF_INET;
- sin->sin_port = 0; // unused
- sin->sin_addr.s_addr = htonl (networkOrder);
+ union {
+ struct sockaddr any_socket;
+ struct sockaddr_in si;
+ } s;
+ s.si.sin_family = AF_INET;
+ s.si.sin_port = 0; // unused
+ s.si.sin_addr.s_addr = htonl (networkOrder);
+ return s.any_socket;
}
static void
@@ -330,7 +334,7 @@
//
// Set the IP address of the new interface/device.
//
- SetInetAddress (&ifr.ifr_addr, AsciiToIpv4 (ip));
+ ifr.ifr_addr = CreateInetAddress (AsciiToIpv4 (ip));
status = ioctl (fd, SIOCSIFADDR, &ifr);
ABORT_IF (status == -1, "Could not set IP address", true);
LOG ("Set device IP address to " << ip);
@@ -338,7 +342,7 @@
//
// Set the net mask of the new interface/device
//
- SetInetAddress (&ifr.ifr_netmask, AsciiToIpv4 (netmask));
+ ifr.ifr_netmask = CreateInetAddress (AsciiToIpv4 (netmask));
status = ioctl (fd, SIOCSIFNETMASK, &ifr);
ABORT_IF (status == -1, "Could not set net mask", true);
LOG ("Set device Net Mask to " << netmask);
--- a/src/devices/tap-bridge/tap-encode-decode.cc Fri Apr 17 15:11:07 2009 +0100
+++ b/src/devices/tap-bridge/tap-encode-decode.cc Fri Apr 17 15:11:38 2009 +0100
@@ -20,6 +20,7 @@
#include <iostream>
#include <iomanip>
#include <sstream>
+#include <stdint.h>
namespace ns3 {
--- a/src/devices/wifi/rraa-wifi-manager.cc Fri Apr 17 15:11:07 2009 +0100
+++ b/src/devices/wifi/rraa-wifi-manager.cc Fri Apr 17 15:11:38 2009 +0100
@@ -29,6 +29,8 @@
NS_LOG_COMPONENT_DEFINE ("RraaWifiManager");
namespace ns3 {
+
+NS_OBJECT_ENSURE_REGISTERED(RraaWifiManager);
RraaWifiRemoteStation::RraaWifiRemoteStation (Ptr<RraaWifiManager> stations)
: m_stations (stations)
@@ -188,7 +190,7 @@
TypeId
RraaWifiManager::GetTypeId (void)
{
- static TypeId tid = TypeId ("RraaWifiManager")
+ static TypeId tid = TypeId ("ns3::RraaWifiManager")
.SetParent<WifiRemoteStationManager> ()
.AddConstructor<RraaWifiManager> ()
.AddAttribute ("Basic",