--- a/examples/tcp/tcp-variants-comparison.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/examples/tcp/tcp-variants-comparison.cc Mon Oct 21 10:28:47 2013 +0300
@@ -300,7 +300,6 @@
ApplicationContainer sourceApp = ftp.Install (sources.Get(i));
sourceApp.Start (Seconds (start_time*i));
sourceApp.Stop (Seconds (stop_time - 3));
- Time check_start (Seconds((start_time*i)+3));
sinkHelper.SetAttribute ("Protocol", TypeIdValue (TcpSocketFactory::GetTypeId ()));
ApplicationContainer sinkApp = sinkHelper.Install (sinks);
--- a/examples/wireless/ht-wifi-network.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/examples/wireless/ht-wifi-network.cc Mon Oct 21 10:28:47 2013 +0300
@@ -92,7 +92,7 @@
Ssid ssid = Ssid ("ns380211n");
- double datarate;
+ double datarate = 0;
StringValue DataRate;
if (i==0)
{
--- a/src/aodv/model/aodv-routing-protocol.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/aodv/model/aodv-routing-protocol.cc Mon Oct 21 10:28:47 2013 +0300
@@ -129,7 +129,6 @@
AllowedHelloLoss (2),
DeletePeriod (Time (5 * std::max (ActiveRouteTimeout, HelloInterval))),
NextHopWait (NodeTraversalTime + MilliSeconds (10)),
- TimeoutBuffer (2),
BlackListTimeout (Time (RreqRetries * NetTraversalTime)),
MaxQueueLen (64),
MaxQueueTime (Seconds (30)),
@@ -202,11 +201,6 @@
TimeValue (Seconds (15)),
MakeTimeAccessor (&RoutingProtocol::DeletePeriod),
MakeTimeChecker ())
- .AddAttribute ("TimeoutBuffer", "Its purpose is to provide a buffer for the timeout so that if the RREP is delayed"
- " due to congestion, a timeout is less likely to occur while the RREP is still en route back to the source.",
- UintegerValue (2),
- MakeUintegerAccessor (&RoutingProtocol::TimeoutBuffer),
- MakeUintegerChecker<uint16_t> ())
.AddAttribute ("NetDiameter", "Net diameter measures the maximum possible number of hops between two nodes in the network",
UintegerValue (35),
MakeUintegerAccessor (&RoutingProtocol::NetDiameter),
--- a/src/aodv/model/aodv-routing-protocol.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/aodv/model/aodv-routing-protocol.h Mon Oct 21 10:28:47 2013 +0300
@@ -129,11 +129,6 @@
*/
Time DeletePeriod;
Time NextHopWait; ///< Period of our waiting for the neighbour's RREP_ACK
- /**
- * The TimeoutBuffer is configurable. Its purpose is to provide a buffer for the timeout so that if the RREP is delayed
- * due to congestion, a timeout is less likely to occur while the RREP is still en route back to the source.
- */
- uint16_t TimeoutBuffer;
Time BlackListTimeout; ///< Time for which the node is put into the blacklist
uint32_t MaxQueueLen; ///< The maximum number of packets that we allow a routing protocol to buffer.
Time MaxQueueTime; ///< The maximum period of time that a routing protocol is allowed to buffer a packet for.
--- a/src/buildings/helper/building-position-allocator.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/buildings/helper/building-position-allocator.h Mon Oct 21 10:28:47 2013 +0300
@@ -95,8 +95,7 @@
int64_t AssignStreams (int64_t stream);
private:
-
- bool m_withReplacement;
+
struct RoomInfo
{
Ptr<Building> b;
--- a/src/buildings/model/itu-r-1238-propagation-loss-model.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/buildings/model/itu-r-1238-propagation-loss-model.h Mon Oct 21 10:28:47 2013 +0300
@@ -60,14 +60,6 @@
virtual int64_t DoAssignStreams (int64_t stream);
double m_frequency; ///< frequency in MHz
- double m_lambda; ///< wavelength
- EnvironmentType m_environment;
- CitySize m_citySize;
- double m_rooftopHeight; ///< in meters
- double m_streetsOrientation; ///< in degrees [0,90]
- double m_streetsWidth; ///< in meters
- double m_buildingsExtend; ///< in meters
- double m_buildingSeparation; ///< in meters
};
--- a/src/click/model/ipv4-l3-click-protocol.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/click/model/ipv4-l3-click-protocol.cc Mon Oct 21 10:28:47 2013 +0300
@@ -330,7 +330,7 @@
// First check whether an existing LoopbackNetDevice exists on the node
for (uint32_t i = 0; i < m_node->GetNDevices (); i++)
{
- if (device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i)))
+ if ((device = DynamicCast<LoopbackNetDevice> (m_node->GetDevice (i))))
{
break;
}
--- a/src/core/model/nstime.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/core/model/nstime.h Mon Oct 21 10:28:47 2013 +0300
@@ -41,64 +41,42 @@
* \ingroup time
* \brief keep track of time values and allow control of global simulation resolution
*
- * This class defines all the classic C++ arithmetic
- * operators +, -, *, /, and all the classic comparison operators:
+ * This class defines all the classic C++ addition/subtraction
+ * operators: +, -, +=, -=; and all the classic comparison operators:
* ==, !=, <, >, <=, >=. It is thus easy to add, substract, or
- * multiply Time objects.
+ * compare Time objects.
*
* For example:
* \code
* Time t1 = Seconds (10.0);
* Time t2 = Seconds (10.0);
- * Time t3 = t1 * t2;
- * Time t4 = t1 / t2;
- * Time t5 = t3 * t1;
- * Time t6 = t1 / t5;
- * Time t7 = t3;
+ * Time t3 = t1;
+ * t3 += t2;
* \endcode
*
* You can also use the following non-member functions to manipulate
* any of these ns3::Time object:
- * - \ref ns3-Time-Abs ns3::Abs
- * - \ref ns3-Time-Max ns3::Max
- * - \ref ns3-Time-Min ns3::Min
+ * - \ref Abs()
+ * - \ref Max()
+ * - \ref Min()
*
- * This class also controls
- * the resolution of the underlying time value . The default resolution
- * is nanoseconds. That is, TimeStep (1).GetNanoSeconds () will return
- * 1. It is possible to either increase or decrease the resolution and the
- * code tries really hard to make this easy.
- *
- * If your resolution is X (say, nanoseconds) and if you create Time objects
- * with a lower resolution (say, picoseconds), don't expect that this
- * code will return 1: PicoSeconds (1).GetPicoSeconds (). It will most
- * likely return 0 because the Time object has only 64 bits of fractional
- * precision which means that PicoSeconds (1) is stored as a 64-bit aproximation
- * of 1/1000 in the Time object. If you later multiply it again by the exact
- * value 1000, the result is unlikely to be 1 exactly. It will be close to
- * 1 but not exactly 1.
+ * This class also controls the resolution of the underlying time value.
+ * The resolution is the smallest representable time interval.
+ * The default resolution is nanoseconds.
*
- * In general, it is thus a really bad idea to try to use time objects of a
- * resolution higher than the global resolution controlled through
- * Time::SetResolution. If you do need to use picoseconds, it's thus best
- * to switch the global resolution to picoseconds to avoid nasty surprises.
+ * To change the resolution, use SetResolution(). All Time objects created
+ * before the call to SetResolution() will be updated to the new resolution.
+ * This can only be done once! (Tracking each Time object uses 4 pointers.
+ * For speed, once we convert the existing instances we discard the recording
+ * data structure and stop tracking new instances, so we have no way
+ * to do a second conversion.)
*
- * Another important issue to keep in mind is that if you increase the
- * global resolution, you also implicitely decrease the range of your simulation.
- * i.e., the global simulation time is stored in a 64 bit integer whose interpretation
- * will depend on the global resolution so, 2^64 picoseconds which is the maximum
- * duration of your simulation if the global resolution is picoseconds
- * is smaller than 2^64 nanoseconds which is the maximum duration of your simulation
- * if the global resolution is nanoseconds.
- *
- * Finally, don't even think about ever changing the global resolution after
- * creating Time objects: all Time objects created before the call to SetResolution
- * will contain values which are not updated to the new resolution. In practice,
- * the default value for the attributes of many models is indeed calculated
- * before the main function of the main program enters. Because of this, if you
- * use one of these models (and it's likely), it's going to be hard to change
- * the global simulation resolution in a way which gives reasonable results. This
- * issue has been filed as bug 954 in the ns-3 bugzilla installation.
+ * If you increase the global resolution, you also implicitly decrease
+ * the range of your simulation. The global simulation time is stored
+ * in a 64 bit integer, whose interpretation will depend on the global
+ * resolution. Therefore the maximum duration of your simulation,
+ * if you use picoseconds, is 2^64 ps = 2^24 s = 7 months, whereas,
+ * had you used nanoseconds, you could have run for 584 years.
*/
class Time
{
--- a/src/core/model/random-variable-stream.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/core/model/random-variable-stream.h Mon Oct 21 10:28:47 2013 +0300
@@ -2012,10 +2012,6 @@
/// The upper bound on values that can be returned by this RNG stream.
double m_max;
-
- /// It's easier to work with the mode internally instead of the
- /// mean. They are related by the simple: mean = (min+max+mode)/3.
- double m_mode;
};
/**
--- a/src/core/test/attribute-test-suite.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/core/test/attribute-test-suite.cc Mon Oct 21 10:28:47 2013 +0300
@@ -225,13 +225,13 @@
int8_t DoGetIntSrc (void) const { return m_intSrc2; }
bool m_boolTestA;
- bool m_boolTest;
- int16_t m_int16;
- int16_t m_int16WithBounds;
+ bool NS_UNUSED_GLOBAL (m_boolTest);
+ int16_t NS_UNUSED_GLOBAL (m_int16);
+ int16_t NS_UNUSED_GLOBAL (m_int16WithBounds);
int16_t m_int16SetGet;
- uint8_t m_uint8;
- float m_float;
- enum Test_e m_enum;
+ uint8_t NS_UNUSED_GLOBAL (m_uint8);
+ float NS_UNUSED_GLOBAL (m_float);
+ enum Test_e NS_UNUSED_GLOBAL (m_enum);
Ptr<RandomVariableStream> m_random;
std::vector<Ptr<Derived> > m_vector1;
std::vector<Ptr<Derived> > m_vector2;
--- a/src/dsr/model/dsr-maintain-buff.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/dsr/model/dsr-maintain-buff.h Mon Oct 21 10:28:47 2013 +0300
@@ -204,8 +204,6 @@
Ipv4Address m_dst;
// / The data ack id
uint16_t m_ackId;
- // / The ipv4 id
- uint16_t m_id;
// / The segments left field
uint8_t m_segsLeft;
// / Expire time for queue entry
--- a/src/dsr/model/dsr-option-header.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/dsr/model/dsr-option-header.cc Mon Oct 21 10:28:47 2013 +0300
@@ -675,7 +675,6 @@
DsrOptionRerrHeader::DsrOptionRerrHeader ()
: m_errorType (0),
- m_reserved (0),
m_salvage (0),
m_errorLength (4)
{
@@ -797,7 +796,7 @@
}
DsrOptionRerrUnreachHeader::DsrOptionRerrUnreachHeader ()
- : m_reserved (0),
+ :
m_salvage (0)
{
SetType (3);
@@ -925,7 +924,7 @@
}
DsrOptionRerrUnsupportHeader::DsrOptionRerrUnsupportHeader ()
- : m_reserved (0),
+ :
m_salvage (0)
{
SetType (3);
--- a/src/dsr/model/dsr-option-header.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/dsr/model/dsr-option-header.h Mon Oct 21 10:28:47 2013 +0300
@@ -377,10 +377,6 @@
private:
/**
- * \brief The data length.
- */
- uint32_t m_dataLength;
- /**
* \brief Identifier of the packet.
*/
uint16_t m_identification;
@@ -817,18 +813,10 @@
private:
/**
- * \brief option data length
- */
- uint8_t m_optDataLen;
- /**
* \brief The error type or route error option
*/
uint8_t m_errorType;
/**
- * \brief The reserved field
- */
- uint8_t m_reserved;
- /**
* \brief The salavage field
*/
uint8_t m_salvage;
@@ -980,18 +968,10 @@
private:
/**
- * \brief option data length
- */
- uint8_t m_optDataLen;
- /**
* \brief The error type or route error option
*/
uint8_t m_errorType;
/**
- * \brief The reserved field
- */
- uint8_t m_reserved;
- /**
* \brief The salavage field
*/
uint8_t m_salvage;
@@ -1011,10 +991,6 @@
* \brief The original destination address
*/
Ipv4Address m_originalDst;
- /**
- * \brief The specific error type
- */
- uint16_t m_typeSpecific;
};
/**
@@ -1138,18 +1114,10 @@
private:
/**
- * \brief option data length
- */
- uint8_t m_optDataLen;
- /**
* \brief The error type or route error option
*/
uint8_t m_errorType;
/**
- * \brief The reserved field
- */
- uint8_t m_reserved;
- /**
* \brief The salavage field
*/
uint8_t m_salvage;
@@ -1245,10 +1213,6 @@
private:
/*
- * The option data length
- */
- uint8_t m_optDataLen;
- /*
* The identification field
*/
uint16_t m_identification;
@@ -1356,10 +1320,6 @@
private:
/**
- * \brief option data length
- */
- uint8_t m_optDataLen;
- /**
* \brief identification field
*/
uint16_t m_identification;
--- a/src/dsr/model/dsr-options.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/dsr/model/dsr-options.h Mon Oct 21 10:28:47 2013 +0300
@@ -431,10 +431,6 @@
*/
Ptr<dsr::RouteCache> m_routeCache;
/**
- * \brief The length of the packet.
- */
- uint32_t m_length;
- /**
* \brief The ip layer 3.
*/
Ptr<Ipv4> m_ipv4;
@@ -489,10 +485,6 @@
private:
/**
- * \brief The length of the packet.
- */
- uint32_t m_length;
- /**
* \brief The ip layer 3.
*/
Ptr<Ipv4> m_ipv4;
@@ -562,10 +554,6 @@
*/
Ptr<dsr::RouteCache> m_routeCache;
/**
- * \brief The length of the packet.
- */
- uint32_t m_length;
- /**
* \brief The ipv4 layer 3.
*/
Ptr<Ipv4> m_ipv4;
@@ -624,10 +612,6 @@
*/
Ptr<dsr::RouteCache> m_routeCache;
/**
- * \brief The length of the packet.
- */
- uint32_t m_length;
- /**
* \brief The ipv4 layer 3.
*/
Ptr<Ipv4> m_ipv4;
@@ -686,10 +670,6 @@
*/
Ptr<dsr::RouteCache> m_routeCache;
/**
- * \brief The length of the packet.
- */
- uint32_t m_length;
- /**
* \brief The ipv4 layer 3.
*/
Ptr<Ipv4> m_ipv4;
--- a/src/dsr/model/dsr-rreq-table.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/dsr/model/dsr-rreq-table.h Mon Oct 21 10:28:47 2013 +0300
@@ -238,9 +238,6 @@
bool FindSourceEntry (Ipv4Address src, Ipv4Address dst, uint16_t id);
private:
-
- // / The max # of requests to retransmit
- uint32_t MaxRequestRexmt;
// / The max request period among requests
Time MaxRequestPeriod;
// / The original request period
--- a/src/energy/model/rv-battery-model.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/energy/model/rv-battery-model.h Mon Oct 21 10:28:47 2013 +0300
@@ -225,7 +225,6 @@
std::vector<double> m_load; // load profile
std::vector<Time> m_timeStamps; // time stamps of load profile
Time m_lastSampleTime;
- uint64_t m_counter;
int m_numOfTerms; // # of terms for infinite sum in battery level estimation
--- a/src/internet/model/ipv6-option.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/internet/model/ipv6-option.h Mon Oct 21 10:28:47 2013 +0300
@@ -225,12 +225,6 @@
* \return the processed size
*/
virtual uint8_t Process (Ptr<Packet> packet, uint8_t offset, Ipv6Header const& ipv6Header, bool& isDropped);
-
-private:
- /**
- * \brief The length of the packet.
- */
- uint32_t m_length;
};
/**
--- a/src/internet/model/tcp-header.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/internet/model/tcp-header.h Mon Oct 21 10:28:47 2013 +0300
@@ -173,7 +173,6 @@
Address m_destination;
uint8_t m_protocol;
- uint16_t m_initialChecksum;
bool m_calcChecksum;
bool m_goodChecksum;
};
--- a/src/lte/model/epc-x2-header.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/epc-x2-header.h Mon Oct 21 10:28:47 2013 +0300
@@ -69,8 +69,6 @@
};
private:
- uint32_t m_headerLength;
-
uint8_t m_messageType;
uint8_t m_procedureCode;
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -217,7 +217,6 @@
FdTbfqFfMacScheduler::FdTbfqFfMacScheduler ()
: m_cschedSapUser (0),
m_schedSapUser (0),
- m_timeWindow (99.0),
m_nextRntiUl (0),
bankSize (0)
{
--- a/src/lte/model/fdtbfq-ff-mac-scheduler.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/fdtbfq-ff-mac-scheduler.h Mon Oct 21 10:28:47 2013 +0300
@@ -252,8 +252,6 @@
FfMacCschedSapProvider::CschedCellConfigReqParameters m_cschedCellConfig;
- double m_timeWindow;
-
uint16_t m_nextRntiUl; // RNTI of the next user to be served next scheduling in UL
uint32_t m_cqiTimersThreshold; // # of TTIs for which a CQI canbe considered valid
--- a/src/lte/model/lte-rrc-header.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/lte-rrc-header.cc Mon Oct 21 10:28:47 2013 +0300
@@ -2224,6 +2224,13 @@
}
void
+RrcAsn1Header::Print (std::ostream &os) const
+{
+ NS_LOG_FUNCTION (this << &os);
+ NS_FATAL_ERROR ("RrcAsn1Header Print() function must also specify LteRrcSap::RadioResourceConfigDedicated as a second argument");
+}
+
+void
RrcAsn1Header::Print (std::ostream &os, LteRrcSap::RadioResourceConfigDedicated radioResourceConfigDedicated) const
{
os << " srbToAddModList: " << std::endl;
--- a/src/lte/model/lte-rrc-header.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/lte-rrc-header.h Mon Oct 21 10:28:47 2013 +0300
@@ -82,6 +82,7 @@
Buffer::Iterator DeserializeQoffsetRange (int8_t * qOffsetRange, Buffer::Iterator bIterator);
Buffer::Iterator DeserializeThresholdEutra (LteRrcSap::ThresholdEutra * thresholdEutra, Buffer::Iterator bIterator);
+ void Print (std::ostream &os) const;
/**
* This function prints RadioResourceConfigDedicated IE, for debugging purposes.
* @param os The output stream to use (i.e. std::cout)
--- a/src/lte/model/rr-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/rr-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -23,6 +23,7 @@
#include <ns3/math.h>
#include <cfloat>
#include <set>
+#include <climits>
#include <ns3/lte-amc.h>
#include <ns3/rr-ff-mac-scheduler.h>
@@ -978,7 +979,7 @@
// Divide the resource equally among the active users according to
// Resource allocation type 0 (see sec 7.1.6.1 of 36.213)
- int rbgPerTb = (nTbs > 0) ? ((rbgNum - rbgAllocatedNum) / nTbs) : DBL_MAX;
+ int rbgPerTb = (nTbs > 0) ? ((rbgNum - rbgAllocatedNum) / nTbs) : INT_MAX;
NS_LOG_INFO (this << " Flows to be transmitted " << nflows << " rbgPerTb " << rbgPerTb);
if (rbgPerTb == 0)
{
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -217,7 +217,6 @@
TdTbfqFfMacScheduler::TdTbfqFfMacScheduler ()
: m_cschedSapUser (0),
m_schedSapUser (0),
- m_timeWindow (99.0),
m_nextRntiUl (0),
bankSize (0)
{
--- a/src/lte/model/tdtbfq-ff-mac-scheduler.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/model/tdtbfq-ff-mac-scheduler.h Mon Oct 21 10:28:47 2013 +0300
@@ -252,8 +252,6 @@
FfMacCschedSapProvider::CschedCellConfigReqParameters m_cschedCellConfig;
- double m_timeWindow;
-
uint16_t m_nextRntiUl; // RNTI of the next user to be served next scheduling in UL
uint32_t m_cqiTimersThreshold; // # of TTIs for which a CQI canbe considered valid
--- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -191,6 +191,7 @@
m_thrRefUl (thrRefUl),
m_errorModelEnabled (errorModelEnabled)
{
+ NS_UNUSED (m_nLc);
}
LenaFdBetFfMacSchedulerTestCase1::~LenaFdBetFfMacSchedulerTestCase1 ()
--- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -248,6 +248,7 @@
m_thrRefUl (thrRefUl),
m_errorModelEnabled (errorModelEnabled)
{
+ NS_UNUSED (m_nLc);
}
LenaFdTbfqFfMacSchedulerTestCase1::~LenaFdTbfqFfMacSchedulerTestCase1 ()
--- a/src/lte/test/lte-test-harq.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-harq.cc Mon Oct 21 10:28:47 2013 +0300
@@ -97,6 +97,7 @@
m_amcBer (amcBer),
m_throughputRef (thrRef)
{
+ NS_UNUSED (m_tbSize);
}
LenaHarqTestCase::~LenaHarqTestCase ()
--- a/src/lte/test/lte-test-interference.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-interference.cc Mon Oct 21 10:28:47 2013 +0300
@@ -103,6 +103,8 @@
m_dlMcs (dlMcs),
m_ulMcs (ulMcs)
{
+ NS_UNUSED (m_dlSe);
+ NS_UNUSED (m_ulSe);
}
LteInterferenceTestCase::~LteInterferenceTestCase ()
--- a/src/lte/test/lte-test-mimo.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-mimo.h Mon Oct 21 10:28:47 2013 +0300
@@ -43,8 +43,6 @@
void GetRlcBufferSample (Ptr<RadioBearerStatsCalculator> rlcStats, uint64_t imsi, uint8_t rnti);
static std::string BuildNameString (uint16_t dist, std::string schedulerType, bool useIdealRrc);
- uint16_t m_nUser;
- uint16_t m_nLc;
uint16_t m_dist;
std::vector<uint32_t> m_estThrDl;
std::string m_schedulerType;
--- a/src/lte/test/lte-test-phy-error-model.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-phy-error-model.cc Mon Oct 21 10:28:47 2013 +0300
@@ -117,6 +117,7 @@
m_blerRef (blerRef),
m_toleranceRxPackets (toleranceRxPackets)
{
+ NS_UNUSED (m_tbSize);
}
LenaDataPhyErrorModelTestCase::~LenaDataPhyErrorModelTestCase ()
@@ -266,6 +267,7 @@
m_tbSize (tbSize),
m_blerRef (blerRef)
{
+ NS_UNUSED (m_tbSize);
}
LenaDlCtrlPhyErrorModelTestCase::~LenaDlCtrlPhyErrorModelTestCase ()
--- a/src/lte/test/lte-test-pss-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -249,6 +249,7 @@
m_thrRefUl (thrRefUl),
m_errorModelEnabled (errorModelEnabled)
{
+ NS_UNUSED (m_nLc);
}
LenaPssFfMacSchedulerTestCase1::~LenaPssFfMacSchedulerTestCase1 ()
--- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -191,6 +191,7 @@
m_thrRefUl (thrRefUl),
m_errorModelEnabled (errorModelEnabled)
{
+ NS_UNUSED (m_nLc);
}
LenaTdBetFfMacSchedulerTestCase1::~LenaTdBetFfMacSchedulerTestCase1 ()
--- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.cc Mon Oct 21 10:28:47 2013 +0300
@@ -248,6 +248,7 @@
m_thrRefUl (thrRefUl),
m_errorModelEnabled (errorModelEnabled)
{
+ NS_UNUSED (m_nLc);
}
LenaTdTbfqFfMacSchedulerTestCase1::~LenaTdTbfqFfMacSchedulerTestCase1 ()
--- a/src/mesh/bindings/modulegen__gcc_ILP32.py Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/bindings/modulegen__gcc_ILP32.py Mon Oct 21 10:28:47 2013 +0300
@@ -27,7 +27,7 @@
## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
- module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
+ module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
@@ -502,12 +502,12 @@
module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]
module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
+ ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
+ module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]
module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]
module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
- ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
- module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
## ie-dot11s-preq.h (module 'mesh'): ns3::dot11s::DestinationAddressUnit [class]
module.add_class('DestinationAddressUnit', parent=root_module['ns3::SimpleRefCount< ns3::dot11s::DestinationAddressUnit, ns3::empty, ns3::DefaultDeleter<ns3::dot11s::DestinationAddressUnit> >'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::Dot11sMeshCapability [class]
@@ -3615,6 +3615,7 @@
return
def register_Ns3Int64x64_t_methods(root_module, cls):
+ cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('!=')
cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
@@ -3672,7 +3673,6 @@
cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
cls.add_output_stream_operator()
- cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('==')
cls.add_binary_comparison_operator('>=')
## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
@@ -4612,6 +4612,7 @@
return
def register_Ns3Time_methods(root_module, cls):
+ cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('!=')
cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
@@ -4620,7 +4621,6 @@
cls.add_binary_comparison_operator('>')
cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
cls.add_output_stream_operator()
- cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('==')
cls.add_binary_comparison_operator('>=')
## nstime.h (module 'core'): ns3::Time::Time() [constructor]
@@ -5239,11 +5239,6 @@
'bool',
[],
is_pure_virtual=True, is_const=True, is_virtual=True)
- ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
- cls.add_method('ConfigureCCHDcf',
- 'void',
- [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],
- visibility='protected')
## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
cls.add_method('ConfigureDcf',
'void',
@@ -11502,8 +11497,8 @@
def register_Ns3FlameFlameProtocolMac_methods(root_module, cls):
## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::flame::FlameProtocolMac const & arg0) [copy constructor]
cls.add_constructor([param('ns3::flame::FlameProtocolMac const &', 'arg0')])
- ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(uint32_t arg0, ns3::Ptr<ns3::flame::FlameProtocol> arg1) [constructor]
- cls.add_constructor([param('uint32_t', 'arg0'), param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg1')])
+ ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::Ptr<ns3::flame::FlameProtocol> arg0) [constructor]
+ cls.add_constructor([param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg0')])
## flame-protocol-mac.h (module 'mesh'): int64_t ns3::flame::FlameProtocolMac::AssignStreams(int64_t stream) [member function]
cls.add_method('AssignStreams',
'int64_t',
--- a/src/mesh/bindings/modulegen__gcc_LP64.py Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/bindings/modulegen__gcc_LP64.py Mon Oct 21 10:28:47 2013 +0300
@@ -27,7 +27,7 @@
## wifi-mode.h (module 'wifi'): ns3::WifiModulationClass [enumeration]
module.add_enum('WifiModulationClass', ['WIFI_MOD_CLASS_UNKNOWN', 'WIFI_MOD_CLASS_IR', 'WIFI_MOD_CLASS_FHSS', 'WIFI_MOD_CLASS_DSSS', 'WIFI_MOD_CLASS_ERP_PBCC', 'WIFI_MOD_CLASS_DSSS_OFDM', 'WIFI_MOD_CLASS_ERP_OFDM', 'WIFI_MOD_CLASS_OFDM', 'WIFI_MOD_CLASS_HT'], import_from_module='ns.wifi')
## wifi-phy-standard.h (module 'wifi'): ns3::WifiPhyStandard [enumeration]
- module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211p_CCH', 'WIFI_PHY_STANDARD_80211p_SCH', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
+ module.add_enum('WifiPhyStandard', ['WIFI_PHY_STANDARD_80211a', 'WIFI_PHY_STANDARD_80211b', 'WIFI_PHY_STANDARD_80211g', 'WIFI_PHY_STANDARD_80211_10MHZ', 'WIFI_PHY_STANDARD_80211_5MHZ', 'WIFI_PHY_STANDARD_holland', 'WIFI_PHY_STANDARD_80211n_2_4GHZ', 'WIFI_PHY_STANDARD_80211n_5GHZ'], import_from_module='ns.wifi')
## wifi-mode.h (module 'wifi'): ns3::WifiCodeRate [enumeration]
module.add_enum('WifiCodeRate', ['WIFI_CODE_RATE_UNDEFINED', 'WIFI_CODE_RATE_3_4', 'WIFI_CODE_RATE_2_3', 'WIFI_CODE_RATE_1_2', 'WIFI_CODE_RATE_5_6'], import_from_module='ns.wifi')
## qos-utils.h (module 'wifi'): ns3::AcIndex [enumeration]
@@ -500,14 +500,14 @@
module.add_enum('dot11sSynchronizationProtocolIdentifier', ['SYNC_NEIGHBOUR_OFFSET', 'SYNC_NULL'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sCongestionControlMode [enumeration]
module.add_enum('dot11sCongestionControlMode', ['CONGESTION_SIGNALING', 'CONGESTION_NULL'])
+ ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
+ module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionMetric [enumeration]
module.add_enum('dot11sPathSelectionMetric', ['METRIC_AIRTIME'])
## ie-dot11s-peer-management.h (module 'mesh'): ns3::dot11s::PmpReasonCode [enumeration]
module.add_enum('PmpReasonCode', ['REASON11S_PEERING_CANCELLED', 'REASON11S_MESH_MAX_PEERS', 'REASON11S_MESH_CAPABILITY_POLICY_VIOLATION', 'REASON11S_MESH_CLOSE_RCVD', 'REASON11S_MESH_MAX_RETRIES', 'REASON11S_MESH_CONFIRM_TIMEOUT', 'REASON11S_MESH_INVALID_GTK', 'REASON11S_MESH_INCONSISTENT_PARAMETERS', 'REASON11S_MESH_INVALID_SECURITY_CAPABILITY', 'REASON11S_RESERVED'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sPathSelectionProtocol [enumeration]
module.add_enum('dot11sPathSelectionProtocol', ['PROTOCOL_HWMP'])
- ## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::dot11sAuthenticationProtocol [enumeration]
- module.add_enum('dot11sAuthenticationProtocol', ['AUTH_NULL', 'AUTH_SAE'])
## ie-dot11s-preq.h (module 'mesh'): ns3::dot11s::DestinationAddressUnit [class]
module.add_class('DestinationAddressUnit', parent=root_module['ns3::SimpleRefCount< ns3::dot11s::DestinationAddressUnit, ns3::empty, ns3::DefaultDeleter<ns3::dot11s::DestinationAddressUnit> >'])
## ie-dot11s-configuration.h (module 'mesh'): ns3::dot11s::Dot11sMeshCapability [class]
@@ -3615,6 +3615,7 @@
return
def register_Ns3Int64x64_t_methods(root_module, cls):
+ cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('!=')
cls.add_inplace_numeric_operator('+=', param('ns3::int64x64_t const &', 'right'))
cls.add_binary_numeric_operator('*', root_module['ns3::int64x64_t'], root_module['ns3::int64x64_t'], param('long long unsigned int const', 'right'))
@@ -3672,7 +3673,6 @@
cls.add_inplace_numeric_operator('-=', param('ns3::int64x64_t const &', 'right'))
cls.add_inplace_numeric_operator('/=', param('ns3::int64x64_t const &', 'right'))
cls.add_output_stream_operator()
- cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('==')
cls.add_binary_comparison_operator('>=')
## int64x64-double.h (module 'core'): ns3::int64x64_t::int64x64_t() [constructor]
@@ -4612,6 +4612,7 @@
return
def register_Ns3Time_methods(root_module, cls):
+ cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('!=')
cls.add_inplace_numeric_operator('+=', param('ns3::Time const &', 'right'))
cls.add_binary_numeric_operator('+', root_module['ns3::Time'], root_module['ns3::Time'], param('ns3::Time const &', 'right'))
@@ -4620,7 +4621,6 @@
cls.add_binary_comparison_operator('>')
cls.add_inplace_numeric_operator('-=', param('ns3::Time const &', 'right'))
cls.add_output_stream_operator()
- cls.add_binary_comparison_operator('<=')
cls.add_binary_comparison_operator('==')
cls.add_binary_comparison_operator('>=')
## nstime.h (module 'core'): ns3::Time::Time() [constructor]
@@ -5239,11 +5239,6 @@
'bool',
[],
is_pure_virtual=True, is_const=True, is_virtual=True)
- ## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureCCHDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
- cls.add_method('ConfigureCCHDcf',
- 'void',
- [param('ns3::Ptr< ns3::Dcf >', 'dcf'), param('uint32_t', 'cwmin'), param('uint32_t', 'cwmax'), param('ns3::AcIndex', 'ac')],
- visibility='protected')
## wifi-mac.h (module 'wifi'): void ns3::WifiMac::ConfigureDcf(ns3::Ptr<ns3::Dcf> dcf, uint32_t cwmin, uint32_t cwmax, ns3::AcIndex ac) [member function]
cls.add_method('ConfigureDcf',
'void',
@@ -11502,8 +11497,8 @@
def register_Ns3FlameFlameProtocolMac_methods(root_module, cls):
## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::flame::FlameProtocolMac const & arg0) [copy constructor]
cls.add_constructor([param('ns3::flame::FlameProtocolMac const &', 'arg0')])
- ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(uint32_t arg0, ns3::Ptr<ns3::flame::FlameProtocol> arg1) [constructor]
- cls.add_constructor([param('uint32_t', 'arg0'), param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg1')])
+ ## flame-protocol-mac.h (module 'mesh'): ns3::flame::FlameProtocolMac::FlameProtocolMac(ns3::Ptr<ns3::flame::FlameProtocol> arg0) [constructor]
+ cls.add_constructor([param('ns3::Ptr< ns3::flame::FlameProtocol >', 'arg0')])
## flame-protocol-mac.h (module 'mesh'): int64_t ns3::flame::FlameProtocolMac::AssignStreams(int64_t stream) [member function]
cls.add_method('AssignStreams',
'int64_t',
--- a/src/mesh/model/dot11s/airtime-metric.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/model/dot11s/airtime-metric.cc Mon Oct 21 10:28:47 2013 +0300
@@ -46,18 +46,10 @@
&AirtimeLinkMetricCalculator::SetHeaderTid),
MakeUintegerChecker<uint8_t> (0)
)
- .AddAttribute ( "Dot11sMeshHeaderLength",
- "Length of the mesh header",
- UintegerValue (6),
- MakeUintegerAccessor (
- &AirtimeLinkMetricCalculator::m_meshHeaderLength),
- MakeUintegerChecker<uint16_t> (0)
- )
;
return tid;
}
-AirtimeLinkMetricCalculator::AirtimeLinkMetricCalculator () :
- m_overheadNanosec (0)
+AirtimeLinkMetricCalculator::AirtimeLinkMetricCalculator ()
{
}
void
--- a/src/mesh/model/dot11s/airtime-metric.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/model/dot11s/airtime-metric.h Mon Oct 21 10:28:47 2013 +0300
@@ -47,14 +47,6 @@
void SetTestLength (uint16_t testLength);
void SetHeaderTid (uint8_t tid);
private:
- /// Overhead expressed in nanoseconds:DIFS + SIFS + 2 * PREAMBLE + ACK
- uint32_t m_overheadNanosec;
- /// Bt value
- uint32_t m_testLength;
- /// header length (used in overhead)
- uint16_t m_headerLength;
- /// meshHeader length (minimum 6 octets)
- uint16_t m_meshHeaderLength;
Ptr<Packet> m_testFrame;
WifiMacHeader m_testHeader;
};
--- a/src/mesh/model/flame/flame-protocol-mac.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/model/flame/flame-protocol-mac.cc Mon Oct 21 10:28:47 2013 +0300
@@ -25,8 +25,8 @@
namespace ns3 {
namespace flame {
NS_LOG_COMPONENT_DEFINE ("FlameProtocolMac");
-FlameProtocolMac::FlameProtocolMac (uint32_t ifIndex, Ptr<FlameProtocol> protocol) :
- m_protocol (protocol), m_ifIndex (ifIndex)
+FlameProtocolMac::FlameProtocolMac (Ptr<FlameProtocol> protocol) :
+ m_protocol (protocol)
{
}
FlameProtocolMac::~FlameProtocolMac ()
--- a/src/mesh/model/flame/flame-protocol-mac.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/model/flame/flame-protocol-mac.h Mon Oct 21 10:28:47 2013 +0300
@@ -34,7 +34,7 @@
class FlameProtocolMac : public MeshWifiInterfaceMacPlugin
{
public:
- FlameProtocolMac (uint32_t, Ptr<FlameProtocol>);
+ FlameProtocolMac (Ptr<FlameProtocol>);
~FlameProtocolMac ();
///\name Inherited from MAC plugin
//\{
@@ -56,7 +56,6 @@
* \{
*/
Ptr<FlameProtocol> m_protocol;
- uint32_t m_ifIndex;
Ptr<MeshWifiInterfaceMac> m_parent;
///\}
///\name Statistics:
--- a/src/mesh/model/flame/flame-protocol.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/model/flame/flame-protocol.cc Mon Oct 21 10:28:47 2013 +0300
@@ -305,7 +305,7 @@
return false;
}
// Installing plugins:
- Ptr<FlameProtocolMac> flameMac = Create<FlameProtocolMac> (wifiNetDev->GetIfIndex (), this);
+ Ptr<FlameProtocolMac> flameMac = Create<FlameProtocolMac> (this);
m_interfaces[wifiNetDev->GetIfIndex ()] = flameMac;
mac->SetBeaconGeneration (false);
mac->InstallPlugin (flameMac);
--- a/src/mesh/test/flame/flame-test-suite.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mesh/test/flame/flame-test-suite.cc Mon Oct 21 10:28:47 2013 +0300
@@ -73,8 +73,6 @@
void TestExpire ();
///\}
private:
- bool error;
-
Mac48Address dst;
Mac48Address hop;
uint32_t iface;
@@ -88,7 +86,6 @@
FlameRtableTest::FlameRtableTest () :
TestCase ("FlameRtable"),
- error (false),
dst ("01:00:00:01:00:01"),
hop ("01:00:00:01:00:03"),
iface (8010),
--- a/src/mpi/model/distributed-simulator-impl.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/mpi/model/distributed-simulator-impl.cc Mon Oct 21 10:28:47 2013 +0300
@@ -96,6 +96,7 @@
m_pLBTS = new LbtsMessage[m_systemCount];
m_grantedTime = Seconds (0);
#else
+ NS_UNUSED (m_systemCount);
NS_FATAL_ERROR ("Can't use distributed simulator without MPI compiled in");
#endif
--- a/src/uan/examples/uan-rc-example.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/uan/examples/uan-rc-example.cc Mon Oct 21 10:28:47 2013 +0300
@@ -174,7 +174,6 @@
"NumberOfRates", UintegerValue (m_numRates),
"NumberOfNodes", UintegerValue (nNodes),
"MaxReservations", UintegerValue (a),
- "RetryRate", DoubleValue (1/30.0),
"SIFS", TimeValue (m_sifs),
"MaxPropDelay", TimeValue (pDelay),
"FrameSize", UintegerValue (m_pktSize));
@@ -186,8 +185,7 @@
uan.SetMac ("ns3::UanMacRc",
"NumberOfRates", UintegerValue (m_numRates),
- "MaxPropDelay", TimeValue (pDelay),
- "RetryRate", DoubleValue (1.0/100.0));
+ "MaxPropDelay", TimeValue (pDelay));
NodeContainer nodes;
nodes.Create (nNodes);
NetDeviceContainer devices = uan.Install (nodes, chan);
--- a/src/uan/model/uan-mac-rc-gw.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/uan/model/uan-mac-rc-gw.cc Mon Oct 21 10:28:47 2013 +0300
@@ -122,11 +122,6 @@
UintegerValue (1023),
MakeUintegerAccessor (&UanMacRcGw::m_numRates),
MakeUintegerChecker<uint32_t> ())
- .AddAttribute ("RetryRate",
- "Number of retry rates per second at non-gateway nodes",
- DoubleValue (1 / 10.0),
- MakeDoubleAccessor (&UanMacRcGw::m_retryRate),
- MakeDoubleChecker<double> ())
.AddAttribute ("MaxPropDelay",
"Maximum propagation delay between gateway and non-gateway nodes",
TimeValue (Seconds (2)),
@@ -152,11 +147,6 @@
DoubleValue (0.01),
MakeDoubleAccessor (&UanMacRcGw::m_retryStep),
MakeDoubleChecker<double> ())
- .AddAttribute ("NumberOfRetryRates",
- "Number of retry rates",
- UintegerValue (100),
- MakeUintegerAccessor (&UanMacRcGw::m_numRetryRates),
- MakeUintegerChecker<uint16_t> ())
.AddAttribute ("TotalRate",
"Total available channel rate in bps (for a single channel, without splitting reservation channel)",
UintegerValue (4096),
--- a/src/uan/model/uan-mac-rc-gw.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/uan/model/uan-mac-rc-gw.h Mon Oct 21 10:28:47 2013 +0300
@@ -116,7 +116,6 @@
uint32_t m_ctsSizeN;
uint32_t m_ctsSizeG;
uint32_t m_ackSize;
- double m_retryRate;
uint16_t m_currentRetryRate;
uint32_t m_currentRateNum;
uint32_t m_numNodes;
@@ -124,7 +123,6 @@
uint32_t m_rateStep;
uint32_t m_frameSize;
- uint16_t m_numRetryRates;
double m_minRetryRate;
double m_retryStep;
--- a/src/uan/model/uan-mac-rc.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/uan/model/uan-mac-rc.cc Mon Oct 21 10:28:47 2013 +0300
@@ -244,11 +244,6 @@
DoubleValue (0.01),
MakeDoubleAccessor (&UanMacRc::m_retryStep),
MakeDoubleChecker<double> ())
- .AddAttribute ("NumberOfRetryRates",
- "Number of retry rates",
- UintegerValue (100),
- MakeUintegerAccessor (&UanMacRc::m_numRetryRates),
- MakeUintegerChecker<uint16_t> ())
.AddAttribute ("MaxPropDelay",
"Maximum possible propagation delay to gateway",
TimeValue (Seconds (2)),
--- a/src/uan/model/uan-mac-rc.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/uan/model/uan-mac-rc.h Mon Oct 21 10:28:47 2013 +0300
@@ -185,7 +185,6 @@
Time m_sifs;
Time m_learnedProp;
- uint16_t m_numRetryRates;
double m_minRetryRate;
double m_retryStep;
--- a/src/wifi/model/aarfcd-wifi-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/aarfcd-wifi-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -77,7 +77,6 @@
// aarf-cd fields below
uint32_t m_minRtsWnd;
uint32_t m_maxRtsWnd;
- bool m_rtsFailsAsDataFails;
bool m_turnOffRtsAfterRateDecrease;
bool m_turnOnRtsAfterRateIncrease;
};
--- a/src/wifi/model/dcf-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/dcf-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -324,7 +324,6 @@
Time m_lastSwitchingStart;
Time m_lastSwitchingDuration;
bool m_rxing;
- bool m_sleeping;
Time m_eifsNoDifs;
EventId m_accessTimeout;
uint32_t m_slotTimeUs;
--- a/src/wifi/model/ideal-wifi-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/ideal-wifi-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -77,8 +77,6 @@
double m_ber;
Thresholds m_thresholds;
- double m_minSnr;
- double m_maxSnr;
};
} // namespace ns3
--- a/src/wifi/model/minstrel-wifi-manager.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/minstrel-wifi-manager.cc Mon Oct 21 10:28:47 2013 +0300
@@ -101,11 +101,6 @@
DoubleValue (75),
MakeDoubleAccessor (&MinstrelWifiManager::m_ewmaLevel),
MakeDoubleChecker<double> ())
- .AddAttribute ("SegmentSize",
- "The largest allowable segment size packet",
- DoubleValue (6000),
- MakeDoubleAccessor (&MinstrelWifiManager::m_segmentSize),
- MakeDoubleChecker <double> ())
.AddAttribute ("SampleColumn",
"The number of columns used for sampling",
DoubleValue (10),
--- a/src/wifi/model/minstrel-wifi-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/minstrel-wifi-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -161,7 +161,6 @@
Time m_updateStats; ///< how frequent do we calculate the stats(1/10 seconds)
double m_lookAroundRate; ///< the % to try other rates than our current rate
double m_ewmaLevel; ///< exponential weighted moving average
- uint32_t m_segmentSize; ///< largest allowable segment size
uint32_t m_sampleCol; ///< number of sample columns
uint32_t m_pktLen; ///< packet length used for calculate mode TxTime
uint32_t m_nsupported; ///< modes supported
--- a/src/wifi/model/wifi-mac-header.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/wifi-mac-header.cc Mon Oct 21 10:28:47 2013 +0300
@@ -46,7 +46,7 @@
};
WifiMacHeader::WifiMacHeader ()
- : m_ctrlPwrMgt (0),
+ :
m_ctrlMoreData (0),
m_ctrlWep (0),
m_ctrlOrder (1),
--- a/src/wifi/model/wifi-mac-header.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/wifi-mac-header.h Mon Oct 21 10:28:47 2013 +0300
@@ -208,7 +208,6 @@
uint8_t m_ctrlFromDs;
uint8_t m_ctrlMoreFrag;
uint8_t m_ctrlRetry;
- uint8_t m_ctrlPwrMgt;
uint8_t m_ctrlMoreData;
uint8_t m_ctrlWep;
uint8_t m_ctrlOrder;
--- a/src/wifi/model/wifi-mac-queue.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/wifi-mac-queue.cc Mon Oct 21 10:28:47 2013 +0300
@@ -167,7 +167,6 @@
if (!m_queue.empty ())
{
PacketQueueI it;
- NS_ASSERT (type <= 4);
for (it = m_queue.begin (); it != m_queue.end (); ++it)
{
if (it->hdr.IsQosData ())
@@ -195,7 +194,6 @@
if (!m_queue.empty ())
{
PacketQueueI it;
- NS_ASSERT (type <= 4);
for (it = m_queue.begin (); it != m_queue.end (); ++it)
{
if (it->hdr.IsQosData ())
@@ -288,7 +286,6 @@
if (!m_queue.empty ())
{
PacketQueueI it;
- NS_ASSERT (type <= 4);
for (it = m_queue.begin (); it != m_queue.end (); it++)
{
if (GetAddressForPacket (type, it) == addr)
--- a/src/wifi/model/wifi-mac-queue.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/wifi-mac-queue.h Mon Oct 21 10:28:47 2013 +0300
@@ -141,7 +141,6 @@
};
PacketQueue m_queue;
- WifiMacParameters *m_parameters;
uint32_t m_size;
uint32_t m_maxSize;
Time m_maxDelay;
--- a/src/wifi/model/wifi-remote-station-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wifi/model/wifi-remote-station-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -524,14 +524,13 @@
WifiMcsList m_bssBasicMcsSet;
bool m_htSupported;
- bool m_isLowLatency;
uint32_t m_maxSsrc;
uint32_t m_maxSlrc;
uint32_t m_rtsCtsThreshold;
uint32_t m_fragmentationThreshold;
uint8_t m_defaultTxPowerLevel;
WifiMode m_nonUnicastMode;
- double m_avgSlrcCoefficient;
+
/**
* The trace source fired when the transmission of a single RTS has failed
*/
--- a/src/wimax/model/snr-to-block-error-rate-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wimax/model/snr-to-block-error-rate-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -92,7 +92,6 @@
void ActivateLoss (bool loss);
private:
void ClearRecords (void);
- double m_speed; // in m/s
uint8_t m_activateLoss;
static const unsigned int TRACE_FILE_PATH_SIZE = 1024;
char m_traceFilePath[TRACE_FILE_PATH_SIZE];
--- a/src/wimax/model/ss-service-flow-manager.cc Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wimax/model/ss-service-flow-manager.cc Mon Oct 21 10:28:47 2013 +0300
@@ -44,7 +44,6 @@
SsServiceFlowManager::SsServiceFlowManager (Ptr<SubscriberStationNetDevice> device)
: m_device (device),
- m_sfidIndex (100),
m_maxDsaReqRetries (100),
m_dsaReq (DsaReq ()),
m_dsaAck (DsaAck ()),
--- a/src/wimax/model/ss-service-flow-manager.h Fri Oct 18 12:17:01 2013 +0300
+++ b/src/wimax/model/ss-service-flow-manager.h Mon Oct 21 10:28:47 2013 +0300
@@ -91,8 +91,6 @@
private:
Ptr<SubscriberStationNetDevice> m_device;
- uint32_t m_sfidIndex;
-
uint8_t m_maxDsaReqRetries;
EventId m_dsaRspTimeoutEvent;