From 540f48c55ac23316e84de5dcab1723e6a1282d18 Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Thu, 23 Feb 2023 17:30:58 -0300 Subject: [PATCH] Fix additional typos --- CHANGES.md | 38 +- doc/manual/source/events.rst | 34 +- .../source/working-with-gitlab-ci-local.rst | 4 +- examples/matrix-topology/matrix-topology.cc | 6 +- examples/tcp/tcp-validation.cc | 2 +- src/aodv/model/aodv-rtable.h | 2 +- .../outdoor-group-mobility-example.cc | 2 +- .../helper/click-internet-stack-helper.cc | 2 +- src/core/model/attribute-accessor-helper.h | 2 +- src/core/model/config.cc | 2 +- src/core/model/matrix-array.h | 4 +- src/core/model/rng-seed-manager.h | 2 +- src/core/test/object-test-suite.cc | 2 +- src/dsr/model/dsr-option-header.cc | 40 +- src/dsr/model/dsr-option-header.h | 6 +- src/dsr/model/dsr-options.cc | 8 +- src/dsr/model/dsr-routing.cc | 14 +- src/energy/helper/energy-source-container.h | 2 +- src/energy/model/li-ion-energy-source.h | 2 +- src/energy/model/simple-device-energy-model.h | 2 +- src/internet/model/global-router-interface.cc | 50 +- src/internet/model/ipv6-header.h | 2 +- src/lr-wpan/examples/lr-wpan-per-plot.cc | 6 +- src/lr-wpan/model/lr-wpan-constants.h | 2 +- src/lr-wpan/model/lr-wpan-fields.cc | 14 +- src/lr-wpan/model/lr-wpan-mac.cc | 2 +- src/lr-wpan/model/lr-wpan-net-device.h | 6 +- src/lte/doc/source/lte-design.rst | 8 +- src/lte/helper/lte-helper.cc | 2 +- src/lte/model/epc-enb-application.h | 10 +- src/lte/model/epc-pgw-application.h | 2 +- src/lte/model/epc-sgw-application.h | 2 +- src/lte/model/ff-mac-common.h | 2 +- src/lte/model/lte-enb-mac.cc | 22 +- src/lte/model/lte-enb-mac.h | 4 +- src/lte/model/lte-enb-phy-sap.h | 4 +- src/lte/model/lte-enb-phy.cc | 2 +- src/lte/model/lte-fr-strict-algorithm.h | 2 +- src/lte/model/lte-rlc-am-header.h | 2 +- src/lte/model/lte-rrc-header.cc | 6 +- src/lte/model/lte-ue-cphy-sap.h | 8 +- src/lte/model/lte-ue-phy.cc | 6 +- src/lte/model/lte-ue-phy.h | 2 +- src/lte/model/lte-ue-rrc.cc | 2 +- src/lte/model/lte-ue-rrc.h | 2 +- src/lte/model/rr-ff-mac-scheduler.cc | 4 +- src/lte/test/lte-test-ipv6-routing.cc | 4 +- src/lte/test/test-lte-handover-failure.cc | 16 +- src/lte/test/test-lte-x2-handover.cc | 472 +++++++++++++----- src/mesh/model/dot11s/hwmp-protocol.h | 4 +- .../dot11s/peer-management-protocol-mac.h | 2 +- .../model/dot11s/peer-management-protocol.h | 4 +- .../reference-point-group-mobility-example.cc | 4 +- src/mpi/model/mpi-receiver.h | 2 +- src/mpi/model/null-message-simulator-impl.h | 6 +- src/network/examples/CMakeLists.txt | 2 +- ...omparisions.cc => lollipop-comparisons.cc} | 0 src/network/model/nix-vector.cc | 12 +- src/network/model/packet-metadata.cc | 4 +- src/network/model/packet-metadata.h | 4 +- src/network/model/packet.cc | 8 +- .../doc/point-to-point-dumbbell.rst | 2 +- src/propagation/model/jakes-process.cc | 6 +- src/sixlowpan/doc/sixlowpan.rst | 4 +- src/sixlowpan/model/sixlowpan-net-device.cc | 24 +- src/sixlowpan/model/sixlowpan-net-device.h | 2 +- src/spectrum/doc/spectrum.rst | 2 +- src/spectrum/model/spectrum-model.h | 2 +- src/stats/model/get-wildcard-matches.cc | 2 +- .../ns3tc/fq-cobalt-queue-disc-test-suite.cc | 2 +- .../ns3tc/fq-codel-queue-disc-test-suite.cc | 2 +- .../examples/fqcodel-l4s-example.cc | 2 +- src/wave/doc/wave.rst | 10 +- src/wave/model/ocb-wifi-mac.cc | 2 +- src/wave/model/ocb-wifi-mac.h | 2 +- src/wave/model/wave-net-device.cc | 2 +- src/wave/test/mac-extension-test-suite.cc | 6 +- src/wifi/model/he/rr-multi-user-scheduler.cc | 4 +- src/wifi/model/mgt-headers.cc | 8 +- src/wifi/model/mgt-headers.h | 4 +- .../model/rate-control/aparf-wifi-manager.cc | 12 +- .../model/rate-control/aparf-wifi-manager.h | 8 +- src/wifi/model/wifi-information-element.h | 2 +- src/wifi/model/wifi-radio-energy-model.h | 2 +- src/wifi/test/tx-duration-test.cc | 6 +- src/wimax/model/bs-net-device.cc | 2 +- src/wimax/model/bs-uplink-scheduler-rtps.cc | 2 +- src/wimax/model/cid-factory.h | 2 +- src/wimax/model/simple-ofdm-wimax-phy.cc | 16 +- src/wimax/model/simple-ofdm-wimax-phy.h | 2 +- src/wimax/model/ss-link-manager.cc | 6 +- src/wimax/model/ss-net-device.cc | 2 +- src/wimax/model/wimax-net-device.h | 2 +- utils/codespell-ignored-lines | 77 +++ utils/codespell-ignored-words | 6 + 95 files changed, 717 insertions(+), 412 deletions(-) rename src/network/examples/{lollipop-comparisions.cc => lollipop-comparisons.cc} (100%) diff --git a/CHANGES.md b/CHANGES.md index f2518adbf..6f4e46cb4 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -20,6 +20,28 @@ Changes from ns-3.38 to ns-3-dev ### Changes to existing API +* (dsr) The spelling of the class `DsrOptionRerrUnsupportHeader` from `dsr-option-header.h` was corrected to `DsrOptionRerrUnsupportedHeader`; this will affect existing users who were using the class with the misspelling. +* (internet) The spelling of the enumerated value `IPV6_EXT_AUTHENTIFICATION` from `ipv6-header.h` was corrected to `IPV6_EXT_AUTHENTICATION`; this will affect existing users who were using the enumerated value with the misspelling. +* (mesh) The spelling of the function `PeerManagementProtocolMac::SetPeerManagerProtcol` from `peer-management-protocol-mac.h` was corrected to `PeerManagementProtocolMac::SetPeerManagerProtocol`; this will affect existing users who were using the function with the misspelling. +* (lr-wpan) The spelling of the constant `aMaxBeaconPayloadLenght` from `lr-wpan-constants.h` was corrected to `aMaxBeaconPayloadLength`; this will affect existing users who were using the constant value with the misspelling. +* (lte) The spelling of the enumeration `ControPduType_t` from `lte-rlc-am-header.h` was corrected to `ControlPduType_t`; this will affect existing users who were using the enumeration with the misspelling. +* (lte) The spelling of the function `LteUeCphySapProvider::StartInSnycDetection()` from `lte-ue-cphy-sap.h` was corrected to `LteUeCphySapProvider::StartInSyncDetection()`; this will affect existing users who were using the function with the misspelling. +* (lte) The spelling of the function `MemberLteUeCphySapProvider::StartInSnycDetection()` from `lte-ue-cphy-sap.h` was corrected to `MemberLteUeCphySapProvider::StartInSyncDetection()`; this will affect existing users who were using the function with the misspelling. +* (lte) The spelling of the function `LteUePhy::StartInSnycDetection()` from `lte-ue-phy.h` was corrected to `LteUePhy::StartInSyncDetection()`; this will affect existing users who were using the function with the misspelling. +* (lte) The spelling of the function `DoUlInfoListElementHarqFeeback` from `lte-enb-phy-sap.h` and `lte-enb-mac.h` was corrected to `DoUlInfoListElementHarqFeedback`; this will affect existing users who were using the function with the mispelling. +* (lte) The spelling of the function `DoDlInfoListElementHarqFeeback` from `lte-enb-phy-sap.h` and `lte-enb-mac.h` was corrected to `DoDlInfoListElementHarqFeedback`; this will affect existing users who were using the function with the mispelling. +* (network) The spelling of the file `lollipop-comparisions.cc` was corrected to `lollipop-comparisons.cc`. +* (network) The spelling of the attribute `currentTrimedFromStart` from `packet-metadata.h` was corrected to `currentTrimmedFromStart`; this will affect existing users who were using the attribute with the misspelling. +* (network) The spelling of the attribute `currentTrimedFromEnd` from `packet-metadata.h` was corrected to `currentTrimmedFromEnd`; this will affect existing users who were using the attribute with the misspelling. +* (wave) The spelling of the function `OcbWifiMac::CancleTx()` from `ocb-wifi-mac.h` was corrected to `OcbWifiMac::CancelTx()`; this will affect existing users who were using the function with the misspelling. +* (wifi) The spelling of the attribute `m_succesMax1` from `aparf-wifi-manager.h` was corrected to `m_successMax1`; this will affect existing users who were using the attribute with the misspelling. +* (wifi) The spelling of the attribute `m_succesMax2` from `aparf-wifi-manager.h` was corrected to `m_successMax2`; this will affect existing users who were using the attribute with the misspelling. +* (wifi) The spelling of the enumerated value `MDAOP_ADVERTISMENT_REQUEST` from `mgmt-headers.h` was corrected to `MDAOP_ADVERTISEMENT_REQUEST`; this will affect existing users who were using the enumerated value with the misspelling. +* (wifi) The spelling of the enumerated value `MDAOP_ADVERTISMENTS` from `mgmt-headers.h` was corrected to `MDAOP_ADVERTISEMENTS`; this will affect existing users who were using the enumerated value with the misspelling. +* (wifi) The spelling of the define `IE_BEAMLINK_MAINENANCE` from `wifi-information-element.h` was corrected to `IE_BEAMLINK_MAINTENANCE`; this will affect existing users who were using the define with the misspelling. +* (wimax) The spelling of the attribute `m_nrRecivedFecBlocks` from `simple-ofdm-wimax-phy.h` was corrected to `m_nrReceivedFecBlocks`; this will affect existing users who were using the attribute with the misspelling. +* (sixlowpan) The spelling of the function `SixLowPanNetDevice::Fragments::GetFraments` from `sixlowpan-net-device.cc` was corrected to `SixLowPanNetDevice::Fragments::GetFragments`; this will affect existing users who were using the function with the misspelling. + ### Changes to build system ### Changed behavior @@ -411,7 +433,7 @@ Changes from ns-3.29 to ns-3.30 * A new attribute `WifiPhy::PostReceptionErrorModel` has been added to force specific packet drops. * A new attribute `WifiPhy::PreambleDetectionModel` has been added to decide whether PHY preambles are successfully detected. * New attributes `QosTxop::AddBaResponseTimeout` and `QosTxop::FailedAddBaTimeout` have been added to set the timeout to wait for an ADDBA response after the ACK to the ADDBA request is received and to set the timeout after a failed BA agreement, respectively. -* A new attribute `QosTxop::UseExpliciteBarAfterMissedBlockAck` has been added to specify whether explicit Block Ack Request should be sent upon missed Block Ack Response. +* A new attribute `QosTxop::UseExplicitBarAfterMissedBlockAck` has been added to specify whether explicit Block Ack Request should be sent upon missed Block Ack Response. * Added a new trace source `EndOfHePreamble` in WifiPhy for tracing end of preamble (after training fields) for received 802.11ax packets. * Added a new helper method to SpectrumWifiPhyHelper and YansWifiPhyHelper to set the **frame capture model**. * Added a new helper method to SpectrumWifiPhyHelper and YansWifiPhyHelper to set the **preamble detection model**. @@ -598,12 +620,12 @@ Changes from ns-3.26 to ns-3.27 * A new standard value has been added that enables the new 11ax data rates. * A new 11ax preamble has been added. * A new attribute was added to configure the guard interval duration for High Efficiency (HE) PHY entities. This attribute can be set using the YansWifiPhyHelper. -* A new information element has been added: HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilites information element is used to advertise the HE capabilities of the node to other nodes in the network. +* A new information element has been added: HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilities information element is used to advertise the HE capabilities of the node to other nodes in the network. * A new class were added for the RRPAA WiFi rate control mechanism. * Included carrier aggregation feature in LTE module * LTE model is extended to support carrier aggregation feature according to 3GPP Release 10, for up to 5 component carriers. -* InstallSingleEnbDevice and InstalSingeUeDevice functions of LteHelper are now constructing LteEnbDevice and LteUeDevice according to CA architecture. Each device, UE and eNodeB contains an instance of component carrier manager, and may have several component carrier instances. +* InstallSingleEnbDevice and InstallSingleUeDevice functions of LteHelper are now constructing LteEnbDevice and LteUeDevice according to CA architecture. Each device, UE and eNodeB contains an instance of component carrier manager, and may have several component carrier instances. * SAP interfaces are extended to include CA message exchange functionality. * RRC connection procedure is extended to allow RRC connection reconfiguration for the configuration of the secondary carriers. * RRC measurement reporting is extended to allow measurement reporting from the secondary carriers. @@ -755,7 +777,7 @@ Changes from ns-3.23 to ns-3.24 * A new helper (VhtWifiMacHelper) was added to set up a Very high throughput (VHT) MAC entity. * A new standard value has been added that enables the new 11ac data rates. * A new 11ac preamble has been added. -* A new information element has been added: VhtCapabilities. This information element is added to the MAC frame header if the node is a VHT node. This VhtCapabilites information element is used to advertise the VHT capabilities of the node to other nodes in the network. +* A new information element has been added: VhtCapabilities. This information element is added to the MAC frame header if the node is a VHT node. This VhtCapabilities information element is used to advertise the VHT capabilities of the node to other nodes in the network. * The ArpCache API was extended to allow the manual removal of ArpCache entries and the addition of permanent (static) entries for IPv4. * The SimpleChannel in the `network` module now allows per-NetDevice blacklists, in order to do hidden terminal testcases. @@ -848,7 +870,7 @@ Changes from ns-3.20 to ns-3.21 * New `const double& SpectrumValue::operator[] (size_t index) const`. * A new TraceSource has been added to TCP sockets: SlowStartThreshold. -* New method CommandLine::AddValue (name, attibutePath) to provide a shorthand argument `name` for the Attribute `path`. This also has the effect of including the help string for the Attribute in the Usage message. +* New method CommandLine::AddValue (name, attributePath) to provide a shorthand argument `name` for the Attribute `path`. This also has the effect of including the help string for the Attribute in the Usage message. * The GSoC 2014 project in the LTE module has brought some additional APIs: * a new abstract class LteFfrAlgorithm, which every future implementation of frequency reuse algorithm should inherit from * a new SAPs: one between MAC Scheduler and FrAlgorithm, one between RRC and FrAlgorithm @@ -999,7 +1021,7 @@ Changes from ns-3.17 to ns-3.18 * New attributes were added to help the user setup a High Throughput (HT) PHY entity. These attributes can be set using the YansWifiPhyHelper * A new standard value has been added that enables the new 11n data rates. * New 11n preambles has been added (Mixed format and greenfield). To be able to change Tx duration according to the preamble used, a new class TxVector has been added to carry the transmission parameters (mode, preamble, stbc,..). Several functions have been updated to allow the passage of TxVector instead of WifiMode in MacLow, WifiRemoteStationManager, WifiPhy, YansWifiPhy,.. - * A new information element has been added: HTCapabilities. This information element is added to the MAC frame header if the node is an HT node. This HTCapabilites information element is used to advertise the HT capabilities of the node to other nodes in the network + * A new information element has been added: HTCapabilities. This information element is added to the MAC frame header if the node is an HT node. This HTCapabilities information element is used to advertise the HT capabilities of the node to other nodes in the network * InternetStackHelper has two new functions:SetIpv4ArpJitter (bool enable) and SetIpv6NsRsJitter (bool enable) to enable/disable the random jitter on the transmission of IPv4 ARP Request and IPv6 NS/RS. * Bounds on valid time inputs for time attributes can now be enabled. See attribute-test-suite.cc for an example. * New generic hash function interface provided in the simulation core. Two hash functions are provided: murmur3 (default), and the venerable FNV1a. See the Hash Functions section in the ns-3 manual. @@ -1068,7 +1090,7 @@ Changes from ns-3.16 to ns-3.17 * New DSR API * Added PassiveBuffer class to save maintenance packet entry for passive acknowledgment option * Added FindSourceEntry function in RreqTable class to keep track of route request entry received from same source node - * Added NotifyDataReciept function in DsrRouting class to notify the data receipt of the next hop from link layer. This is used for the link layer acknowledgment. + * Added NotifyDataReceipt function in DsrRouting class to notify the data receipt of the next hop from link layer. This is used for the link layer acknowledgment. * New Tag, PacketSocketTag, to carry the destination address of a packet and the packet type * New Tag, DeviceNameTag, to carry the ns-3 device name from where a packet is coming * New Error Model, BurstError model, to determine which bursts of packets are errored corresponding to an underlying distribution, burst rate, and burst size @@ -1102,7 +1124,7 @@ Changes from ns-3.16 to ns-3.17 * LteEnbPhy new methods GetLteEnbCphySapProvider, SetLteEnbCphySapUser, GetDlSpectrumPhy, GetUlSpectrumPhy, CreateSrsReport * LteEnbPhy methods DoSendMacPdu, DoSetTransmissionMode, DoSetSrsConfigurationIndex, DoGetMacChTtiDelay, DoSendLteControlMessage, AddUePhy, DeleteUePhy made private * LteEnbPhySapProvider removed methods SetBandwidth, SetTransmissionMode, SetSrsConfigurationIndex, SetCellId - * LteEnbPhySapUser added methods ReceiveRachPreamble, UlInfoListElementHarqFeeback, DlInfoListElementHarqFeeback + * LteEnbPhySapUser added methods ReceiveRachPreamble, UlInfoListElementHarqFeedback, DlInfoListElementHarqFeedback * LtePdcp added methods (Set/Get)Status * LtePdcp DoTransmitRrcPdu renamed DoTransmitPdcpSdu * LteUeRrc new enum State. New methods SetLteUeCphySapProvider, GetLteUeCphySapUser, SetLteUeRrcSapUser, GetLteUeRrcSapProvider, GetState, GetDlEarfcn, GetDlBandwidth, GetUlBandwidth, GetCellId, SetUseRlcSm . GetRnti made const. diff --git a/doc/manual/source/events.rst b/doc/manual/source/events.rst index b77c03db6..a7c39dd7b 100644 --- a/doc/manual/source/events.rst +++ b/doc/manual/source/events.rst @@ -326,20 +326,20 @@ complexity on `Insert()` and `RemoveNext()`, are listed in the following table. See the individual Scheduler API pages for details on the complexity of the other API calls. -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| Scheduler Type | Complexity | -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| | | Time | Space | -| `SchedulerImpl` Type | Method +-------------+--------------+----------+--------------+ -| | | Insert() | RemoveNext() | Overhead | Per Event | -+=======================+=====================================+=============+==============+==========+==============+ -| CalendarScheduler | ` []` | Constant | Constant | 24 bytes | 16 bytes | -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| HeapScheduler | Heap on `std::vector` | Logarithmic | Logarithmic | 24 bytes | 0 | -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| ListScheduler | `std::list` | Linear | Constant | 24 bytes | 16 bytes | -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| MapScheduler | `st::map` | Logarithmic | Constant | 40 bytes | 32 bytes | -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| PriorityQueueSchduler | `std::priority_queue<,std::vector>` | Logarithimc | Logarithims | 24 bytes | 0 | -+-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ +| Scheduler Type | Complexity | ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ +| | | Time | Space | +| `SchedulerImpl` Type | Method +-------------+--------------+----------+--------------+ +| | | Insert() | RemoveNext() | Overhead | Per Event | ++========================+=====================================+=============+==============+==========+==============+ +| CalendarScheduler | ` []` | Constant | Constant | 24 bytes | 16 bytes | ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ +| HeapScheduler | Heap on `std::vector` | Logarithmic | Logarithmic | 24 bytes | 0 | ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ +| ListScheduler | `std::list` | Linear | Constant | 24 bytes | 16 bytes | ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ +| MapScheduler | `st::map` | Logarithmic | Constant | 40 bytes | 32 bytes | ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ +| PriorityQueueScheduler | `std::priority_queue<,std::vector>` | Logarithimc | Logarithims | 24 bytes | 0 | ++------------------------+-------------------------------------+-------------+--------------+----------+--------------+ diff --git a/doc/manual/source/working-with-gitlab-ci-local.rst b/doc/manual/source/working-with-gitlab-ci-local.rst index 0d76cde9f..6dec6a81b 100644 --- a/doc/manual/source/working-with-gitlab-ci-local.rst +++ b/doc/manual/source/working-with-gitlab-ci-local.rst @@ -5,7 +5,7 @@ Working with gitlab-ci-local ---------------------------- -.. _continuos integration (CI) : https://docs.gitlab.com/ee/ci/ +.. _continuous integration (CI) : https://docs.gitlab.com/ee/ci/ .. _pipelines : https://docs.gitlab.com/ee/ci/introduction/index.html#continuous-integration .. _daily and weekly pipelines : https://gitlab.com/nsnam/ns-3-dev/-/pipeline_schedules .. _crypto miners abuse : https://about.gitlab.com/blog/2021/05/17/prevent-crypto-mining-abuse/ @@ -15,7 +15,7 @@ Working with gitlab-ci-local .. _rootless mode : https://docs.docker.com/engine/security/rootless/ The ns-3 project repository is currently hosted in GitLab, which includes -`continuos integration (CI)`_ tools to automate build, tests, packaging and +`continuous integration (CI)`_ tools to automate build, tests, packaging and distribution of software. The CI works based on jobs, that are defined on YAML files. diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index 0cfaa302b..9c1cf4f22 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/examples/matrix-topology/matrix-topology.cc @@ -60,7 +60,7 @@ using namespace ns3; // ---------- Prototypes ------------------------------------------------------ std::vector> readNxNMatrix(std::string adj_mat_file_name); -std::vector> readCordinatesFile(std::string node_coordinates_file_name); +std::vector> readCoordinatesFile(std::string node_coordinates_file_name); void printCoordinateArray(const char* description, std::vector> coord_array); void printMatrix(const char* description, std::vector> array); @@ -115,7 +115,7 @@ main(int argc, char* argv[]) // ---------- Read Node Coordinates File ----------------------------------- std::vector> coord_array; - coord_array = readCordinatesFile(node_coordinates_file_name); + coord_array = readCoordinatesFile(node_coordinates_file_name); // Optionally display node coordinates file // printCoordinateArray (node_coordinates_file_name.c_str (),coord_array); @@ -361,7 +361,7 @@ readNxNMatrix(std::string adj_mat_file_name) } std::vector> -readCordinatesFile(std::string node_coordinates_file_name) +readCoordinatesFile(std::string node_coordinates_file_name) { std::ifstream node_coordinates_file; node_coordinates_file.open(node_coordinates_file_name, std::ios::in); diff --git a/examples/tcp/tcp-validation.cc b/examples/tcp/tcp-validation.cc index 7aed2a009..0ba5774dd 100644 --- a/examples/tcp/tcp-validation.cc +++ b/examples/tcp/tcp-validation.cc @@ -933,7 +933,7 @@ main(int argc, char* argv[]) proto->SetAttribute("SocketType", TypeIdValue(secondTcpTypeId)); } - // InternetStackHelper will install a base TrafficControLayer on the node, + // InternetStackHelper will install a base TrafficControlLayer on the node, // but the Ipv4AddressHelper below will install the default FqCoDelQueueDisc // on all single device nodes. The below code overrides the configuration // that is normally done by the Ipv4AddressHelper::Install() method by diff --git a/src/aodv/model/aodv-rtable.h b/src/aodv/model/aodv-rtable.h index ac65e21c8..dfe52fe58 100644 --- a/src/aodv/model/aodv-rtable.h +++ b/src/aodv/model/aodv-rtable.h @@ -407,7 +407,7 @@ class RoutingTableEntry /// List of precursors std::vector m_precursorList; /// When I can send another request - Time m_routeRequestTimout; + Time m_routeRequestTimeout; /// Number of route requests uint8_t m_reqCount; /// Indicate if this entry is in "blacklist" diff --git a/src/buildings/examples/outdoor-group-mobility-example.cc b/src/buildings/examples/outdoor-group-mobility-example.cc index 6f59bca76..e7ccfa54b 100644 --- a/src/buildings/examples/outdoor-group-mobility-example.cc +++ b/src/buildings/examples/outdoor-group-mobility-example.cc @@ -196,7 +196,7 @@ main(int argc, char* argv[]) outdoorMm->SetPosition(Vector(10, 10, 0)); streamIndex += outdoorMm->AssignStreams(streamIndex); - // Each HierachicalMobilityModel contains the above model as the Parent, + // Each HierarchicalMobilityModel contains the above model as the Parent, // and a user defined model as the Child. Two MobilityModel objects are // instantiated per node, and each node also shares the same parent model. diff --git a/src/click/helper/click-internet-stack-helper.cc b/src/click/helper/click-internet-stack-helper.cc index ee800ddc3..fda4ba901 100644 --- a/src/click/helper/click-internet-stack-helper.cc +++ b/src/click/helper/click-internet-stack-helper.cc @@ -488,7 +488,7 @@ ClickInternetStackHelper::EnableAsciiIpv4Internal(Ptr strea "Drop", MakeBoundCallback(&Ipv4L3ProtocolDropSinkWithoutContext, theStream)); NS_ASSERT_MSG(result == true, - "ClickInternetStackHelper::EanableAsciiIpv4Internal(): " + "ClickInternetStackHelper::EnableAsciiIpv4Internal(): " "Unable to connect ipv4L3Protocol \"Drop\""); } diff --git a/src/core/model/attribute-accessor-helper.h b/src/core/model/attribute-accessor-helper.h index 1beccfbc5..e9f1e9f1c 100644 --- a/src/core/model/attribute-accessor-helper.h +++ b/src/core/model/attribute-accessor-helper.h @@ -247,7 +247,7 @@ template inline Ptr DoMakeAccessorHelperOne(U T::*memberVariable) { - /* AttributeAcessor implementation for a class member variable. */ + /* AttributeAccessor implementation for a class member variable. */ class MemberVariable : public AccessorHelper { public: diff --git a/src/core/model/config.cc b/src/core/model/config.cc index 566984ad5..668987d91 100644 --- a/src/core/model/config.cc +++ b/src/core/model/config.cc @@ -638,7 +638,7 @@ class ConfigImpl : public Singleton { public: // Keep Set and SetFailSafe since their errors are triggered - // by the underlying ObjecBase functions. + // by the underlying ObjectBase functions. /** \copydoc ns3::Config::Set() */ void Set(std::string path, const AttributeValue& value); /** \copydoc ns3::Config::SetFailSafe() */ diff --git a/src/core/model/matrix-array.h b/src/core/model/matrix-array.h index 7bfab6b2c..24534d6a0 100644 --- a/src/core/model/matrix-array.h +++ b/src/core/model/matrix-array.h @@ -179,13 +179,13 @@ class MatrixArray : public ValArray /** * \brief operator+ definition for MatrixArray. * \param rhs The rhs MatrixArray object - * \returns The result of operator+ of this MatrixArray and rhs MatrixAray + * \returns The result of operator+ of this MatrixArray and rhs MatrixArray */ MatrixArray operator+(const MatrixArray& rhs) const; /** * \brief binary operator- definition for MatrixArray. * \param rhs The rhs MatrixArray object - * \returns The result of operator- of this MatrixArray and rhs MatrixAray + * \returns The result of operator- of this MatrixArray and rhs MatrixArray */ MatrixArray operator-(const MatrixArray& rhs) const; /** diff --git a/src/core/model/rng-seed-manager.h b/src/core/model/rng-seed-manager.h index 7681b3f42..a44f1b4c2 100644 --- a/src/core/model/rng-seed-manager.h +++ b/src/core/model/rng-seed-manager.h @@ -46,7 +46,7 @@ class RngSeedManager * subsequently instantiated RandomVariableStream objects. * * \code - * RngSeedManger::SetSeed(15); + * RngSeedManager::SetSeed(15); * UniformVariable x(2,3); // These will give the same output every time * ExponentialVariable y(120); // as long as the seed stays the same. * \endcode diff --git a/src/core/test/object-test-suite.cc b/src/core/test/object-test-suite.cc index abf3fbce1..76032ab68 100644 --- a/src/core/test/object-test-suite.cc +++ b/src/core/test/object-test-suite.cc @@ -541,7 +541,7 @@ ObjectFactoryTestCase::DoRun() // // Since a declared a BaseA, even if it is really a DerivedA, we should not - // be able to GetOBject for a DerivedA since this would break the type + // be able to GetObject for a DerivedA since this would break the type // declaration. // NS_TEST_ASSERT_MSG_EQ(!a->GetObject(), diff --git a/src/dsr/model/dsr-option-header.cc b/src/dsr/model/dsr-option-header.cc index f12d092ac..7d1e95aba 100644 --- a/src/dsr/model/dsr-option-header.cc +++ b/src/dsr/model/dsr-option-header.cc @@ -1018,25 +1018,25 @@ DsrOptionRerrUnreachHeader::GetAlignment() const return retVal; } -NS_OBJECT_ENSURE_REGISTERED(DsrOptionRerrUnsupportHeader); +NS_OBJECT_ENSURE_REGISTERED(DsrOptionRerrUnsupportedHeader); TypeId -DsrOptionRerrUnsupportHeader::GetTypeId() +DsrOptionRerrUnsupportedHeader::GetTypeId() { - static TypeId tid = TypeId("ns3::dsr::DsrOptionRerrUnsupportHeader") - .AddConstructor() + static TypeId tid = TypeId("ns3::dsr::DsrOptionRerrUnsupportedHeader") + .AddConstructor() .SetParent() .SetGroupName("Dsr"); return tid; } TypeId -DsrOptionRerrUnsupportHeader::GetInstanceTypeId() const +DsrOptionRerrUnsupportedHeader::GetInstanceTypeId() const { return GetTypeId(); } -DsrOptionRerrUnsupportHeader::DsrOptionRerrUnsupportHeader() +DsrOptionRerrUnsupportedHeader::DsrOptionRerrUnsupportedHeader() : m_salvage(0) { SetType(3); @@ -1044,60 +1044,60 @@ DsrOptionRerrUnsupportHeader::DsrOptionRerrUnsupportHeader() SetErrorType(3); } -DsrOptionRerrUnsupportHeader::~DsrOptionRerrUnsupportHeader() +DsrOptionRerrUnsupportedHeader::~DsrOptionRerrUnsupportedHeader() { } void -DsrOptionRerrUnsupportHeader::SetSalvage(uint8_t salvage) +DsrOptionRerrUnsupportedHeader::SetSalvage(uint8_t salvage) { m_salvage = salvage; } uint8_t -DsrOptionRerrUnsupportHeader::GetSalvage() const +DsrOptionRerrUnsupportedHeader::GetSalvage() const { return m_salvage; } void -DsrOptionRerrUnsupportHeader::SetErrorSrc(Ipv4Address errorSrcAddress) +DsrOptionRerrUnsupportedHeader::SetErrorSrc(Ipv4Address errorSrcAddress) { m_errorSrcAddress = errorSrcAddress; } Ipv4Address -DsrOptionRerrUnsupportHeader::GetErrorSrc() const +DsrOptionRerrUnsupportedHeader::GetErrorSrc() const { return m_errorSrcAddress; } void -DsrOptionRerrUnsupportHeader::SetErrorDst(Ipv4Address errorDstAddress) +DsrOptionRerrUnsupportedHeader::SetErrorDst(Ipv4Address errorDstAddress) { m_errorDstAddress = errorDstAddress; } Ipv4Address -DsrOptionRerrUnsupportHeader::GetErrorDst() const +DsrOptionRerrUnsupportedHeader::GetErrorDst() const { return m_errorDstAddress; } void -DsrOptionRerrUnsupportHeader::SetUnsupported(uint16_t unsupported) +DsrOptionRerrUnsupportedHeader::SetUnsupported(uint16_t unsupported) { m_unsupported = unsupported; } uint16_t -DsrOptionRerrUnsupportHeader::GetUnsupported() const +DsrOptionRerrUnsupportedHeader::GetUnsupported() const { return m_unsupported; } void -DsrOptionRerrUnsupportHeader::Print(std::ostream& os) const +DsrOptionRerrUnsupportedHeader::Print(std::ostream& os) const { os << "( type = " << (uint32_t)GetType() << " length = " << (uint32_t)GetLength() << " errorType = " << (uint32_t)m_errorType << " salvage = " << (uint32_t)m_salvage @@ -1106,13 +1106,13 @@ DsrOptionRerrUnsupportHeader::Print(std::ostream& os) const } uint32_t -DsrOptionRerrUnsupportHeader::GetSerializedSize() const +DsrOptionRerrUnsupportedHeader::GetSerializedSize() const { return 16; } void -DsrOptionRerrUnsupportHeader::Serialize(Buffer::Iterator start) const +DsrOptionRerrUnsupportedHeader::Serialize(Buffer::Iterator start) const { Buffer::Iterator i = start; @@ -1126,7 +1126,7 @@ DsrOptionRerrUnsupportHeader::Serialize(Buffer::Iterator start) const } uint32_t -DsrOptionRerrUnsupportHeader::Deserialize(Buffer::Iterator start) +DsrOptionRerrUnsupportedHeader::Deserialize(Buffer::Iterator start) { Buffer::Iterator i = start; @@ -1142,7 +1142,7 @@ DsrOptionRerrUnsupportHeader::Deserialize(Buffer::Iterator start) } DsrOptionHeader::Alignment -DsrOptionRerrUnsupportHeader::GetAlignment() const +DsrOptionRerrUnsupportedHeader::GetAlignment() const { Alignment retVal = {4, 0}; return retVal; diff --git a/src/dsr/model/dsr-option-header.h b/src/dsr/model/dsr-option-header.h index 86fe5ad0d..b1be00246 100644 --- a/src/dsr/model/dsr-option-header.h +++ b/src/dsr/model/dsr-option-header.h @@ -1028,7 +1028,7 @@ class DsrOptionRerrUnreachHeader : public DsrOptionRerrHeader \endverbatim */ -class DsrOptionRerrUnsupportHeader : public DsrOptionRerrHeader +class DsrOptionRerrUnsupportedHeader : public DsrOptionRerrHeader { public: /** @@ -1044,11 +1044,11 @@ class DsrOptionRerrUnsupportHeader : public DsrOptionRerrHeader /** * \brief Constructor. */ - DsrOptionRerrUnsupportHeader(); + DsrOptionRerrUnsupportedHeader(); /** * \brief Destructor. */ - ~DsrOptionRerrUnsupportHeader() override; + ~DsrOptionRerrUnsupportedHeader() override; /** * \brief Set the route error source address * \param errorSrcAddress The error source address diff --git a/src/dsr/model/dsr-options.cc b/src/dsr/model/dsr-options.cc index 08bfdb3e4..600933d87 100644 --- a/src/dsr/model/dsr-options.cc +++ b/src/dsr/model/dsr-options.cc @@ -1634,12 +1634,12 @@ DsrOptionRerr::Process(Ptr packet, /* * Remove the route error header from the packet, and get the error type */ - DsrOptionRerrUnsupportHeader rerrUnsupport; - p->RemoveHeader(rerrUnsupport); + DsrOptionRerrUnsupportedHeader rerrUnsupported; + p->RemoveHeader(rerrUnsupported); /// \todo This is for the other two error options, not supporting for now - // uint32_t rerrSize = rerrUnsupport.GetSerializedSize(); - // uint32_t serialized = DoSendError (p, rerrUnsupport, rerrSize, ipv4Address, protocol); + // uint32_t rerrSize = rerrUnsupported.GetSerializedSize(); + // uint32_t serialized = DoSendError (p, rerrUnsupported, rerrSize, ipv4Address, protocol); uint32_t serialized = 0; return serialized; } diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc index e4a1c4825..b951cc59d 100644 --- a/src/dsr/model/dsr-routing.cc +++ b/src/dsr/model/dsr-routing.cc @@ -3720,21 +3720,21 @@ DsrRouting::Receive(Ptr p, const Ipv4Header& ip, Ptr inco */ uint8_t salvage = 0; - DsrOptionRerrUnsupportHeader rerrUnsupportHeader; - rerrUnsupportHeader.SetErrorType(3); // The error type 3 means Option not supported - rerrUnsupportHeader.SetErrorSrc( + DsrOptionRerrUnsupportedHeader rerrUnsupportedHeader; + rerrUnsupportedHeader.SetErrorType(3); // The error type 3 means Option not supported + rerrUnsupportedHeader.SetErrorSrc( m_mainAddress); // The error source address is our own address - rerrUnsupportHeader.SetUnsupported(optionType); // The unsupported option type number - rerrUnsupportHeader.SetErrorDst( + rerrUnsupportedHeader.SetUnsupported(optionType); // The unsupported option type number + rerrUnsupportedHeader.SetErrorDst( src); // Error destination address is the destination of the data packet - rerrUnsupportHeader.SetSalvage( + rerrUnsupportedHeader.SetSalvage( salvage); // Set the value about whether to salvage a packet or not /* * The unknown option error is not supported currently in this implementation, and it's also * not likely to happen in simulations */ - // SendError (rerrUnsupportHeader, 0, protocol); // Send the error packet + // SendError (rerrUnsupportedHeader, 0, protocol); // Send the error packet } return IpL4Protocol::RX_OK; } diff --git a/src/energy/helper/energy-source-container.h b/src/energy/helper/energy-source-container.h index 1ae8ff011..d955f57c8 100644 --- a/src/energy/helper/energy-source-container.h +++ b/src/energy/helper/energy-source-container.h @@ -63,7 +63,7 @@ class EnergySourceContainer : public Object /** * \param source Pointer to an EnergySource. * - * Creates an EnergySourceContianer with exactly one EnergySource previously + * Creates an EnergySourceContainer with exactly one EnergySource previously * instantiated. */ EnergySourceContainer(Ptr source); diff --git a/src/energy/model/li-ion-energy-source.h b/src/energy/model/li-ion-energy-source.h index 78e24cb9e..24d2e36be 100644 --- a/src/energy/model/li-ion-energy-source.h +++ b/src/energy/model/li-ion-energy-source.h @@ -46,7 +46,7 @@ namespace ns3 * * * The model requires several parameters to approximates the discharge curves: - * - IntialCellVoltage, maximum voltage of the fully charged cell + * - InitialCellVoltage, maximum voltage of the fully charged cell * - NominalCellVoltage, nominal cell's voltage, is used to determine the end of the * nominal zone. * - ExpCellVoltage, cell's voltage at the end of the exponential zone diff --git a/src/energy/model/simple-device-energy-model.h b/src/energy/model/simple-device-energy-model.h index 633238024..a3fdd287a 100644 --- a/src/energy/model/simple-device-energy-model.h +++ b/src/energy/model/simple-device-energy-model.h @@ -65,7 +65,7 @@ class SimpleDeviceEnergyModel : public DeviceEnergyModel virtual Ptr GetNode() const; /** - * \brief Sets pointer to EnergySouce installed on node. + * \brief Sets pointer to EnergySource installed on node. * * \param source Pointer to EnergySource installed on node. * diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc index 16d7a2cf0..f6bafd730 100644 --- a/src/internet/model/global-router-interface.cc +++ b/src/internet/model/global-router-interface.cc @@ -831,29 +831,29 @@ GlobalRouter::ProcessSingleBroadcastLink(Ptr nd, // case. // ClearBridgesVisited(); - Ipv4Address desigRtr; - desigRtr = FindDesignatedRouterForLink(nd); + Ipv4Address designatedRtr; + designatedRtr = FindDesignatedRouterForLink(nd); // // Let's double-check that any designated router we find out on our // network is really on our network. // - if (desigRtr != "255.255.255.255") + if (designatedRtr != "255.255.255.255") { Ipv4Address networkHere = addrLocal.CombineMask(maskLocal); - Ipv4Address networkThere = desigRtr.CombineMask(maskLocal); + Ipv4Address networkThere = designatedRtr.CombineMask(maskLocal); NS_ABORT_MSG_UNLESS( networkHere == networkThere, "GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion (" - << addrLocal << "/" << maskLocal.GetPrefixLength() << ", " << desigRtr << "/" - << maskLocal.GetPrefixLength() << ")"); + << addrLocal << "/" << maskLocal.GetPrefixLength() << ", " << designatedRtr + << "/" << maskLocal.GetPrefixLength() << ")"); } - if (desigRtr == addrLocal) + if (designatedRtr == addrLocal) { c.Add(nd); NS_LOG_LOGIC("Node " << node->GetId() << " elected a designated router"); } - plr->SetLinkId(desigRtr); + plr->SetLinkId(designatedRtr); // // OSPF says that the Link Data is this router's own IP address. @@ -921,7 +921,7 @@ GlobalRouter::ProcessBridgedBroadcastLink(Ptr nd, // bool areTransitNetwork = false; - Ipv4Address desigRtr ("255.255.255.255"); + Ipv4Address designatedRtr ("255.255.255.255"); for (uint32_t i = 0; i < bnd->GetNBridgePorts (); ++i) { @@ -945,24 +945,24 @@ GlobalRouter::ProcessBridgedBroadcastLink(Ptr nd, // all. // ClearBridgesVisited (); - Ipv4Address desigRtrTemp = FindDesignatedRouterForLink (ndTemp); + Ipv4Address designatedRtrTemp = FindDesignatedRouterForLink (ndTemp); // // Let's double-check that any designated router we find out on our // network is really on our network. // - if (desigRtrTemp != "255.255.255.255") + if (designatedRtrTemp != "255.255.255.255") { Ipv4Address networkHere = addrLocal.CombineMask (maskLocal); - Ipv4Address networkThere = desigRtrTemp.CombineMask (maskLocal); + Ipv4Address networkThere = designatedRtrTemp.CombineMask (maskLocal); NS_ABORT_MSG_UNLESS (networkHere == networkThere, "GlobalRouter::ProcessSingleBroadcastLink(): Network number confusion (" << addrLocal << "/" << maskLocal.GetPrefixLength () << ", " << - desigRtrTemp << "/" << maskLocal.GetPrefixLength () << ")"); + designatedRtrTemp << "/" << maskLocal.GetPrefixLength () << ")"); } - if (desigRtrTemp < desigRtr) + if (designatedRtrTemp < designatedRtr) { - desigRtr = desigRtrTemp; + designatedRtr = designatedRtrTemp; } } } @@ -1013,12 +1013,12 @@ GlobalRouter::ProcessBridgedBroadcastLink(Ptr nd, // gets the IP interface address of the designated router in this // case. // - if (desigRtr == addrLocal) + if (designatedRtr == addrLocal) { c.Add (nd); NS_LOG_LOGIC ("Node " << node->GetId () << " elected a designated router"); } - plr->SetLinkId (desigRtr); + plr->SetLinkId (designatedRtr); // // OSPF says that the Link Data is this router's own IP address. @@ -1337,7 +1337,7 @@ GlobalRouter::FindDesignatedRouterForLink(Ptr ndLocal) const NS_LOG_LOGIC("Looking for designated router off of net device " << ndLocal << " on node " << ndLocal->GetNode()->GetId()); - Ipv4Address desigRtr("255.255.255.255"); + Ipv4Address designatedRtr("255.255.255.255"); // // Look through all of the devices on the channel to which the net device @@ -1402,8 +1402,8 @@ GlobalRouter::FindDesignatedRouterForLink(Ptr ndLocal) const "primary one"); } Ipv4Address addrOther = ipv4->GetAddress(interfaceOther, 0).GetLocal(); - desigRtr = addrOther < desigRtr ? addrOther : desigRtr; - NS_LOG_LOGIC("designated router now " << desigRtr); + designatedRtr = addrOther < designatedRtr ? addrOther : designatedRtr; + NS_LOG_LOGIC("designated router now " << designatedRtr); } } @@ -1433,8 +1433,8 @@ GlobalRouter::FindDesignatedRouterForLink(Ptr ndLocal) const NS_LOG_LOGIC("Recursively looking for routers down bridge port " << ndBridged); Ipv4Address addrOther = FindDesignatedRouterForLink(ndBridged); - desigRtr = addrOther < desigRtr ? addrOther : desigRtr; - NS_LOG_LOGIC("designated router now " << desigRtr); + designatedRtr = addrOther < designatedRtr ? addrOther : designatedRtr; + NS_LOG_LOGIC("designated router now " << designatedRtr); } } else @@ -1466,13 +1466,13 @@ GlobalRouter::FindDesignatedRouterForLink(Ptr ndLocal) const "primary one"); } Ipv4Address addrOther = ipv4->GetAddress(interfaceOther, 0).GetLocal(); - desigRtr = addrOther < desigRtr ? addrOther : desigRtr; - NS_LOG_LOGIC("designated router now " << desigRtr); + designatedRtr = addrOther < designatedRtr ? addrOther : designatedRtr; + NS_LOG_LOGIC("designated router now " << designatedRtr); } } } } - return desigRtr; + return designatedRtr; } // diff --git a/src/internet/model/ipv6-header.h b/src/internet/model/ipv6-header.h index 1927e40df..073863a9b 100644 --- a/src/internet/model/ipv6-header.h +++ b/src/internet/model/ipv6-header.h @@ -88,7 +88,7 @@ class Ipv6Header : public Header IPV6_EXT_ROUTING = 43, IPV6_EXT_FRAGMENTATION = 44, IPV6_EXT_CONFIDENTIALITY = 50, - IPV6_EXT_AUTHENTIFICATION = 51, + IPV6_EXT_AUTHENTICATION = 51, IPV6_ICMPV6 = 58, IPV6_EXT_END = 59, IPV6_EXT_DESTINATION = 60, diff --git a/src/lr-wpan/examples/lr-wpan-per-plot.cc b/src/lr-wpan/examples/lr-wpan-per-plot.cc index a770816f3..38d1f55f8 100644 --- a/src/lr-wpan/examples/lr-wpan-per-plot.cc +++ b/src/lr-wpan/examples/lr-wpan-per-plot.cc @@ -86,7 +86,7 @@ main(int argc, char* argv[]) Gnuplot perplot = Gnuplot("802.15.4-per-vs-rxSignal.eps"); Gnuplot2dDataset perdatasetExperimental("Experimental"); - Gnuplot2dDataset perdatasetTheorical("Theoretical"); + Gnuplot2dDataset perdatasetTheoretical("Theoretical"); Ptr n0 = CreateObject(); Ptr n1 = CreateObject(); @@ -214,7 +214,7 @@ main(int argc, char* argv[]) sensThreshold = false; } - perdatasetTheorical.Add(j, perTheoretical); + perdatasetTheoretical.Add(j, perTheoretical); } std::cout << "_____________________________________________________________________________\n"; @@ -229,7 +229,7 @@ main(int argc, char* argv[]) << "Rx Sensitivity (Theo) = " << sensitivityTheo << " dBm"; perplot.AddDataset(perdatasetExperimental); - perplot.AddDataset(perdatasetTheorical); + perplot.AddDataset(perdatasetTheoretical); perplot.SetTitle(os.str()); perplot.SetTerminal("postscript eps color enh \"Times-BoldItalic\""); diff --git a/src/lr-wpan/model/lr-wpan-constants.h b/src/lr-wpan/model/lr-wpan-constants.h index 4241df33a..609b5dc35 100644 --- a/src/lr-wpan/model/lr-wpan-constants.h +++ b/src/lr-wpan/model/lr-wpan-constants.h @@ -119,7 +119,7 @@ constexpr uint32_t aMaxBeaconOverhead{75}; * The maximum size, in octets, of a beacon payload. * See IEEE 802.15.4-2011, section 6.4.1, Table 51. */ -constexpr uint32_t aMaxBeaconPayloadLenght{aMaxPhyPacketSize - aMaxBeaconOverhead}; +constexpr uint32_t aMaxBeaconPayloadLength{aMaxPhyPacketSize - aMaxBeaconOverhead}; /** @} */ diff --git a/src/lr-wpan/model/lr-wpan-fields.cc b/src/lr-wpan/model/lr-wpan-fields.cc index 955f8adef..59829e815 100644 --- a/src/lr-wpan/model/lr-wpan-fields.cc +++ b/src/lr-wpan/model/lr-wpan-fields.cc @@ -268,18 +268,18 @@ GtsFields::Serialize(Buffer::Iterator i) const if (m_gtsSpecDescCount > 0) { - uint8_t gtsDescStartAndLenght; + uint8_t gtsDescStartAndLength; i.WriteU8(GetGtsDirectionField()); for (int j = 0; j < m_gtsSpecDescCount; j++) { WriteTo(i, m_gtsList[j].m_gtsDescDevShortAddr); - gtsDescStartAndLenght = + gtsDescStartAndLength = (m_gtsList[j].m_gtsDescStartSlot & 0x0F) | // GTS descriptor bits 16-19 (m_gtsList[j].m_gtsDescLength & 0xF0); // GTS descriptor bits 20-23 - i.WriteU8(gtsDescStartAndLenght); + i.WriteU8(gtsDescStartAndLength); } } return i; @@ -296,14 +296,14 @@ GtsFields::Deserialize(Buffer::Iterator i) uint8_t gtsDirectionField = i.ReadU8(); SetGtsDirectionField(gtsDirectionField); - uint8_t gtsDescStartAndLenght; + uint8_t gtsDescStartAndLength; for (int j = 0; j < m_gtsSpecDescCount; j++) { ReadFrom(i, m_gtsList[j].m_gtsDescDevShortAddr); - gtsDescStartAndLenght = i.ReadU8(); - m_gtsList[j].m_gtsDescStartSlot = (gtsDescStartAndLenght) & (0x0F); - m_gtsList[j].m_gtsDescLength = (gtsDescStartAndLenght >> 4) & (0x0F); + gtsDescStartAndLength = i.ReadU8(); + m_gtsList[j].m_gtsDescStartSlot = (gtsDescStartAndLength) & (0x0F); + m_gtsList[j].m_gtsDescLength = (gtsDescStartAndLength >> 4) & (0x0F); } } return i; diff --git a/src/lr-wpan/model/lr-wpan-mac.cc b/src/lr-wpan/model/lr-wpan-mac.cc index 8a330757b..79f8736ec 100644 --- a/src/lr-wpan/model/lr-wpan-mac.cc +++ b/src/lr-wpan/model/lr-wpan-mac.cc @@ -833,7 +833,7 @@ LrWpanMac::MlmeSetRequest(LrWpanMacPibAttributeIdentifier id, PtrmacBeaconPayload->GetSize() > lrwpan::aMaxBeaconPayloadLenght) + if (attribute->macBeaconPayload->GetSize() > lrwpan::aMaxBeaconPayloadLength) { confirmParams.m_status = MLMESET_INVALID_PARAMETER; } diff --git a/src/lr-wpan/model/lr-wpan-net-device.h b/src/lr-wpan/model/lr-wpan-net-device.h index 7c6758ad5..5d7ff5891 100644 --- a/src/lr-wpan/model/lr-wpan-net-device.h +++ b/src/lr-wpan/model/lr-wpan-net-device.h @@ -250,7 +250,7 @@ class LrWpanNetDevice : public NetDevice * * \param panId The PanID * \param shortAddr The Short MAC address - * \return a Pseudo-Mac48Adress + * \return a Pseudo-Mac48Address */ Mac48Address BuildPseudoMacAddress(uint16_t panId, Mac16Address shortAddr) const; @@ -309,8 +309,8 @@ class LrWpanNetDevice : public NetDevice /** * How the pseudo MAC address is created. * - * According to \RFC{4944} the psudo-MAC is YYYY:0000:XXXX (with U/L bit set to local) - * According to \RFC{6282} the psudo-MAC is 0200:0000:XXXX + * According to \RFC{4944} the pseudo-MAC is YYYY:0000:XXXX (with U/L bit set to local) + * According to \RFC{6282} the pseudo-MAC is 0200:0000:XXXX */ PseudoMacAddressMode_e m_pseudoMacMode; }; diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst index f363a18f1..f61022b93 100644 --- a/src/lte/doc/source/lte-design.rst +++ b/src/lte/doc/source/lte-design.rst @@ -685,7 +685,7 @@ The model can be disabled for working with a zero-losses channel by setting the Config::SetDefault("ns3::LteSpectrumPhy::DataErrorModelEnabled", BooleanValue(false)); -.. _sec-control-channles-phy-error-model: +.. _sec-control-channels-phy-error-model: Control Channels PHY Error Model ++++++++++++++++++++++++++++++++ @@ -2266,13 +2266,13 @@ is less than a defined threshold Qout (default: -5dB), the frame cannot be decod (see``LteUePhy::RadioLinkFailureDetection``). The Qout threshold corresponds to 10% block error rate (BLER) of a hypothetical PDCCH transmission taking into account the PCFICH errors [R4-081920]_ (also refer to -:ref:`sec-control-channles-phy-error-model`). Once, the UE is unable to decode +:ref:`sec-control-channels-phy-error-model`). Once, the UE is unable to decode 20 consecutive frames, i.e., the Qout evaluation period (200ms) is reached, an out-of-sync indication is sent to the UE RRC layer (see ``LteUeRrc::DoNotifyOutOfSync``). Else, the counter for the unsuccessfuly decoded frames is reset to zero. At the LteUeRrc, when the number of consecutive out-of-sync indications matches with the value of N310 parameter, the T310 timer is started and LteUePhy is notified to start -measuring for in-sync indications (see ``LteUePhy::DoStartInSnycDetection``). We note +measuring for in-sync indications (see ``LteUePhy::DoStartInSyncDetection``). We note that, the UE RRC state is not changed till the expiration of T310 timer. If the resultant SINR values averaged over a downlink frame is greater than a defined threshold Qin (default: -3.8dB), the frame is considered to be successfully @@ -2468,7 +2468,7 @@ where: - :math:`F_{n-1}` is the old filtered measurement result, where :math:`F_0 = M_1` (i.e. the first measurement is not filtered); and - :math:`a = (\frac{1}{2})^{\frac{k}{4}}`, where :math:`k` is the configurable - `filterCoefficent` provided by the ``QuantityConfig``; + `filterCoefficient` provided by the ``QuantityConfig``; :math:`k = 4` is the default value, but can be configured by setting the `RsrpFilterCoefficient` and `RsrqFilterCoefficient` attributes in diff --git a/src/lte/helper/lte-helper.cc b/src/lte/helper/lte-helper.cc index c5397a26a..08337c317 100644 --- a/src/lte/helper/lte-helper.cc +++ b/src/lte/helper/lte-helper.cc @@ -939,7 +939,7 @@ LteHelper::InstallSingleUeDevice(Ptr n) // number of component carriers in UE RRC ccmUe->SetNumberOfComponentCarriers(m_noOfCcs); - // run intializeSap to create the proper number of MAC and PHY control sap provider/users + // run initializeSap to create the proper number of MAC and PHY control sap provider/users rrc->InitializeSap(); if (m_useIdealRrc) diff --git a/src/lte/model/epc-enb-application.h b/src/lte/model/epc-enb-application.h index d44c4f1d9..100c65f3c 100644 --- a/src/lte/model/epc-enb-application.h +++ b/src/lte/model/epc-enb-application.h @@ -150,7 +150,7 @@ class EpcEnbApplication : public Application struct EpsFlowId_t { uint16_t m_rnti; ///< RNTI - uint8_t m_bid; ///< Bid, the EPS Bearer IDentifier + uint8_t m_bid; ///< Bid, the EPS Bearer Identifier public: EpsFlowId_t(); @@ -237,7 +237,7 @@ class EpcEnbApplication : public Application * * \param packet t * \param rnti maps to enbUeS1Id - * \param bid the EPS Bearer IDentifier + * \param bid the EPS Bearer Identifier */ void SendToLteSocket(Ptr packet, uint16_t rnti, uint8_t bid); @@ -245,16 +245,16 @@ class EpcEnbApplication : public Application * Send a packet to the SGW via the S1-U interface * * \param packet packet to be sent - * \param teid the Tunnel Endpoint IDentifier + * \param teid the Tunnel Endpoint Identifier */ void SendToS1uSocket(Ptr packet, uint32_t teid); /** * internal method used for the actual setup of the S1 Bearer * - * \param teid the Tunnel Endpoint IDentifier + * \param teid the Tunnel Endpoint Identifier * \param rnti maps to enbUeS1Id - * \param bid the S1-U Bearer IDentifier + * \param bid the S1-U Bearer Identifier */ void SetupS1Bearer(uint32_t teid, uint16_t rnti, uint8_t bid); diff --git a/src/lte/model/epc-pgw-application.h b/src/lte/model/epc-pgw-application.h index 1ee2cd51e..1adab080a 100644 --- a/src/lte/model/epc-pgw-application.h +++ b/src/lte/model/epc-pgw-application.h @@ -123,7 +123,7 @@ class EpcPgwApplication : public Application * * \param packet packet to be sent * \param sgwS5uAddress the address of the SGW - * \param teid the Tunnel Endpoint IDentifier + * \param teid the Tunnel Endpoint Identifier */ void SendToS5uSocket(Ptr packet, Ipv4Address sgwS5uAddress, uint32_t teid); diff --git a/src/lte/model/epc-sgw-application.h b/src/lte/model/epc-sgw-application.h index a70af2084..d515d3a3b 100644 --- a/src/lte/model/epc-sgw-application.h +++ b/src/lte/model/epc-sgw-application.h @@ -144,7 +144,7 @@ class EpcSgwApplication : public Application * * \param packet packet to be sent * \param enbS1uAddress the address of the eNB - * \param teid the Tunnel Endpoint IDentifier + * \param teid the Tunnel Endpoint Identifier */ void SendToS1uSocket(Ptr packet, Ipv4Address enbS1uAddress, uint32_t teid); diff --git a/src/lte/model/ff-mac-common.h b/src/lte/model/ff-mac-common.h index e333bf60e..db49208d1 100644 --- a/src/lte/model/ff-mac-common.h +++ b/src/lte/model/ff-mac-common.h @@ -262,7 +262,7 @@ struct RlcPduListElement_s }; /** - * \brief See section 4.3.8 builDataListElement + * \brief See section 4.3.8 buildDataListElement * \struct BuildDataListElement_s */ struct BuildDataListElement_s diff --git a/src/lte/model/lte-enb-mac.cc b/src/lte/model/lte-enb-mac.cc index 977493912..09de76e23 100644 --- a/src/lte/model/lte-enb-mac.cc +++ b/src/lte/model/lte-enb-mac.cc @@ -261,8 +261,8 @@ class EnbMacMemberLteEnbPhySapUser : public LteEnbPhySapUser void ReceiveLteControlMessage(Ptr msg) override; void ReceiveRachPreamble(uint32_t prachId) override; void UlCqiReport(FfMacSchedSapProvider::SchedUlCqiInfoReqParameters ulcqi) override; - void UlInfoListElementHarqFeeback(UlInfoListElement_s params) override; - void DlInfoListElementHarqFeeback(DlInfoListElement_s params) override; + void UlInfoListElementHarqFeedback(UlInfoListElement_s params) override; + void DlInfoListElementHarqFeedback(DlInfoListElement_s params) override; private: LteEnbMac* m_mac; ///< the MAC @@ -304,15 +304,15 @@ EnbMacMemberLteEnbPhySapUser::UlCqiReport(FfMacSchedSapProvider::SchedUlCqiInfoR } void -EnbMacMemberLteEnbPhySapUser::UlInfoListElementHarqFeeback(UlInfoListElement_s params) +EnbMacMemberLteEnbPhySapUser::UlInfoListElementHarqFeedback(UlInfoListElement_s params) { - m_mac->DoUlInfoListElementHarqFeeback(params); + m_mac->DoUlInfoListElementHarqFeedback(params); } void -EnbMacMemberLteEnbPhySapUser::DlInfoListElementHarqFeeback(DlInfoListElement_s params) +EnbMacMemberLteEnbPhySapUser::DlInfoListElementHarqFeedback(DlInfoListElement_s params) { - m_mac->DoDlInfoListElementHarqFeeback(params); + m_mac->DoDlInfoListElementHarqFeedback(params); } // ////////////////////////////////////// @@ -563,7 +563,7 @@ LteEnbMac::DoSubframeIndication(uint32_t frameNo, uint32_t subframeNo) FfMacSchedSapProvider::SchedDlTriggerReqParameters dlparams; dlparams.m_sfnSf = ((0x3FF & dlSchedFrameNo) << 4) | (0xF & dlSchedSubframeNo); - // Forward DL HARQ feebacks collected during last TTI + // Forward DL HARQ Feedbacks collected during last TTI if (!m_dlInfoListReceived.empty()) { dlparams.m_dlInfoList = m_dlInfoListReceived; @@ -617,7 +617,7 @@ LteEnbMac::DoSubframeIndication(uint32_t frameNo, uint32_t subframeNo) FfMacSchedSapProvider::SchedUlTriggerReqParameters ulparams; ulparams.m_sfnSf = ((0x3FF & ulSchedFrameNo) << 4) | (0xF & ulSchedSubframeNo); - // Forward DL HARQ feebacks collected during last TTI + // Forward DL HARQ Feedbacks collected during last TTI if (!m_ulInfoListReceived.empty()) { ulparams.m_ulInfoList = m_ulInfoListReceived; @@ -646,7 +646,7 @@ LteEnbMac::DoReceiveLteControlMessage(Ptr msg) { Ptr dlharq = DynamicCast(msg); - DoDlInfoListElementHarqFeeback(dlharq->GetDlHarqFeedback()); + DoDlInfoListElementHarqFeedback(dlharq->GetDlHarqFeedback()); } else { @@ -1296,14 +1296,14 @@ LteEnbMac::DoCschedCellConfigUpdateInd( } void -LteEnbMac::DoUlInfoListElementHarqFeeback(UlInfoListElement_s params) +LteEnbMac::DoUlInfoListElementHarqFeedback(UlInfoListElement_s params) { NS_LOG_FUNCTION(this); m_ulInfoListReceived.push_back(params); } void -LteEnbMac::DoDlInfoListElementHarqFeeback(DlInfoListElement_s params) +LteEnbMac::DoDlInfoListElementHarqFeedback(DlInfoListElement_s params) { NS_LOG_FUNCTION(this); // Update HARQ buffer diff --git a/src/lte/model/lte-enb-mac.h b/src/lte/model/lte-enb-mac.h index ba4d2d542..4dc3a2648 100644 --- a/src/lte/model/lte-enb-mac.h +++ b/src/lte/model/lte-enb-mac.h @@ -365,12 +365,12 @@ class LteEnbMac : public Object * \brief UL Info List ELements HARQ Feedback function * \param params UlInfoListElement_s */ - void DoUlInfoListElementHarqFeeback(UlInfoListElement_s params); + void DoUlInfoListElementHarqFeedback(UlInfoListElement_s params); /** * \brief DL Info List ELements HARQ Feedback function * \param params DlInfoListElement_s */ - void DoDlInfoListElementHarqFeeback(DlInfoListElement_s params); + void DoDlInfoListElementHarqFeedback(DlInfoListElement_s params); /// RNTI, LC ID, SAP of the RLC instance std::map> m_rlcAttached; diff --git a/src/lte/model/lte-enb-phy-sap.h b/src/lte/model/lte-enb-phy-sap.h index 57f9de632..e20519a4d 100644 --- a/src/lte/model/lte-enb-phy-sap.h +++ b/src/lte/model/lte-enb-phy-sap.h @@ -109,14 +109,14 @@ class LteEnbPhySapUser * * \param params */ - virtual void UlInfoListElementHarqFeeback(UlInfoListElement_s params) = 0; + virtual void UlInfoListElementHarqFeedback(UlInfoListElement_s params) = 0; /** * Notify the HARQ on the DL transmission status * * \param params */ - virtual void DlInfoListElementHarqFeeback(DlInfoListElement_s params) = 0; + virtual void DlInfoListElementHarqFeedback(DlInfoListElement_s params) = 0; }; } // namespace ns3 diff --git a/src/lte/model/lte-enb-phy.cc b/src/lte/model/lte-enb-phy.cc index f25134526..22812abf3 100644 --- a/src/lte/model/lte-enb-phy.cc +++ b/src/lte/model/lte-enb-phy.cc @@ -1161,7 +1161,7 @@ LteEnbPhy::ReportUlHarqFeedback(UlInfoListElement_s mes) { NS_LOG_FUNCTION(this); // forward to scheduler - m_enbPhySapUser->UlInfoListElementHarqFeeback(mes); + m_enbPhySapUser->UlInfoListElementHarqFeedback(mes); } } // namespace ns3 diff --git a/src/lte/model/lte-fr-strict-algorithm.h b/src/lte/model/lte-fr-strict-algorithm.h index 2b7bc91ee..6d13f99bc 100644 --- a/src/lte/model/lte-fr-strict-algorithm.h +++ b/src/lte/model/lte-fr-strict-algorithm.h @@ -141,7 +141,7 @@ class LteFrStrictAlgorithm : public LteFfrAlgorithm }; std::map m_ues; ///< UEs - std::vector m_egdeUes; ///< Edge UEs + std::vector m_edgeUes; ///< Edge UEs uint8_t m_edgeSubBandThreshold; ///< Edge subband threshold diff --git a/src/lte/model/lte-rlc-am-header.h b/src/lte/model/lte-rlc-am-header.h index 22fbb674d..948b79254 100644 --- a/src/lte/model/lte-rlc-am-header.h +++ b/src/lte/model/lte-rlc-am-header.h @@ -74,7 +74,7 @@ class LteRlcAmHeader : public Header }; /// ControlPduType_t enumeration - enum ControPduType_t + enum ControlPduType_t { STATUS_PDU = 000, }; diff --git a/src/lte/model/lte-rrc-header.cc b/src/lte/model/lte-rrc-header.cc index 5319bb473..2cf040a12 100644 --- a/src/lte/model/lte-rrc-header.cc +++ b/src/lte/model/lte-rrc-header.cc @@ -1934,7 +1934,7 @@ RrcAsn1Header::SerializeRadioResourceConfigCommonSCell( SerializeInteger(rrccsc.ulConfiguration.ulFreqInfo.ulCarrierFreq, 0, MAX_EARFCN); SerializeInteger(rrccsc.ulConfiguration.ulFreqInfo.ulBandwidth, 6, 100); - // Serialize UlPowerControllCommonSCell + // Serialize UlPowerControlCommonSCell std::bitset<2> UlPowerControlCommonSCell_r10; UlPowerControlCommonSCell_r10.set(1, 0); // p0-NominalPUSCH-r10 Not Implemented UlPowerControlCommonSCell_r10.set(0, 1); // alpha @@ -5384,7 +5384,7 @@ RrcConnectionReconfigurationHeader::PreSerialize() const // Serialize t304 SerializeEnum(8, 0); - // Serialize newUE-Identitiy + // Serialize newUE-Identity SerializeBitstring(std::bitset<16>(m_mobilityControlInfo.newUeIdentity)); // Serialize radioResourceConfigCommon @@ -6258,7 +6258,7 @@ RrcConnectionReestablishmentRequestHeader::PreSerialize() const SerializeUlCcchMessage(0); - // Serialize RrcConnectionReestablishmentReques sequence: + // Serialize RrcConnectionReestablishmentRequest sequence: // no default or optional fields. Extension marker not present. SerializeSequence(std::bitset<0>(), false); diff --git a/src/lte/model/lte-ue-cphy-sap.h b/src/lte/model/lte-ue-cphy-sap.h index c8af203ce..3b2e573b4 100644 --- a/src/lte/model/lte-ue-cphy-sap.h +++ b/src/lte/model/lte-ue-cphy-sap.h @@ -194,7 +194,7 @@ class LteUeCphySapProvider * started by checking if the radio frames are in-sync for N311 * consecutive times. */ - virtual void StartInSnycDetection() = 0; + virtual void StartInSyncDetection() = 0; /** * \brief A method call by UE RRC to communicate the IMSI to the UE PHY @@ -327,7 +327,7 @@ class MemberLteUeCphySapProvider : public LteUeCphySapProvider void SetRsrpFilterCoefficient(uint8_t rsrpFilterCoefficient) override; void ResetPhyAfterRlf() override; void ResetRlfParams() override; - void StartInSnycDetection() override; + void StartInSyncDetection() override; void SetImsi(uint64_t imsi) override; private: @@ -454,9 +454,9 @@ MemberLteUeCphySapProvider::ResetRlfParams() template void -MemberLteUeCphySapProvider::StartInSnycDetection() +MemberLteUeCphySapProvider::StartInSyncDetection() { - m_owner->DoStartInSnycDetection(); + m_owner->DoStartInSyncDetection(); } template diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index f7cf3591e..4c0eb4e46 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -1585,7 +1585,7 @@ LteUePhy::DoResetRlfParams() } void -LteUePhy::DoStartInSnycDetection() +LteUePhy::DoStartInSyncDetection() { NS_LOG_FUNCTION(this); // indicates that the downlink radio link quality has to be monitored for in-sync indications @@ -1617,7 +1617,7 @@ LteUePhy::RlfDetection(double sinrDb) m_numOfSubframes++; NS_LOG_LOGIC("No of Subframes: " << m_numOfSubframes << " UE synchronized: " << m_downlinkInSync); - // check for out_of_snyc indications first when UE is both DL and UL synchronized + // check for out_of_sync indications first when UE is both DL and UL synchronized // m_downlinkInSync=true indicates that the evaluation is for out-of-sync indications if (m_downlinkInSync && m_numOfSubframes == 10) { @@ -1657,7 +1657,7 @@ LteUePhy::RlfDetection(double sinrDb) m_ueCphySapUser->NotifyOutOfSync(); m_numOfFrames = 0; } - // check for in_snyc indications when T310 timer is started + // check for in_sync indications when T310 timer is started // m_downlinkInSync=false indicates that the evaluation is for in-sync indications if (!m_downlinkInSync && m_numOfSubframes == 10) { diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index 38d25c552..575fe1300 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -580,7 +580,7 @@ class LteUePhy : public LtePhy * consecutive times. * */ - void DoStartInSnycDetection(); + void DoStartInSyncDetection(); /** * \brief Radio link failure detection function diff --git a/src/lte/model/lte-ue-rrc.cc b/src/lte/model/lte-ue-rrc.cc index 821d0d5ea..8b8fd7e88 100644 --- a/src/lte/model/lte-ue-rrc.cc +++ b/src/lte/model/lte-ue-rrc.cc @@ -3374,7 +3374,7 @@ LteUeRrc::DoNotifyOutOfSync() { NS_LOG_INFO("t310 started"); } - m_cphySapProvider.at(0)->StartInSnycDetection(); + m_cphySapProvider.at(0)->StartInSyncDetection(); m_noOfSyncIndications = 0; } } diff --git a/src/lte/model/lte-ue-rrc.h b/src/lte/model/lte-ue-rrc.h index daf4ef1f3..9b8c1d542 100644 --- a/src/lte/model/lte-ue-rrc.h +++ b/src/lte/model/lte-ue-rrc.h @@ -347,7 +347,7 @@ class LteUeRrc : public Object typedef void (*ImsiCidRntiTracedCallback)(uint64_t imsi, uint16_t cellId, uint16_t rnti); /** - * TracedCallback signature for MIBRecieved, Sib1Received and + * TracedCallback signature for MIBReceived, Sib1Received and * HandoverStart events. * * \param [in] imsi diff --git a/src/lte/model/rr-ff-mac-scheduler.cc b/src/lte/model/rr-ff-mac-scheduler.cc index 5bf71eb6a..b1b9332de 100644 --- a/src/lte/model/rr-ff-mac-scheduler.cc +++ b/src/lte/model/rr-ff-mac-scheduler.cc @@ -978,10 +978,10 @@ RrFfMacScheduler::DoSchedDlTriggerReq( if ((itLcRnti == lcActivesPerRnti.end()) || (itRnti != rntiAllocated.end())) { // skip this RNTI (no active queue or yet allocated for HARQ) - uint16_t rntiDiscared = (*it).m_rnti; + uint16_t rntiDiscarded = (*it).m_rnti; while (it != m_rlcBufferReq.end()) { - if ((*it).m_rnti != rntiDiscared) + if ((*it).m_rnti != rntiDiscarded) { break; } diff --git a/src/lte/test/lte-test-ipv6-routing.cc b/src/lte/test/lte-test-ipv6-routing.cc index f6ab82189..c09559566 100644 --- a/src/lte/test/lte-test-ipv6-routing.cc +++ b/src/lte/test/lte-test-ipv6-routing.cc @@ -181,7 +181,7 @@ LteIpv6RoutingTestCase::Checker() Ptr p2 = (*it2)->Copy(); Ipv6Header ipv6header2; p2->RemoveHeader(ipv6header2); - Ipv6Address sorceAddress = ipv6header2.GetSource(); + Ipv6Address sourceAddress = ipv6header2.GetSource(); Ipv6Address destinationAddress = ipv6header2.GetDestination(); UdpHeader udpHeader2; p2->RemoveHeader(udpHeader2); @@ -190,7 +190,7 @@ LteIpv6RoutingTestCase::Checker() sourcePort = udpHeader2.GetSourcePort(); destinationPort = udpHeader2.GetDestinationPort(); // Check whether the uids, addresses and ports match - if ((p2->GetUid() == p1->GetUid()) && sorceAddress == ipv6header1.GetDestination() && + if ((p2->GetUid() == p1->GetUid()) && sourceAddress == ipv6header1.GetDestination() && destinationAddress == ipv6header1.GetSource() && sourcePort == udpHeader1.GetDestinationPort() && destinationPort == udpHeader1.GetSourcePort()) diff --git a/src/lte/test/test-lte-handover-failure.cc b/src/lte/test/test-lte-handover-failure.cc index 96255ce9b..5181a121b 100644 --- a/src/lte/test/test-lte-handover-failure.cc +++ b/src/lte/test/test-lte-handover-failure.cc @@ -110,7 +110,7 @@ class LteHandoverFailureTestCase : public TestCase m_handoverJoiningTimeout(handoverJoiningTimeout), m_handoverLeavingTimeout(handoverLeavingTimeout), m_targeteNodeBPosition(targeteNodeBPosition), - m_hasHandoverFailureOccured(false) + m_hasHandoverFailureOccurred(false) { } @@ -198,8 +198,8 @@ class LteHandoverFailureTestCase : public TestCase uint8_t m_raResponseWindowSize; ///< window length for reception of RAR Time m_handoverJoiningTimeout; ///< handover joining timeout duration at target eNodeB Time m_handoverLeavingTimeout; ///< handover leaving timeout duration at source eNodeB - uint16_t m_targeteNodeBPosition; ///< position of the target eNodeB - bool m_hasHandoverFailureOccured; ///< has handover failure occurred in simulation + uint16_t m_targeteNodeBPosition; ///< position of the target eNodeB + bool m_hasHandoverFailureOccurred; ///< has handover failure occurred in simulation }; // end of class LteHandoverFailureTestCase @@ -321,7 +321,7 @@ LteHandoverFailureTestCase::HandoverFailureMaxRach(std::string context, uint16_t targetCellId) { NS_LOG_FUNCTION(this << context << imsi << rnti << targetCellId); - m_hasHandoverFailureOccured = true; + m_hasHandoverFailureOccurred = true; } void @@ -331,7 +331,7 @@ LteHandoverFailureTestCase::HandoverFailureNoPreamble(std::string context, uint16_t targetCellId) { NS_LOG_FUNCTION(this << context << imsi << rnti << targetCellId); - m_hasHandoverFailureOccured = true; + m_hasHandoverFailureOccurred = true; } void @@ -341,7 +341,7 @@ LteHandoverFailureTestCase::HandoverFailureJoining(std::string context, uint16_t targetCellId) { NS_LOG_FUNCTION(this << context << imsi << rnti << targetCellId); - m_hasHandoverFailureOccured = true; + m_hasHandoverFailureOccurred = true; } void @@ -351,14 +351,14 @@ LteHandoverFailureTestCase::HandoverFailureLeaving(std::string context, uint16_t targetCellId) { NS_LOG_FUNCTION(this << context << imsi << rnti << targetCellId); - m_hasHandoverFailureOccured = true; + m_hasHandoverFailureOccurred = true; } void LteHandoverFailureTestCase::DoTeardown() { NS_LOG_FUNCTION(this); - NS_TEST_ASSERT_MSG_EQ(m_hasHandoverFailureOccured, true, "Handover failure did not occur"); + NS_TEST_ASSERT_MSG_EQ(m_hasHandoverFailureOccurred, true, "Handover failure did not occur"); } /** diff --git a/src/lte/test/test-lte-x2-handover.cc b/src/lte/test/test-lte-x2-handover.cc index 8358d3082..214bdd616 100644 --- a/src/lte/test/test-lte-x2-handover.cc +++ b/src/lte/test/test-lte-x2-handover.cc @@ -708,48 +708,48 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() ue2bwd.sourceEnbDeviceIndex = 1; ue2bwd.targetEnbDeviceIndex = 0; - std::string hel0name("none"); - std::list hel0; + std::string handoverEventList0name("none"); + std::list handoverEventList0; - std::string hel1name("1 fwd"); - const std::list hel1{ + std::string handoverEventList1name("1 fwd"); + const std::list handoverEventList1{ ue1fwd, }; - std::string hel2name("1 fwd & bwd"); - const std::list hel2{ + std::string handoverEventList2name("1 fwd & bwd"); + const std::list handoverEventList2{ ue1fwd, ue1bwd, }; - std::string hel3name("1 fwd & bwd & fwd"); - const std::list hel3{ + std::string handoverEventList3name("1 fwd & bwd & fwd"); + const std::list handoverEventList3{ ue1fwd, ue1bwd, ue1fwdagain, }; - std::string hel4name("1+2 fwd"); - const std::list hel4{ + std::string handoverEventList4name("1+2 fwd"); + const std::list handoverEventList4{ ue1fwd, ue2fwd, }; - std::string hel5name("1+2 fwd & bwd"); - const std::list hel5{ + std::string handoverEventList5name("1+2 fwd & bwd"); + const std::list handoverEventList5{ ue1fwd, ue1bwd, ue2fwd, ue2bwd, }; - // std::string hel6name("2 fwd"); - // const std::list hel6{ + // std::string handoverEventList6name("2 fwd"); + // const std::list handoverEventList6{ // ue2fwd, // }; - // std::string hel7name("2 fwd & bwd"); - // const std::list hel7{ + // std::string handoverEventList7name("2 fwd & bwd"); + // const std::list handoverEventList7{ // ue2fwd, // ue2bwd, // }; @@ -766,126 +766,326 @@ LteX2HandoverTestSuite::LteX2HandoverTestSuite() for (int32_t useIdealRrc = 1; useIdealRrc >= 0; --useIdealRrc) { // nUes, nDBearers, helist, name, sched, admitHo, idealRrc - AddTestCase( - new LteX2HandoverTestCase(1, 0, hel0, hel0name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 0, hel0, hel0name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 5, hel0, hel0name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 5, hel0, hel0name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 0, hel1, hel1name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 1, hel1, hel1name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 2, hel1, hel1name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 0, hel1, hel1name, *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 1, hel1, hel1name, *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 2, hel1, hel1name, *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 0, hel1, hel1name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 1, hel1, hel1name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 2, hel1, hel1name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 0, hel1, hel1name, *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 1, hel1, hel1name, *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 2, hel1, hel1name, *schedIt, false, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 0, hel2, hel2name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 1, hel2, hel2name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 2, hel2, hel2name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 0, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 1, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(1, 2, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 0, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 1, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 2, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::QUICK); - AddTestCase( - new LteX2HandoverTestCase(2, 0, hel4, hel4name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 1, hel4, hel4name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 2, hel4, hel4name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 0, hel5, hel5name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 1, hel5, hel5name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(2, 2, hel5, hel5name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 0, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 1, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 2, hel3, hel3name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 0, hel4, hel4name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 1, hel4, hel4name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 2, hel4, hel4name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 0, hel5, hel5name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 1, hel5, hel5name, *schedIt, true, useIdealRrc), - TestCase::EXTENSIVE); - AddTestCase( - new LteX2HandoverTestCase(3, 2, hel5, hel5name, *schedIt, true, useIdealRrc), - TestCase::QUICK); + AddTestCase(new LteX2HandoverTestCase(1, + 0, + handoverEventList0, + handoverEventList0name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 0, + handoverEventList0, + handoverEventList0name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 5, + handoverEventList0, + handoverEventList0name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 5, + handoverEventList0, + handoverEventList0name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 0, + handoverEventList1, + handoverEventList1name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 1, + handoverEventList1, + handoverEventList1name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 2, + handoverEventList1, + handoverEventList1name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 0, + handoverEventList1, + handoverEventList1name, + *schedIt, + false, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 1, + handoverEventList1, + handoverEventList1name, + *schedIt, + false, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 2, + handoverEventList1, + handoverEventList1name, + *schedIt, + false, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 0, + handoverEventList1, + handoverEventList1name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 1, + handoverEventList1, + handoverEventList1name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 2, + handoverEventList1, + handoverEventList1name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 0, + handoverEventList1, + handoverEventList1name, + *schedIt, + false, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 1, + handoverEventList1, + handoverEventList1name, + *schedIt, + false, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 2, + handoverEventList1, + handoverEventList1name, + *schedIt, + false, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 0, + handoverEventList2, + handoverEventList2name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 1, + handoverEventList2, + handoverEventList2name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 2, + handoverEventList2, + handoverEventList2name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 0, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 1, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(1, + 2, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 0, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 1, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 2, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::QUICK); + AddTestCase(new LteX2HandoverTestCase(2, + 0, + handoverEventList4, + handoverEventList4name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 1, + handoverEventList4, + handoverEventList4name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 2, + handoverEventList4, + handoverEventList4name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 0, + handoverEventList5, + handoverEventList5name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 1, + handoverEventList5, + handoverEventList5name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(2, + 2, + handoverEventList5, + handoverEventList5name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 0, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 1, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 2, + handoverEventList3, + handoverEventList3name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 0, + handoverEventList4, + handoverEventList4name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 1, + handoverEventList4, + handoverEventList4name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 2, + handoverEventList4, + handoverEventList4name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 0, + handoverEventList5, + handoverEventList5name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 1, + handoverEventList5, + handoverEventList5name, + *schedIt, + true, + useIdealRrc), + TestCase::EXTENSIVE); + AddTestCase(new LteX2HandoverTestCase(3, + 2, + handoverEventList5, + handoverEventList5name, + *schedIt, + true, + useIdealRrc), + TestCase::QUICK); } } } diff --git a/src/mesh/model/dot11s/hwmp-protocol.h b/src/mesh/model/dot11s/hwmp-protocol.h index 3b53c51cf..6b4a6992b 100644 --- a/src/mesh/model/dot11s/hwmp-protocol.h +++ b/src/mesh/model/dot11s/hwmp-protocol.h @@ -136,12 +136,12 @@ class HwmpProtocol : public MeshL2RoutingProtocol bool Install(Ptr mp); /** * Peer link status function - * \param meshPontAddress The MAC address of the mesh point + * \param meshPointAddress The MAC address of the mesh point * \param peerAddress The MAC address of the peer * \param interface The interface number * \param status The status of the peer link */ - void PeerLinkStatus(Mac48Address meshPontAddress, + void PeerLinkStatus(Mac48Address meshPointAddress, Mac48Address peerAddress, uint32_t interface, bool status); diff --git a/src/mesh/model/dot11s/peer-management-protocol-mac.h b/src/mesh/model/dot11s/peer-management-protocol-mac.h index f063f00a7..6200e91c6 100644 --- a/src/mesh/model/dot11s/peer-management-protocol-mac.h +++ b/src/mesh/model/dot11s/peer-management-protocol-mac.h @@ -186,7 +186,7 @@ class PeerManagementProtocolMac : public MeshWifiInterfaceMacPlugin * Set peer manager protocol function * \param protocol the peer manager protocol */ - void SetPeerManagerProtcol(Ptr protocol); + void SetPeerManagerProtocol(Ptr protocol); /** * Send peer link management frame function * \param peerAddress the peer MAC address diff --git a/src/mesh/model/dot11s/peer-management-protocol.h b/src/mesh/model/dot11s/peer-management-protocol.h index 53d18e29e..1c5f44219 100644 --- a/src/mesh/model/dot11s/peer-management-protocol.h +++ b/src/mesh/model/dot11s/peer-management-protocol.h @@ -300,13 +300,13 @@ class PeerManagementProtocol : public Object * \brief Indicates changes in peer links * \param interface the interface * \param peerAddress the peer address - * \param peerMeshPointAddres the peer mesh point address + * \param peerMeshPointAddress the peer mesh point address * \param ostate old state * \param nstate new state */ void PeerLinkStatus(uint32_t interface, Mac48Address peerAddress, - Mac48Address peerMeshPointAddres, + Mac48Address peerMeshPointAddress, PeerLink::PeerState ostate, PeerLink::PeerState nstate); /** diff --git a/src/mobility/examples/reference-point-group-mobility-example.cc b/src/mobility/examples/reference-point-group-mobility-example.cc index 1a9083908..f65f231f6 100644 --- a/src/mobility/examples/reference-point-group-mobility-example.cc +++ b/src/mobility/examples/reference-point-group-mobility-example.cc @@ -16,7 +16,7 @@ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA * * Author: Michele Polese - * Heavily edited by Tom Henderson (to reuse HierachicalMobilityModel) + * Heavily edited by Tom Henderson (to reuse HierarchicalMobilityModel) */ /** @@ -140,7 +140,7 @@ main(int argc, char* argv[]) waypointMm->AddWaypoint(Waypoint(Seconds(700), Vector(90, 10, 0))); waypointMm->AddWaypoint(Waypoint(Seconds(800), Vector(10, 10, 0))); - // Each HierachicalMobilityModel contains the above model as the Parent, + // Each HierarchicalMobilityModel contains the above model as the Parent, // and a user defined model as the Child. Two MobilityModel objects are // instantiated per node (one hierarchical, and one child model), and // a single parent model is reused across all nodes. diff --git a/src/mpi/model/mpi-receiver.h b/src/mpi/model/mpi-receiver.h index 2ca2babd9..13b27204e 100644 --- a/src/mpi/model/mpi-receiver.h +++ b/src/mpi/model/mpi-receiver.h @@ -18,7 +18,7 @@ /** * \file * \ingroup mpi - * ns3::MpiReciver declaration, + * ns3::MpiReceiver declaration, * provides an interface to aggregate to MPI-compatible NetDevices. */ diff --git a/src/mpi/model/null-message-simulator-impl.h b/src/mpi/model/null-message-simulator-impl.h index e4c38c336..851caacf7 100644 --- a/src/mpi/model/null-message-simulator-impl.h +++ b/src/mpi/model/null-message-simulator-impl.h @@ -148,14 +148,14 @@ class NullMessageSimulatorImpl : public SimulatorImpl * \param bundle Bundle to reschedule Null Message event for * * Reschedule Null Message event for the specified - * RemoteChannelBundel. Existing event will be canceled. + * RemoteChannelBundle. Existing event will be canceled. */ void RescheduleNullMessageEvent(Ptr bundle); /** * \param nodeSysId SystemID to reschedule null event for * - * Reschedule Null Message event for the RemoteChannelBundel to the + * Reschedule Null Message event for the RemoteChannelBundle to the * task nodeSysId. Existing event will be canceled. */ void RescheduleNullMessageEvent(uint32_t nodeSysId); @@ -165,7 +165,7 @@ class NullMessageSimulatorImpl : public SimulatorImpl * * \return Guarantee time * - * Calculate the guarantee time for incoming RemoteChannelBundel + * Calculate the guarantee time for incoming RemoteChannelBundle * from task nodeSysId. No message should arrive from task * nodeSysId with a receive time less than the guarantee time. */ diff --git a/src/network/examples/CMakeLists.txt b/src/network/examples/CMakeLists.txt index 7fdcc43ba..28220767b 100644 --- a/src/network/examples/CMakeLists.txt +++ b/src/network/examples/CMakeLists.txt @@ -3,7 +3,7 @@ set(base_examples main-packet-header main-packet-tag packet-socket-apps - lollipop-comparisions + lollipop-comparisons ) foreach( diff --git a/src/network/examples/lollipop-comparisions.cc b/src/network/examples/lollipop-comparisons.cc similarity index 100% rename from src/network/examples/lollipop-comparisions.cc rename to src/network/examples/lollipop-comparisons.cc diff --git a/src/network/model/nix-vector.cc b/src/network/model/nix-vector.cc index d7caeb3cc..ad4adbd86 100644 --- a/src/network/model/nix-vector.cc +++ b/src/network/model/nix-vector.cc @@ -257,13 +257,13 @@ NixVector::Deserialize(const uint32_t* buffer, uint32_t size) m_used = *p++; // NixVector is packed in 32-bit unsigned ints. - uint32_t nixVectorLenth = m_totalBitSize / 32; - nixVectorLenth += (m_totalBitSize % 32) ? 1 : 0; + uint32_t nixVectorLength = m_totalBitSize / 32; + nixVectorLength += (m_totalBitSize % 32) ? 1 : 0; - NS_ASSERT_MSG(size >= 16 + nixVectorLenth, - "NixVector serialized length should have been " << 16 + nixVectorLenth + NS_ASSERT_MSG(size >= 16 + nixVectorLength, + "NixVector serialized length should have been " << 16 + nixVectorLength << " but buffer is shorter"); - if (size < 16 + nixVectorLenth * 4) + if (size < 16 + nixVectorLength * 4) { // return zero if an entire nix-vector was // not deserialized @@ -273,7 +273,7 @@ NixVector::Deserialize(const uint32_t* buffer, uint32_t size) // make sure the nix-vector // is empty m_nixVector.clear(); - for (uint32_t j = 0; j < nixVectorLenth; j++) + for (uint32_t j = 0; j < nixVectorLength; j++) { uint32_t nix = *p++; m_nixVector.push_back(nix); diff --git a/src/network/model/packet-metadata.cc b/src/network/model/packet-metadata.cc index dd3c9b173..331c25353 100644 --- a/src/network/model/packet-metadata.cc +++ b/src/network/model/packet-metadata.cc @@ -1083,8 +1083,8 @@ PacketMetadata::ItemIterator::Next() m_current = smallItem.next; uint32_t uid = (smallItem.typeUid & 0xfffffffe) >> 1; item.tid.SetUid(uid); - item.currentTrimedFromStart = extraItem.fragmentStart; - item.currentTrimedFromEnd = extraItem.fragmentEnd - smallItem.size; + item.currentTrimmedFromStart = extraItem.fragmentStart; + item.currentTrimmedFromEnd = extraItem.fragmentEnd - smallItem.size; item.currentSize = extraItem.fragmentEnd - extraItem.fragmentStart; if (extraItem.fragmentStart != 0 || extraItem.fragmentEnd != smallItem.size) { diff --git a/src/network/model/packet-metadata.h b/src/network/model/packet-metadata.h index 1a3fa863f..51ad2efbb 100644 --- a/src/network/model/packet-metadata.h +++ b/src/network/model/packet-metadata.h @@ -117,12 +117,12 @@ class PacketMetadata * how many bytes were trimmed from the start of a fragment. * if isFragment is true, this field is zero. */ - uint32_t currentTrimedFromStart; + uint32_t currentTrimmedFromStart; /** * how many bytes were trimmed from the end of a fragment. * if isFragment is true, this field is zero. */ - uint32_t currentTrimedFromEnd; + uint32_t currentTrimmedFromEnd; /** * an iterator which can be fed to Deserialize. Valid only * if isFragment and isPayload are false. diff --git a/src/network/model/packet.cc b/src/network/model/packet.cc index 82503adef..e62ca11a7 100644 --- a/src/network/model/packet.cc +++ b/src/network/model/packet.cc @@ -471,8 +471,8 @@ Packet::Print(std::ostream& os) const os << item.tid.GetName(); break; } - os << " Fragment [" << item.currentTrimedFromStart << ":" - << (item.currentTrimedFromStart + item.currentSize) << "]"; + os << " Fragment [" << item.currentTrimmedFromStart << ":" + << (item.currentTrimmedFromStart + item.currentSize) << "]"; } else { @@ -540,8 +540,8 @@ Packet::Print(std::ostream& os) const os << item.tid.GetName (); break; } - os << " Fragment [" << item.currentTrimedFromStart<<":" - << (item.currentTrimedFromStart + item.currentSize) << "]"; + os << " Fragment [" << item.currentTrimmedFromStart<<":" + << (item.currentTrimmedFromStart + item.currentSize) << "]"; } else { diff --git a/src/point-to-point-layout/doc/point-to-point-dumbbell.rst b/src/point-to-point-layout/doc/point-to-point-dumbbell.rst index 8549d5f00..b6c952059 100644 --- a/src/point-to-point-layout/doc/point-to-point-dumbbell.rst +++ b/src/point-to-point-layout/doc/point-to-point-dumbbell.rst @@ -38,7 +38,7 @@ nodes, function ``AssignIpv4Addresses`` which takes ``Ipv4AddressHelper`` objects for the left, right and router nodes for assigning IPv4 address to each node. It provides a function ``AssignIpv6Addresses`` which takes a ``Ipv6Address`` address base and a ``Ipv6Prefix`` prefix for assigning -IPv6Adddress to every node. +IPv6Address to every node. Node Positioning ================ diff --git a/src/propagation/model/jakes-process.cc b/src/propagation/model/jakes-process.cc index 34fa21133..83d7bd4f5 100644 --- a/src/propagation/model/jakes-process.cc +++ b/src/propagation/model/jakes-process.cc @@ -143,12 +143,12 @@ JakesProcess::DoDispose() std::complex JakesProcess::GetComplexGain() const { - std::complex sumAplitude = std::complex(0, 0); + std::complex sumAmplitude = std::complex(0, 0); for (unsigned int i = 0; i < m_oscillators.size(); i++) { - sumAplitude += m_oscillators[i].GetValueAt(Now()); + sumAmplitude += m_oscillators[i].GetValueAt(Now()); } - return sumAplitude; + return sumAmplitude; } double diff --git a/src/sixlowpan/doc/sixlowpan.rst b/src/sixlowpan/doc/sixlowpan.rst index 17858987c..09336e94f 100644 --- a/src/sixlowpan/doc/sixlowpan.rst +++ b/src/sixlowpan/doc/sixlowpan.rst @@ -112,8 +112,8 @@ attribute. Scope and Limitations ===================== -Contex-based compression -######################## +Context-based compression +######################### IPHC sateful (context-based) compression is supported but, since :rfc:`6775` ("Neighbor Discovery Optimization for IPv6 over Low-Power Wireless Personal Area Networks (6LoWPANs)") diff --git a/src/sixlowpan/model/sixlowpan-net-device.cc b/src/sixlowpan/model/sixlowpan-net-device.cc index 24adaee63..333002b4a 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.cc +++ b/src/sixlowpan/model/sixlowpan-net-device.cc @@ -1427,8 +1427,8 @@ SixLowPanNetDevice::DecompressLowPanIphc(Ptr packet, const Address& src, return true; } - uint8_t contexPrefix[16]; - m_contextTable[contextId].contextPrefix.GetBytes(contexPrefix); + uint8_t contextPrefix[16]; + m_contextTable[contextId].contextPrefix.GetBytes(contextPrefix); uint8_t contextLength = m_contextTable[contextId].contextPrefix.GetPrefixLength(); uint8_t srcAddress[16] = {}; @@ -1453,13 +1453,13 @@ SixLowPanNetDevice::DecompressLowPanIphc(Ptr packet, const Address& src, // Do not combine the prefix - we want to override the bytes. for (uint8_t i = 0; i < bytesToCopy; i++) { - srcAddress[i] = contexPrefix[i]; + srcAddress[i] = contextPrefix[i]; } if (bitsToCopy) { uint8_t addressBitMask = (1 << (8 - bitsToCopy)) - 1; uint8_t prefixBitMask = ~addressBitMask; - srcAddress[bytesToCopy] = (contexPrefix[bytesToCopy] & prefixBitMask) | + srcAddress[bytesToCopy] = (contextPrefix[bytesToCopy] & prefixBitMask) | (srcAddress[bytesToCopy] & addressBitMask); } ipHeader.SetSource(Ipv6Address::Deserialize(srcAddress)); @@ -1524,8 +1524,8 @@ SixLowPanNetDevice::DecompressLowPanIphc(Ptr packet, const Address& src, return true; } - uint8_t contexPrefix[16]; - m_contextTable[contextId].contextPrefix.GetBytes(contexPrefix); + uint8_t contextPrefix[16]; + m_contextTable[contextId].contextPrefix.GetBytes(contextPrefix); uint8_t contextLength = m_contextTable[contextId].contextPrefix.GetPrefixLength(); if (encoding.GetM() == false) @@ -1553,13 +1553,13 @@ SixLowPanNetDevice::DecompressLowPanIphc(Ptr packet, const Address& src, // Do not combine the prefix - we want to override the bytes. for (uint8_t i = 0; i < bytesToCopy; i++) { - dstAddress[i] = contexPrefix[i]; + dstAddress[i] = contextPrefix[i]; } if (bitsToCopy) { uint8_t addressBitMask = (1 << (8 - bitsToCopy)) - 1; uint8_t prefixBitMask = ~addressBitMask; - dstAddress[bytesToCopy] = (contexPrefix[bytesToCopy] & prefixBitMask) | + dstAddress[bytesToCopy] = (contextPrefix[bytesToCopy] & prefixBitMask) | (dstAddress[bytesToCopy] & addressBitMask); } ipHeader.SetDestination(Ipv6Address::Deserialize(dstAddress)); @@ -1572,7 +1572,7 @@ SixLowPanNetDevice::DecompressLowPanIphc(Ptr packet, const Address& src, dstAddress[0] = 0xff; memcpy(dstAddress + 1, encoding.GetDstInlinePart(), 2); dstAddress[3] = contextLength; - memcpy(dstAddress + 4, contexPrefix, 8); + memcpy(dstAddress + 4, contextPrefix, 8); memcpy(dstAddress + 12, encoding.GetDstInlinePart() + 2, 4); ipHeader.SetDestination(Ipv6Address::Deserialize(dstAddress)); } @@ -2485,7 +2485,7 @@ SixLowPanNetDevice::ProcessFragment(Ptr& packet, FragmentsTimeoutsListI_t iter = m_timeoutEventList.begin(); FragmentKey_t oldestKey = std::get<1>(*iter); - std::list> storedFragments = m_fragments[oldestKey]->GetFraments(); + std::list> storedFragments = m_fragments[oldestKey]->GetFragments(); for (std::list>::iterator fragIter = storedFragments.begin(); fragIter != storedFragments.end(); fragIter++) @@ -2658,7 +2658,7 @@ SixLowPanNetDevice::Fragments::SetPacketSize(uint32_t packetSize) } std::list> -SixLowPanNetDevice::Fragments::GetFraments() const +SixLowPanNetDevice::Fragments::GetFragments() const { std::list> fragments; std::list, uint16_t>>::const_iterator iter; @@ -2687,7 +2687,7 @@ SixLowPanNetDevice::HandleFragmentsTimeout(FragmentKey_t key, uint32_t iif) NS_LOG_FUNCTION(this); MapFragments_t::iterator it = m_fragments.find(key); - std::list> storedFragments = it->second->GetFraments(); + std::list> storedFragments = it->second->GetFragments(); for (std::list>::iterator fragIter = storedFragments.begin(); fragIter != storedFragments.end(); fragIter++) diff --git a/src/sixlowpan/model/sixlowpan-net-device.h b/src/sixlowpan/model/sixlowpan-net-device.h index ed19dea73..ff3a8d4f9 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.h +++ b/src/sixlowpan/model/sixlowpan-net-device.h @@ -510,7 +510,7 @@ class SixLowPanNetDevice : public NetDevice * \brief Get a list of the current stored fragments. * \returns The current stored fragments. */ - std::list> GetFraments() const; + std::list> GetFragments() const; /** * \brief Set the Timeout iterator. diff --git a/src/spectrum/doc/spectrum.rst b/src/spectrum/doc/spectrum.rst index ef5124800..be7118cc0 100644 --- a/src/spectrum/doc/spectrum.rst +++ b/src/spectrum/doc/spectrum.rst @@ -263,7 +263,7 @@ Here are some notes on how the spectrum module is expected to be used. is one of the main features of the spectrum module, to support inter-technology interference. For example, if you implement a WifiSpectrumPhy and a - BluetoohSpectrumPhy, and plug both on a SpectrumChannel, then you'll + BluetoothSpectrumPhy, and plug both on a SpectrumChannel, then you'll be able to simulate interference between wifi and bluetooth and vice versa. diff --git a/src/spectrum/model/spectrum-model.h b/src/spectrum/model/spectrum-model.h index 034df1913..b56a85340 100644 --- a/src/spectrum/model/spectrum-model.h +++ b/src/spectrum/model/spectrum-model.h @@ -72,7 +72,7 @@ class SpectrumModel : public SimpleRefCount { public: /** - * Comparison operator. Returns true if the two SpectumModels are identical + * Comparison operator. Returns true if the two SpectrumModels are identical * \param lhs left operand * \param rhs right operand * \returns true if the two operands are identical diff --git a/src/stats/model/get-wildcard-matches.cc b/src/stats/model/get-wildcard-matches.cc index e4f16a81a..1809e8975 100644 --- a/src/stats/model/get-wildcard-matches.cc +++ b/src/stats/model/get-wildcard-matches.cc @@ -79,7 +79,7 @@ GetWildcardMatches(const std::string& configPath, tokenStart = 0; for (i = 0; i < nonWildcardTokenCount; i++) { - // Look for the non-wilcard token. + // Look for the non-wildcard token. token = matchedPath.find(nonWildcardTokens[i], tokenStart); // Make sure that the token is found. diff --git a/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc b/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc index 87f59097f..e053c6195 100644 --- a/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc +++ b/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc @@ -1308,7 +1308,7 @@ FqCobaltQueueDiscEcnMarking::DoRun() * * The variable outerhash stores the nearest multiple of 8 that is lesser than * the hash. When a flow hash of 20 arrives, the value of outerhash - * is 16. Since m_flowIndices[16] wasn’t previously allotted, a new flow + * is 16. Since m_flowIndices[16] wasn't previously allotted, a new flow * is created, and the tag corresponding to this queue is set to 20. */ class FqCobaltQueueDiscSetLinearProbing : public TestCase diff --git a/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc b/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc index 8c7405e0e..a81bdbedf 100644 --- a/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc +++ b/src/test/ns3tc/fq-codel-queue-disc-test-suite.cc @@ -1372,7 +1372,7 @@ FqCoDelQueueDiscECNMarking::DoRun() * * The variable outerHash stores the nearest multiple of 8 that is lesser than * the hash. When a flow hash of 20 arrives, the value of outerHash - * is 16. Since m_flowIndices[16] wasn’t previously allotted, a new flow + * is 16. Since m_flowIndices[16] wasn't previously allotted, a new flow * is created, and the tag corresponding to this queue is set to 20. */ class FqCoDelQueueDiscSetLinearProbing : public TestCase diff --git a/src/traffic-control/examples/fqcodel-l4s-example.cc b/src/traffic-control/examples/fqcodel-l4s-example.cc index 8dcfdba75..8ba9f3434 100644 --- a/src/traffic-control/examples/fqcodel-l4s-example.cc +++ b/src/traffic-control/examples/fqcodel-l4s-example.cc @@ -775,7 +775,7 @@ main(int argc, char* argv[]) proto->SetAttribute("SocketType", TypeIdValue(n1TcpTypeId)); } - // InternetStackHelper will install a base TrafficControLayer on the node, + // InternetStackHelper will install a base TrafficControlLayer on the node, // but the Ipv4AddressHelper below will install the default FqCoDelQueueDisc // on all single device nodes. The below code overrides the configuration // that is normally done by the Ipv4AddressHelper::Install() method by diff --git a/src/wave/doc/wave.rst b/src/wave/doc/wave.rst index f01e9e862..5c11a5ced 100644 --- a/src/wave/doc/wave.rst +++ b/src/wave/doc/wave.rst @@ -30,7 +30,7 @@ applications to transmit information using WAVE. In |ns3|, the focus of the ``wave`` module is on both the MAC layer and the multi-channel coordination layer. -The key design aspect of 802.11p-compilant MAC layer is that they allow +The key design aspect of 802.11p-compliant MAC layer is that they allow communications outside the context of a basic service set (BSS). The literature uses the acronym OCB to denote "outside the context of a BSS", and the class ``ns3::OcbWifiMac`` models this in |ns3|. @@ -43,7 +43,7 @@ small delay in the MAC layer. Users can create IEEE802.11p-compliant device (the object of the class ``ns3::WifiNetDevice`` associating with ``ns3::OcbWifiMac``) . -The key design aspect of the WAVE-compilant MAC layer (including 802.11p MAC +The key design aspect of the WAVE-compliant MAC layer (including 802.11p MAC layer and 1609.4 MAC extension layer) is that, based on OCB features, they provide devices with the capability of switching between control and service channels, using a single radio or using multiple radios. Therefore devices can communicate with others in single or multiple @@ -141,7 +141,7 @@ feature has no relation to wifi MAC classes, then a new class will be defined. This approach was selected to be non-intrusive to the |ns3| wifi module. All of these classes will be hosted in a 'container' class called ``ns3:: WaveNetDevice``. This class is a subclass inheriting -from ``ns3::NetDeivce``, composed of the objects of +from ``ns3::NetDevice``, composed of the objects of ``ns3::ChannelScheduler``, ``ns3::ChannelManager``, ``ns3::ChannelCoordinator`` and ``ns3::VsaManager`` classes to provide the features described in 1609.4 while still @@ -262,7 +262,7 @@ is the data plane of the standard. Channel coordination -The class ``ns3::ChannelCoordinator`` defines the CCH Interval, SCH Interval and GuardInteval. Users can be aware of which interval the current time or +The class ``ns3::ChannelCoordinator`` defines the CCH Interval, SCH Interval and GuardInterval. Users can be aware of which interval the current time or future time will be in. If channel access mode is assigned to alternating CCH and SCH access, channel interval events will be notified repeatedly for class @@ -509,7 +509,7 @@ From , usage is as follows: // declare WAVE BSM helper instance WaveBsmHelper m_waveBsmHelper; - // the following are passed to the WaveBsmHelpe::Install() + // the following are passed to the WaveBsmHelper::Install() // method, and they are thus assumed to be created and // initialized themselves, based on the user's // simulation setup criteria. diff --git a/src/wave/model/ocb-wifi-mac.cc b/src/wave/model/ocb-wifi-mac.cc index f8f52945d..068ef63ad 100644 --- a/src/wave/model/ocb-wifi-mac.cc +++ b/src/wave/model/ocb-wifi-mac.cc @@ -488,7 +488,7 @@ OcbWifiMac::MakeVirtualBusy(Time duration) } void -OcbWifiMac::CancleTx(AcIndex ac) +OcbWifiMac::CancelTx(AcIndex ac) { NS_LOG_FUNCTION(this << ac); Ptr queue = GetQosTxop(ac); diff --git a/src/wave/model/ocb-wifi-mac.h b/src/wave/model/ocb-wifi-mac.h index 17b1152ba..c3a2e5c73 100644 --- a/src/wave/model/ocb-wifi-mac.h +++ b/src/wave/model/ocb-wifi-mac.h @@ -169,7 +169,7 @@ class OcbWifiMac : public WifiMac * To support MAC extension for multiple channel operation, * Cancel transmit operation for internal queue associated with a specified Access Category. */ - void CancleTx(AcIndex ac); + void CancelTx(AcIndex ac); /** * To support MAC extension for multiple channel operation, * Reset current MAC entity and flush its internal queues. diff --git a/src/wave/model/wave-net-device.cc b/src/wave/model/wave-net-device.cc index ef2841b0d..51ebca2e8 100644 --- a/src/wave/model/wave-net-device.cc +++ b/src/wave/model/wave-net-device.cc @@ -476,7 +476,7 @@ WaveNetDevice::CancelTx(uint32_t channelNumber, AcIndex ac) return; } Ptr mac = GetMac(channelNumber); - mac->CancleTx(ac); + mac->CancelTx(ac); } void diff --git a/src/wave/test/mac-extension-test-suite.cc b/src/wave/test/mac-extension-test-suite.cc index f24cb660a..0459543b0 100644 --- a/src/wave/test/mac-extension-test-suite.cc +++ b/src/wave/test/mac-extension-test-suite.cc @@ -1178,7 +1178,7 @@ ChannelAccessTestCase::DoRun() Ptr device = DynamicCast(m_devices.Get(i)); device->SetReceiveCallback(MakeCallback(&ChannelAccessTestCase::Receive, this)); - // at 0s, receivers are assigned ContinuosAccess from CCH, SCH1 to SCH6 + // at 0s, receivers are assigned ContinuousAccess from CCH, SCH1 to SCH6 static std::vector WaveChannels = ChannelManager::GetWaveChannels(); uint32_t channel = WaveChannels[i - 1]; const SchInfo info = SchInfo(channel, false, EXTENDED_CONTINUOUS); @@ -1301,7 +1301,7 @@ ChannelAccessTestCase::DoRun() Ptr device = DynamicCast(m_devices.Get(i)); device->SetReceiveCallback(MakeCallback(&ChannelAccessTestCase::Receive, this)); - // at 0s, receivers are assigned ContinuosAccess from CCH, SCH1 to SCH6 + // at 0s, receivers are assigned ContinuousAccess from CCH, SCH1 to SCH6 static std::vector WaveChannels = ChannelManager::GetWaveChannels(); uint32_t channel = WaveChannels[i - 1]; const SchInfo info = SchInfo(channel, false, EXTENDED_CONTINUOUS); @@ -1318,7 +1318,7 @@ ChannelAccessTestCase::DoRun() Simulator::Schedule(Seconds(0.1), &ChannelAccessTestCase::SendX, this, SCH5, 0); Simulator::Schedule(Seconds(0.1), &ChannelAccessTestCase::SendX, this, SCH6, 0); - // at 1s, the sender is assigned ContinuosAccess for SCH1, so only node-2 can receive + // at 1s, the sender is assigned ContinuousAccess for SCH1, so only node-2 can receive // packets. SchInfo info = SchInfo(SCH1, false, EXTENDED_ALTERNATING); Simulator::Schedule(Seconds(1), &WaveNetDevice::StartSch, m_sender, info); diff --git a/src/wifi/model/he/rr-multi-user-scheduler.cc b/src/wifi/model/he/rr-multi-user-scheduler.cc index b6bbf4ba9..b1af13d1e 100644 --- a/src/wifi/model/he/rr-multi-user-scheduler.cc +++ b/src/wifi/model/he/rr-multi-user-scheduler.cc @@ -180,7 +180,7 @@ RrMultiUserScheduler::SelectTxFormat() template WifiTxVector -RrMultiUserScheduler::GetTxVectorForUlMu(Func canbeSolicited) +RrMultiUserScheduler::GetTxVectorForUlMu(Func canBeSolicited) { NS_LOG_FUNCTION(this); @@ -214,7 +214,7 @@ RrMultiUserScheduler::GetTxVectorForUlMu(Func canbeSolicited) { NS_LOG_DEBUG("Next candidate STA (MAC=" << staIt->address << ", AID=" << staIt->aid << ")"); - if (!canbeSolicited(*staIt)) + if (!canBeSolicited(*staIt)) { NS_LOG_DEBUG("Skipping station based on provided function object"); staIt++; diff --git a/src/wifi/model/mgt-headers.cc b/src/wifi/model/mgt-headers.cc index 343c49ca6..82646850e 100644 --- a/src/wifi/model/mgt-headers.cc +++ b/src/wifi/model/mgt-headers.cc @@ -2357,11 +2357,11 @@ WifiActionHeader::GetAction() const case MDA_SETUP_REPLY: retval.meshAction = MDA_SETUP_REPLY; break; - case MDAOP_ADVERTISMENT_REQUEST: - retval.meshAction = MDAOP_ADVERTISMENT_REQUEST; + case MDAOP_ADVERTISEMENT_REQUEST: + retval.meshAction = MDAOP_ADVERTISEMENT_REQUEST; break; - case MDAOP_ADVERTISMENTS: - retval.meshAction = MDAOP_ADVERTISMENTS; + case MDAOP_ADVERTISEMENTS: + retval.meshAction = MDAOP_ADVERTISEMENTS; break; case MDAOP_SET_TEARDOWN: retval.meshAction = MDAOP_SET_TEARDOWN; diff --git a/src/wifi/model/mgt-headers.h b/src/wifi/model/mgt-headers.h index 632500f4a..7de26aa10 100644 --- a/src/wifi/model/mgt-headers.h +++ b/src/wifi/model/mgt-headers.h @@ -1354,9 +1354,9 @@ class WifiActionHeader : public Header 4, // Action Value:4 in Category 13: Mesh MCCA-Setup-Request (not used so far) MDA_SETUP_REPLY = 5, // Action Value:5 in Category 13: Mesh MCCA-Setup-Reply (not used so far) - MDAOP_ADVERTISMENT_REQUEST = + MDAOP_ADVERTISEMENT_REQUEST = 6, // Action Value:6 in Category 13: Mesh MCCA-Advertisement-Request (not used so far) - MDAOP_ADVERTISMENTS = 7, // Action Value:7 in Category 13: Mesh (not used so far) + MDAOP_ADVERTISEMENTS = 7, // Action Value:7 in Category 13: Mesh (not used so far) MDAOP_SET_TEARDOWN = 8, // Action Value:8 in Category 13: Mesh (not used so far) TBTT_ADJUSTMENT_REQUEST = 9, // Action Value:9 in Category 13: Mesh (not used so far) TBTT_ADJUSTMENT_RESPONSE = 10, // Action Value:10 in Category 13: Mesh (not used so far) diff --git a/src/wifi/model/rate-control/aparf-wifi-manager.cc b/src/wifi/model/rate-control/aparf-wifi-manager.cc index 2146ea40e..672132d81 100644 --- a/src/wifi/model/rate-control/aparf-wifi-manager.cc +++ b/src/wifi/model/rate-control/aparf-wifi-manager.cc @@ -70,13 +70,13 @@ AparfWifiManager::GetTypeId() "The minimum number of successful transmissions in \"High\" state to try " "a new power or rate.", UintegerValue(3), - MakeUintegerAccessor(&AparfWifiManager::m_succesMax1), + MakeUintegerAccessor(&AparfWifiManager::m_successMax1), MakeUintegerChecker()) .AddAttribute("SuccessThreshold2", "The minimum number of successful transmissions in \"Low\" state to try " "a new power or rate.", UintegerValue(10), - MakeUintegerAccessor(&AparfWifiManager::m_succesMax2), + MakeUintegerAccessor(&AparfWifiManager::m_successMax2), MakeUintegerChecker()) .AddAttribute("FailThreshold", "The minimum number of failed transmissions to try a new power or rate.", @@ -162,7 +162,7 @@ AparfWifiManager::DoCreateStation() const NS_LOG_FUNCTION(this); AparfWifiRemoteStation* station = new AparfWifiRemoteStation(); - station->m_successThreshold = m_succesMax1; + station->m_successThreshold = m_successMax1; station->m_failThreshold = m_failMax; station->m_nSuccess = 0; station->m_nFailed = 0; @@ -217,12 +217,12 @@ AparfWifiManager::DoReportDataFailed(WifiRemoteStation* st) if (station->m_aparfState == AparfWifiManager::Low) { station->m_aparfState = AparfWifiManager::High; - station->m_successThreshold = m_succesMax1; + station->m_successThreshold = m_successMax1; } else if (station->m_aparfState == AparfWifiManager::Spread) { station->m_aparfState = AparfWifiManager::Low; - station->m_successThreshold = m_succesMax2; + station->m_successThreshold = m_successMax2; } if (station->m_nFailed == station->m_failThreshold) @@ -291,7 +291,7 @@ AparfWifiManager::DoReportDataOk(WifiRemoteStation* st, else if (station->m_aparfState == AparfWifiManager::Spread) { station->m_aparfState = AparfWifiManager::High; - station->m_successThreshold = m_succesMax1; + station->m_successThreshold = m_successMax1; } if (station->m_nSuccess == station->m_successThreshold) diff --git a/src/wifi/model/rate-control/aparf-wifi-manager.h b/src/wifi/model/rate-control/aparf-wifi-manager.h index b7c8817c8..2ccee357d 100644 --- a/src/wifi/model/rate-control/aparf-wifi-manager.h +++ b/src/wifi/model/rate-control/aparf-wifi-manager.h @@ -92,10 +92,10 @@ class AparfWifiManager : public WifiRemoteStationManager */ void CheckInit(AparfWifiRemoteStation* station); - uint32_t m_succesMax1; //!< The minimum number of successful transmissions in \"High\" state to - //!< try a new power or rate. - uint32_t m_succesMax2; //!< The minimum number of successful transmissions in \"Low\" state to - //!< try a new power or rate. + uint32_t m_successMax1; //!< The minimum number of successful transmissions in \"High\" state to + //!< try a new power or rate. + uint32_t m_successMax2; //!< The minimum number of successful transmissions in \"Low\" state to + //!< try a new power or rate. uint32_t m_failMax; //!< The minimum number of failed transmissions to try a new power or rate. uint32_t m_powerMax; //!< The maximum number of power changes. uint8_t m_powerInc; //!< Step size for increment the power. diff --git a/src/wifi/model/wifi-information-element.h b/src/wifi/model/wifi-information-element.h index 0ea914db0..2d21bc246 100644 --- a/src/wifi/model/wifi-information-element.h +++ b/src/wifi/model/wifi-information-element.h @@ -199,7 +199,7 @@ typedef uint8_t WifiInformationElementId; #define IE_CLUSTER_REPORT ((WifiInformationElementId)166) #define IE_RELAY_CAPABILITIES ((WifiInformationElementId)167) #define IE_RELAY_TRANSFER_PARAMETER_SET ((WifiInformationElementId)168) -#define IE_BEAMLINK_MAINENANCE ((WifiInformationElementId)169) +#define IE_BEAMLINK_MAINTENANCE ((WifiInformationElementId)169) // 170 to 171 are reserved #define IE_DMG_LINK_ADAPTATION_ACKNOWLEDGMENT ((WifiInformationElementId)172) // 173 is reserved diff --git a/src/wifi/model/wifi-radio-energy-model.h b/src/wifi/model/wifi-radio-energy-model.h index 206900df9..61a3b18fe 100644 --- a/src/wifi/model/wifi-radio-energy-model.h +++ b/src/wifi/model/wifi-radio-energy-model.h @@ -170,7 +170,7 @@ class WifiRadioEnergyModel : public DeviceEnergyModel ~WifiRadioEnergyModel() override; /** - * \brief Sets pointer to EnergySouce installed on node. + * \brief Sets pointer to EnergySource installed on node. * * \param source Pointer to EnergySource installed on node. * diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc index 2d7733b31..cb029e2d3 100644 --- a/src/wifi/test/tx-duration-test.cc +++ b/src/wifi/test/tx-duration-test.cc @@ -303,7 +303,7 @@ TxDurationTest::CheckMuTxDuration(std::list sizes, MicroSeconds(6); // 2.4 GHz band should be at the end of the bands to test } Time calculatedDuration = NanoSeconds(0); - uint32_t longuestSize = 0; + uint32_t longestSize = 0; auto iterStaId = staIds.begin(); for (auto& size : sizes) { @@ -313,7 +313,7 @@ TxDurationTest::CheckMuTxDuration(std::list sizes, { calculatedDuration = ppduDurationForSta; staId = *iterStaId; - longuestSize = size; + longestSize = size; } ++iterStaId; } @@ -322,7 +322,7 @@ TxDurationTest::CheckMuTxDuration(std::list sizes, if (calculatedDuration != knownDuration || calculatedDuration != calculatedDurationUsingList) { - std::cerr << "size=" << longuestSize << " band=" << testedBand << " staId=" << staId + std::cerr << "size=" << longestSize << " band=" << testedBand << " staId=" << staId << " nss=" << +txVector.GetNss(staId) << " mode=" << txVector.GetMode(staId) << " channelWidth=" << channelWidth << " guardInterval=" << guardInterval << " datarate=" diff --git a/src/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc index 398e09818..d96435031 100644 --- a/src/wimax/model/bs-net-device.cc +++ b/src/wimax/model/bs-net-device.cc @@ -639,7 +639,7 @@ BaseStationNetDevice::DoSend(Ptr packet, NS_LOG_INFO("BS (" << source << "):"); NS_LOG_INFO("\tSending packet..."); NS_LOG_INFO("\t\tDestination: " << dest); - NS_LOG_INFO("\t\tPaket Size: " << packet->GetSize()); + NS_LOG_INFO("\t\tPacket Size: " << packet->GetSize()); NS_LOG_INFO("\t\tProtocol: " << protocolNumber); if (protocolNumber == 2048) diff --git a/src/wimax/model/bs-uplink-scheduler-rtps.cc b/src/wimax/model/bs-uplink-scheduler-rtps.cc index 8adc5c479..a6e495fe4 100644 --- a/src/wimax/model/bs-uplink-scheduler-rtps.cc +++ b/src/wimax/model/bs-uplink-scheduler-rtps.cc @@ -632,7 +632,7 @@ UplinkSchedulerRtps::ULSchedulerRTPSConnection(uint32_t& symbolsToAllocation, NS_LOG_INFO("\t\tUpdateGrantedBandwidth for " << i << " = " << allocSizeBytes); if (record_[i]->GetRequestedBandwidth() < allocSizeBytes) { - // the flow need new poll to set the newer requredBandwidth + // the flow need new poll to set the newer requiredBandwidth record_[i]->SetGrantedBandwidth(0); record_[i]->SetRequestedBandwidth(0); } diff --git a/src/wimax/model/cid-factory.h b/src/wimax/model/cid-factory.h index 25f1015e1..07a8d03a0 100644 --- a/src/wimax/model/cid-factory.h +++ b/src/wimax/model/cid-factory.h @@ -35,7 +35,7 @@ namespace ns3 * This class uses the definitions from Table 345 in ieee-802.16-2004 to * allocate cids in different integer ranges according to their type. * The relative allocation of the ranges is controlled by the parameter 'm' - * introduced in the above-mentionned table. + * introduced in the above-mentioned table. * * Note: The current implementation merely allocates cids sequentially from * the start of the allowed range. A proper implementation would be able diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index c53ba37e2..f9330b56b 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -180,7 +180,7 @@ SimpleOfdmWimaxPhy::InitSimpleOfdmWimaxPhy() m_txPower = 30; // dBm SetBandwidth(10000000); // 10Mhz m_nbErroneousBlock = 0; - m_nrRecivedFecBlocks = 0; + m_nrReceivedFecBlocks = 0; m_snrToBlockErrorRateManager = new SNRToBlockErrorRateManager(); } @@ -412,7 +412,7 @@ SimpleOfdmWimaxPhy::StartReceive(uint32_t burstSize, delete record; NS_LOG_INFO("PHY: Receive rxPower=" << rxPower << ", Nwb=" << Nwb << ", SNR=" << SNR - << ", Modulation=" << modulationType << ", BlocErrorRate=" + << ", Modulation=" << modulationType << ", BlockErrorRate=" << blockErrorRate << ", drop=" << std::boolalpha << drop); switch (GetState()) @@ -433,7 +433,7 @@ SimpleOfdmWimaxPhy::StartReceive(uint32_t burstSize, { NotifyRxBegin(burst); m_receivedFecBlocks->clear(); - m_nrRecivedFecBlocks = 0; + m_nrReceivedFecBlocks = 0; SetBlockParameters(burstSize, modulationType); m_blockTime = GetBlockTransmissionTime(modulationType); } @@ -469,14 +469,14 @@ SimpleOfdmWimaxPhy::EndReceiveFecBlock(uint32_t burstSize, Ptr burst) { SetState(PHY_STATE_IDLE); - m_nrRecivedFecBlocks++; + m_nrReceivedFecBlocks++; if (drop == true) { m_nbErroneousBlock++; } - if ((uint32_t)m_nrRecivedFecBlocks * m_blockSize == burstSize * 8 + m_paddingBits) + if ((uint32_t)m_nrReceivedFecBlocks * m_blockSize == burstSize * 8 + m_paddingBits) { NotifyRxEnd(burst); if (m_nbErroneousBlock == 0) @@ -488,7 +488,7 @@ SimpleOfdmWimaxPhy::EndReceiveFecBlock(uint32_t burstSize, NotifyRxDrop(burst); } m_nbErroneousBlock = 0; - m_nrRecivedFecBlocks = 0; + m_nrReceivedFecBlocks = 0; } } @@ -619,8 +619,8 @@ SimpleOfdmWimaxPhy::RecreateBuffer() uint32_t i = 0; for (uint32_t j = 0; j < m_nrBlocks; j++) { - Bvec tmpRecFecBloc = m_receivedFecBlocks->front(); - buffer.insert(buffer.begin() + i, tmpRecFecBloc.begin(), tmpRecFecBloc.end()); + Bvec tmpRecFecBlock = m_receivedFecBlocks->front(); + buffer.insert(buffer.begin() + i, tmpRecFecBlock.begin(), tmpRecFecBlock.end()); m_receivedFecBlocks->pop_front(); i += m_blockSize; } diff --git a/src/wimax/model/simple-ofdm-wimax-phy.h b/src/wimax/model/simple-ofdm-wimax-phy.h index 3aba1dcca..8265de9ad 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.h +++ b/src/wimax/model/simple-ofdm-wimax-phy.h @@ -467,7 +467,7 @@ class SimpleOfdmWimaxPhy : public WimaxPhy uint16_t m_blockSize; ///< block size uint32_t m_paddingBits; ///< padding bits uint16_t m_nbErroneousBlock; ///< erroneous blocks - uint16_t m_nrRecivedFecBlocks; ///< number received FEC blocks + uint16_t m_nrReceivedFecBlocks; ///< number received FEC blocks uint16_t m_nfft; ///< NFFT double m_g; ///< G value double m_bandWidth; ///< bandwidth diff --git a/src/wimax/model/ss-link-manager.cc b/src/wimax/model/ss-link-manager.cc index 0fc66598a..f564ad0ec 100644 --- a/src/wimax/model/ss-link-manager.cc +++ b/src/wimax/model/ss-link-manager.cc @@ -284,7 +284,7 @@ SSLinkManager::StartContentionResolution() void SSLinkManager::PerformBackoff() { - Time defferTime = Seconds(0); + Time deferTime = Seconds(0); Time timeToAllocation = Seconds(0); uint16_t nrPsPerRangOpp = m_ss->GetCurrentUcd().GetChannelEncodings().GetRangReqOppSize(); uint16_t oppSize = m_ss->GetCurrentUcd().GetChannelEncodings().GetRangReqOppSize() / @@ -294,9 +294,9 @@ SSLinkManager::PerformBackoff() { if (m_rangingBO == 0) { - defferTime = + deferTime = Seconds(deferTOs * nrPsPerRangOpp * m_ss->GetPhy()->GetPsDuration().GetSeconds()); - timeToAllocation = m_ss->GetTimeToAllocation(defferTime); + timeToAllocation = m_ss->GetTimeToAllocation(deferTime); Simulator::Schedule(timeToAllocation, &SSLinkManager::SendRangingRequest, diff --git a/src/wimax/model/ss-net-device.cc b/src/wimax/model/ss-net-device.cc index ce92f03ff..45a1fa629 100644 --- a/src/wimax/model/ss-net-device.cc +++ b/src/wimax/model/ss-net-device.cc @@ -672,7 +672,7 @@ SubscriberStationNetDevice::DoSend(Ptr packet, else { NS_LOG_DEBUG("SS (" << GetMacAddress() << ")"); - NS_LOG_INFO("\tCan't send packet! (NotRegitered with the network)"); + NS_LOG_INFO("\tCan't send packet! (NotRegistered with the network)"); return false; } diff --git a/src/wimax/model/wimax-net-device.h b/src/wimax/model/wimax-net-device.h index c35d7f595..ea8947c6a 100644 --- a/src/wimax/model/wimax-net-device.h +++ b/src/wimax/model/wimax-net-device.h @@ -64,7 +64,7 @@ class UplinkScheduler; * \ingroup wimax * * This class holds together ns3::WimaxPhy, ns3::WimaxConnection, - * ns3::ConectionManager, ns3::BurstProfileManager, and + * ns3::ConnectionManager, ns3::BurstProfileManager, and * ns3::BandwidthManager. */ class WimaxNetDevice : public NetDevice diff --git a/utils/codespell-ignored-lines b/utils/codespell-ignored-lines index 085de63b9..070683325 100644 --- a/utils/codespell-ignored-lines +++ b/utils/codespell-ignored-lines @@ -44,3 +44,80 @@ Network Animator nam. It is not possible to run a simulation #./src/internet-apps/model/v4ping.h:37 * \brief an application which sends one ICMP ECHO request, waits for a REPLYs + +#./src/openflow/model/openflow-switch-net-device.cc:544, 548 + arp_h->ar_tha); // Target hardware address. + arp_h->ar_hln = sizeof arp_h->ar_tha; // Hardware address length. + +./src/dsr/model/dsr-routing.cc:243, 246, 3360, 3363 + .AddAttribute("GratReplyHoldoff", + MakeTimeAccessor(&DsrRouting::m_gratReplyHoldoff), + m_gratReplyHoldoff))) // Find the gratuitous reply entry + GraReplyEntry graReplyEntry(source, srcAddress, m_gratReplyHoldoff + Simulator::Now()); + +./src/dsr/model/dsr-routing.h:882 + Time m_gratReplyHoldoff; ///< The max gratuitous reply hold off time + +./src/dsr/model/dsr-gratuitous-reply-table.cc:75, 76 + i->m_gratReplyHoldoff = + std::max(gratReplyHoldoff + Simulator::Now(), i->m_gratReplyHoldoff); + +./src/dsr/model/dsr-gratuitous-reply-table.h:54, 66, 137 + Time m_gratReplyHoldoff; ///< gratuitous reply holdoff time + m_gratReplyHoldoff(h) + return (b.m_gratReplyHoldoff < Simulator::Now()); + +./RELEASE_NOTES.md:1087 +- Bug 2530 - aodv: Rename aodv::SetBalckListTimeout to aodv::SetBlackListTimeout + +./doc/installation/source/linux.rst:122 + apt install gir1.2-goocanvas-2.0 python3-gi python3-gi-cairo python3-pygraphviz gir1.2-gtk-3.0 ipython3 + +./doc/tutorial/source/getting-started.rst:347: + >> Searching for system dependency gir-bindings - OK + +./src/wave/examples/vanet-routing-compare.cc:1565, 1971 +static ns3::GlobalValue g_rate("VRCrate", + GlobalValue::GetValueByName("VRCrate", stringValue); + +./src/lte/model/lte-mi-error-model.h:23: + * for mobIlE Video AppLications) project, which is a + +./src/traffic-control/model/codel-queue-disc.h:17: + * Codel, the COntrolled DELay Queueing discipline + +./src/internet/model/global-route-manager-impl.h:555: + * \param vs a list of SPFVertexes + +./src/internet/model/candidate-queue.h:166: + * SPFVertexes are added into the queue according to the ordering + +./src/internet/model/global-route-manager-impl.h:555 + typedef std::list ListOfSPFVertex_t; //!< container of SPFVertexes + +./CHANGES.md: +* (mesh) The spelling of the function `PeerManagementProtocolMac::SetPeerManagerProtcol` from `peer-management-protocol-mac.h` was corrected to `PeerManagementProtocolMac::SetPeerManagerProtocol`; this will affect existing users who were using the function with the misspelling. +* The spelling of the attribute `IntialCellVoltage` from `LiIonEnergySource` was corrected to `InitialCellVoltage`; this will affect existing users who were using the attribute with the misspelling. +* (dsr) The spelling of the class `DsrOptionRerrUnsupportHeader` from `dsr-option-header.h` was corrected to `DsrOptionRerrUnsupportedHeader`; this will affect existing users who were using the class with the misspelling. +* (internet) The spelling of the enumerated value `IPV6_EXT_AUTHENTIFICATION` from `ipv6-header.h` was corrected to `IPV6_EXT_AUTHENTICATION`; this will affect existing users who were using the enumerated value with the misspelling. +* (lte) The spelling of the enumeration `ControPduType_t` from `lte-rlc-am-header.h` was corrected to `ControlPduType_t`; this will affect existing users who were using the enumeration with the misspelling. +* (lte) The spelling of the function `LteUeCphySapProvider::StartInSnycDetection()` from `lte-ue-cphy-sap.h` was corrected to `LteUeCphySapProvider::StartInSyncDetection()`; this will affect existing users who were using the function with the misspelling. +* (lte) The spelling of the function `MemberLteUeCphySapProvider::StartInSnycDetection()` from `lte-ue-cphy-sap.h` was corrected to `MemberLteUeCphySapProvider::StartInSyncDetection()`; this will affect existing users who were using the function with the misspelling. +* (lte) The spelling of the function `LteUePhy::StartInSnycDetection()` from `lte-ue-phy.h` was corrected to `LteUePhy::StartInSyncDetection()`; this will affect existing users who were using the function with the misspelling. +* (network) The spelling of the file `lollipop-comparisions.cc` was corrected to `lollipop-comparisons.cc`. +* (network) The spelling of the attribute `currentTrimedFromStart` from `packet-metadata.h` was corrected to `currentTrimmedFromStart`; this will affect existing users who were using the attribute with the misspelling. +* (network) The spelling of the attribute `currentTrimedFromEnd` from `packet-metadata.h` was corrected to `currentTrimmedFromEnd`; this will affect existing users who were using the attribute with the misspelling. +* (wave) The spelling of the function `OcbWifiMac::CancleTx()` from `ocb-wifi-mac.h` was corrected to `OcbWifiMac::CancelTx()`; this will affect existing users who were using the function with the misspelling. +* (wifi) The spelling of the attribute `m_succesMax1` from `aparf-wifi-manager.h` was corrected to `m_successMax1`; this will affect existing users who were using the attribute with the misspelling. +* (wifi) The spelling of the attribute `m_succesMax2` from `aparf-wifi-manager.h` was corrected to `m_successMax2`; this will affect existing users who were using the attribute with the misspelling. +* (wifi) The spelling of the enumerated value `MDAOP_ADVERTISMENT_REQUEST` from `mgmt-headers.h` was corrected to `MDAOP_ADVERTISEMENT_REQUEST`; this will affect existing users who were using the enumerated value with the misspelling. +* (wifi) The spelling of the enumerated value `MDAOP_ADVERTISMENTS` from `mgmt-headers.h` was corrected to `MDAOP_ADVERTISEMENTS`; this will affect existing users who were using the enumerated value with the misspelling. +* (wifi) The spelling of the define `IE_BEAMLINK_MAINENANCE` from `wifi-information-element.h` was corrected to `IE_BEAMLINK_MAINTENANCE`; this will affect existing users who were using the define with the misspelling. +* (wimax) The spelling of the attribute `m_nrRecivedFecBlocks` from `simple-ofdm-wimax-phy.h` was corrected to `m_nrReceivedFecBlocks`; this will affect existing users who were using the attribute with the misspelling. +* (lte) The spelling of the function `DoUlInfoListElementHarqFeeback` from `lte-enb-phy-sap.h` and `lte-enb-mac.h` was corrected to `DoUlInfoListElementHarqFeedback`; this will affect existing users who were using the function with the mispelling. +* (lte) The spelling of the function `DoDlInfoListElementHarqFeeback` from `lte-enb-phy-sap.h` and `lte-enb-mac.h` was corrected to `DoDlInfoListElementHarqFeedback`; this will affect existing users who were using the function with the mispelling. +* (lr-wpan) The spelling of the constant `aMaxBeaconPayloadLenght` from `lr-wpan-constants.h` was corrected to `aMaxBeaconPayloadLength`; this will affect existing users who were using the constant value with the misspelling. +* (sixlowpan) The spelling of the function `SixLowPanNetDevice::Fragments::GetFraments` from `sixlowpan-net-device.cc` was corrected to `SixLowPanNetDevice::Fragments::GetFragments`; this will affect existing users who were using the function with the misspelling. +* The attribute `Recievers` in class `YansWifiPhy` was misspelled, so this has been corrected to `Receivers`. + + diff --git a/utils/codespell-ignored-words b/utils/codespell-ignored-words index 7ccab4b3e..1e3ca01f7 100644 --- a/utils/codespell-ignored-words +++ b/utils/codespell-ignored-words @@ -1,3 +1,6 @@ +#LaTeX +te + #Core anid anumber @@ -17,6 +20,7 @@ ect iif nce inflight +upto #Internet Apps clen @@ -26,6 +30,7 @@ nin #DSR cleanp +grat #LTE commun @@ -48,6 +53,7 @@ fo #Traffic Control taht +interm #Wimax opps