From 6f076416e7e9b0fb4e2ddf6653693cd3b5cc537c Mon Sep 17 00:00:00 2001 From: Gabriel Ferreira Date: Sat, 18 Feb 2023 00:43:21 -0300 Subject: [PATCH] Fix typos --- .codespellrc | 5 +- CHANGES.md | 10 +-- RELEASE_NOTES.md | 14 ++-- doc/contributing/source/coding-style.rst | 2 +- doc/contributing/source/external.rst | 2 +- doc/contributing/source/models.rst | 2 +- doc/main.h | 2 +- doc/manual/source/events.rst | 4 +- doc/manual/source/test-framework.rst | 2 +- doc/manual/source/troubleshoot.rst | 2 +- doc/manual/source/working-with-cmake.rst | 2 +- doc/manual/source/working-with-git.rst | 6 +- examples/energy/energy-model-example.cc | 2 +- .../energy-model-with-harvesting-example.cc | 2 +- examples/matrix-topology/matrix-topology.cc | 2 +- examples/routing/manet-routing-compare.cc | 2 +- examples/tcp/tcp-validation.cc | 2 +- examples/tcp/tcp-variants-comparison.cc | 14 ++-- .../traffic-control/queue-discs-benchmark.cc | 8 +-- examples/tutorial/seventh.cc | 4 +- examples/tutorial/sixth.cc | 4 +- examples/wireless/wifi-adhoc.cc | 2 +- examples/wireless/wifi-clear-channel-cmu.cc | 2 +- examples/wireless/wifi-hidden-terminal.cc | 2 +- examples/wireless/wifi-spatial-reuse.cc | 2 +- .../wireless/wifi-spectrum-per-example.cc | 2 +- .../wifi-spectrum-per-interference.cc | 2 +- src/antenna/test/test-cosine-antenna.cc | 2 +- src/antenna/test/test-degrees-radians.cc | 2 +- src/antenna/test/test-isotropic-antenna.cc | 2 +- src/antenna/test/test-parabolic-antenna.cc | 2 +- .../test/bulk-send-application-test-suite.cc | 4 +- .../test/udp-client-server-test.cc | 6 +- src/brite/examples/conf_files/ASBarabasi.conf | 2 +- src/brite/examples/conf_files/ASWaxman.conf | 2 +- src/brite/examples/conf_files/RTBarabasi.conf | 2 +- .../examples/conf_files/RTBarabasi10.conf | 2 +- .../examples/conf_files/RTBarabasi20.conf | 2 +- .../examples/conf_files/RTBarabasi5.conf | 2 +- src/brite/examples/conf_files/RTWaxman.conf | 2 +- src/brite/examples/conf_files/RTWaxman10.conf | 2 +- src/brite/examples/conf_files/RTWaxman20.conf | 2 +- src/brite/examples/conf_files/RTWaxman5.conf | 2 +- .../conf_files/TD_ASBarabasi_RTWaxman.conf | 2 +- src/buildings/doc/source/buildings-design.rst | 4 +- src/buildings/doc/source/buildings-user.rst | 4 +- .../outdoor-group-mobility-example.cc | 2 +- .../examples/outdoor-random-walk-example.cc | 2 +- src/buildings/helper/building-container.h | 2 +- .../helper/building-position-allocator.h | 2 +- src/buildings/model/building-list.cc | 4 +- .../buildings-channel-condition-model.cc | 2 +- ...hybrid-buildings-propagation-loss-model.cc | 2 +- .../buildings-channel-condition-model-test.cc | 2 +- src/buildings/test/buildings-pathloss-test.h | 4 +- ...ee-gpp-v2v-channel-condition-model-test.cc | 2 +- src/core/doc/environment-variables.h | 2 +- src/core/model/attribute-container.h | 2 +- src/core/model/calendar-scheduler.h | 2 +- src/core/model/config.cc | 2 +- src/core/model/environment-variable.cc | 2 +- src/core/model/global-value.cc | 2 +- src/core/model/length.h | 6 +- src/core/model/nstime.h | 2 +- src/core/model/object-base.h | 2 +- src/core/model/random-variable-stream.cc | 2 +- src/core/model/random-variable-stream.h | 2 +- src/core/model/realtime-simulator-impl.cc | 2 +- src/core/model/test.cc | 2 +- src/core/model/valgrind.h | 2 +- src/core/test/callback-test-suite.cc | 8 +-- src/core/test/int64x64-test-suite.cc | 6 +- .../test/random-variable-stream-test-suite.cc | 4 +- src/core/test/simulator-test-suite.cc | 2 +- src/core/test/time-test-suite.cc | 4 +- src/csma-layout/examples/csma-star.cc | 2 +- src/csma/examples/csma-packet-socket.cc | 2 +- src/csma/model/backoff.h | 2 +- src/csma/model/csma-net-device.cc | 2 +- src/dsdv/model/dsdv-packet-queue.cc | 4 +- src/dsdv/model/dsdv-routing-protocol.h | 2 +- src/dsr/model/dsr-option-header.cc | 12 ++-- src/dsr/model/dsr-option-header.h | 2 +- src/dsr/model/dsr-rcache.cc | 10 +-- src/dsr/model/dsr-rreq-table.h | 2 +- src/fd-net-device/doc/netmap-net-device.rst | 2 +- src/fd-net-device/examples/fd-emu-onoff.cc | 2 +- src/fd-net-device/examples/fd-emu-ping.cc | 4 +- src/fd-net-device/examples/fd-emu-udp-echo.cc | 2 +- src/fd-net-device/examples/fd-tap-ping.cc | 2 +- .../model/ipv4-flow-classifier.cc | 2 +- src/flow-monitor/model/ipv4-flow-probe.cc | 2 +- .../model/ipv6-flow-classifier.cc | 2 +- src/flow-monitor/model/ipv6-flow-probe.cc | 2 +- src/internet-apps/doc/internet-apps.rst | 2 +- src/internet-apps/model/ping.h | 4 +- src/internet-apps/model/v4traceroute.cc | 2 +- src/internet-apps/model/v4traceroute.h | 2 +- src/internet-apps/test/ping-test.cc | 2 +- src/internet/doc/ipv4.rst | 4 +- src/internet/doc/ipv6.rst | 2 +- src/internet/doc/tcp.rst | 6 +- .../examples/neighbor-cache-example.cc | 4 +- src/internet/helper/neighbor-cache-helper.h | 2 +- .../model/global-route-manager-impl.cc | 2 +- src/internet/model/icmpv6-l4-protocol.cc | 4 +- src/internet/model/ipv4-l3-protocol.cc | 2 +- src/internet/model/tcp-bbr.h | 6 +- src/internet/model/tcp-congestion-ops.h | 2 +- src/internet/model/tcp-rate-ops.h | 2 +- src/internet/model/tcp-rx-buffer.h | 2 +- src/internet/model/tcp-socket-base.cc | 6 +- src/internet/model/udp-socket-impl.cc | 2 +- src/internet/model/windowed-filter.h | 4 +- src/internet/test/ipv4-header-test.cc | 4 +- src/internet/test/neighbor-cache-test.cc | 2 +- .../test/tcp-advertised-window-test.cc | 2 +- .../test/tcp-classic-recovery-test.cc | 7 +- src/internet/test/tcp-dctcp-test.cc | 4 +- src/internet/test/tcp-rate-ops-test.cc | 8 +-- src/lr-wpan/doc/lr-wpan.rst | 4 +- src/lr-wpan/examples/lr-wpan-mlme.cc | 2 +- src/lr-wpan/model/lr-wpan-mac.h | 2 +- src/lr-wpan/test/lr-wpan-mac-test.cc | 2 +- src/lte/doc/source/lte-design.rst | 8 +-- src/lte/examples/lena-radio-link-failure.cc | 2 +- src/lte/helper/cc-helper.h | 2 +- src/lte/model/cqa-ff-mac-scheduler.cc | 9 +-- src/lte/model/epc-enb-application.h | 2 +- src/lte/model/epc-gtpc-header.h | 2 +- src/lte/model/epc-pgw-application.h | 4 +- src/lte/model/epc-sgw-application.h | 4 +- src/lte/model/epc-x2-header.h | 6 +- src/lte/model/epc-x2-sap.h | 4 +- .../fading-traces/fading_trace_generator.m | 2 +- src/lte/model/fdbet-ff-mac-scheduler.cc | 7 +- src/lte/model/fdmt-ff-mac-scheduler.cc | 7 +- src/lte/model/fdmt-ff-mac-scheduler.h | 2 +- src/lte/model/fdtbfq-ff-mac-scheduler.cc | 9 +-- src/lte/model/lte-ccm-rrc-sap.h | 4 +- src/lte/model/lte-enb-phy-sap.h | 4 +- src/lte/model/lte-enb-rrc.cc | 4 +- src/lte/model/lte-enb-rrc.h | 2 +- .../model/lte-ffr-distributed-algorithm.cc | 9 +-- src/lte/model/lte-ffr-distributed-algorithm.h | 2 +- src/lte/model/lte-fr-soft-algorithm.cc | 2 +- src/lte/model/lte-mac-sap.h | 2 +- src/lte/model/lte-radio-bearer-info.h | 2 +- src/lte/model/lte-rrc-header.cc | 4 +- src/lte/model/lte-spectrum-phy.cc | 2 +- src/lte/model/lte-spectrum-value-helper.h | 2 +- src/lte/model/lte-ue-ccm-rrc-sap.h | 2 +- src/lte/model/lte-ue-phy-sap.h | 2 +- src/lte/model/lte-ue-phy.cc | 6 +- src/lte/model/lte-ue-phy.h | 2 +- src/lte/model/lte-ue-rrc.h | 4 +- src/lte/model/pf-ff-mac-scheduler.cc | 9 ++- src/lte/model/pss-ff-mac-scheduler.cc | 7 +- src/lte/model/pss-ff-mac-scheduler.h | 2 +- src/lte/model/tdbet-ff-mac-scheduler.cc | 7 +- src/lte/model/tdmt-ff-mac-scheduler.cc | 7 +- src/lte/model/tdtbfq-ff-mac-scheduler.cc | 7 +- src/lte/model/tta-ff-mac-scheduler.cc | 7 +- ...-test-carrier-aggregation-configuration.cc | 2 +- .../test/lte-test-fdbet-ff-mac-scheduler.h | 2 +- .../test/lte-test-fdtbfq-ff-mac-scheduler.h | 2 +- src/lte/test/lte-test-interference-fr.h | 4 +- src/lte/test/lte-test-interference.h | 2 +- src/lte/test/lte-test-pf-ff-mac-scheduler.h | 4 +- src/lte/test/lte-test-phy-error-model.h | 2 +- src/lte/test/lte-test-pss-ff-mac-scheduler.h | 6 +- src/lte/test/lte-test-rlc-am-transmitter.h | 4 +- src/lte/test/lte-test-rlc-um-transmitter.h | 2 +- .../test/lte-test-spectrum-value-helper.cc | 2 +- .../test/lte-test-tdbet-ff-mac-scheduler.h | 2 +- src/lte/test/lte-test-tdmt-ff-mac-scheduler.h | 2 +- .../test/lte-test-tdtbfq-ff-mac-scheduler.h | 4 +- src/lte/test/lte-test-tta-ff-mac-scheduler.h | 2 +- src/lte/test/lte-test-ue-measurements.h | 4 +- src/lte/test/reference/lte_cqi_generation.m | 4 +- src/lte/test/reference/lte_frequency_reuse.m | 4 +- src/lte/test/reference/lte_link_budget.m | 2 +- .../reference/lte_link_budget_interference.m | 2 +- .../lte_link_budget_interference_fr.m | 2 +- src/lte/test/reference/lte_ue_measurements.m | 4 +- src/lte/test/test-lte-handover-failure.cc | 4 +- src/mesh/model/dot11s/ie-dot11s-preq.h | 2 +- src/mobility/helper/group-mobility-helper.h | 2 +- src/mobility/helper/ns2-mobility-helper.cc | 4 +- ...ady-state-random-waypoint-mobility-model.h | 2 +- .../test/ns2-mobility-helper-test-suite.cc | 4 +- .../test/waypoint-mobility-model-test.cc | 2 +- src/mpi/model/distributed-simulator-impl.cc | 2 +- src/netanim/examples/resources-counters.cc | 2 +- src/netanim/model/animation-interface.cc | 2 +- src/netanim/model/animation-interface.h | 10 +-- src/network/doc/error-model.rst | 2 +- src/network/helper/application-container.h | 2 +- src/network/model/nix-vector.h | 2 +- src/network/model/socket.h | 2 +- src/network/test/pcap-file-test-suite.cc | 4 +- src/network/test/test-data-rate.cc | 2 +- src/network/utils/data-rate.h | 8 +-- src/network/utils/llc-snap-header.h | 2 +- src/network/utils/queue-size.h | 2 +- .../doc/nix-vector-routing.rst | 2 +- .../model/nix-vector-routing.h | 2 +- src/olsr/doc/olsr.rst | 2 +- .../test/olsr-routing-protocol-test-suite.cc | 26 +++---- .../jakes-propagation-model-example.cc | 2 +- .../model/channel-condition-model.h | 14 ++-- ...e-gpp-propagation-loss-model-test-suite.cc | 2 +- src/sixlowpan/doc/sixlowpan.rst | 2 +- src/sixlowpan/model/sixlowpan-net-device.cc | 6 +- src/sixlowpan/model/sixlowpan-net-device.h | 10 +-- src/spectrum/doc/spectrum.rst | 6 +- src/spectrum/model/half-duplex-ideal-phy.h | 2 +- ...ree-gpp-spectrum-propagation-loss-model.cc | 2 +- .../two-ray-spectrum-propagation-loss-model.h | 3 +- src/spectrum/test/spectrum-value-test.cc | 4 +- .../two-ray-to-three-gpp-ch-calibration.py | 2 +- src/stats/model/average.h | 2 +- src/tap-bridge/doc/tap.rst | 2 +- .../examples/tap-csma-virtual-machine.cc | 2 +- .../examples/tap-wifi-virtual-machine.cc | 2 +- src/tap-bridge/model/tap-bridge.cc | 2 +- src/tap-bridge/model/tap-creator.cc | 2 +- src/test/csma-system-test-suite.cc | 4 +- src/test/doc/tests.h | 2 +- .../ns3tc/fq-cobalt-queue-disc-test-suite.cc | 2 +- src/test/ns3tcp/ns3tcp-loss-test-suite.cc | 2 +- src/test/ns3tcp/ns3tcp-socket-writer.h | 2 +- src/test/ns3tcp/ns3tcp-state-test-suite.cc | 4 +- .../traced-callback-typedef-test-suite.cc | 6 +- .../examples/topology-example-sim.cc | 2 +- src/traffic-control/doc/cobalt.rst | 2 +- .../examples/codel-vs-pfifo-asymmetric.cc | 10 +-- .../examples/fqcodel-l4s-example.cc | 4 +- .../model/cobalt-queue-disc.cc | 2 +- src/traffic-control/model/cobalt-queue-disc.h | 2 +- .../test/cobalt-queue-disc-test-suite.cc | 2 +- .../test/codel-queue-disc-test-suite.cc | 2 +- .../test/tbf-queue-disc-test-suite.cc | 2 +- src/uan/doc/uan.rst | 2 +- src/uan/model/uan-header-common.cc | 2 +- src/uan/model/uan-header-rc.h | 10 +-- src/uan/model/uan-phy-dual.cc | 2 +- src/uan/model/uan-phy-dual.h | 2 +- src/uan/model/uan-phy-gen.cc | 2 +- src/uan/model/uan-phy.h | 2 +- src/wave/doc/wave.rst | 4 +- src/wave/examples/vanet-routing-compare.cc | 2 +- src/wave/model/channel-coordinator.h | 2 +- src/wave/model/ocb-wifi-mac.h | 4 +- src/wifi/doc/source/wifi-testing.rst | 4 +- src/wifi/examples/reference/Bianchi11a.m | 2 +- src/wifi/examples/reference/Bianchi11g.m | 2 +- src/wifi/examples/reference/bianchi11ax.py | 2 +- src/wifi/examples/wifi-bianchi.cc | 8 +-- src/wifi/examples/wifi-phy-test.cc | 2 +- .../examples/wifi-test-interference-helper.cc | 16 ++--- src/wifi/model/block-ack-manager.h | 2 +- src/wifi/model/channel-access-manager.h | 2 +- src/wifi/model/he/he-phy.cc | 4 +- src/wifi/model/he/he-phy.h | 2 +- src/wifi/model/phy-entity.h | 2 +- src/wifi/model/vht/vht-phy.cc | 2 +- src/wifi/model/wifi-mac-trailer.h | 2 +- src/wifi/model/wifi-mac.cc | 2 +- src/wifi/model/wifi-phy-state-helper.cc | 2 +- src/wifi/model/wifi-phy-state-helper.h | 4 +- src/wifi/model/wifi-remote-station-manager.h | 4 +- src/wifi/model/wifi-tx-vector.h | 4 +- src/wifi/test/channel-access-manager-test.cc | 24 +++---- src/wifi/test/examples-to-run.py | 10 +-- src/wifi/test/tx-duration-test.cc | 2 +- src/wifi/test/wifi-aggregation-test.cc | 6 +- src/wifi/test/wifi-eht-info-elems-test.cc | 2 +- src/wifi/test/wifi-mac-ofdma-test.cc | 2 +- src/wifi/test/wifi-phy-cca-test.cc | 28 ++++---- src/wifi/test/wifi-phy-ofdma-test.cc | 40 +++++------ src/wifi/test/wifi-phy-reception-test.cc | 10 +-- src/wifi/test/wifi-phy-thresholds-test.cc | 4 +- src/wifi/test/wifi-test.cc | 6 +- src/wifi/test/wifi-txop-test.cc | 2 +- src/wimax/examples/wimax-ipv4.cc | 2 +- src/wimax/model/bs-net-device.cc | 2 +- src/wimax/model/bs-scheduler.cc | 2 +- src/wimax/model/bs-uplink-scheduler-rtps.h | 2 +- src/wimax/model/bs-uplink-scheduler-simple.h | 2 +- src/wimax/model/cid.cc | 2 +- src/wimax/model/dl-mac-messages.h | 2 +- src/wimax/model/ofdm-downlink-frame-prefix.h | 2 +- src/wimax/model/simple-ofdm-wimax-channel.h | 2 +- src/wimax/model/simple-ofdm-wimax-phy.cc | 2 +- src/wimax/model/ss-link-manager.h | 4 +- src/wimax/model/ss-service-flow-manager.h | 2 +- src/wimax/model/ul-job.h | 2 +- test.py | 2 +- utils/codespell-ignored-lines | 46 ++++++++++++ utils/codespell-ignored-words | 72 +++++++++++++++++++ utils/codespell_ignored_words | 0 302 files changed, 679 insertions(+), 545 deletions(-) create mode 100644 utils/codespell-ignored-lines create mode 100644 utils/codespell-ignored-words delete mode 100644 utils/codespell_ignored_words diff --git a/.codespellrc b/.codespellrc index f56e0abfa..c428309c9 100644 --- a/.codespellrc +++ b/.codespellrc @@ -1,3 +1,4 @@ [codespell] -skip = .git,.gitlab-ci-local -ignore-words = ./utils/codespell_ignored_words +skip = .git,.gitlab-ci-local,*.eps,*.pdf,*.css_t,AUTHORS +ignore-words = ./utils/codespell-ignored-words +exclude-file = ./utils/codespell-ignored-lines diff --git a/CHANGES.md b/CHANGES.md index 39f0f52cd..50a1ce1cb 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -413,7 +413,7 @@ Changes from ns-3.29 to ns-3.30 * It is now possible to know the size of the SpectrumValue underlying std::vector, as well as accessing read-only every element of it. * The `GetClosestSide` method of the Rectangle class returns the correct closest side also for positions outside the rectangle. * The trace sources `BackoffTrace` and `CwTrace` were moved from class QosTxop to base class Txop, allowing these values to be traced for DCF operation. In addition, the trace signature for BackoffTrace was changed from TracedValue to TracedCallback (callback taking one argument instead of two). Most users of CwTrace for QosTxop configurations will not need to change existing programs, but users of BackoffTrace will need to adjust the callback signature to match. -* New trace sources, namely `DrbCreated`, `Srb1Created` and `DrbCreated` have beed implemented in LteEnbRrc and LteUeRrc classes repectively. These new traces are used to improve the connection of the RLC and PDCP stats in the RadioBearerStatsConnector API. +* New trace sources, namely `DrbCreated`, `Srb1Created` and `DrbCreated` have been implemented in LteEnbRrc and LteUeRrc classes respectively. These new traces are used to improve the connection of the RLC and PDCP stats in the RadioBearerStatsConnector API. * `TraceFadingLossModel` has been moved from lte to spectrum module. ### Changes to build system @@ -441,7 +441,7 @@ Changes from ns-3.29 to ns-3.30 * New `ATTACH_REQUEST` state to wait for finalization of the S1 signalling with the core network. * New InitialContextSetupRequest primitive of the S1 SAP that is received by the eNB RRC when the S1 signalling from the core network is finished. -* A new buffer has been introduced in the LteEnbRrc class. This buffer will be used by a target eNB during handover to buffer the packets comming from a source eNB on X2 inteface. The target eNB will buffer this data until it receives RRC Connection Reconfiguration Complete from a UE. +* A new buffer has been introduced in the LteEnbRrc class. This buffer will be used by a target eNB during handover to buffer the packets coming from a source eNB on X2 interface. The target eNB will buffer this data until it receives RRC Connection Reconfiguration Complete from a UE. * The default qdisc installed on single-queue devices (such as PointToPoint, Csma and Simple) is now `FqCoDel` (instead of PfifoFast). On multi-queue devices (such as Wifi), the default root qdisc is now `Mq` with as many FqCoDel child qdiscs as the number of device queues. The new defaults are motivated by the willingness to align with the behavior of major Linux distributions and by the need to preserve the effectiveness of Wifi EDCA Functions in differentiating Access Categories (see issue #35). * LTE RLC TM mode does not report anymore the layer-to-layer delay, as it misses (by standard) an header to which attach the timestamp tag. Users can switch to the PDCP layer delay measurements, which must be the same. * Token Bank Fair Queue Scheduler (`ns3::FdTbfqFfMacScheduler`) will not anymore schedule a UE, which does not have any RBG left after removng the RBG from its allocation map if the computed TB size is greater than the "budget" computed in the scheduler. @@ -940,7 +940,7 @@ Changes from ns-3.18.1 to ns-3.19 * For the TapBridge device, in UseLocal mode there is a MAC learning function. TapBridge has been waiting for the first packet received from tap interface to set the address of the bridged device to the source address of the first packet. This has caused problems with WiFi. The new behavior is that after connection to the tap interface, ns-3 learns the MAC address of that interface with a system call and immediately sets the address of the bridged device to the learned one. See [bug 1777](https://www.nsnam.org/bugzilla/show_bug.cgi?id=1777) for more details. * TapBridge device now correctly implements IsLinkUp() method. * IPv6 addresses and routing tables are printed like in Linux `route -A inet6` command. -* A change in `Ipv[4,6]Interface` enforces the correct behaviour of IP when a device do not support the minimum MTU requirements. This is set to 68 and 1280 octects respectively. IP simulations that may have run over devices with smaller MTUs than 68 or 1280, respectively, will no longer be able to use such devices. +* A change in `Ipv[4,6]Interface` enforces the correct behaviour of IP when a device do not support the minimum MTU requirements. This is set to 68 and 1280 octets respectively. IP simulations that may have run over devices with smaller MTUs than 68 or 1280, respectively, will no longer be able to use such devices. Changes from ns-3.18 to ns-3.18.1 --------------------------------- @@ -981,7 +981,7 @@ Changes from ns-3.17 to ns-3.18 * 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 -* InternetStackHelper has two new functions:SetIpv4ArpJitter (bool enable) and SetIpv6NsRsJitter (bool enable) to enable/disable the random jitter on the tranmission of IPv4 ARP Request and IPv6 NS/RS. +* 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. * New Mac16Address has been added. It can be used with IPv6 to make an Autoconfigured address. @@ -1550,7 +1550,7 @@ Changes from ns-3.7 to ns-3.8 * **MPI Interface for distributed simulation:** Enables access to necessary MPI information such as MPI rank and size. * **Point-to-point remote channel:** Enables point-to-point connection between net-devices on different simulators, for use with distributed simulation. * **GetSystemId in simulator:** For use with distributed simulation, GetSystemId returns zero by non-distributed simulators. For the distributed simulator, it returns the MPI rank. -* **Enhancements to src/core/random-variable.cc/h:** New Zeta random variable generator. The Zeta random distribution is tightly related to the Zipf distribution (already in ns-3.7). See the documentation, especially because sometimes the Zeta distribution is called Zipf and viceversa. Here we conform to the Wikipedia naming convention, i.e., Zipf is bounded while Zeta isn't. +* **Enhancements to src/core/random-variable.cc/h:** New Zeta random variable generator. The Zeta random distribution is tightly related to the Zipf distribution (already in ns-3.7). See the documentation, especially because sometimes the Zeta distribution is called Zipf and vice-versa. Here we conform to the Wikipedia naming convention, i.e., Zipf is bounded while Zeta isn't. * **Two-ray ground propagation loss model:** Calculates the crossover distance under which Friis is used. The antenna height is set to the nodes z coordinate, but can be added to using the model parameter SetHeightAboveZ, which will affect ALL stations * **Pareto random variable** has two new constructors to specify scale and shape: diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md index 6bae02843..d8f50baa3 100644 --- a/RELEASE_NOTES.md +++ b/RELEASE_NOTES.md @@ -352,7 +352,7 @@ This release has been tested on the following systems: - (network) Improved support for bit fields in header serialization/deserialization. - (network) Added support for DLT_LORATAP DataLinkType to PCAP files - (network) More arithmetic operators are provided for DataRate objects -- (nix-vector) Nix-Vector routing supports multiple interface addresse and can print out routing paths. +- (nix-vector) Nix-Vector routing supports multiple interface addresses and can print out routing paths. - (olsr) Add support for printing OLSR headers - (sixlowpan) Added support for stateful (i.e., context-based) RFC6282 compression. - (tcp) TCP CUBIC is now the default TCP congestion control, replacing NewReno. @@ -616,7 +616,7 @@ issue number (prefixed by '#'), or GitLab merge request number (prefixed by '!') - (lr-wpan) !326 - Inactive Periods Queue fix - (lte) #106 - Inconsistent imsi representation in LTE module - (lte) #196 - Remove LteSecondaryCellSelectionTestSuite from LTE module -- (lte) #221 - Stop T310 upon receving handover command +- (lte) #221 - Stop T310 upon receiving handover command - (network) #216 - Correct the return value for PacketSocket::SendTo() - (network) !239 - Refactor DelayJitterEstimation to more closely follow RFC 1889 and RFC 3550 - (propagation) !269 - Fix Okumura-Hata propagation loss model for frequency > 1.5 Ghz and medium or small city @@ -624,7 +624,7 @@ issue number (prefixed by '#'), or GitLab merge request number (prefixed by '!') - (wifi) - Fix frame capture when signals arrive at the exact same time and add additional tests to verify these cases - (wifi) - Fix MCS selection in ideal rate manager for cases with unbalanced MIMO settings and/or RX diversity - (wifi) - Fix SNR computations for MIMO -- (wifi) - Fix ReportAmpduTxStatus called two times when BAR is explicitely sent upon missed BACK +- (wifi) - Fix ReportAmpduTxStatus called two times when BAR is explicitly sent upon missed BACK - (wifi) A zero value for the backoff timer might be discarded and a new value might be generated by an erroneous call to NotifyCollision(). - (wifi) Bug 1909, Issue #41 - Implementation of ACK timeout @@ -2068,8 +2068,8 @@ These platforms have been tested; others may work also: same way as with Ipv4PacketInfoTag. See Doxygen for current limitations in using Ipv[4,6]PacketInfoTag to set IP properties. -- Ipv[4,6]Interfaces not respecting the minimum MTU requirements (68 octects - for IPv4 and 1280 octects for IPv6) will be automatically set as Down. +- Ipv[4,6]Interfaces not respecting the minimum MTU requirements (68 octets + for IPv4 and 1280 octets for IPv6) will be automatically set as Down. - IPv6 addresses and routing tables are printed in a more conventional way, closely matching the Linux "route -A inet6" command. @@ -2350,7 +2350,7 @@ These platforms have been tested; others may work also: - bug 1633 - Bake - should not report that it is downloading qt4 when it is already installed - bug 1635 - Small bug without Simulator::Destroy() - bug 1636 - Compilation error flagged as unmet dependency -- bug 1637 - Bake calling apt-get for unpriviledged user +- bug 1637 - Bake calling apt-get for unprivileged user - bug 1639 - bake.py support for linux mint - bug 1640 - bake needs to test for g++ - bug 1641 - bake reports autotools dependency, but needs automake @@ -3729,7 +3729,7 @@ wiki for more information: Support for several ICMP messages has been added to ns-3. See src/internet-stack/icmpv4.h for details. - IPv6 Address Support - New clases to support IPv6 addresses has been added to the system. This + New classes to support IPv6 addresses has been added to the system. This is enabling technology for fuller IPv6 support scheduled for ns-3.4. - A flow-id tag has been added to the contributed code section - Star topologies can be created from the topology helper functions diff --git a/doc/contributing/source/coding-style.rst b/doc/contributing/source/coding-style.rst index d9220665a..5875ab101 100644 --- a/doc/contributing/source/coding-style.rst +++ b/doc/contributing/source/coding-style.rst @@ -798,7 +798,7 @@ that usage is consistent within a file. }; All the functions and variables must be documented, with the exception of -member functions inherited from parent classes (the documentaion is copied +member functions inherited from parent classes (the documentation is copied automatically from the parent class), and default constructor/destructor. It is strongly suggested to use grouping to bind together logically related diff --git a/doc/contributing/source/external.rst b/doc/contributing/source/external.rst index 36fd8e98e..6eea997c7 100644 --- a/doc/contributing/source/external.rst +++ b/doc/contributing/source/external.rst @@ -24,7 +24,7 @@ student who wishes to make his or her thesis-related code available but who does not plan to update it further. See :ref:`sec-unmaintained-contributed` below. -However, much of the emphasis of this chaper is on hosting |ns3| extensions +However, much of the emphasis of this chapter is on hosting |ns3| extensions in the |ns3| `App Store `_. Rationale for the app store diff --git a/doc/contributing/source/models.rst b/doc/contributing/source/models.rst index 995c915be..d58b3d2d1 100644 --- a/doc/contributing/source/models.rst +++ b/doc/contributing/source/models.rst @@ -148,7 +148,7 @@ For example, if you have made changes to optimize one module, and in the course of doing so, you fixed a bug in another module, make sure you separate these two sets of changes in two separate submissions. -When splitting a large submission into seprate submissions, (ideally) these +When splitting a large submission into separate submissions, (ideally) these submissions should be prefaced (in the Merge Request description) by a detailed explanation of the overall plan such that code reviewers can review each submission separately but within a diff --git a/doc/main.h b/doc/main.h index 6c5592eec..9a3ac3b55 100644 --- a/doc/main.h +++ b/doc/main.h @@ -115,6 +115,6 @@ * * All environment variables used by ns-3 are documented by module. * - * \section environcore Core Enviroment Variables + * \section environcore Core Environment Variables * See \ref core-environ */ diff --git a/doc/manual/source/events.rst b/doc/manual/source/events.rst index b32f01c64..b77c03db6 100644 --- a/doc/manual/source/events.rst +++ b/doc/manual/source/events.rst @@ -261,7 +261,7 @@ For example one can use noisy local clocks with the real time adapter. A single adapter can be added on top of the `DefaultSimulatorImpl` by the same two methods above: binding the `"SimulatorImplementationType"` global value or -using the command line argument. To chain multipe adapters a different +using the command line argument. To chain multiple adapters a different approach must be used; see the `SimulatorAdapter::AddAdapter()` API documentation. @@ -335,7 +335,7 @@ complexity of the other API calls. +=======================+=====================================+=============+==============+==========+==============+ | CalendarScheduler | ` []` | Constant | Constant | 24 bytes | 16 bytes | +-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ -| HeapScheduler | Heap on `std::vector` | Logarithmic | Logaritmic | 24 bytes | 0 | +| HeapScheduler | Heap on `std::vector` | Logarithmic | Logarithmic | 24 bytes | 0 | +-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ | ListScheduler | `std::list` | Linear | Constant | 24 bytes | 16 bytes | +-----------------------+-------------------------------------+-------------+--------------+----------+--------------+ diff --git a/doc/manual/source/test-framework.rst b/doc/manual/source/test-framework.rst index 7bd145ba2..79bac86c5 100644 --- a/doc/manual/source/test-framework.rst +++ b/doc/manual/source/test-framework.rst @@ -495,7 +495,7 @@ the directory where the test lives. For example, ``ns3tcp-loss-NewReno0-response-vectors.pcap`` is a file consisting of a number of TCP headers that are used as the expected responses of the |ns3| TCP under test. -Note that Unit Tests are often preferrable to System Tests, as they are more +Note that Unit Tests are often preferable to System Tests, as they are more independent from small changes in the modules that are not the goal of the test. Examples diff --git a/doc/manual/source/troubleshoot.rst b/doc/manual/source/troubleshoot.rst index 046db3685..d3b88c836 100644 --- a/doc/manual/source/troubleshoot.rst +++ b/doc/manual/source/troubleshoot.rst @@ -28,7 +28,7 @@ Here is an example of what might occur:: Compilation finished successfully Command ['/home/tomh/ns-3-nsc/build/debug/examples/tcp-point-to-point'] exited with code -11 -The error message says that the program terminated unsuccessfully, but it is +The error message says that the program terminated unsuccessfuly, but it is not clear from this information what might be wrong. To examine more closely, try running it under the `gdb debugger `_: diff --git a/doc/manual/source/working-with-cmake.rst b/doc/manual/source/working-with-cmake.rst index 3e7c772e3..858d7b43b 100644 --- a/doc/manual/source/working-with-cmake.rst +++ b/doc/manual/source/working-with-cmake.rst @@ -2182,7 +2182,7 @@ Module macros: build_lib_example The second most important macro from a module author perspective is the ``build_lib_example``, which builds the examples for their module. As with ``build_lib`` we explain what it does block-by-block. -In the first block, arguments are parsed and we check wether the current module is in the contrib +In the first block, arguments are parsed and we check whether the current module is in the contrib or the src folder. .. sourcecode:: cmake diff --git a/doc/manual/source/working-with-git.rst b/doc/manual/source/working-with-git.rst index fe6a32c4a..0bd276ecc 100644 --- a/doc/manual/source/working-with-git.rst +++ b/doc/manual/source/working-with-git.rst @@ -255,12 +255,12 @@ to create a merge request. It is strongly suggested to rebase your branch on top of upstream/master (or master, if you kept it synced) before submitting your work. This helps reviewing the code changes proposed in the branch. merge it without conflicts, and it increase the speed of the GitLab CI. -GitLab CI (Continous Integration) +GitLab CI (Continuous Integration) +++++++++++++++++++++++++++++++++ -GitLab provides a CI (Continous Integration) feature. Shortly put, after every push the code is built and tests are run in one of the GitLab servers. +GitLab provides a CI (Continuous Integration) feature. Shortly put, after every push the code is built and tests are run in one of the GitLab servers. -Merge requests are expected to pass the CI, as is to not generate errors or warings during compilation, to have all the tests pasing, and to not generate warnings on the documentation. +Merge requests are expected to pass the CI, as is to not generate errors or warnings during compilation, to have all the tests passing, and to not generate warnings on the documentation. Hence, the CI is very important for the workflow. However, sometimes running the Ci is superfluous, for example: - You are in the middle of some work (and perhaps you know that there are errors), diff --git a/examples/energy/energy-model-example.cc b/examples/energy/energy-model-example.cc index 8890db98e..ab42be174 100644 --- a/examples/energy/energy-model-example.cc +++ b/examples/energy/energy-model-example.cc @@ -39,7 +39,7 @@ NS_LOG_COMPONENT_DEFINE("EnergyExample"); * Print a received packet * * \param from sender address - * \return a sting with the details of the packet: dst {IP, port}, time. + * \return a string with the details of the packet: dst {IP, port}, time. */ static inline std::string PrintReceivedPacket(Address& from) diff --git a/examples/energy/energy-model-with-harvesting-example.cc b/examples/energy/energy-model-with-harvesting-example.cc index 35ac1c077..99fd3ba24 100644 --- a/examples/energy/energy-model-with-harvesting-example.cc +++ b/examples/energy/energy-model-with-harvesting-example.cc @@ -68,7 +68,7 @@ NS_LOG_COMPONENT_DEFINE("EnergyWithHarvestingExample"); * Print a received packet * * \param from sender address - * \return a sting with the details of the packet: dst {IP, port}, time. + * \return a string with the details of the packet: dst {IP, port}, time. */ static inline std::string PrintReceivedPacket(Address& from) diff --git a/examples/matrix-topology/matrix-topology.cc b/examples/matrix-topology/matrix-topology.cc index baac1bb43..0cfaa302b 100644 --- a/examples/matrix-topology/matrix-topology.cc +++ b/examples/matrix-topology/matrix-topology.cc @@ -117,7 +117,7 @@ main(int argc, char* argv[]) std::vector> coord_array; coord_array = readCordinatesFile(node_coordinates_file_name); - // Optionally display node co-ordinates file + // Optionally display node coordinates file // printCoordinateArray (node_coordinates_file_name.c_str (),coord_array); int n_nodes = coord_array.size(); diff --git a/examples/routing/manet-routing-compare.cc b/examples/routing/manet-routing-compare.cc index bac711faf..a213ba278 100644 --- a/examples/routing/manet-routing-compare.cc +++ b/examples/routing/manet-routing-compare.cc @@ -102,7 +102,7 @@ class RoutingExperiment // static void SetMACParam (ns3::NetDeviceContainer & devices, // int slotDistance); /** - * Handles the command-line parmeters. + * Handles the command-line parameters. * \param argc The argument count. * \param argv The argument vector. * \return the CSV filename. diff --git a/examples/tcp/tcp-validation.cc b/examples/tcp/tcp-validation.cc index b3eac89e6..7aed2a009 100644 --- a/examples/tcp/tcp-validation.cc +++ b/examples/tcp/tcp-validation.cc @@ -34,7 +34,7 @@ // This program is designed to observe long-running TCP congestion control // behavior over a configurable bottleneck link. The program is also -// instrumented to check progam data against validated results, when +// instrumented to check program data against validated results, when // the validation option is enabled. // // ---> downstream (primary data transfer from servers to clients) diff --git a/examples/tcp/tcp-variants-comparison.cc b/examples/tcp/tcp-variants-comparison.cc index e35ed8433..31f0a9ef8 100644 --- a/examples/tcp/tcp-variants-comparison.cc +++ b/examples/tcp/tcp-variants-comparison.cc @@ -59,14 +59,14 @@ static std::map firstCwnd; //!< First conge static std::map firstSshThr; //!< First SlowStart threshold. static std::map firstRtt; //!< First RTT. static std::map firstRto; //!< First RTO. -static std::map> cWndStream; //!< Congstion window outut stream. +static std::map> cWndStream; //!< Congstion window output stream. static std::map> - ssThreshStream; //!< SlowStart threshold outut stream. -static std::map> rttStream; //!< RTT outut stream. -static std::map> rtoStream; //!< RTO outut stream. -static std::map> nextTxStream; //!< Next TX outut stream. -static std::map> nextRxStream; //!< Next RX outut stream. -static std::map> inFlightStream; //!< In flight outut stream. + ssThreshStream; //!< SlowStart threshold output stream. +static std::map> rttStream; //!< RTT output stream. +static std::map> rtoStream; //!< RTO output stream. +static std::map> nextTxStream; //!< Next TX output stream. +static std::map> nextRxStream; //!< Next RX output stream. +static std::map> inFlightStream; //!< In flight output stream. static std::map cWndValue; //!< congestion window value. static std::map ssThreshValue; //!< SlowStart threshold value. diff --git a/examples/traffic-control/queue-discs-benchmark.cc b/examples/traffic-control/queue-discs-benchmark.cc index c18ac078d..87eee9f3e 100644 --- a/examples/traffic-control/queue-discs-benchmark.cc +++ b/examples/traffic-control/queue-discs-benchmark.cc @@ -67,9 +67,9 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("BenchmarkQueueDiscs"); /** - * Print the queue limitis. + * Print the queue limits. * - * \param stream The ouput stream. + * \param stream The output stream. * \param oldVal Old value. * \param newVal New value. */ @@ -82,7 +82,7 @@ LimitsTrace(Ptr stream, uint32_t oldVal, uint32_t newVal) /** * Print the bytes in the queue. * - * \param stream The ouput stream. + * \param stream The output stream. * \param oldVal Old value. * \param newVal New value. */ @@ -96,7 +96,7 @@ BytesInQueueTrace(Ptr stream, uint32_t oldVal, uint32_t new * Sample and print the queue goodput. * * \param app The Tx app. - * \param stream The ouput stream. + * \param stream The output stream. * \param period The sampling period. */ static void diff --git a/examples/tutorial/seventh.cc b/examples/tutorial/seventh.cc index 0f35e8271..f4b61be1e 100644 --- a/examples/tutorial/seventh.cc +++ b/examples/tutorial/seventh.cc @@ -69,7 +69,7 @@ NS_LOG_COMPONENT_DEFINE("SeventhScriptExample"); /** * Congestion window change callback * - * \param stream The ouput stream file. + * \param stream The output stream file. * \param oldCwnd Old congestion window. * \param newCwnd New congestion window. */ @@ -84,7 +84,7 @@ CwndChange(Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) /** * Rx drop callback * - * \param file The ouput PCAP file. + * \param file The output PCAP file. * \param p The dropped packet. */ static void diff --git a/examples/tutorial/sixth.cc b/examples/tutorial/sixth.cc index 4fa7629c9..85f49ee12 100644 --- a/examples/tutorial/sixth.cc +++ b/examples/tutorial/sixth.cc @@ -65,7 +65,7 @@ NS_LOG_COMPONENT_DEFINE("SixthScriptExample"); /** * Congestion window change callback * - * \param stream The ouput stream file. + * \param stream The output stream file. * \param oldCwnd Old congestion window. * \param newCwnd New congestion window. */ @@ -80,7 +80,7 @@ CwndChange(Ptr stream, uint32_t oldCwnd, uint32_t newCwnd) /** * Rx drop callback * - * \param file The ouput PCAP file. + * \param file The output PCAP file. * \param p The dropped packet. */ static void diff --git a/examples/wireless/wifi-adhoc.cc b/examples/wireless/wifi-adhoc.cc index ca38694c3..e65724382 100644 --- a/examples/wireless/wifi-adhoc.cc +++ b/examples/wireless/wifi-adhoc.cc @@ -67,7 +67,7 @@ class Experiment private: /** * Receive a packet. - * \param socket The recieving socket. + * \param socket The receiving socket. */ void ReceivePacket(Ptr socket); /** diff --git a/examples/wireless/wifi-clear-channel-cmu.cc b/examples/wireless/wifi-clear-channel-cmu.cc index c564f731e..4b245270f 100644 --- a/examples/wireless/wifi-clear-channel-cmu.cc +++ b/examples/wireless/wifi-clear-channel-cmu.cc @@ -64,7 +64,7 @@ class Experiment private: /** * Receive a packet. - * \param socket The recieving socket. + * \param socket The receiving socket. */ void ReceivePacket(Ptr socket); /** diff --git a/examples/wireless/wifi-hidden-terminal.cc b/examples/wireless/wifi-hidden-terminal.cc index fe4b80c24..6adfa9249 100644 --- a/examples/wireless/wifi-hidden-terminal.cc +++ b/examples/wireless/wifi-hidden-terminal.cc @@ -49,7 +49,7 @@ using namespace ns3; /** * Run single 10 seconds experiment * - * \param enableCtsRts if true, enable RTS/CTS for packets larget than 100 bytes. + * \param enableCtsRts if true, enable RTS/CTS for packets larger than 100 bytes. * \param wifiManager WiFi manager to use. */ void diff --git a/examples/wireless/wifi-spatial-reuse.cc b/examples/wireless/wifi-spatial-reuse.cc index 9bd4ad4a5..26aa40654 100644 --- a/examples/wireless/wifi-spatial-reuse.cc +++ b/examples/wireless/wifi-spatial-reuse.cc @@ -32,7 +32,7 @@ // STA1 and AP1 are in one BSS (with color set to 1), while STA2 and AP2 are in // another BSS (with color set to 2). The distances are configurable (d1 through d3). // -// STA1 is continously transmitting data to AP1, while STA2 is continuously sending data to AP2. +// STA1 is continuously transmitting data to AP1, while STA2 is continuously sending data to AP2. // Each STA has configurable traffic loads (inter packet interval and packet size). // It is also possible to configure TX power per node as well as their CCA-ED tresholds. // OBSS_PD spatial reuse feature can be enabled (default) or disabled, and the OBSS_PD diff --git a/examples/wireless/wifi-spectrum-per-example.cc b/examples/wireless/wifi-spectrum-per-example.cc index aed4d655f..15f8d1a29 100644 --- a/examples/wireless/wifi-spectrum-per-example.cc +++ b/examples/wireless/wifi-spectrum-per-example.cc @@ -102,7 +102,7 @@ uint32_t g_samples; //!< Number of samples * Monitor sniffer Rx trace * * \param packet The sensed packet. - * \param channelFreqMhz The channel frequancy [MHz]. + * \param channelFreqMhz The channel frequency [MHz]. * \param txVector The Tx vector. * \param aMpdu The aMPDU. * \param signalNoise The signal and noise dBm. diff --git a/examples/wireless/wifi-spectrum-per-interference.cc b/examples/wireless/wifi-spectrum-per-interference.cc index 0964f3fec..61f21dc67 100644 --- a/examples/wireless/wifi-spectrum-per-interference.cc +++ b/examples/wireless/wifi-spectrum-per-interference.cc @@ -108,7 +108,7 @@ uint32_t g_samples; //!< Number of samples * Monitor sniffer Rx trace * * \param packet The sensed packet. - * \param channelFreqMhz The channel frequancy [MHz]. + * \param channelFreqMhz The channel frequency [MHz]. * \param txVector The Tx vector. * \param aMpdu The aMPDU. * \param signalNoise The signal and noise dBm. diff --git a/src/antenna/test/test-cosine-antenna.cc b/src/antenna/test/test-cosine-antenna.cc index 7a14d330c..feabf24b4 100644 --- a/src/antenna/test/test-cosine-antenna.cc +++ b/src/antenna/test/test-cosine-antenna.cc @@ -66,7 +66,7 @@ class CosineAntennaModelTestCase : public TestCase * \param b Horizontal and Vertical Beamwidth * \param o Orientation * \param g MaxGain - * \param expectedGainDb Expeted antenna gain + * \param expectedGainDb Expected antenna gain * \param cond Test condition */ CosineAntennaModelTestCase(Angles a, diff --git a/src/antenna/test/test-degrees-radians.cc b/src/antenna/test/test-degrees-radians.cc index f693698cf..083d0c691 100644 --- a/src/antenna/test/test-degrees-radians.cc +++ b/src/antenna/test/test-degrees-radians.cc @@ -129,7 +129,7 @@ RadiansToDegreesTestCase::DoRun() /** * \ingroup tests * - * \brief TestSuite: degree to radians (and viceversa) conversions + * \brief TestSuite: degree to radians (and vice-versa) conversions */ class DegreesRadiansTestSuite : public TestSuite { diff --git a/src/antenna/test/test-isotropic-antenna.cc b/src/antenna/test/test-isotropic-antenna.cc index 28c04e5be..5dd45198a 100644 --- a/src/antenna/test/test-isotropic-antenna.cc +++ b/src/antenna/test/test-isotropic-antenna.cc @@ -45,7 +45,7 @@ class IsotropicAntennaModelTestCase : public TestCase /** * Constructor * \param a Antenna angle - * \param expectedGainDb Expeted antenna gain + * \param expectedGainDb Expected antenna gain */ IsotropicAntennaModelTestCase(Angles a, double expectedGainDb); diff --git a/src/antenna/test/test-parabolic-antenna.cc b/src/antenna/test/test-parabolic-antenna.cc index 431345c86..eddf0de61 100644 --- a/src/antenna/test/test-parabolic-antenna.cc +++ b/src/antenna/test/test-parabolic-antenna.cc @@ -66,7 +66,7 @@ class ParabolicAntennaModelTestCase : public TestCase * \param b Beamwidth * \param o Orientation * \param g MaxGain - * \param expectedGainDb Expeted antenna gain + * \param expectedGainDb Expected antenna gain * \param cond Test condition */ ParabolicAntennaModelTestCase(Angles a, diff --git a/src/applications/test/bulk-send-application-test-suite.cc b/src/applications/test/bulk-send-application-test-suite.cc index bf344bb57..769742a73 100644 --- a/src/applications/test/bulk-send-application-test-suite.cc +++ b/src/applications/test/bulk-send-application-test-suite.cc @@ -173,8 +173,8 @@ class BulkSendSeqTsSizeTestCase : public TestCase uint64_t m_received{0}; //!< number of bytes received uint64_t m_seqTxCounter{0}; //!< Counter for Sequences on Tx uint64_t m_seqRxCounter{0}; //!< Counter for Sequences on Rx - Time m_lastTxTs{Seconds(0)}; //!< Last recored timestamp on Tx - Time m_lastRxTs{Seconds(0)}; //!< Last recored timestamp on Rx + Time m_lastTxTs{Seconds(0)}; //!< Last recorded timestamp on Tx + Time m_lastRxTs{Seconds(0)}; //!< Last recorded timestamp on Rx }; BulkSendSeqTsSizeTestCase::BulkSendSeqTsSizeTestCase() diff --git a/src/applications/test/udp-client-server-test.cc b/src/applications/test/udp-client-server-test.cc index b4b7a167a..33509284a 100644 --- a/src/applications/test/udp-client-server-test.cc +++ b/src/applications/test/udp-client-server-test.cc @@ -330,13 +330,13 @@ UdpEchoClientSetFillTestCase::DoRun() ApplicationContainer clientApps = echoClient.Install(nodes.Get(0)); - uint8_t arry[64]; + uint8_t array[64]; uint8_t i; for (i = 0; i < 64; i++) { - arry[i] = i; + array[i] = i; } - echoClient.SetFill(clientApps.Get(0), &(arry[0]), (uint32_t)64, (uint32_t)64); + echoClient.SetFill(clientApps.Get(0), &(array[0]), (uint32_t)64, (uint32_t)64); clientApps.Start(Seconds(2.0)); clientApps.Stop(Seconds(10.0)); diff --git a/src/brite/examples/conf_files/ASBarabasi.conf b/src/brite/examples/conf_files/ASBarabasi.conf index 34aed1c23..b8530b97a 100644 --- a/src/brite/examples/conf_files/ASBarabasi.conf +++ b/src/brite/examples/conf_files/ASBarabasi.conf @@ -15,7 +15,7 @@ BeginModel EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/ASWaxman.conf b/src/brite/examples/conf_files/ASWaxman.conf index e128c977a..35d56e6ff 100644 --- a/src/brite/examples/conf_files/ASWaxman.conf +++ b/src/brite/examples/conf_files/ASWaxman.conf @@ -17,7 +17,7 @@ BeginModel BWMax = 1024.0 EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTBarabasi.conf b/src/brite/examples/conf_files/RTBarabasi.conf index af374d851..d88730c20 100644 --- a/src/brite/examples/conf_files/RTBarabasi.conf +++ b/src/brite/examples/conf_files/RTBarabasi.conf @@ -16,7 +16,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTBarabasi10.conf b/src/brite/examples/conf_files/RTBarabasi10.conf index 3c780ad69..c6fe1d49d 100644 --- a/src/brite/examples/conf_files/RTBarabasi10.conf +++ b/src/brite/examples/conf_files/RTBarabasi10.conf @@ -16,7 +16,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTBarabasi20.conf b/src/brite/examples/conf_files/RTBarabasi20.conf index 4b8fe7d76..12ea5a8d3 100644 --- a/src/brite/examples/conf_files/RTBarabasi20.conf +++ b/src/brite/examples/conf_files/RTBarabasi20.conf @@ -16,7 +16,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 1 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTBarabasi5.conf b/src/brite/examples/conf_files/RTBarabasi5.conf index 94c7b4de4..12e01a789 100644 --- a/src/brite/examples/conf_files/RTBarabasi5.conf +++ b/src/brite/examples/conf_files/RTBarabasi5.conf @@ -16,7 +16,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTWaxman.conf b/src/brite/examples/conf_files/RTWaxman.conf index fa669b7f1..d96b3a9ba 100644 --- a/src/brite/examples/conf_files/RTWaxman.conf +++ b/src/brite/examples/conf_files/RTWaxman.conf @@ -19,7 +19,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 1 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTWaxman10.conf b/src/brite/examples/conf_files/RTWaxman10.conf index dcbab8cbc..ea088fdc0 100644 --- a/src/brite/examples/conf_files/RTWaxman10.conf +++ b/src/brite/examples/conf_files/RTWaxman10.conf @@ -19,7 +19,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTWaxman20.conf b/src/brite/examples/conf_files/RTWaxman20.conf index 2203edd2e..c79ac5604 100644 --- a/src/brite/examples/conf_files/RTWaxman20.conf +++ b/src/brite/examples/conf_files/RTWaxman20.conf @@ -19,7 +19,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/RTWaxman5.conf b/src/brite/examples/conf_files/RTWaxman5.conf index 52bdc850c..e4b46c762 100644 --- a/src/brite/examples/conf_files/RTWaxman5.conf +++ b/src/brite/examples/conf_files/RTWaxman5.conf @@ -19,7 +19,7 @@ EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/brite/examples/conf_files/TD_ASBarabasi_RTWaxman.conf b/src/brite/examples/conf_files/TD_ASBarabasi_RTWaxman.conf index 40424104a..b143fc013 100644 --- a/src/brite/examples/conf_files/TD_ASBarabasi_RTWaxman.conf +++ b/src/brite/examples/conf_files/TD_ASBarabasi_RTWaxman.conf @@ -43,7 +43,7 @@ BeginModel BWMax = -1.0 EndModel -BeginOutput #**Atleast one of these options should have value 1** +BeginOutput #**At least one of these options should have value 1** BRITE = 1 #0 = Do not save as BRITE, 1 = save as BRITE. OTTER = 0 #0 = Do not visualize with Otter, 1 = Visualize EndOutput diff --git a/src/buildings/doc/source/buildings-design.rst b/src/buildings/doc/source/buildings-design.rst index 46e9b341b..acc410ed9 100644 --- a/src/buildings/doc/source/buildings-design.rst +++ b/src/buildings/doc/source/buildings-design.rst @@ -151,8 +151,8 @@ The shadowing is modeled according to a log-normal distribution with variable st The model considers that the mean of the shadowing loss in dB is always 0. For the variance, the model considers three possible values of standard deviation, in detail: - * outdoor (``m_shadowingSigmaOutdoor``, defaul value of 7 dB) :math:`\rightarrow X_\mathrm{O} \sim N(\mu_\mathrm{O}, \sigma_\mathrm{O}^2)`. - * indoor (``m_shadowingSigmaIndoor``, defaul value of 10 dB) :math:`\rightarrow X_\mathrm{I} \sim N(\mu_\mathrm{I}, \sigma_\mathrm{I}^2)`. + * outdoor (``m_shadowingSigmaOutdoor``, default value of 7 dB) :math:`\rightarrow X_\mathrm{O} \sim N(\mu_\mathrm{O}, \sigma_\mathrm{O}^2)`. + * indoor (``m_shadowingSigmaIndoor``, default value of 10 dB) :math:`\rightarrow X_\mathrm{I} \sim N(\mu_\mathrm{I}, \sigma_\mathrm{I}^2)`. * external walls penetration (``m_shadowingSigmaExtWalls``, default value 5 dB) :math:`\rightarrow X_\mathrm{W} \sim N(\mu_\mathrm{W}, \sigma_\mathrm{W}^2)` The simulator generates a shadowing value per each active link according to nodes' position the first time the link is used for transmitting. In case of transmissions from outdoor nodes to indoor ones, and vice-versa, the standard deviation (:math:`\sigma_\mathrm{IO}`) has to be calculated as the square root of the sum of the quadratic values of the standard deviatio in case of outdoor nodes and the one for the external walls penetration. This is due to the fact that that the components producing the shadowing are independent of each other; therefore, the variance of a distribution resulting from the sum of two independent normal ones is the sum of the variances. diff --git a/src/buildings/doc/source/buildings-user.rst b/src/buildings/doc/source/buildings-user.rst index 80c426a93..5ae47dbda 100644 --- a/src/buildings/doc/source/buildings-user.rst +++ b/src/buildings/doc/source/buildings-user.rst @@ -220,9 +220,9 @@ The ``BuildingMobilityLossModel`` parameter configurable with the ns3 attribute The ``BuildingPropagationLossModel`` class has the following configurable parameters configurable with the attribute system: -* ``Frequency``: reference frequency (default 2160 MHz), note that by setting the frequency the wavelength is set accordingly automatically and viceversa). +* ``Frequency``: reference frequency (default 2160 MHz), note that by setting the frequency the wavelength is set accordingly automatically and vice-versa). * ``Lambda``: the wavelength (0.139 meters, considering the above frequency). -* ``ShadowSigmaOutdoor``: the standard deviation of the shadowing for outdoor nodes (defaul 7.0). +* ``ShadowSigmaOutdoor``: the standard deviation of the shadowing for outdoor nodes (default 7.0). * ``ShadowSigmaIndoor``: the standard deviation of the shadowing for indoor nodes (default 8.0). * ``ShadowSigmaExtWalls``: the standard deviation of the shadowing due to external walls penetration for outdoor to indoor communications (default 5.0). * ``RooftopLevel``: the level of the rooftop of the building in meters (default 20 meters). diff --git a/src/buildings/examples/outdoor-group-mobility-example.cc b/src/buildings/examples/outdoor-group-mobility-example.cc index c350ad0d5..6f59bca76 100644 --- a/src/buildings/examples/outdoor-group-mobility-example.cc +++ b/src/buildings/examples/outdoor-group-mobility-example.cc @@ -98,7 +98,7 @@ PrintPosition(Ptr node) /** * Print the buildings list in a format that can be used by Gnuplot to draw them. * - * \param filename The ouput filename. + * \param filename The output filename. */ void PrintGnuplottableBuildingListToFile(std::string filename) diff --git a/src/buildings/examples/outdoor-random-walk-example.cc b/src/buildings/examples/outdoor-random-walk-example.cc index b398e2e84..7ba4a3ade 100644 --- a/src/buildings/examples/outdoor-random-walk-example.cc +++ b/src/buildings/examples/outdoor-random-walk-example.cc @@ -31,7 +31,7 @@ NS_LOG_COMPONENT_DEFINE("OutdoorRandomWalkExample"); /** * Print the buildings list in a format that can be used by Gnuplot to draw them. * - * \param filename The ouput filename. + * \param filename The output filename. */ void PrintGnuplottableBuildingListToFile(std::string filename) diff --git a/src/buildings/helper/building-container.h b/src/buildings/helper/building-container.h index 7f48048f8..0f2f6fbd2 100644 --- a/src/buildings/helper/building-container.h +++ b/src/buildings/helper/building-container.h @@ -137,7 +137,7 @@ class BuildingContainer * Buildings can be retrieved from the container in two ways. First, * directly by an index into the container, and second, using an iterator. * This method is used in the direct method and is used to retrieve the - * indexed Ptr. + * indexed Ptr. * * \code * uint32_t nBuildings = container.GetN (); diff --git a/src/buildings/helper/building-position-allocator.h b/src/buildings/helper/building-position-allocator.h index 404ff22cb..35d861f08 100644 --- a/src/buildings/helper/building-position-allocator.h +++ b/src/buildings/helper/building-position-allocator.h @@ -162,7 +162,7 @@ class RandomRoomPositionAllocator : public PositionAllocator private: /** - * Room informations + * Room information */ struct RoomInfo { diff --git a/src/buildings/model/building-list.cc b/src/buildings/model/building-list.cc index 9f533e83d..9bf0c3826 100644 --- a/src/buildings/model/building-list.cc +++ b/src/buildings/model/building-list.cc @@ -55,13 +55,13 @@ class BuildingListPriv : public Object */ uint32_t Add(Ptr building); /** - * Returns an interator to the start of the list. + * Returns an iterator to the start of the list. * * \returns iterator to the begin of the container. */ BuildingList::Iterator Begin() const; /** - * Returns an interator to the end of the list. + * Returns an iterator to the end of the list. * * \returns iterator to the end of the container. */ diff --git a/src/buildings/model/buildings-channel-condition-model.cc b/src/buildings/model/buildings-channel-condition-model.cc index bed68dc72..5e89c598b 100644 --- a/src/buildings/model/buildings-channel-condition-model.cc +++ b/src/buildings/model/buildings-channel-condition-model.cc @@ -105,7 +105,7 @@ BuildingsChannelConditionModel::GetChannelCondition(Ptr a, { cond->SetO2iCondition(ChannelCondition::O2iConditionValue::O2I); - NS_LOG_DEBUG("a is indoor and b outdoor or viceversa"); + NS_LOG_DEBUG("a is indoor and b outdoor or vice-versa"); cond->SetLosCondition(ChannelCondition::LosConditionValue::NLOS); } diff --git a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc index 9509acd3e..9b07995fa 100644 --- a/src/buildings/model/hybrid-buildings-propagation-loss-model.cc +++ b/src/buildings/model/hybrid-buildings-propagation-loss-model.cc @@ -174,7 +174,7 @@ HybridBuildingsPropagationLossModel::GetLoss(Ptr a, Ptr Okumura Hata + // Over the rooftop transmission -> Okumura Hata loss = OkumuraHata(a, b); NS_LOG_INFO(this << " O-O (>1000): above rooftop -> OH : " << loss); } diff --git a/src/buildings/test/buildings-channel-condition-model-test.cc b/src/buildings/test/buildings-channel-condition-model-test.cc index eece8b674..d5a4aea2d 100644 --- a/src/buildings/test/buildings-channel-condition-model-test.cc +++ b/src/buildings/test/buildings-channel-condition-model-test.cc @@ -66,7 +66,7 @@ class BuildingsChannelConditionModelTestCase : public TestCase ChannelCondition::LosConditionValue m_losCond; //!< the correct channel condition }; - TestVectors m_testVectors; //!< array containg all the test vectors + TestVectors m_testVectors; //!< array containing all the test vectors }; BuildingsChannelConditionModelTestCase::BuildingsChannelConditionModelTestCase() diff --git a/src/buildings/test/buildings-pathloss-test.h b/src/buildings/test/buildings-pathloss-test.h index 7cbf3c3c2..7700d0c16 100644 --- a/src/buildings/test/buildings-pathloss-test.h +++ b/src/buildings/test/buildings-pathloss-test.h @@ -55,7 +55,7 @@ class BuildingsPathlossTestCase : public TestCase * \param freq Communication frequency * \param m1 First MobilityModel Index * \param m2 Second MobilityModel Index - * \param env Enviroment type + * \param env Environment type * \param city City size * \param refValue Theoretical loss * \param name Test name @@ -81,7 +81,7 @@ class BuildingsPathlossTestCase : public TestCase double m_freq; //!< Communication frequency uint16_t m_mobilityModelIndex1; //!< First MobilityModel Index uint16_t m_mobilityModelIndex2; //!< Second MobilityModel Index - EnvironmentType m_env; //!< Enviroment type + EnvironmentType m_env; //!< Environment type CitySize m_city; //!< City size double m_lossRef; //!< Theoretical loss }; diff --git a/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc b/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc index b7e15b635..bd3e041c5 100644 --- a/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc +++ b/src/buildings/test/three-gpp-v2v-channel-condition-model-test.cc @@ -76,7 +76,7 @@ class ThreeGppV2vBuildingsChCondModelTestCase : public TestCase TypeId m_typeId; //!< the type ID of the channel condition model to be used }; - TestVectors m_testVectors; //!< array containg all the test vectors + TestVectors m_testVectors; //!< array containing all the test vectors }; ThreeGppV2vBuildingsChCondModelTestCase::ThreeGppV2vBuildingsChCondModelTestCase() diff --git a/src/core/doc/environment-variables.h b/src/core/doc/environment-variables.h index 3427fa1f1..b23fc53dd 100644 --- a/src/core/doc/environment-variables.h +++ b/src/core/doc/environment-variables.h @@ -72,7 +72,7 @@ const char* NS_ATTRIBUTE_DEFAULT = "name=value[;...]"; * message, used when building documentation. * * This is used primarily by the documentation builds, which execute each - * registered example to gather their ns3::CommmandLine::Usage information. + * registered example to gather their ns3::CommandLine::Usage information. * This wouldn't normally be useful to users. * *
diff --git a/src/core/model/attribute-container.h b/src/core/model/attribute-container.h index 08ffdccfc..88bc31ebc 100644 --- a/src/core/model/attribute-container.h +++ b/src/core/model/attribute-container.h @@ -228,7 +228,7 @@ template class C = std::list> Ptr MakeAttributeContainerChecker(Ptr itemchecker); /** - * Make unitialized AttributeContainerChecker using explicit types. + * Make uninitialized AttributeContainerChecker using explicit types. * @tparam A AttributeValue type in container. * @tparam C Container type returned by Get. * \return AttributeContainerChecker. diff --git a/src/core/model/calendar-scheduler.h b/src/core/model/calendar-scheduler.h index ceb997423..73c0822fd 100644 --- a/src/core/model/calendar-scheduler.h +++ b/src/core/model/calendar-scheduler.h @@ -55,7 +55,7 @@ class EventImpl; * `(ts / m_width) % m_nBuckets`. This class automatically adjusts * the number of buckets to keep the average occupancy around 2. * Buckets themselves are implemented as a `std::list<>`, and events are - * kept sorted withing the buckets. + * kept sorted within the buckets. * * \par Time Complexity * diff --git a/src/core/model/config.cc b/src/core/model/config.cc index 77cbd5847..566984ad5 100644 --- a/src/core/model/config.cc +++ b/src/core/model/config.cc @@ -129,7 +129,7 @@ MatchContainer::Connect(std::string name, const CallbackBase& cb) { if (!ConnectFailSafe(name, cb)) { - NS_FATAL_ERROR("Cound not connect callback to " << name); + NS_FATAL_ERROR("Could not connect callback to " << name); } } diff --git a/src/core/model/environment-variable.cc b/src/core/model/environment-variable.cc index 84e74589f..fa71a3a6d 100644 --- a/src/core/model/environment-variable.cc +++ b/src/core/model/environment-variable.cc @@ -100,7 +100,7 @@ namespace ns3 * \ingroup core-environ * * \def NS_LOCAL_LOG(msg) - * File-local loggging macro for environment-variable.cc + * File-local logging macro for environment-variable.cc * Our usual Logging doesn't work here because these functions * get called during static initialization of Logging itself. * \param msg The message stream to log diff --git a/src/core/model/global-value.cc b/src/core/model/global-value.cc index 4db14277b..aad86274a 100644 --- a/src/core/model/global-value.cc +++ b/src/core/model/global-value.cc @@ -149,7 +149,7 @@ GlobalValue::Bind(std::string name, const AttributeValue& value) return; } } - NS_FATAL_ERROR("Non-existant global value: " << name); + NS_FATAL_ERROR("Non-existent global value: " << name); } bool diff --git a/src/core/model/length.h b/src/core/model/length.h index 89df5bea1..9f33774ec 100644 --- a/src/core/model/length.h +++ b/src/core/model/length.h @@ -134,7 +134,7 @@ namespace ns3 * Length::Unit * * \code - * //These two contructors are equivalent + * //These two constructors are equivalent * Length l1 (1, "cm"); * Length l2 (1, Length::Unit::Centimeter); * \endcode @@ -146,7 +146,7 @@ namespace ns3 * from boost::unit quantities. * * \code - * //construct length from a boost::units quantitiy + * //construct length from a boost::units quantity * boost::units::quantity q * = 5 * boost::units::si::meter; * Length meters (q); @@ -445,7 +445,7 @@ class Length * Initialize an object with the value from \p other. * * After the move completes, \p other is left in an undefined but - * useable state. + * usable state. * * \param other Length object to move */ diff --git a/src/core/model/nstime.h b/src/core/model/nstime.h index 4af3c5f82..f0282d4d9 100644 --- a/src/core/model/nstime.h +++ b/src/core/model/nstime.h @@ -1058,7 +1058,7 @@ operator*(T lhs, const Time& rhs) * Exact division, returning a dimensionless fixed point number. * * This can be truncated to integer, or converted to double - * (with loss of precison). Assuming `ta` and `tb` are Times: + * (with loss of precision). Assuming `ta` and `tb` are Times: * * \code * int64x64_t ratio = ta / tb; diff --git a/src/core/model/object-base.h b/src/core/model/object-base.h index 71785a1af..66aa4be1c 100644 --- a/src/core/model/object-base.h +++ b/src/core/model/object-base.h @@ -238,7 +238,7 @@ class ObjectBase */ void GetAttribute(std::string name, AttributeValue& value) const; /** - * Get the value of an attribute without raising erros. + * Get the value of an attribute without raising errors. * * If the attribute could not be read this will return \c false, * but not raise any errors. diff --git a/src/core/model/random-variable-stream.cc b/src/core/model/random-variable-stream.cc index cb132fa4d..5d1d30dce 100644 --- a/src/core/model/random-variable-stream.cc +++ b/src/core/model/random-variable-stream.cc @@ -355,7 +355,7 @@ SequentialRandomVariable::GetValue() NS_LOG_FUNCTION(this); if (!m_isCurrentSet) { - // Start the sequence at its minimium value. + // Start the sequence at its minimum value. m_current = m_min; m_isCurrentSet = true; } diff --git a/src/core/model/random-variable-stream.h b/src/core/model/random-variable-stream.h index a14a15c22..6feb07648 100644 --- a/src/core/model/random-variable-stream.h +++ b/src/core/model/random-variable-stream.h @@ -354,7 +354,7 @@ class ConstantRandomVariable : public RandomVariableStream * This RNG has four configuration attributes: * * - An increment, \c Increment. - * - A consecutive repeat numer, \c Consecutive. + * - A consecutive repeat number, \c Consecutive. * - The minimum value, \c Min. * - The maximum value, \c Max. * diff --git a/src/core/model/realtime-simulator-impl.cc b/src/core/model/realtime-simulator-impl.cc index ce1740c0a..6ca7ed893 100644 --- a/src/core/model/realtime-simulator-impl.cc +++ b/src/core/model/realtime-simulator-impl.cc @@ -266,7 +266,7 @@ RealtimeSimulatorImpl::ProcessOneEvent() // // It's easiest to understand if you just consider a short tsDelay that only // requires a SpinWait down in the synchronizer. What will happen is that - // whan Synchronize calls SpinWait, SpinWait will look directly at its + // when Synchronize calls SpinWait, SpinWait will look directly at its // condition variable. Note that we set this condition variable to false // inside the critical section above. // diff --git a/src/core/model/test.cc b/src/core/model/test.cc index caeada38c..688e2c8b6 100644 --- a/src/core/model/test.cc +++ b/src/core/model/test.cc @@ -217,7 +217,7 @@ class TestRunnerImpl : public Singleton * * \param [in] begin Iterator to the first TestCase to print. * \param [in] end Iterator to the end of the list. - * \param [in] printTestType Preprend the test type label if \c true. + * \param [in] printTestType Prepend the test type label if \c true. */ void PrintTestNameList(std::list::const_iterator begin, std::list::const_iterator end, diff --git a/src/core/model/valgrind.h b/src/core/model/valgrind.h index 466f61feb..65c66c899 100644 --- a/src/core/model/valgrind.h +++ b/src/core/model/valgrind.h @@ -974,7 +974,7 @@ typedef /* Use these to write the name of your wrapper. NOTE: duplicates VG_WRAP_FUNCTION_Z{U,Z} in pub_tool_redir.h. NOTE also: inserts - the default behaviour equivalance class tag "0000" into the name. + the default behaviour equivalence class tag "0000" into the name. See pub_tool_redir.h for details -- normally you don't need to think about this, though. */ diff --git a/src/core/test/callback-test-suite.cc b/src/core/test/callback-test-suite.cc index ef76e4469..f278c956b 100644 --- a/src/core/test/callback-test-suite.cc +++ b/src/core/test/callback-test-suite.cc @@ -97,7 +97,7 @@ class BasicCallbackTestCase : public TestCase }; /** - * Variable to verify that a calback has been called. + * Variable to verify that a callback has been called. * @{ */ static bool gBasicCallbackTest5; @@ -138,7 +138,7 @@ BasicCallbackTarget7(int a) } BasicCallbackTestCase::BasicCallbackTestCase() - : TestCase("Check basic Callback mechansim") + : TestCase("Check basic Callback mechanism") { } @@ -294,7 +294,7 @@ class MakeCallbackTestCase : public TestCase }; /** - * Variable to verify that a calback has been called. + * Variable to verify that a callback has been called. * @{ */ static bool gMakeCallbackTest5; @@ -449,7 +449,7 @@ class MakeBoundCallbackTestCase : public TestCase }; /** - * Variable to verify that a calback has been called. + * Variable to verify that a callback has been called. * @{ */ static int gMakeBoundCallbackTest1; diff --git a/src/core/test/int64x64-test-suite.cc b/src/core/test/int64x64-test-suite.cc index 0822f8d65..b3374563e 100644 --- a/src/core/test/int64x64-test-suite.cc +++ b/src/core/test/int64x64-test-suite.cc @@ -212,7 +212,7 @@ class Int64x64IntRoundTestCase : public TestCase * Check the int64x64 value for correctness. * \param value The int64x64_t value. * \param expectInt The expected integer value. - * \param expectRnd TThe expected rounding value. + * \param expectRnd The expected rounding value. */ void Check(const int64x64_t value, const int64_t expectInt, const int64_t expectRnd); }; @@ -866,7 +866,7 @@ class Int64x64CompareTestCase : public TestCase * Check the int64x64 for correctness. * \param result The actual value. * \param expect The expected value. - * \param msg The error mesage to print. + * \param msg The error message to print. */ void Check(const bool result, const bool expect, const std::string& msg); }; @@ -986,7 +986,7 @@ class Int64x64InvertTestCase : public TestCase * \param factor The factor used to invert the number. * \param result The value. * \param expect The expected value. - * \param msg The error mesage to print. + * \param msg The error message to print. * \param tolerance The allowed tolerance. */ void CheckCase(const uint64_t factor, diff --git a/src/core/test/random-variable-stream-test-suite.cc b/src/core/test/random-variable-stream-test-suite.cc index ad88bded5..610ea0d26 100644 --- a/src/core/test/random-variable-stream-test-suite.cc +++ b/src/core/test/random-variable-stream-test-suite.cc @@ -1835,7 +1835,7 @@ ErlangTestCase::ChiSquaredTest(Ptr rng) const double lambda = 1.0; // Note that Erlang distribution is equal to the gamma distribution - // when k is an iteger, which is why the gamma distribution's cdf + // when k is an integer, which is why the gamma distribution's cdf // function can be used here. for (std::size_t i = 0; i < N_BINS; ++i) { @@ -1930,7 +1930,7 @@ ErlangAntitheticTestCase::ChiSquaredTest(Ptr rng) const double lambda = 1.0; // Note that Erlang distribution is equal to the gamma distribution - // when k is an iteger, which is why the gamma distribution's cdf + // when k is an integer, which is why the gamma distribution's cdf // function can be used here. for (std::size_t i = 0; i < N_BINS; ++i) { diff --git a/src/core/test/simulator-test-suite.cc b/src/core/test/simulator-test-suite.cc index 76515dde2..e0824ea6b 100644 --- a/src/core/test/simulator-test-suite.cc +++ b/src/core/test/simulator-test-suite.cc @@ -73,7 +73,7 @@ class SimulatorEventsTestCase : public TestCase */ uint64_t NowUs(); /** - * Checks that the events has been detroyed. + * Checks that the events has been destroyed. */ void Destroy(); /** diff --git a/src/core/test/time-test-suite.cc b/src/core/test/time-test-suite.cc index 211e5b7fa..1b522a3c2 100644 --- a/src/core/test/time-test-suite.cc +++ b/src/core/test/time-test-suite.cc @@ -94,7 +94,7 @@ class TimeSimpleTestCase : public TestCase * \tparam T type of division value * * \param t Time value to divide - * \param expected Expected result of the divsion + * \param expected Expected result of the division * \param val Value to divide by * \param msg Error message to print if test fails */ @@ -152,7 +152,7 @@ TimeSimpleTestCase::DoTimeOperations() t1 = Time(101LL * oneSec); NS_TEST_ASSERT_MSG_EQ((t2 % t1).GetSeconds(), 81, "Remainder Operation (2000 % 101 = 81)"); - NS_TEST_ASSERT_MSG_EQ(Div(t2, t1), 19, "Modular Divison"); + NS_TEST_ASSERT_MSG_EQ(Div(t2, t1), 19, "Modular Division"); NS_TEST_ASSERT_MSG_EQ(Rem(t2, t1).GetSeconds(), 81, "Remainder Operation (2000 % 101 = 81)"); } diff --git a/src/csma-layout/examples/csma-star.cc b/src/csma-layout/examples/csma-star.cc index ec55b9484..859cd8ea2 100644 --- a/src/csma-layout/examples/csma-star.cc +++ b/src/csma-layout/examples/csma-star.cc @@ -116,7 +116,7 @@ main(int argc, char* argv[]) // assign addresses to them as well. We put all of the fill devices into // a single device container, so the first nFill devices are associated // with the channel connected to spokeDevices.Get (0), the second nFill - // devices afe associated with the channel connected to spokeDevices.Get (1) + // devices are associated with the channel connected to spokeDevices.Get (1) // etc. // Ipv4AddressHelper address; diff --git a/src/csma/examples/csma-packet-socket.cc b/src/csma/examples/csma-packet-socket.cc index f94414f90..79cfd927d 100644 --- a/src/csma/examples/csma-packet-socket.cc +++ b/src/csma/examples/csma-packet-socket.cc @@ -40,7 +40,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("CsmaPacketSocketExample"); -/// Ouput stream. +/// Output stream. std::ofstream g_os; /** diff --git a/src/csma/model/backoff.h b/src/csma/model/backoff.h index bcd190a92..40ec8e15a 100644 --- a/src/csma/model/backoff.h +++ b/src/csma/model/backoff.h @@ -116,7 +116,7 @@ class Backoff private: /** - * Number of times that the transmitter has tried to unsuccessfully transmit the current packet. + * Number of times that the transmitter has tried to unsuccessfuly transmit the current packet. */ uint32_t m_numBackoffRetries; diff --git a/src/csma/model/csma-net-device.cc b/src/csma/model/csma-net-device.cc index 6d767d010..33d555e15 100644 --- a/src/csma/model/csma-net-device.cc +++ b/src/csma/model/csma-net-device.cc @@ -368,7 +368,7 @@ CsmaNetDevice::AddHeader(Ptr p, // // All Ethernet frames must carry a minimum payload of 46 bytes. The - // LLC SNAP header counts as part of this payload. We need to padd out + // LLC SNAP header counts as part of this payload. We need to pad out // if we don't have enough bytes. These must be real bytes since they // will be written to pcap files and compared in regression trace files. // diff --git a/src/dsdv/model/dsdv-packet-queue.cc b/src/dsdv/model/dsdv-packet-queue.cc index 9cab56e9c..40c447a14 100644 --- a/src/dsdv/model/dsdv-packet-queue.cc +++ b/src/dsdv/model/dsdv-packet-queue.cc @@ -53,7 +53,7 @@ PacketQueue::GetSize() bool PacketQueue::Enqueue(QueueEntry& entry) { - NS_LOG_FUNCTION("Enqueing packet destined for" << entry.GetIpv4Header().GetDestination()); + NS_LOG_FUNCTION("Enqueuing packet destined for" << entry.GetIpv4Header().GetDestination()); Purge(); uint32_t numPacketswithdst; for (std::vector::const_iterator i = m_queue.begin(); i != m_queue.end(); ++i) @@ -74,7 +74,7 @@ PacketQueue::Enqueue(QueueEntry& entry) } else { - // NS_LOG_DEBUG("Packet size while enqueing "<GetSize()); + // NS_LOG_DEBUG("Packet size while enqueuing "<GetSize()); entry.SetExpireTime(m_queueTimeout); m_queue.push_back(entry); return true; diff --git a/src/dsdv/model/dsdv-routing-protocol.h b/src/dsdv/model/dsdv-routing-protocol.h index 2c7495041..e8b285210 100644 --- a/src/dsdv/model/dsdv-routing-protocol.h +++ b/src/dsdv/model/dsdv-routing-protocol.h @@ -179,7 +179,7 @@ class RoutingProtocol : public Ipv4RoutingProtocol bool EnableBuffering; /// Flag that is used to enable or disable Weighted Settling Time bool EnableWST; - /// This is the wighted factor to determine the weighted settling time + /// This is the weighted factor to determine the weighted settling time double m_weightedFactor; /// This is a flag to enable route aggregation. Route aggregation will aggregate all routes for /// 'RouteAggregationTime' from the time an update is received by a node and sends them as a diff --git a/src/dsr/model/dsr-option-header.cc b/src/dsr/model/dsr-option-header.cc index 3dd9905f7..f12d092ac 100644 --- a/src/dsr/model/dsr-option-header.cc +++ b/src/dsr/model/dsr-option-header.cc @@ -1085,15 +1085,15 @@ DsrOptionRerrUnsupportHeader::GetErrorDst() const } void -DsrOptionRerrUnsupportHeader::SetUnsupported(uint16_t unsupport) +DsrOptionRerrUnsupportHeader::SetUnsupported(uint16_t unsupported) { - m_unsupport = unsupport; + m_unsupported = unsupported; } uint16_t DsrOptionRerrUnsupportHeader::GetUnsupported() const { - return m_unsupport; + return m_unsupported; } void @@ -1102,7 +1102,7 @@ DsrOptionRerrUnsupportHeader::Print(std::ostream& os) const os << "( type = " << (uint32_t)GetType() << " length = " << (uint32_t)GetLength() << " errorType = " << (uint32_t)m_errorType << " salvage = " << (uint32_t)m_salvage << " error source = " << m_errorSrcAddress << " error dst = " << m_errorDstAddress - << " unsupported option = " << m_unsupport << " )"; + << " unsupported option = " << m_unsupported << " )"; } uint32_t @@ -1122,7 +1122,7 @@ DsrOptionRerrUnsupportHeader::Serialize(Buffer::Iterator start) const i.WriteU8(m_salvage); WriteTo(i, m_errorSrcAddress); WriteTo(i, m_errorDstAddress); - i.WriteU16(m_unsupport); + i.WriteU16(m_unsupported); } uint32_t @@ -1136,7 +1136,7 @@ DsrOptionRerrUnsupportHeader::Deserialize(Buffer::Iterator start) m_salvage = i.ReadU8(); ReadFrom(i, m_errorSrcAddress); ReadFrom(i, m_errorDstAddress); - m_unsupport = i.ReadU16(); + m_unsupported = i.ReadU16(); return GetSerializedSize(); } diff --git a/src/dsr/model/dsr-option-header.h b/src/dsr/model/dsr-option-header.h index 24e2adf37..86fe5ad0d 100644 --- a/src/dsr/model/dsr-option-header.h +++ b/src/dsr/model/dsr-option-header.h @@ -1136,7 +1136,7 @@ class DsrOptionRerrUnsupportHeader : public DsrOptionRerrHeader /** * \brief The unsupported option */ - uint16_t m_unsupport; + uint16_t m_unsupported; }; /** diff --git a/src/dsr/model/dsr-rcache.cc b/src/dsr/model/dsr-rcache.cc index d470ca549..d0cc2e1db 100644 --- a/src/dsr/model/dsr-rcache.cc +++ b/src/dsr/model/dsr-rcache.cc @@ -374,7 +374,7 @@ DsrRouteCache::RebuildBestRouteTable(Ipv4Address source) if (s.find(ip) == s.end()) { /* - * \brief The followings are for comparison + * \brief The following are for comparison */ if (j->second <= temp) { @@ -821,7 +821,7 @@ DsrRouteCache::DeleteAllRoutesIncludeLink(Ipv4Address errorSrc, // Purge the link node cache first PurgeLinkNode(); /* - * The followings are for cleaning the broken link in link cache + * The following are for cleaning the broken link in link cache * We basically remove the link between errorSrc and unreachNode */ Link link1(errorSrc, unreachNode); @@ -837,7 +837,7 @@ DsrRouteCache::DeleteAllRoutesIncludeLink(Ipv4Address errorSrc, std::map::iterator i = m_nodeCache.find(errorSrc); if (i == m_nodeCache.end()) { - NS_LOG_LOGIC("Update the node stability unsuccessfully"); + NS_LOG_LOGIC("Update the node stability unsuccessfuly"); } else { @@ -846,7 +846,7 @@ DsrRouteCache::DeleteAllRoutesIncludeLink(Ipv4Address errorSrc, i = m_nodeCache.find(unreachNode); if (i == m_nodeCache.end()) { - NS_LOG_LOGIC("Update the node stability unsuccessfully"); + NS_LOG_LOGIC("Update the node stability unsuccessfuly"); } else { @@ -858,7 +858,7 @@ DsrRouteCache::DeleteAllRoutesIncludeLink(Ipv4Address errorSrc, else { /* - * the followings are for cleaning the broken link in pathcache + * the following are for cleaning the broken link in pathcache * */ Purge(); diff --git a/src/dsr/model/dsr-rreq-table.h b/src/dsr/model/dsr-rreq-table.h index 7ac70d8ff..eade4d39f 100644 --- a/src/dsr/model/dsr-rreq-table.h +++ b/src/dsr/model/dsr-rreq-table.h @@ -199,7 +199,7 @@ class DsrReceivedRreqEntry // \} private: - Ipv4Address m_destination; //!< IPv4 address of the destinaton + Ipv4Address m_destination; //!< IPv4 address of the destination Ipv4Address m_source; //!< IPv4 address of the source uint16_t m_identification; //!< Route request identification Time m_expire; //!< Route request expire time diff --git a/src/fd-net-device/doc/netmap-net-device.rst b/src/fd-net-device/doc/netmap-net-device.rst index f9b1ce077..0c38e573c 100644 --- a/src/fd-net-device/doc/netmap-net-device.rst +++ b/src/fd-net-device/doc/netmap-net-device.rst @@ -26,7 +26,7 @@ can expect that emulation support using Netmap will support higher packets per second than emulation using FdNetDevice with raw sockets (which pass through the Linux networking kernel). -.. [Rizzo2012] Luigi Rizzo, "netmap: A Novel Framework for Fast Packet I/O", Proceedings of 2012 USENIX Annual Techincal Conference, June 2012. +.. [Rizzo2012] Luigi Rizzo, "netmap: A Novel Framework for Fast Packet I/O", Proceedings of 2012 USENIX Annual Technical Conference, June 2012. .. [Imputato2019] Pasquale Imputato, Stefano Avallone, Enhancing the fidelity of network emulation through direct access to device buffers, Journal of Network and Computer Applications, Volume 130, 2019, Pages 63-75, (http://www.sciencedirect.com/science/article/pii/S1084804519300220) diff --git a/src/fd-net-device/examples/fd-emu-onoff.cc b/src/fd-net-device/examples/fd-emu-onoff.cc index 3d3e6b066..8a8cd9056 100644 --- a/src/fd-net-device/examples/fd-emu-onoff.cc +++ b/src/fd-net-device/examples/fd-emu-onoff.cc @@ -218,7 +218,7 @@ main(int argc, char* argv[]) if (emuMode == "dpdk") { DpdkNetDeviceHelper* dpdk = new DpdkNetDeviceHelper(); - // Use e1000 driver library (this is for IGb PMD supproting Intel 1GbE NIC) + // Use e1000 driver library (this is for IGb PMD supporting Intel 1GbE NIC) // NOTE: DPDK supports multiple Poll Mode Drivers (PMDs) and you can use it // based on your NIC. You just need to set pmd library as follows: dpdk->SetPmdLibrary("librte_pmd_e1000.so"); diff --git a/src/fd-net-device/examples/fd-emu-ping.cc b/src/fd-net-device/examples/fd-emu-ping.cc index f2f148b6c..3b9449d1b 100644 --- a/src/fd-net-device/examples/fd-emu-ping.cc +++ b/src/fd-net-device/examples/fd-emu-ping.cc @@ -201,7 +201,7 @@ main(int argc, char* argv[]) if (emuMode == "dpdk") { DpdkNetDeviceHelper* dpdk = new DpdkNetDeviceHelper(); - // Use e1000 driver library (this is for IGb PMD supproting Intel 1GbE NIC) + // Use e1000 driver library (this is for IGb PMD supporting Intel 1GbE NIC) // NOTE: DPDK supports multiple Poll Mode Drivers (PMDs) and you can use it // based on your NIC. You just need to set pmd library as follows: dpdk->SetPmdLibrary("librte_pmd_e1000.so"); @@ -269,7 +269,7 @@ main(int argc, char* argv[]) // of a hassle and since there is no law that says we cannot mix the // helper API with the low level API, let's just use the helper. // - NS_LOG_INFO("Create Ping Appliation"); + NS_LOG_INFO("Create Ping Application"); Ptr app = CreateObject(); app->SetAttribute("Destination", AddressValue(remoteIp)); app->SetAttribute("VerboseMode", EnumValue(Ping::VerboseMode::VERBOSE)); diff --git a/src/fd-net-device/examples/fd-emu-udp-echo.cc b/src/fd-net-device/examples/fd-emu-udp-echo.cc index 5a4cbb38f..0fd6cf7dc 100644 --- a/src/fd-net-device/examples/fd-emu-udp-echo.cc +++ b/src/fd-net-device/examples/fd-emu-udp-echo.cc @@ -40,7 +40,7 @@ // (OUI) 00:00:00 as a base. This vendor code is not assigned to any // organization and so should not conflict with any real hardware. We'll use // the first n of these addresses, where n is the number of nodes, in this -// simualtion. It is up to you to determine that using these MAC addresses is +// simulation. It is up to you to determine that using these MAC addresses is // okay on your network and won't conflict with anything else (including another // simulation using emu devices) on your network. Once you have made this // determination, you need to put the interface you chose into promiscuous mode. diff --git a/src/fd-net-device/examples/fd-tap-ping.cc b/src/fd-net-device/examples/fd-tap-ping.cc index 2dd742fd8..d94a69424 100644 --- a/src/fd-net-device/examples/fd-tap-ping.cc +++ b/src/fd-net-device/examples/fd-tap-ping.cc @@ -201,7 +201,7 @@ main(int argc, char* argv[]) // of a hassle and since there is no law that says we cannot mix the // helper API with the low level API, let's just use the helper. // - NS_LOG_INFO("Create Ping Appliation"); + NS_LOG_INFO("Create Ping Application"); Ptr app = CreateObject(); app->SetAttribute("Destination", AddressValue(remoteIp)); app->SetAttribute("VerboseMode", EnumValue(Ping::VerboseMode::VERBOSE)); diff --git a/src/flow-monitor/model/ipv4-flow-classifier.cc b/src/flow-monitor/model/ipv4-flow-classifier.cc index 54e675566..f1f50183a 100644 --- a/src/flow-monitor/model/ipv4-flow-classifier.cc +++ b/src/flow-monitor/model/ipv4-flow-classifier.cc @@ -124,7 +124,7 @@ Ipv4FlowClassifier::Classify(const Ipv4Header& ipHeader, } // we rely on the fact that for both TCP and UDP the ports are - // carried in the first 4 octects. + // carried in the first 4 octets. // This allows to read the ports even on fragmented packets // not carrying a full TCP or UDP header. diff --git a/src/flow-monitor/model/ipv4-flow-probe.cc b/src/flow-monitor/model/ipv4-flow-probe.cc index 3d4a83a9a..94aacd7f6 100644 --- a/src/flow-monitor/model/ipv4-flow-probe.cc +++ b/src/flow-monitor/model/ipv4-flow-probe.cc @@ -61,7 +61,7 @@ class Ipv4FlowProbeTag : public Tag void Print(std::ostream& os) const override; Ipv4FlowProbeTag(); /** - * \brief Consructor + * \brief Constructor * \param flowId the flow identifier * \param packetId the packet identifier * \param packetSize the packet size diff --git a/src/flow-monitor/model/ipv6-flow-classifier.cc b/src/flow-monitor/model/ipv6-flow-classifier.cc index 6b340bd18..3e61c5ff2 100644 --- a/src/flow-monitor/model/ipv6-flow-classifier.cc +++ b/src/flow-monitor/model/ipv6-flow-classifier.cc @@ -125,7 +125,7 @@ Ipv6FlowClassifier::Classify(const Ipv6Header& ipHeader, } // we rely on the fact that for both TCP and UDP the ports are - // carried in the first 4 octects. + // carried in the first 4 octets. // This allows to read the ports even on fragmented packets // not carrying a full TCP or UDP header. diff --git a/src/flow-monitor/model/ipv6-flow-probe.cc b/src/flow-monitor/model/ipv6-flow-probe.cc index a274f50e2..80f3e63d1 100644 --- a/src/flow-monitor/model/ipv6-flow-probe.cc +++ b/src/flow-monitor/model/ipv6-flow-probe.cc @@ -62,7 +62,7 @@ class Ipv6FlowProbeTag : public Tag void Print(std::ostream& os) const override; Ipv6FlowProbeTag(); /** - * \brief Consructor + * \brief Constructor * \param flowId the flow identifier * \param packetId the packet identifier * \param packetSize the packet size diff --git a/src/internet-apps/doc/internet-apps.rst b/src/internet-apps/doc/internet-apps.rst index 0ba7520da..27fcdf496 100644 --- a/src/internet-apps/doc/internet-apps.rst +++ b/src/internet-apps/doc/internet-apps.rst @@ -154,7 +154,7 @@ be totally silent. The fifth statement is a typical ``Install()`` method that returns an ApplicationContainer (in this case, of size 1). The sixth and seventh statements fetch the application instance created and configure a trace sink (``TracePingRtt``) for the ``Rtt`` trace source. -The eigth and ninth statements configure the start and stop time, +The eighth and ninth statements configure the start and stop time, respectively. The helper is most useful when there are many similarly configured diff --git a/src/internet-apps/model/ping.h b/src/internet-apps/model/ping.h index 36219efc6..8a18b747a 100644 --- a/src/internet-apps/model/ping.h +++ b/src/internet-apps/model/ping.h @@ -176,7 +176,7 @@ class Ping : public Application * \returns the application signature. * * The application signature is the NodeId concatenated with the - * application index inthe node. + * application index in the node. */ uint64_t GetApplicationSignature() const; @@ -245,7 +245,7 @@ class Ping : public Application /** * Constructor. * \param txTimePar Echo request Tx time. - * \param ackedPar True if the Echo request has been acknoledged at leats once. + * \param ackedPar True if the Echo request has been acknowledged at least once. */ EchoRequestData(Time txTimePar, bool ackedPar) : txTime(txTimePar), diff --git a/src/internet-apps/model/v4traceroute.cc b/src/internet-apps/model/v4traceroute.cc index c5fd22084..1bff07cbd 100644 --- a/src/internet-apps/model/v4traceroute.cc +++ b/src/internet-apps/model/v4traceroute.cc @@ -237,7 +237,7 @@ V4TraceRoute::Receive(Ptr socket) uint8_t data[8]; timeoutResp.GetData(data); - // Get the 7th and 8th Octect to obtain the Sequence number from + // Get the 7th and 8th Octet to obtain the Sequence number from // the original packet. uint16_t recvSeq; recvSeq = (uint16_t)data[7] << 0; diff --git a/src/internet-apps/model/v4traceroute.h b/src/internet-apps/model/v4traceroute.h index a2308366f..151fddd92 100644 --- a/src/internet-apps/model/v4traceroute.h +++ b/src/internet-apps/model/v4traceroute.h @@ -118,7 +118,7 @@ class V4TraceRoute : public Application uint16_t m_maxProbes; /// The current TTL value uint16_t m_ttl; - /// The maximium Ttl (Max number of hops to trace) + /// The maximum Ttl (Max number of hops to trace) uint32_t m_maxTtl; /// The wait time until the response is considered lost. Time m_waitIcmpReplyTimeout; diff --git a/src/internet-apps/test/ping-test.cc b/src/internet-apps/test/ping-test.cc index 0ba063086..2114d9000 100644 --- a/src/internet-apps/test/ping-test.cc +++ b/src/internet-apps/test/ping-test.cc @@ -400,7 +400,7 @@ PingTestCase::TxTraceSink(uint16_t seq, Ptr p) { NS_TEST_ASSERT_MSG_EQ(Simulator::Now() - m_lastTx, m_interpacketInterval, - "configured interval did'nt match the observed interval"); + "configured interval didn't match the observed interval"); m_lastTx = Simulator::Now(); } } diff --git a/src/internet/doc/ipv4.rst b/src/internet/doc/ipv4.rst index 1c41af1e4..42a183929 100644 --- a/src/internet/doc/ipv4.rst +++ b/src/internet/doc/ipv4.rst @@ -156,7 +156,7 @@ The "Rx" trace is fired when a packet is passed from the device up to the ns3::Ipv4L3Protocol::Receive function. - In the receive function, the Ipv4InterfaceList is iterated, and if the - Ipv4Interface corresponding to the receiving device is fount to be in the + Ipv4Interface corresponding to the receiving device is found to be in the UP state, the trace is fired. The "Drop" trace is fired in any case where the packet is dropped (in both @@ -239,7 +239,7 @@ NeighborCache ************* NeighborCacheHelper provides a way to generate ARP cache automatically. It -generates needed ARP cache before simulation start to avoid the delay and mesage overhead of +generates needed ARP cache before simulation start to avoid the delay and message overhead of address resolution in simulations that are focused on other performance aspects. The state of entries which are generated by NeighborCacheHelper is ``STATIC_AUTOGENERATED``, which is similar to ``PERMANENT``, but they are not manually added or removed by user, they diff --git a/src/internet/doc/ipv6.rst b/src/internet/doc/ipv6.rst index b83e471ef..609f46d1c 100644 --- a/src/internet/doc/ipv6.rst +++ b/src/internet/doc/ipv6.rst @@ -496,7 +496,7 @@ NeighborCache ************* NeighborCacheHelper provides a way to generate NDISC cache automatically. It generates -needed NDISC cache before simulation start to avoid the delay and mesage overhead of +needed NDISC cache before simulation start to avoid the delay and message overhead of neighbor discovery in simulations that are focused on other performance aspects. The state of entries generate by NeighborCacheHelper is ``STATIC_AUTOGENERATED``, which is similar to ``PERMANENT``, but they are not manually added or removed by user, they diff --git a/src/internet/doc/tcp.rst b/src/internet/doc/tcp.rst index 7fb481dbb..445dea31e 100644 --- a/src/internet/doc/tcp.rst +++ b/src/internet/doc/tcp.rst @@ -1639,7 +1639,7 @@ For SSRB, it is calculated as: .. math:: limit = MAX(prrDelivered - prrOut, DeliveredData) + MSS -where ``DeliveredData`` represets the total number of bytes delivered to the +where ``DeliveredData`` represents the total number of bytes delivered to the receiver as indicated by the current ACK and ``MSS`` is the maximum segment size. After limit calculation, the cWnd is updated as given below: @@ -1678,7 +1678,7 @@ EnterRecovery is called when packet loss is detected and recovery is triggered. While in recovery phase, each time when an ACK arrives, DoRecovery is called which performs the necessary congestion window changes as per the recovery algorithm. ExitRecovery is called just prior to exiting recovery phase in order to perform the -required congestion window ajustments. UpdateBytesSent is used to keep track of +required congestion window adjustments. UpdateBytesSent is used to keep track of bytes sent and is called whenever a data packet is sent during recovery phase. Delivery Rate Estimation @@ -1936,7 +1936,7 @@ the first SYN-ACK has 0 as advertised window size: .... } -Pratically, we are checking that every SYN packet sent by the RECEIVER has the +Practically, we are checking that every SYN packet sent by the RECEIVER has the advertised window set to 0. The same thing is done also by checking, in the Rx method, that each SYN received by SENDER has the advertised window set to 0. Thanks to the log subsystem, we can print what is happening through messages. diff --git a/src/internet/examples/neighbor-cache-example.cc b/src/internet/examples/neighbor-cache-example.cc index b955a5b1d..8e92a6d34 100644 --- a/src/internet/examples/neighbor-cache-example.cc +++ b/src/internet/examples/neighbor-cache-example.cc @@ -21,7 +21,7 @@ * This example shows how to generate neighbor caches on the scope of * a channel, a NetDeviceContainer, an InterfaceContainer and globally. * The example also shows a scenario that auto-generated neighbor caches - * can avoid droping packets because of ARP message or Neighbor Discover + * can avoid dropping packets because of ARP message or Neighbor Discover * message. * If the user runs the example without any command line option, NeighborCacheHelper * will generate neighbor cache for all devices and the output is their @@ -290,7 +290,7 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("NeighborCacheExample"); /** - * Neigbor Cache example class. + * neighbor Cache example class. * * It handles the creation and run of an example. */ diff --git a/src/internet/helper/neighbor-cache-helper.h b/src/internet/helper/neighbor-cache-helper.h index 9ad82b96a..a99000c10 100644 --- a/src/internet/helper/neighbor-cache-helper.h +++ b/src/internet/helper/neighbor-cache-helper.h @@ -95,7 +95,7 @@ class NeighborCacheHelper void FlushAutoGenerated() const; /** - * \brief Enable/diable dynamic neighbor cache, auto-generated neighbor cache will update + * \brief Enable/disable dynamic neighbor cache, auto-generated neighbor cache will update * by IP addresses changed when dynamic neighbor cache enabled. User should ensure that * the NeighborCacheHelper object persists for the duration of the simulation when dynamic * neighbor cache is enabled. diff --git a/src/internet/model/global-route-manager-impl.cc b/src/internet/model/global-route-manager-impl.cc index 4da8e72fd..ac4f48368 100644 --- a/src/internet/model/global-route-manager-impl.cc +++ b/src/internet/model/global-route-manager-impl.cc @@ -1702,7 +1702,7 @@ GlobalRouteManagerImpl::SPFIntraAddStub(GlobalRoutingLinkRecord* l, SPFVertex* v NS_ASSERT_MSG(m_spfroot, "GlobalRouteManagerImpl::SPFIntraAddStub (): Root pointer not set"); - // XXX simplifed logic for the moment. There are two cases to consider: + // XXX simplified logic for the moment. There are two cases to consider: // 1) the stub network is on this router; do nothing for now // (already handled above) // 2) the stub network is on a remote router, so I should use the diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc index 1d4935290..33385d758 100644 --- a/src/internet/model/icmpv6-l4-protocol.cc +++ b/src/internet/model/icmpv6-l4-protocol.cc @@ -703,7 +703,7 @@ Icmpv6L4Protocol::HandleNS(Ptr packet, } break; default: - /* unknow option, quit */ + /* unknown option, quit */ next = false; } if (packet->GetSize() == 0) @@ -1383,7 +1383,7 @@ Icmpv6L4Protocol::SendRS(Ipv6Address src, Ipv6Address dst, Address hardwareAddre } else { - // Following RS transmission - adding further jitter is unnecesary. + // Following RS transmission - adding further jitter is unnecessary. rsTimeout = m_rsPrevRetransmissionTimeout * (2 + m_rsRetransmissionJitter->GetValue()); if (rsTimeout > m_rsMaxRetransmissionTime) { diff --git a/src/internet/model/ipv4-l3-protocol.cc b/src/internet/model/ipv4-l3-protocol.cc index df93888df..8154aa105 100644 --- a/src/internet/model/ipv4-l3-protocol.cc +++ b/src/internet/model/ipv4-l3-protocol.cc @@ -1395,7 +1395,7 @@ Ipv4L3Protocol::SetUp(uint32_t i) NS_LOG_LOGIC( "Interface " << int(i) - << " is set to be down for IPv4. Reason: not respecting minimum IPv4 MTU (68 octects)"); + << " is set to be down for IPv4. Reason: not respecting minimum IPv4 MTU (68 octets)"); } } diff --git a/src/internet/model/tcp-bbr.h b/src/internet/model/tcp-bbr.h index d7b87907a..3143287b0 100644 --- a/src/internet/model/tcp-bbr.h +++ b/src/internet/model/tcp-bbr.h @@ -217,18 +217,18 @@ class TcpBbr : public TcpCongestionOps uint32_t InFlight(Ptr tcb, double gain); /** - * \brief Intializes the full pipe estimator. + * \brief Initializes the full pipe estimator. */ void InitFullPipe(); /** - * \brief Intializes the pacing rate. + * \brief Initializes the pacing rate. * \param tcb the socket state. */ void InitPacingRate(Ptr tcb); /** - * \brief Intializes the round counting related variables. + * \brief Initializes the round counting related variables. */ void InitRoundCounting(); diff --git a/src/internet/model/tcp-congestion-ops.h b/src/internet/model/tcp-congestion-ops.h index 8f2ef7a83..34fdcaf72 100644 --- a/src/internet/model/tcp-congestion-ops.h +++ b/src/internet/model/tcp-congestion-ops.h @@ -88,7 +88,7 @@ class TcpCongestionOps : public Object * * Is guaranteed that the congestion control state (\p TcpAckState_t) is * changed BEFORE the invocation of this method. - * The implementator should return the slow start threshold (and not change + * The implementer should return the slow start threshold (and not change * it directly) because, in the future, the TCP implementation may require to * instantly recover from a loss event (e.g. when there is a network with an high * reordering factor). diff --git a/src/internet/model/tcp-rate-ops.h b/src/internet/model/tcp-rate-ops.h index 9877767ea..69cb5407d 100644 --- a/src/internet/model/tcp-rate-ops.h +++ b/src/internet/model/tcp-rate-ops.h @@ -247,7 +247,7 @@ class TcpRateLinux : public TcpRateOps private: // Rate sample related variables TcpRateConnection m_rate; //!< Rate information - TcpRateSample m_rateSample; //!< Rate sample (continuosly updated) + TcpRateSample m_rateSample; //!< Rate sample (continuously updated) TracedCallback m_rateTrace; //!< Rate trace TracedCallback m_rateSampleTrace; //!< Rate Sample trace diff --git a/src/internet/model/tcp-rx-buffer.h b/src/internet/model/tcp-rx-buffer.h index 3977a01b4..c8aee7e09 100644 --- a/src/internet/model/tcp-rx-buffer.h +++ b/src/internet/model/tcp-rx-buffer.h @@ -140,7 +140,7 @@ class TcpRxBuffer : public Object /** * Insert a packet into the buffer and update the availBytes counter to * reflect the number of bytes ready to send to the application. This - * function handles overlap by triming the head of the inputted packet and + * function handles overlap by trimming the head of the inputted packet and * removing data from the buffer that overlaps the tail of the inputted * packet * diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc index dfdfc2192..ee443db5c 100644 --- a/src/internet/model/tcp-socket-base.cc +++ b/src/internet/model/tcp-socket-base.cc @@ -1150,7 +1150,7 @@ TcpSocketBase::CloseAndNotify() } /* Tell if a sequence number range is out side the range that my rx buffer can - accpet */ + accept */ bool TcpSocketBase::OutOfRange(SequenceNumber32 head, SequenceNumber32 tail) const { @@ -1708,7 +1708,7 @@ TcpSocketBase::DupAck(uint32_t currentDelivered) // NOTE: We do not count the DupAcks received in CA_LOSS, because we // don't know if they are generated by a spurious retransmission or because // of a real packet loss. With SACK, it is easy to know, but we do not consider - // dupacks. Without SACK, there are some euristics in the RFC 6582, but + // dupacks. Without SACK, there are some heuristics in the RFC 6582, but // for now, we do not implement it, leading to ignoring the dupacks. if (m_tcb->m_congState == TcpSocketState::CA_LOSS) { @@ -1772,7 +1772,7 @@ TcpSocketBase::DupAck(uint32_t currentDelivered) // CA_RECOVERY when sequence number is advanced significantly since // the last congestion event, which could be common for // bandwidth-greedy application in high speed and reliable network - // (such as datacenter network) whose sending rate is constrainted by + // (such as datacenter network) whose sending rate is constrained by // TCP socket buffer size at receiver side. if ((m_dupAckCount == m_retxThresh) && ((m_highRxAckMark >= m_recover) || (!m_recoverActive))) diff --git a/src/internet/model/udp-socket-impl.cc b/src/internet/model/udp-socket-impl.cc index ca5373aec..c8be8d80e 100644 --- a/src/internet/model/udp-socket-impl.cc +++ b/src/internet/model/udp-socket-impl.cc @@ -754,7 +754,7 @@ UdpSocketImpl::DoSendTo(Ptr p, Ipv6Address dest, uint16_t port) tag.SetHopLimit(GetIpv6HopLimit()); p->AddPacketTag(tag); } - // There is no analgous to an IPv4 broadcast address in IPv6. + // There is no analogous to an IPv4 broadcast address in IPv6. // Instead, we use a set of link-local, site-local, and global // multicast addresses. The Ipv6 routing layers should all // provide an interface-specific route to these addresses such diff --git a/src/internet/model/windowed-filter.h b/src/internet/model/windowed-filter.h index 9bb469201..d0f55d049 100644 --- a/src/internet/model/windowed-filter.h +++ b/src/internet/model/windowed-filter.h @@ -136,14 +136,14 @@ class WindowedFilter { public: /** - * \brief contructor + * \brief constructor */ WindowedFilter() { } /** - * \brief contructor + * \brief constructor * \param windowLength is the period after which a best estimate expires. * \param zeroValue is used as the uninitialized value for objects of T. Importantly, * zeroValue should be an invalid value for a true sample. diff --git a/src/internet/test/ipv4-header-test.cc b/src/internet/test/ipv4-header-test.cc index e6a39a9d6..ad632bdec 100644 --- a/src/internet/test/ipv4-header-test.cc +++ b/src/internet/test/ipv4-header-test.cc @@ -62,7 +62,7 @@ class Ipv4HeaderTest : public TestCase Ipv4Header m_receivedHeader; //!< Received header. /** - * \brief Send a packet with speciic DSCP and ECN fields. + * \brief Send a packet with specific DSCP and ECN fields. * \param socket The source socket. * \param to The destination address. * \param dscp The DSCP field. @@ -74,7 +74,7 @@ class Ipv4HeaderTest : public TestCase Ipv4Header::EcnType ecn); /** - * \brief Send a packet with speciic DSCP and ECN fields. + * \brief Send a packet with specific DSCP and ECN fields. * \param socket The source socket. * \param to The destination address. * \param dscp The DSCP field. diff --git a/src/internet/test/neighbor-cache-test.cc b/src/internet/test/neighbor-cache-test.cc index 59edf934b..6874440dd 100644 --- a/src/internet/test/neighbor-cache-test.cc +++ b/src/internet/test/neighbor-cache-test.cc @@ -236,7 +236,7 @@ DynamicNeighborCacheTest::DoRun() } net.Add(tx2Dev); - // Recieve node + // Receive node Ptr rxDev; { rxDev = CreateObject(); diff --git a/src/internet/test/tcp-advertised-window-test.cc b/src/internet/test/tcp-advertised-window-test.cc index ee5fcc38a..292b9d1f4 100644 --- a/src/internet/test/tcp-advertised-window-test.cc +++ b/src/internet/test/tcp-advertised-window-test.cc @@ -272,7 +272,7 @@ TcpDropRatioErrorModel::ShouldDrop(const Ipv4Header& ipHeader, * * m_tcb->m_rxBuffer->MaxBufferSize () * - * This change was introduced with regard to situations in which the receiviing + * This change was introduced with regard to situations in which the receiving * application does not read from the socket as fast as possible (see bug 2559 * for details). This test ensures that no regression is introduced for other, * "normal" cases. diff --git a/src/internet/test/tcp-classic-recovery-test.cc b/src/internet/test/tcp-classic-recovery-test.cc index 1a9e5fcab..5227bafaf 100644 --- a/src/internet/test/tcp-classic-recovery-test.cc +++ b/src/internet/test/tcp-classic-recovery-test.cc @@ -102,9 +102,10 @@ ClassicRecoveryTest::DoRun() uint32_t cWndInflPrevious = m_state->m_cWndInfl; uint32_t cWndPrevious = m_state->m_cWnd; recovery->DoRecovery(m_state, 500); - NS_TEST_ASSERT_MSG_EQ(m_state->m_cWndInfl, - (cWndInflPrevious + m_state->m_segmentSize), - "m_cWndInfl should be incresed by one segmentSize on calling DoRecovery"); + NS_TEST_ASSERT_MSG_EQ( + m_state->m_cWndInfl, + (cWndInflPrevious + m_state->m_segmentSize), + "m_cWndInfl should be increased by one segmentSize on calling DoRecovery"); NS_TEST_ASSERT_MSG_EQ(m_state->m_cWnd, cWndPrevious, "cWnd should not change in recovery"); recovery->ExitRecovery(m_state); diff --git a/src/internet/test/tcp-dctcp-test.cc b/src/internet/test/tcp-dctcp-test.cc index c534efed0..3c1028a46 100644 --- a/src/internet/test/tcp-dctcp-test.cc +++ b/src/internet/test/tcp-dctcp-test.cc @@ -186,7 +186,7 @@ TcpDctcpCodePointsTest::Rx(const Ptr p, const TcpHeader& h, Socket 0, "The flag ECE should be not be set in TCP header of the packet " "sent by the receiver if it receives a packet without CE bit set " - "in IP header inspite of Sender not sending CWR flags to it"); + "in IP header in spite of Sender not sending CWR flags to it"); } } } @@ -213,7 +213,7 @@ TcpDctcpCodePointsTest::ConfigureEnvironment() * * The SendDataPacket function of this class sends data packet numbered 1 with CE flags set and * also doesn't set CWR flags on receipt of ECE flags for test 3. This is done to verify that DCTCP - * receiver sends ECE only if it receives CE inspite of sender not sending CWR flags for ECE + * receiver sends ECE only if it receives CE in spite of sender not sending CWR flags for ECE * */ class TcpDctcpCongestedRouter : public TcpSocketMsgBase diff --git a/src/internet/test/tcp-rate-ops-test.cc b/src/internet/test/tcp-rate-ops-test.cc index ab496d48a..6c5f57b19 100644 --- a/src/internet/test/tcp-rate-ops-test.cc +++ b/src/internet/test/tcp-rate-ops-test.cc @@ -438,7 +438,7 @@ TcpRateLinuxWithSocketsTest::FinalChecks() * \ingroup internet-tests * \ingroup tests * - * \brief The TcpRateLinuxWithBufferTest tests rate sample functionality with arbitary SACK + * \brief The TcpRateLinuxWithBufferTest tests rate sample functionality with arbitrary SACK * scenario. Check the value of delivered against a home-made guess */ class TcpRateLinuxWithBufferTest : public TestCase @@ -470,7 +470,7 @@ class TcpRateLinuxWithBufferTest : public TestCase /** \brief Test with acks without drop */ void TestWithStraightAcks(); - /** \brief Test with arbitary SACK scenario */ + /** \brief Test with arbitrary SACK scenario */ void TestWithSackBlocks(); uint32_t m_expectedDelivered{0}; //!< Amount of expected delivered data @@ -645,12 +645,12 @@ class TcpRateOpsTestSuite : public TestSuite AddTestCase( new TcpRateLinuxWithBufferTest(1000, - "Checking rate sample values with arbitary SACK Block"), + "Checking rate sample values with arbitrary SACK Block"), TestCase::QUICK); AddTestCase( new TcpRateLinuxWithBufferTest(500, - "Checking rate sample values with arbitary SACK Block"), + "Checking rate sample values with arbitrary SACK Block"), TestCase::QUICK); } }; diff --git a/src/lr-wpan/doc/lr-wpan.rst b/src/lr-wpan/doc/lr-wpan.rst index 8be73e8cc..c398859e2 100644 --- a/src/lr-wpan/doc/lr-wpan.rst +++ b/src/lr-wpan/doc/lr-wpan.rst @@ -165,7 +165,7 @@ IEEE 802.15.4 supports 4 types of scanning: In active and passive scans, the link quality indicator (LQI) is the main parameter used to determine the optimal coordinator. LQI values range from 0 to 255. Where 255 is the highest quality link value and 0 the lowest. Typically, a link lower than 127 is considered a link with poor quality. -In LR-WPAN, association is used to join or leave PANs. All devices in LR-WPAN must belong to a PAN to communicate. |ns3| uses a classic association procedure described in the standard. The standard also covers a more effective association procedure known as fast association (See IEEE 802.15.4-2015, fastA) but this association is currently not supported by |ns3|. Alternatively, |ns3| can do a "quick and dirty" association using either ```LrWpanHelper::AssociateToPan``` or ```LrWpanHelper::AssociateToBeaconPan```. These functions are used when a preset association can be done. For example, when the relationships between existing nodes and coordinators are known and can be set before the begining of the simulation. In other situations, like in many networks in real deployments or in large networks, it is desirable that devices "associate themselves" with the best possible available coordinator candidates. This is a process known as bootstrap, and simulating this process makes it possible to demonstrate the kind of situations a node would face in which large networks to associate in real environment. +In LR-WPAN, association is used to join or leave PANs. All devices in LR-WPAN must belong to a PAN to communicate. |ns3| uses a classic association procedure described in the standard. The standard also covers a more effective association procedure known as fast association (See IEEE 802.15.4-2015, fastA) but this association is currently not supported by |ns3|. Alternatively, |ns3| can do a "quick and dirty" association using either ```LrWpanHelper::AssociateToPan``` or ```LrWpanHelper::AssociateToBeaconPan```. These functions are used when a preset association can be done. For example, when the relationships between existing nodes and coordinators are known and can be set before the beginning of the simulation. In other situations, like in many networks in real deployments or in large networks, it is desirable that devices "associate themselves" with the best possible available coordinator candidates. This is a process known as bootstrap, and simulating this process makes it possible to demonstrate the kind of situations a node would face in which large networks to associate in real environment. Bootstrap (a.k.a. network initialization) is possible with a combination of scan and association MAC primitives. Details on the general process for this network initialization is described in the standard. Bootstrap is a complex process that not only requires the scanning networks, but also the exchange of command frames and the use of a pending transaction list (indirect transmissions) in the coordinator to store command frames. The following summarizes the whole process: @@ -246,7 +246,7 @@ The 64-bit addresses are unique worldwide, and set by the device vendor (in a re The 16-bit addresses are not guaranteed to be unique, and they are typically either assigned during the devices deployment, or assigned dynamically during the device bootstrap. -The other relavant "address" to consider is the PanId (16 bits), which represents the PAN +The other relevant "address" to consider is the PanId (16 bits), which represents the PAN the device is attached to. Due to the limited number of available bytes in a packet, IEEE 802.15.4 tries to use short diff --git a/src/lr-wpan/examples/lr-wpan-mlme.cc b/src/lr-wpan/examples/lr-wpan-mlme.cc index 92909349e..c2e5d3e0c 100644 --- a/src/lr-wpan/examples/lr-wpan-mlme.cc +++ b/src/lr-wpan/examples/lr-wpan-mlme.cc @@ -82,7 +82,7 @@ StartConfirm(MlmeStartConfirmParams params) { if (params.m_status == MLMESTART_SUCCESS) { - NS_LOG_UNCOND(Simulator::Now().GetSeconds() << "Beacon status SUCESSFUL"); + NS_LOG_UNCOND(Simulator::Now().GetSeconds() << "Beacon status SUCCESSFUL"); } } diff --git a/src/lr-wpan/model/lr-wpan-mac.h b/src/lr-wpan/model/lr-wpan-mac.h index 1f2ca1967..88ed98fdf 100644 --- a/src/lr-wpan/model/lr-wpan-mac.h +++ b/src/lr-wpan/model/lr-wpan-mac.h @@ -1117,7 +1117,7 @@ class LrWpanMac : public Object /** * CSMA-CA algorithm calls back the MAC after executing channel assessment. * - * \param macState indicate BUSY oder IDLE channel condition + * \param macState indicate BUSY or IDLE channel condition */ void SetLrWpanMacState(LrWpanMacState macState); diff --git a/src/lr-wpan/test/lr-wpan-mac-test.cc b/src/lr-wpan/test/lr-wpan-mac-test.cc index 48d5766ff..6e78d04fd 100644 --- a/src/lr-wpan/test/lr-wpan-mac-test.cc +++ b/src/lr-wpan/test/lr-wpan-mac-test.cc @@ -366,7 +366,7 @@ TestActiveScanPanDescriptors::DoRun() * the scanned channels). On reception of such commands, coordinators reply with a single beacon * which contains a PAN descriptor. The test makes sure that the PAN descriptors are received (2 * PAN descriptors) and because both PAN coordinators are set to a different distance from the - * end device, their LQI values should be bellow 255 but above 0. Likewise, Coordinator 2 LQI + * end device, their LQI values should be below 255 but above 0. Likewise, Coordinator 2 LQI * value should be less than Coordinator 1 LQI value. The exact expected value of LQI is not * tested, this is dependable on the LQI implementation. */ diff --git a/src/lte/doc/source/lte-design.rst b/src/lte/doc/source/lte-design.rst index 9439f3f81..0bf4e0ad9 100644 --- a/src/lte/doc/source/lte-design.rst +++ b/src/lte/doc/source/lte-design.rst @@ -707,7 +707,7 @@ MIMO Model The use of multiple antennas both at transmitter and receiver side, known as multiple-input and multiple-output (MIMO), is a problem well studied in literature during the past years. Most of the work concentrate on evaluating analytically the gain that the different MIMO schemes might have in term of capacity; however someones provide also information of the gain in terms of received power [CatreuxMIMO]_. -According to the considerations above, a model more flexible can be obtained considering the gain that MIMO schemes bring in the system from a statistical point of view. As highlighted before, [CatreuxMIMO]_ presents the statistical gain of several MIMO solutions respect to the SISO one in case of no correlation between the antennas. In the work the gain is presented as the cumulative distribution function (CDF) of the output SINR for what concern SISO, MIMO-Alamouti, MIMO-MMSE, MIMO-OSIC-MMSE and MIMO-ZF schemes. Elaborating the results, the output SINR distribution can be approximated with a log-normal one with different mean and variance as function of the scheme considered. However, the variances are not so different and they are approximatively equal to the one of the SISO mode already included in the shadowing component of the ``BuildingsPropagationLossModel``, in detail: +According to the considerations above, a model more flexible can be obtained considering the gain that MIMO schemes bring in the system from a statistical point of view. As highlighted before, [CatreuxMIMO]_ presents the statistical gain of several MIMO solutions respect to the SISO one in case of no correlation between the antennas. In the work the gain is presented as the cumulative distribution function (CDF) of the output SINR for what concern SISO, MIMO-Alamouti, MIMO-MMSE, MIMO-OSIC-MMSE and MIMO-ZF schemes. Elaborating the results, the output SINR distribution can be approximated with a log-normal one with different mean and variance as function of the scheme considered. However, the variances are not so different and they are approximately equal to the one of the SISO mode already included in the shadowing component of the ``BuildingsPropagationLossModel``, in detail: * SISO: :math:`\mu = 13.5` and :math:`\sigma = 20` [dB]. * MIMO-Alamouti: :math:`\mu = 17.7` and :math:`\sigma = 11.1` [dB]. @@ -2269,7 +2269,7 @@ the PCFICH errors [R4-081920]_ (also refer to :ref:`sec-control-channles-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 unsuccessfully decoded frames is reset to zero. At the +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 @@ -3371,7 +3371,7 @@ SGW node, it is delivered locally (as the destination address of the outmost IP header matches the address of the point-to-point net device). The local delivery process will forward the packet to the EpcSgwApplication via the corresponding UDP socket. The -EpcSgwApplication then perfoms the following operations: +EpcSgwApplication then performs the following operations: #. it removes the GTP header and retrieves the S1-U TEID; #. it maps the S1-U TEID to get the S5 TEID to which the packet @@ -3604,7 +3604,7 @@ The X2 service interface is used by the RRC entity to send and receive messages * the ``EpcX2SapProvider`` part is provided by the X2 entity and used by the RRC entity and - * the ``EpcX2SapUser`` part is provided by the RRC entity and used by the RRC enity. + * the ``EpcX2SapUser`` part is provided by the RRC entity and used by the RRC entity. The primitives that are supported in our X2-C model are described in the following subsections. diff --git a/src/lte/examples/lena-radio-link-failure.cc b/src/lte/examples/lena-radio-link-failure.cc index b792a0ac7..e007da944 100644 --- a/src/lte/examples/lena-radio-link-failure.cc +++ b/src/lte/examples/lena-radio-link-failure.cc @@ -307,7 +307,7 @@ ReceivePacket(Ptr packet, const Address&) } /** - * Write the troughput to file. + * Write the throughput to file. * * \param firstWrite True if first time writing. * \param binSize Bin size. diff --git a/src/lte/helper/cc-helper.h b/src/lte/helper/cc-helper.h index ec7cf3921..9b98c411f 100644 --- a/src/lte/helper/cc-helper.h +++ b/src/lte/helper/cc-helper.h @@ -74,7 +74,7 @@ class CcHelper : public Object * \param dlBandwidth the DL bandwidth * \param ulEarfcn the UL EARFCN * \param dlEarfcn the DL EARFCN - * \param isPrimary ture if primary + * \param isPrimary true if primary * \returns the component carrier */ ComponentCarrier DoCreateSingleCc(uint16_t ulBandwidth, diff --git a/src/lte/model/cqa-ff-mac-scheduler.cc b/src/lte/model/cqa-ff-mac-scheduler.cc index 30dc2ab2f..f606595d7 100644 --- a/src/lte/model/cqa-ff-mac-scheduler.cc +++ b/src/lte/model/cqa-ff-mac-scheduler.cc @@ -1144,12 +1144,12 @@ CqaFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(itLogicalChannels->first.m_rnti)); } if (!HarqProcessAvailability(itLogicalChannels->first.m_rnti)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(itLogicalChannels->first.m_rnti)); } continue; @@ -1379,7 +1379,7 @@ CqaFfMacScheduler::DoSchedDlTriggerReq( UeToCoitaMetric.clear(); // Iterate through the users and calculate which user will use the best of the current - // resource bloc.end()k and assign to that user. + // resource block.end() and assign to that user. for (std::set::iterator it = itCurrentGroup->second.begin(); it != itCurrentGroup->second.end(); it++) @@ -2089,7 +2089,8 @@ CqaFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/epc-enb-application.h b/src/lte/model/epc-enb-application.h index e114e8db2..d44c4f1d9 100644 --- a/src/lte/model/epc-enb-application.h +++ b/src/lte/model/epc-enb-application.h @@ -245,7 +245,7 @@ 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 Enpoint IDentifier + * \param teid the Tunnel Endpoint IDentifier */ void SendToS1uSocket(Ptr packet, uint32_t teid); diff --git a/src/lte/model/epc-gtpc-header.h b/src/lte/model/epc-gtpc-header.h index a57401535..64597ebf1 100644 --- a/src/lte/model/epc-gtpc-header.h +++ b/src/lte/model/epc-gtpc-header.h @@ -188,7 +188,7 @@ class GtpcHeader : public Header /** * \ingroup lte - * GTP-C Information Elemements + * GTP-C Information Elements */ class GtpcIes { diff --git a/src/lte/model/epc-pgw-application.h b/src/lte/model/epc-pgw-application.h index 683f21c5d..1ee2cd51e 100644 --- a/src/lte/model/epc-pgw-application.h +++ b/src/lte/model/epc-pgw-application.h @@ -114,7 +114,7 @@ class EpcPgwApplication : public Application * Send a data packet to the internet via the SGi interface of the PGW * * \param packet packet to be sent - * \param teid the Tunnel Enpoint Identifier + * \param teid the Tunnel Endpoint Identifier */ void SendToTunDevice(Ptr packet, uint32_t teid); @@ -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 Enpoint 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 e60bb64c0..a70af2084 100644 --- a/src/lte/model/epc-sgw-application.h +++ b/src/lte/model/epc-sgw-application.h @@ -135,7 +135,7 @@ class EpcSgwApplication : public Application * * \param packet packet to be sent * \param pgwAddr the address of the PGW - * \param teid the Tunnel Enpoint Identifier + * \param teid the Tunnel Endpoint Identifier */ void SendToS5uSocket(Ptr packet, Ipv4Address pgwAddr, uint32_t teid); @@ -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 Enpoint IDentifier + * \param teid the Tunnel Endpoint IDentifier */ void SendToS1uSocket(Ptr packet, Ipv4Address enbS1uAddress, uint32_t teid); diff --git a/src/lte/model/epc-x2-header.h b/src/lte/model/epc-x2-header.h index 0ff114b96..c3ce296a8 100644 --- a/src/lte/model/epc-x2-header.h +++ b/src/lte/model/epc-x2-header.h @@ -186,18 +186,18 @@ class EpcX2HandoverRequestHeader : public Header */ uint64_t GetUeAggregateMaxBitRateDownlink() const; /** - * Set UE Aggregrate Max Bit Rate Downlink function + * Set UE Aggregate Max Bit Rate Downlink function * \param bitRate the bit rate */ void SetUeAggregateMaxBitRateDownlink(uint64_t bitRate); /** - * Get UE Aggregrate Max Bit Rate Uplik function + * Get UE Aggregate Max Bit Rate Uplik function * \returns the UE aggregate max bit rate uplink */ uint64_t GetUeAggregateMaxBitRateUplink() const; /** - * Set UE Aggregrate Max Bit Rate Uplik function + * Set UE Aggregate Max Bit Rate Uplik function * \param bitRate the bit rate */ void SetUeAggregateMaxBitRateUplink(uint64_t bitRate); diff --git a/src/lte/model/epc-x2-sap.h b/src/lte/model/epc-x2-sap.h index 0b20118ef..8c4fb0c38 100644 --- a/src/lte/model/epc-x2-sap.h +++ b/src/lte/model/epc-x2-sap.h @@ -232,8 +232,8 @@ class EpcX2Sap uint16_t sourceCellId; ///< source cell ID uint16_t targetCellId; ///< target cell ID uint32_t mmeUeS1apId; ///< MME UE S1 AP ID - uint64_t ueAggregateMaxBitRateDownlink; ///< UE aggregrate max bit rate downlink - uint64_t ueAggregateMaxBitRateUplink; ///< UE aggregrate max bit rate uplink + uint64_t ueAggregateMaxBitRateDownlink; ///< UE aggregate max bit rate downlink + uint64_t ueAggregateMaxBitRateUplink; ///< UE aggregate max bit rate uplink std::vector bearers; ///< bearers Ptr rrcContext; ///< RRC context }; diff --git a/src/lte/model/fading-traces/fading_trace_generator.m b/src/lte/model/fading-traces/fading_trace_generator.m index 2152f23db..794bc705c 100644 --- a/src/lte/model/fading-traces/fading_trace_generator.m +++ b/src/lte/model/fading-traces/fading_trace_generator.m @@ -8,7 +8,7 @@ delays_vehicularEVA = [0 30e-9 150e-9 310e-9 370e-9 710e-9 1090e-9 1730e-9 2510e delays_urbanETU = [0 50e-9 120e-9 200e-9 230e-9 500e-9 1600e-9 2300e-9 5000e-9]; Td = 100/c; -% Realtive power of taps (according to 3GPP TS 36.104 Annex B.2) +% Relative power of taps (according to 3GPP TS 36.104 Annex B.2) power_pedestrianEPA = [0.0 -1.0 -2.0 -3.0 -8.0 -17.2 -20.8]; power_vehicularEVA = [0.0 -1.5 -1.4 -3.6 -0.6 -9.1 -7.0 -12.0 -16.9]; power_urbanETU = [-1.0 -1.0 -1.0 0.0 0.0 0.0 -3.0 -5.0 -7.0]; diff --git a/src/lte/model/fdbet-ff-mac-scheduler.cc b/src/lte/model/fdbet-ff-mac-scheduler.cc index f67876342..3623eb09a 100644 --- a/src/lte/model/fdbet-ff-mac-scheduler.cc +++ b/src/lte/model/fdbet-ff-mac-scheduler.cc @@ -909,11 +909,11 @@ FdBetFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*itFlow).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*itFlow).first); } if (!HarqProcessAvailability((*itFlow).first)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*itFlow).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*itFlow).first); } continue; } @@ -1506,7 +1506,8 @@ FdBetFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/fdmt-ff-mac-scheduler.cc b/src/lte/model/fdmt-ff-mac-scheduler.cc index 0265dee09..a2896e773 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.cc +++ b/src/lte/model/fdmt-ff-mac-scheduler.cc @@ -900,11 +900,11 @@ FdMtFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it)); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it)); } if (!HarqProcessAvailability((*it))) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it)); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it)); } continue; } @@ -1465,7 +1465,8 @@ FdMtFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/fdmt-ff-mac-scheduler.h b/src/lte/model/fdmt-ff-mac-scheduler.h index fdb2ad984..db4ec4fad 100644 --- a/src/lte/model/fdmt-ff-mac-scheduler.h +++ b/src/lte/model/fdmt-ff-mac-scheduler.h @@ -269,7 +269,7 @@ class FdMtFfMacScheduler : public FfMacScheduler */ void UpdateDlRlcBufferInfo(uint16_t rnti, uint8_t lcid, uint16_t size); /** - * Update UL RLC b uffer info function + * Update UL RLC buffer info function * \param rnti the RNTI * \param size the size */ diff --git a/src/lte/model/fdtbfq-ff-mac-scheduler.cc b/src/lte/model/fdtbfq-ff-mac-scheduler.cc index b03f1045e..7a47b03ca 100644 --- a/src/lte/model/fdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/fdtbfq-ff-mac-scheduler.cc @@ -1036,11 +1036,11 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it).first); } if (!HarqProcessAvailability((*it).first)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it).first); } continue; } @@ -1132,7 +1132,7 @@ FdTbfqFfMacScheduler::DoSchedDlTriggerReq( } budget = budget + (*itMax).second.tokenPoolSize; - // calculate how much bytes this UE actally need + // calculate how much bytes this UE actually need if (budget == 0) { // there are no tokens for this UE @@ -1886,7 +1886,8 @@ FdTbfqFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/lte-ccm-rrc-sap.h b/src/lte/model/lte-ccm-rrc-sap.h index 70cddad05..006f814c9 100644 --- a/src/lte/model/lte-ccm-rrc-sap.h +++ b/src/lte/model/lte-ccm-rrc-sap.h @@ -105,7 +105,7 @@ class LteCcmRrcSapProvider * \param lcid the Logical Channel id * \param lcGroup the Logical Channel group * \param msu a pointer to the LteMacSapUser, the LteEnbComponentCarrierManager - * has to store a LteMacSapUser for each Rlc istance, in order to + * has to store a LteMacSapUser for each Rlc instance, in order to * properly redirect the packet * \return vector of LcsConfig contains the lc configuration for each Mac * the size of the vector is equal to the number of component @@ -136,7 +136,7 @@ class LteCcmRrcSapProvider /** * \brief Add the Signal Bearer for a specific Ue in LteEnbComponenCarrierManager * \param lcInfo this structure it is hard-coded in the LteEnbRrc - * \param rlcMacSapUser it is the MacSapUser of the Rlc istance + * \param rlcMacSapUser it is the MacSapUser of the Rlc instance * \return the LteMacSapUser of the ComponentCarrierManager * */ diff --git a/src/lte/model/lte-enb-phy-sap.h b/src/lte/model/lte-enb-phy-sap.h index 096442766..57f9de632 100644 --- a/src/lte/model/lte-enb-phy-sap.h +++ b/src/lte/model/lte-enb-phy-sap.h @@ -105,14 +105,14 @@ class LteEnbPhySapUser virtual void UlCqiReport(FfMacSchedSapProvider::SchedUlCqiInfoReqParameters ulcqi) = 0; /** - * Notify the HARQ on the UL tranmission status + * Notify the HARQ on the UL transmission status * * \param params */ virtual void UlInfoListElementHarqFeeback(UlInfoListElement_s params) = 0; /** - * Notify the HARQ on the DL tranmission status + * Notify the HARQ on the DL transmission status * * \param params */ diff --git a/src/lte/model/lte-enb-rrc.cc b/src/lte/model/lte-enb-rrc.cc index b1210be6b..d893bd84c 100644 --- a/src/lte/model/lte-enb-rrc.cc +++ b/src/lte/model/lte-enb-rrc.cc @@ -2904,7 +2904,7 @@ LteEnbRrc::DoRecvHandoverRequest(EpcX2SapUser::HandoverRequestParams req) Ptr ueManager = GetUeManager(rnti); EpcX2Sap::HandoverPreparationFailureParams msg = ueManager->BuildHoPrepFailMsg(); m_x2SapProvider->SendHandoverPreparationFailure(msg); - RemoveUe(rnti); // reomve the UE from the target eNB + RemoveUe(rnti); // remove the UE from the target eNB return; } @@ -3476,7 +3476,7 @@ LteEnbRrc::RemoveSrsConfigurationIndex(uint16_t srcCi) NS_LOG_FUNCTION(this << srcCi); std::set::iterator it = m_ueSrsConfigurationIndexSet.find(srcCi); NS_ASSERT_MSG(it != m_ueSrsConfigurationIndexSet.end(), - "request to remove unkwown SRS CI " << srcCi); + "request to remove unknown SRS CI " << srcCi); m_ueSrsConfigurationIndexSet.erase(it); } diff --git a/src/lte/model/lte-enb-rrc.h b/src/lte/model/lte-enb-rrc.h index 964751af9..3b09ff913 100644 --- a/src/lte/model/lte-enb-rrc.h +++ b/src/lte/model/lte-enb-rrc.h @@ -1498,7 +1498,7 @@ class LteEnbRrc : public Object * \note this method can have the side effect of updating the SRS * configuration index of all UEs * - * \param srcCi the indext to be removed + * \param srcCi the index to be removed */ void RemoveSrsConfigurationIndex(uint16_t srcCi); diff --git a/src/lte/model/lte-ffr-distributed-algorithm.cc b/src/lte/model/lte-ffr-distributed-algorithm.cc index 45a340442..352103171 100644 --- a/src/lte/model/lte-ffr-distributed-algorithm.cc +++ b/src/lte/model/lte-ffr-distributed-algorithm.cc @@ -456,8 +456,8 @@ LteFfrDistributedAlgorithm::DoReportUeMeas(uint16_t rnti, LteRrcSap::MeasResults UpdateNeighbourMeasurements(rnti, it->physCellId, it->rsrpResult, it->rsrqResult); bool found = false; - for (std::vector::iterator ncIt = m_neigborCell.begin(); - ncIt != m_neigborCell.end(); + for (std::vector::iterator ncIt = m_neighborCell.begin(); + ncIt != m_neighborCell.end(); ncIt++) { if ((*ncIt) == it->physCellId) @@ -467,7 +467,7 @@ LteFfrDistributedAlgorithm::DoReportUeMeas(uint16_t rnti, LteRrcSap::MeasResults } if (found == false) { - m_neigborCell.push_back(it->physCellId); + m_neighborCell.push_back(it->physCellId); } } } @@ -622,7 +622,8 @@ LteFfrDistributedAlgorithm::Calculate() } } - for (std::vector::iterator ncIt = m_neigborCell.begin(); ncIt != m_neigborCell.end(); + for (std::vector::iterator ncIt = m_neighborCell.begin(); + ncIt != m_neighborCell.end(); ncIt++) { SendLoadInformation((*ncIt)); diff --git a/src/lte/model/lte-ffr-distributed-algorithm.h b/src/lte/model/lte-ffr-distributed-algorithm.h index daafd71c0..ca53422ca 100644 --- a/src/lte/model/lte-ffr-distributed-algorithm.h +++ b/src/lte/model/lte-ffr-distributed-algorithm.h @@ -182,7 +182,7 @@ class LteFfrDistributedAlgorithm : public LteFfrAlgorithm typedef std::map MeasurementTable_t; MeasurementTable_t m_ueMeasures; ///< UE measures - std::vector m_neigborCell; ///< neighbor cell + std::vector m_neighborCell; ///< neighbor cell uint8_t m_rsrpDifferenceThreshold; ///< RSRP difference threshold diff --git a/src/lte/model/lte-fr-soft-algorithm.cc b/src/lte/model/lte-fr-soft-algorithm.cc index 71702fb43..9f5d3dcdf 100644 --- a/src/lte/model/lte-fr-soft-algorithm.cc +++ b/src/lte/model/lte-fr-soft-algorithm.cc @@ -64,7 +64,7 @@ struct FrSoftUplinkDefaultConfiguration uint8_t cellId; ///< cell ID uint8_t ulBandwidth; ///< UL bandwidth uint8_t ulEdgeSubBandOffset; ///< UL edge subband offset - uint8_t ulEdgeSubBandwidth; ///< UL endge subbandwidth + uint8_t ulEdgeSubBandwidth; ///< UL edge subbandwidth }; /// Soft uplink default configuration diff --git a/src/lte/model/lte-mac-sap.h b/src/lte/model/lte-mac-sap.h index e8d3522e2..e4ad59c57 100644 --- a/src/lte/model/lte-mac-sap.h +++ b/src/lte/model/lte-mac-sap.h @@ -51,7 +51,7 @@ class LteMacSapProvider uint8_t harqProcessId; /**< the HARQ process id that was passed by the MAC in the call to NotifyTxOpportunity that generated this PDU */ uint8_t componentCarrierId; /**< the component carrier id corresponding to the sending Mac - istance */ + instance */ }; /** diff --git a/src/lte/model/lte-radio-bearer-info.h b/src/lte/model/lte-radio-bearer-info.h index 113ab93ac..f7c881aec 100644 --- a/src/lte/model/lte-radio-bearer-info.h +++ b/src/lte/model/lte-radio-bearer-info.h @@ -64,7 +64,7 @@ class LteSignalingRadioBearerInfo : public LteRadioBearerInfo */ static TypeId GetTypeId(); - uint8_t m_srbIdentity; ///< SRB indentity + uint8_t m_srbIdentity; ///< SRB identity LteRrcSap::LogicalChannelConfig m_logicalChannelConfig; ///< logical channel config }; diff --git a/src/lte/model/lte-rrc-header.cc b/src/lte/model/lte-rrc-header.cc index 087bf2c78..5319bb473 100644 --- a/src/lte/model/lte-rrc-header.cc +++ b/src/lte/model/lte-rrc-header.cc @@ -142,7 +142,7 @@ RrcAsn1Header::SerializeDrbToAddModList(std::list drbToA for (; it != drbToAddModList.end(); it++) { // Serialize DRB-ToAddMod sequence - // 5 otional fields. Extension marker is present. + // 5 optional fields. Extension marker is present. std::bitset<5> drbToAddModListOptionalFieldsPresent = std::bitset<5>(); drbToAddModListOptionalFieldsPresent.set(4, 1); // eps-BearerIdentity present drbToAddModListOptionalFieldsPresent.set(3, 0); // pdcp-Config not present @@ -230,7 +230,7 @@ RrcAsn1Header::SerializeSrbToAddModList(std::list srbToA for (; it != srbToAddModList.end(); it++) { // Serialize SRB-ToAddMod sequence - // 2 otional fields. Extension marker is present. + // 2 optional fields. Extension marker is present. std::bitset<2> srbToAddModListOptionalFieldsPresent = std::bitset<2>(); srbToAddModListOptionalFieldsPresent.set(1, 0); // rlc-Config not present srbToAddModListOptionalFieldsPresent.set(0, 1); // logicalChannelConfig present diff --git a/src/lte/model/lte-spectrum-phy.cc b/src/lte/model/lte-spectrum-phy.cc index bc98f12bf..2c0840601 100644 --- a/src/lte/model/lte-spectrum-phy.cc +++ b/src/lte/model/lte-spectrum-phy.cc @@ -923,7 +923,7 @@ LteSpectrumPhy::AddExpectedTb(uint16_t rnti, it = m_expectedTbs.find(tbId); if (it != m_expectedTbs.end()) { - // migth be a TB of an unreceived packet (due to high progpalosses) + // might be a TB of an unreceived packet (due to high progpalosses) m_expectedTbs.erase(it); } // insert new entry diff --git a/src/lte/model/lte-spectrum-value-helper.h b/src/lte/model/lte-spectrum-value-helper.h index eca9a01f8..e64af14e4 100644 --- a/src/lte/model/lte-spectrum-value-helper.h +++ b/src/lte/model/lte-spectrum-value-helper.h @@ -90,7 +90,7 @@ class LteSpectrumValueHelper /** * * - * \param txBandwidthConf the tranmission bandwidth + * \param txBandwidthConf the transmission bandwidth * configuration in number of resource blocks * * \return the nominal channel bandwidth in Hz as per 3GPP TS 36.101 diff --git a/src/lte/model/lte-ue-ccm-rrc-sap.h b/src/lte/model/lte-ue-ccm-rrc-sap.h index ce426165d..f67b40fc8 100644 --- a/src/lte/model/lte-ue-ccm-rrc-sap.h +++ b/src/lte/model/lte-ue-ccm-rrc-sap.h @@ -95,7 +95,7 @@ class LteUeCcmRrcSapProvider * \brief Add the Signal Bearer for a specific Ue in LteUeComponenCarrierManager * \param lcid the Logical Channel Id * \param lcConfig this structure it is hard-coded in the LteEnbRrc - * \param msu it is the MacSapUser of the Rlc istance + * \param msu it is the MacSapUser of the Rlc instance * \return the LteMacSapUser of the ComponentCarrierManager * */ diff --git a/src/lte/model/lte-ue-phy-sap.h b/src/lte/model/lte-ue-phy-sap.h index 93c81bff1..126d499bf 100644 --- a/src/lte/model/lte-ue-phy-sap.h +++ b/src/lte/model/lte-ue-phy-sap.h @@ -79,7 +79,7 @@ class LteUePhySapUser virtual ~LteUePhySapUser(); /** - * \brief Receive Phy Pdu funtion. + * \brief Receive Phy Pdu function. * * It is called by the Phy to notify the MAC of the reception of a new PHY-PDU * diff --git a/src/lte/model/lte-ue-phy.cc b/src/lte/model/lte-ue-phy.cc index 824135a5b..f7cf3591e 100644 --- a/src/lte/model/lte-ue-phy.cc +++ b/src/lte/model/lte-ue-phy.cc @@ -870,7 +870,7 @@ LteUePhy::CreateDlCqiFeedbackMessage(const SpectrumValue& sinr) } dlcqi.m_rnti = m_rnti; dlcqi.m_ri = 1; // not yet used - dlcqi.m_cqiType = CqiListElement_s::P10; // Peridic CQI using PUCCH wideband + dlcqi.m_cqiType = CqiListElement_s::P10; // Periodic CQI using PUCCH wideband NS_ASSERT_MSG(nLayer > 0, " nLayer negative"); NS_ASSERT_MSG(nLayer < 3, " nLayer limit is 2s"); for (uint8_t i = 0; i < nLayer; i++) @@ -1653,7 +1653,7 @@ LteUePhy::RlfDetection(double sinrDb) if (m_downlinkInSync && (m_numOfFrames * 10) == m_numOfQoutEvalSf) { NS_LOG_LOGIC("At " << Simulator::Now().As(Time::MS) - << " ms UE PHY sending out of snyc indication to UE RRC layer"); + << " ms UE PHY sending out of sync indication to UE RRC layer"); m_ueCphySapUser->NotifyOutOfSync(); m_numOfFrames = 0; } @@ -1692,7 +1692,7 @@ LteUePhy::RlfDetection(double sinrDb) if (!m_downlinkInSync && (m_numOfFrames * 10) == m_numOfQinEvalSf) { NS_LOG_LOGIC("At " << Simulator::Now().As(Time::MS) - << " ms UE PHY sending in snyc indication to UE RRC layer"); + << " ms UE PHY sending in sync indication to UE RRC layer"); m_ueCphySapUser->NotifyInSync(); m_numOfFrames = 0; } diff --git a/src/lte/model/lte-ue-phy.h b/src/lte/model/lte-ue-phy.h index 0fdd438c3..38d25c552 100644 --- a/src/lte/model/lte-ue-phy.h +++ b/src/lte/model/lte-ue-phy.h @@ -572,7 +572,7 @@ class LteUePhy : public LtePhy void DoResetRlfParams(); /** - * \brief Start in Snyc detection function + * \brief Start in Sync detection function * * When T310 timer is started, it indicates that physical layer * problems are detected at the UE and the recovery process is diff --git a/src/lte/model/lte-ue-rrc.h b/src/lte/model/lte-ue-rrc.h index dcd7b140c..daf4ef1f3 100644 --- a/src/lte/model/lte-ue-rrc.h +++ b/src/lte/model/lte-ue-rrc.h @@ -734,7 +734,7 @@ class LteUeRrc : public Object void StartConnection(); /** * \brief Leave connected mode method - * Resets the UE back to an appropiate state depending + * Resets the UE back to an appropriate state depending * on the nature of cause. For example, the UE is move * to the IDLE_START state upon radio link failure. At * RRC, all radio bearers except SRB 0 are removed, @@ -821,7 +821,7 @@ class LteUeRrc : public Object uint8_t m_lastRrcTransactionIdentifier; ///< last RRC transaction identifier - LteRrcSap::PdschConfigDedicated m_pdschConfigDedicated; ///< the PDSCH condig dedicated + LteRrcSap::PdschConfigDedicated m_pdschConfigDedicated; ///< the PDSCH config dedicated uint16_t m_dlBandwidth; /**< Downlink bandwidth in RBs. */ uint16_t m_ulBandwidth; /**< Uplink bandwidth in RBs. */ diff --git a/src/lte/model/pf-ff-mac-scheduler.cc b/src/lte/model/pf-ff-mac-scheduler.cc index 1838e9af9..474b4f753 100644 --- a/src/lte/model/pf-ff-mac-scheduler.cc +++ b/src/lte/model/pf-ff-mac-scheduler.cc @@ -966,11 +966,13 @@ PfFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" + << (uint16_t)(*it).first); } if (!HarqProcessAvailability((*it).first)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" + << (uint16_t)(*it).first); } continue; } @@ -1590,7 +1592,8 @@ PfFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/pss-ff-mac-scheduler.cc b/src/lte/model/pss-ff-mac-scheduler.cc index d18e15274..18acc2225 100644 --- a/src/lte/model/pss-ff-mac-scheduler.cc +++ b/src/lte/model/pss-ff-mac-scheduler.cc @@ -1004,11 +1004,11 @@ PssFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it).first); } if (!HarqProcessAvailability((*it).first)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it).first); } continue; } @@ -1953,7 +1953,8 @@ PssFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/pss-ff-mac-scheduler.h b/src/lte/model/pss-ff-mac-scheduler.h index ad86b05b2..8c64a5fed 100644 --- a/src/lte/model/pss-ff-mac-scheduler.h +++ b/src/lte/model/pss-ff-mac-scheduler.h @@ -226,7 +226,7 @@ class PssFfMacScheduler : public FfMacScheduler const struct FfMacSchedSapProvider::SchedUlTriggerReqParameters& params); /** - * \brief Sched UL noise inteference request function + * \brief Sched UL noise interference request function * * \param params FfMacSchedSapProvider::SchedUlNoiseInterferenceReqParameters */ diff --git a/src/lte/model/tdbet-ff-mac-scheduler.cc b/src/lte/model/tdbet-ff-mac-scheduler.cc index da016b34e..1e28b7e47 100644 --- a/src/lte/model/tdbet-ff-mac-scheduler.cc +++ b/src/lte/model/tdbet-ff-mac-scheduler.cc @@ -935,11 +935,11 @@ TdBetFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it).first); } if (!HarqProcessAvailability((*it).first)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it).first); } continue; } @@ -1422,7 +1422,8 @@ TdBetFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/tdmt-ff-mac-scheduler.cc b/src/lte/model/tdmt-ff-mac-scheduler.cc index 43329957c..7c1a0ce9f 100644 --- a/src/lte/model/tdmt-ff-mac-scheduler.cc +++ b/src/lte/model/tdmt-ff-mac-scheduler.cc @@ -895,11 +895,11 @@ TdMtFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it)); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it)); } if (!HarqProcessAvailability((*it))) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it)); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it)); } continue; @@ -1394,7 +1394,8 @@ TdMtFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/tdtbfq-ff-mac-scheduler.cc b/src/lte/model/tdtbfq-ff-mac-scheduler.cc index 33dd294f0..92eb85d0f 100644 --- a/src/lte/model/tdtbfq-ff-mac-scheduler.cc +++ b/src/lte/model/tdtbfq-ff-mac-scheduler.cc @@ -1028,11 +1028,11 @@ TdTbfqFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it).first); } if (!HarqProcessAvailability((*it).first)) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it).first); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it).first); } continue; } @@ -1622,7 +1622,8 @@ TdTbfqFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/model/tta-ff-mac-scheduler.cc b/src/lte/model/tta-ff-mac-scheduler.cc index 85bc8da0c..6d151ab17 100644 --- a/src/lte/model/tta-ff-mac-scheduler.cc +++ b/src/lte/model/tta-ff-mac-scheduler.cc @@ -900,11 +900,11 @@ TtaFfMacScheduler::DoSchedDlTriggerReq( // UE already allocated for HARQ or without HARQ process available -> drop it if (itRnti != rntiAllocated.end()) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ tx" << (uint16_t)(*it)); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ tx" << (uint16_t)(*it)); } if (!HarqProcessAvailability((*it))) { - NS_LOG_DEBUG(this << " RNTI discared for HARQ id" << (uint16_t)(*it)); + NS_LOG_DEBUG(this << " RNTI discarded for HARQ id" << (uint16_t)(*it)); } continue; } @@ -1482,7 +1482,8 @@ TtaFfMacScheduler::DoSchedUlTriggerReq( if ((itRnti != rntiAllocated.end()) || ((*it).second == 0)) { // UE already allocated for UL-HARQ -> skip it - NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discared, RNTI " << (*it).first); + NS_LOG_DEBUG(this << " UE already allocated in HARQ -> discarded, RNTI " + << (*it).first); it++; if (it == m_ceBsrRxed.end()) { diff --git a/src/lte/test/lte-test-carrier-aggregation-configuration.cc b/src/lte/test/lte-test-carrier-aggregation-configuration.cc index 4ff49fea5..958896a3d 100644 --- a/src/lte/test/lte-test-carrier-aggregation-configuration.cc +++ b/src/lte/test/lte-test-carrier-aggregation-configuration.cc @@ -136,7 +136,7 @@ class CarrierAggregationConfigTestCase : public TestCase */ std::vector> EquallySpacedCcs(); - uint32_t m_numberOfNodes; ///< Numer of nodes + uint32_t m_numberOfNodes; ///< Number of nodes uint16_t m_numberOfComponentCarriers; ///< Number of component carriers std::vector m_configToCheck; ///< Vector containing all the configurations to check diff --git a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.h b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.h index 00384cda2..66fb27411 100644 --- a/src/lte/test/lte-test-fdbet-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-fdbet-ff-mac-scheduler.h @@ -77,7 +77,7 @@ class LenaFdBetFfMacSchedulerTestCase1 : public TestCase /** * \ingroup lte-test * - * \brief Test case is simillar to the one defined in + * \brief Test case is similar to the one defined in * LenaFdBetFfMacSchedulerTestCase1, with the difference that UEs are * placed in such a way to experience different SINRs from eNodeB. */ diff --git a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.h b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.h index e0959cb12..b74ca7d3b 100644 --- a/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-fdtbfq-ff-mac-scheduler.h @@ -83,7 +83,7 @@ class LenaFdTbfqFfMacSchedulerTestCase1 : public TestCase /** * \ingroup lte-test * - * \brief Test case is simillar to the one defined in + * \brief Test case is similar to the one defined in * LenaFdTbfqFfMacSchedulerTestCase1, with the difference that UEs are * placed in such a way to experience different SINRs from eNodeB. */ diff --git a/src/lte/test/lte-test-interference-fr.h b/src/lte/test/lte-test-interference-fr.h index ff9c6892d..00f52a7ba 100644 --- a/src/lte/test/lte-test-interference-fr.h +++ b/src/lte/test/lte-test-interference-fr.h @@ -54,7 +54,7 @@ class LteInterferenceHardFrTestCase : public TestCase * * \param name the reference name * \param d1 distance between ENB and UE - * \param d2 distnace between ENB and other UE + * \param d2 distance between ENB and other UE * \param dlSinr the DL SINR * \param ulSinr the UL SINR */ @@ -86,7 +86,7 @@ class LteInterferenceStrictFrTestCase : public TestCase * * \param name the reference name * \param d1 distance between ENB and UE - * \param d2 distnace between ENB and other UE + * \param d2 distance between ENB and other UE * \param commonDlSinr the DL SINR * \param commonUlSinr the UL SINR * \param edgeDlSinr the DL SINR diff --git a/src/lte/test/lte-test-interference.h b/src/lte/test/lte-test-interference.h index 4a0720031..bf8bcf7bf 100644 --- a/src/lte/test/lte-test-interference.h +++ b/src/lte/test/lte-test-interference.h @@ -51,7 +51,7 @@ class LteInterferenceTestCase : public TestCase * * \param name the reference name * \param d1 distance between ENB and UE - * \param d2 distnace between ENB and other UE + * \param d2 distance between ENB and other UE * \param dlSinr the DL SINR * \param ulSinr the UL SINR * \param dlSe the DL se diff --git a/src/lte/test/lte-test-pf-ff-mac-scheduler.h b/src/lte/test/lte-test-pf-ff-mac-scheduler.h index 39034abd0..c6d316f5f 100644 --- a/src/lte/test/lte-test-pf-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-pf-ff-mac-scheduler.h @@ -60,7 +60,7 @@ class LenaPfFfMacSchedulerTestCase1 : public TestCase /** * Build name string * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, double dist); @@ -98,7 +98,7 @@ class LenaPfFfMacSchedulerTestCase2 : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, std::vector dist); diff --git a/src/lte/test/lte-test-phy-error-model.h b/src/lte/test/lte-test-phy-error-model.h index 5c964e5a3..573853c4f 100644 --- a/src/lte/test/lte-test-phy-error-model.h +++ b/src/lte/test/lte-test-phy-error-model.h @@ -106,7 +106,7 @@ class LenaDlCtrlPhyErrorModelTestCase : public TestCase /** * Build name string * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \param rngRun the rng run * \returns the name string */ diff --git a/src/lte/test/lte-test-pss-ff-mac-scheduler.h b/src/lte/test/lte-test-pss-ff-mac-scheduler.h index 6af705641..8f9c6338a 100644 --- a/src/lte/test/lte-test-pss-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-pss-ff-mac-scheduler.h @@ -65,7 +65,7 @@ class LenaPssFfMacSchedulerTestCase1 : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, double dist); @@ -82,7 +82,7 @@ class LenaPssFfMacSchedulerTestCase1 : public TestCase /** * \ingroup lte-test * - * \brief Simillar to the LenaPssFfMacSchedulerTestCase1 with the difference that + * \brief Similar to the LenaPssFfMacSchedulerTestCase1 with the difference that * UEs are places in such a way to experience different SINRs. Test checks if the * achieved throughput in such conditions has expected value. */ @@ -109,7 +109,7 @@ class LenaPssFfMacSchedulerTestCase2 : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, std::vector dist); diff --git a/src/lte/test/lte-test-rlc-am-transmitter.h b/src/lte/test/lte-test-rlc-am-transmitter.h index a7e6cf8b3..aa6f67b57 100644 --- a/src/lte/test/lte-test-rlc-am-transmitter.h +++ b/src/lte/test/lte-test-rlc-am-transmitter.h @@ -69,7 +69,7 @@ class LteRlcAmTransmitterTestCase : public TestCase /** * Check data received function * \param time the time to check - * \param shouldReceived shoul dhave received indicator + * \param shouldReceived should have received indicator * \param assertMsg the assert message */ void CheckDataReceived(Time time, std::string shouldReceived, std::string assertMsg); @@ -84,7 +84,7 @@ class LteRlcAmTransmitterTestCase : public TestCase private: /** * Check data received function - * \param shouldReceived shoul dhave received indicator + * \param shouldReceived should have received indicator * \param assertMsg the assert message */ void DoCheckDataReceived(std::string shouldReceived, std::string assertMsg); diff --git a/src/lte/test/lte-test-rlc-um-transmitter.h b/src/lte/test/lte-test-rlc-um-transmitter.h index ff3ed2340..bc3e37f7e 100644 --- a/src/lte/test/lte-test-rlc-um-transmitter.h +++ b/src/lte/test/lte-test-rlc-um-transmitter.h @@ -69,7 +69,7 @@ class LteRlcUmTransmitterTestCase : public TestCase /** * Check data received function * \param time the time to check - * \param shouldReceived shoul dhave received indicator + * \param shouldReceived should have received indicator * \param assertMsg the assert message */ void CheckDataReceived(Time time, std::string shouldReceived, std::string assertMsg); diff --git a/src/lte/test/lte-test-spectrum-value-helper.cc b/src/lte/test/lte-test-spectrum-value-helper.cc index fee065eb2..127423f49 100644 --- a/src/lte/test/lte-test-spectrum-value-helper.cc +++ b/src/lte/test/lte-test-spectrum-value-helper.cc @@ -40,7 +40,7 @@ class LteSpectrumModelTestCase : public TestCase * * \param str the test reference name * \param earfcn the central carrier frequency - * \param bw bandwidth tha bandwidth + * \param bw bandwidth the bandwidth * \param fcs the expected spectrum model */ LteSpectrumModelTestCase(const char* str, uint16_t earfcn, uint8_t bw, std::vector fcs); diff --git a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.h b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.h index f4b80e1da..d5dcb7067 100644 --- a/src/lte/test/lte-test-tdbet-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-tdbet-ff-mac-scheduler.h @@ -61,7 +61,7 @@ class LenaTdBetFfMacSchedulerTestCase1 : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between UE nodes and eNodeB + * \param dist the distance between UE nodes and eNodeB * \returns the name string */ static std::string BuildNameString(uint16_t nUser, double dist); diff --git a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.h b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.h index 5706bf477..6ddc1bcce 100644 --- a/src/lte/test/lte-test-tdmt-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-tdmt-ff-mac-scheduler.h @@ -61,7 +61,7 @@ class LenaTdMtFfMacSchedulerTestCase : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, double dist); diff --git a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.h b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.h index fd5d1131e..9e3fcad93 100644 --- a/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-tdtbfq-ff-mac-scheduler.h @@ -65,7 +65,7 @@ class LenaTdTbfqFfMacSchedulerTestCase1 : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between UE nodes and eNodeB + * \param dist the distance between UE nodes and eNodeB * \returns the name string */ static std::string BuildNameString(uint16_t nUser, double dist); @@ -107,7 +107,7 @@ class LenaTdTbfqFfMacSchedulerTestCase2 : public TestCase /** * Builds the test name string based on provided parameter values * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, std::vector dist); diff --git a/src/lte/test/lte-test-tta-ff-mac-scheduler.h b/src/lte/test/lte-test-tta-ff-mac-scheduler.h index 09c738383..cb3bd3a1f 100644 --- a/src/lte/test/lte-test-tta-ff-mac-scheduler.h +++ b/src/lte/test/lte-test-tta-ff-mac-scheduler.h @@ -61,7 +61,7 @@ class LenaTtaFfMacSchedulerTestCase : public TestCase /** * Build name string * \param nUser the number of UE nodes - * \param dist the distnace between nodes + * \param dist the distance between nodes * \returns the name string */ static std::string BuildNameString(uint16_t nUser, double dist); diff --git a/src/lte/test/lte-test-ue-measurements.h b/src/lte/test/lte-test-ue-measurements.h index 9be4e15fc..8980d58d6 100644 --- a/src/lte/test/lte-test-ue-measurements.h +++ b/src/lte/test/lte-test-ue-measurements.h @@ -144,8 +144,8 @@ class LteUeMeasurementsPiecewiseTestSuite1 : public TestSuite * the placement of UE is being changed several times. Four different * cases are considered: UE is very near to eNodeB, UE is near to eNodeB, * UE is far from eNodeB and UE is very far from eNodeB. Test checks - * if the measurments correspond to the real conditions of the UE, i.e. - * wnen the signal from serving cell becomes weak, the measurements should + * if the measurements correspond to the real conditions of the UE, i.e. + * when the signal from serving cell becomes weak, the measurements should * also start to correspond to the new channel conditions. Additionally, it * is checked if UE detects some neighboring signal, if it does the test * fails because there is no neighbor in this configuration. Also, test diff --git a/src/lte/test/reference/lte_cqi_generation.m b/src/lte/test/reference/lte_cqi_generation.m index 4b9b14a2c..751719c57 100644 --- a/src/lte/test/reference/lte_cqi_generation.m +++ b/src/lte/test/reference/lte_cqi_generation.m @@ -9,11 +9,11 @@ ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 nrbsControl = 25; % tx bandwidth configuration in number of RBs bwControl = nrbsControl * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 nrbsData = 12; % tx bandwidth configuration in number of RBs bwData = nrbsData * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBmData = kT + 10*log10(bwData); % noise power dBm diff --git a/src/lte/test/reference/lte_frequency_reuse.m b/src/lte/test/reference/lte_frequency_reuse.m index 964873986..9aa60d70f 100644 --- a/src/lte/test/reference/lte_frequency_reuse.m +++ b/src/lte/test/reference/lte_frequency_reuse.m @@ -11,7 +11,7 @@ dlp = 10.^((dlpdBm - 30)/10); %% tx pow in W in DL %%DOWNLINK P_A = 0; %% << change this value to simulate Downlink Power Allocation PdschPower = 10.^((dlpdBm+ P_A - 30)/10); -printf("Expexted Pdsch Power: %f \n", PdschPower) +printf("Expected Pdsch Power: %f \n", PdschPower) %%UPLINK @@ -69,5 +69,5 @@ if (PuschPowerdB < Pcmin) endif PuschPower = 10.^((PuschPowerdB - 30 )/10); -printf("Expexted Pusch Power: %f \n", PuschPower) +printf("Expected Pusch Power: %f \n", PuschPower) diff --git a/src/lte/test/reference/lte_link_budget.m b/src/lte/test/reference/lte_link_budget.m index 83763fc4d..6be3bcc1f 100644 --- a/src/lte/test/reference/lte_link_budget.m +++ b/src/lte/test/reference/lte_link_budget.m @@ -7,7 +7,7 @@ close all; f = 2160e6; % carrier freq Hz, EARFCN = 500 (downlink) nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz n = kT + 10*log10(bw); % noise power dBm p = 30; % tx power dBm diff --git a/src/lte/test/reference/lte_link_budget_interference.m b/src/lte/test/reference/lte_link_budget_interference.m index 028fa23bc..20c871e0b 100644 --- a/src/lte/test/reference/lte_link_budget_interference.m +++ b/src/lte/test/reference/lte_link_budget_interference.m @@ -8,7 +8,7 @@ fdl = 2120e6; % DL carrier freq Hz, EARFCN = 100 ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBm = kT + 10*log10(bw); % noise power dBm diff --git a/src/lte/test/reference/lte_link_budget_interference_fr.m b/src/lte/test/reference/lte_link_budget_interference_fr.m index 0431d8a65..358b3143e 100644 --- a/src/lte/test/reference/lte_link_budget_interference_fr.m +++ b/src/lte/test/reference/lte_link_budget_interference_fr.m @@ -8,7 +8,7 @@ fdl = 2120e6; % DL carrier freq Hz, EARFCN = 100 ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 nrbs = 25; % tx bandwidth configuration in number of RBs bw = nrbs * 180000; % bandwidth in Hz, note that this is smaller than - % the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1 + % the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBm = kT + 10*log10(bw); % noise power dBm diff --git a/src/lte/test/reference/lte_ue_measurements.m b/src/lte/test/reference/lte_ue_measurements.m index 770238031..134962c1b 100644 --- a/src/lte/test/reference/lte_ue_measurements.m +++ b/src/lte/test/reference/lte_ue_measurements.m @@ -6,10 +6,10 @@ close all; fdl = 2120e6; % DL carrier freq Hz, EARFCN = 100 ful = 1930e6; % UL carrier freq Hz, EARFCN = 18100 -nrbs = 25; % tx bandwdith configuration in number of RBs +nrbs = 25; % tx bandwidth configuration in number of RBs nres = nrbs * 12; bw = 180000 / 12; % bandwidth per RE in Hz -%%bwtot = xxx %%, note that this is smaller than the nominal Channel Bandwdith, see TS 36.101 fig 5.6-1 +%%bwtot = xxx %%, note that this is smaller than the nominal Channel Bandwidth, see TS 36.101 fig 5.6-1 kT = -174; % noise PSD in dBm / Hz ndBm = kT + 10*log10(bw); % noise power dBm for a RE diff --git a/src/lte/test/test-lte-handover-failure.cc b/src/lte/test/test-lte-handover-failure.cc index f53d8e306..96255ce9b 100644 --- a/src/lte/test/test-lte-handover-failure.cc +++ b/src/lte/test/test-lte-handover-failure.cc @@ -123,7 +123,7 @@ class LteHandoverFailureTestCase : public TestCase /** * \brief Called at the end of simulation and verifies that a handover - * and a handover failure has occured in the simulation. + * and a handover failure has occurred in the simulation. */ void DoTeardown() override; @@ -199,7 +199,7 @@ class LteHandoverFailureTestCase : public TestCase 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 occured in simulation + bool m_hasHandoverFailureOccured; ///< has handover failure occurred in simulation }; // end of class LteHandoverFailureTestCase diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.h b/src/mesh/model/dot11s/ie-dot11s-preq.h index e5bd3e5cd..0f2dbdbcf 100644 --- a/src/mesh/model/dot11s/ie-dot11s-preq.h +++ b/src/mesh/model/dot11s/ie-dot11s-preq.h @@ -214,7 +214,7 @@ class IePreq : public WifiInformationElement */ Mac48Address GetOriginatorAddress() const; /** - * Get originator sequence numnber value + * Get originator sequence number value * \returns the originator sequence number */ uint32_t GetOriginatorSeqNumber() const; diff --git a/src/mobility/helper/group-mobility-helper.h b/src/mobility/helper/group-mobility-helper.h index 55377361c..b3e77724e 100644 --- a/src/mobility/helper/group-mobility-helper.h +++ b/src/mobility/helper/group-mobility-helper.h @@ -181,7 +181,7 @@ class GroupMobilityHelper int64_t AssignStreams(NodeContainer c, int64_t stream); private: - // Enable loggin from template instantiations + // Enable logging from template instantiations NS_LOG_TEMPLATE_DECLARE; //!< the log component bool m_referencePositionSet{ diff --git a/src/mobility/helper/ns2-mobility-helper.cc b/src/mobility/helper/ns2-mobility-helper.cc index bd539b9d4..012f94818 100644 --- a/src/mobility/helper/ns2-mobility-helper.cc +++ b/src/mobility/helper/ns2-mobility-helper.cc @@ -178,7 +178,7 @@ static bool IsSetInitialPos(ParseResult pr); /** * Check if this corresponds to a line like this: $ns_ at 1 "$node_(0) setdest 2 3 4" * \param pr the ParseResult to analyze - * \returns true if the ParseResult looks like a coordinate with a scheduled time and destionation + * \returns true if the ParseResult looks like a coordinate with a scheduled time and destination */ static bool IsSchedSetPos(ParseResult pr); @@ -746,7 +746,7 @@ bool IsSetInitialPos(ParseResult pr) { // number of tokens has $node_( ? has "set" has - // doble for position? + // double for position? return pr.tokens.size() == 4 && HasNodeIdNumber(pr.tokens[0]) && pr.tokens[1] == NS2_SET && pr.has_dval[3] // coord name is X_, Y_ or Z_ ? diff --git a/src/mobility/model/steady-state-random-waypoint-mobility-model.h b/src/mobility/model/steady-state-random-waypoint-mobility-model.h index 012baef0d..d2520265b 100644 --- a/src/mobility/model/steady-state-random-waypoint-mobility-model.h +++ b/src/mobility/model/steady-state-random-waypoint-mobility-model.h @@ -38,7 +38,7 @@ namespace ns3 * The difference is that the initial values of this parameters are not * from uniform distribution but from stationary distribution of RWM model. * The implementation of this model is 2D-specific and with nonzero nodes speeds. - * In the 3D ns-3 coordinate system, the momement occurs on the + * In the 3D ns-3 coordinate system, the movement occurs on the * \f$ z=\overline{Z} \f$ plane, where \f$ \overline{Z} \f$ is a constant which * can be configured using the Z attribute. * diff --git a/src/mobility/test/ns2-mobility-helper-test-suite.cc b/src/mobility/test/ns2-mobility-helper-test-suite.cc index a8fb92daa..170453f78 100644 --- a/src/mobility/test/ns2-mobility-helper-test-suite.cc +++ b/src/mobility/test/ns2-mobility-helper-test-suite.cc @@ -114,7 +114,7 @@ class Ns2MobilityHelperTest : public TestCase /** * Less-than operator - used to sort by timestamp * \param o object to compare to - * \returns true if the timestamp of the 1nd operand is less than the other one's + * \returns true if the timestamp of the 1st operand is less than the other one's */ bool operator<(const ReferencePoint& o) const { @@ -508,7 +508,7 @@ class Ns2MobilityHelperTestSuite : public TestSuite t->AddReferencePoint("0", 3, Vector(0, -1, 0), Vector(0, 0, 0)); AddTestCase(t, TestCase::QUICK); - // Sqare setdest with values in the form 1.0e+2 + // Square setdest with values in the form 1.0e+2 t = new Ns2MobilityHelperTest("Foalt numbers in 1.0e+2 format", Seconds(6)); t->SetTrace("$node_(0) set X_ 0.0\n" "$node_(0) set Y_ 0.0\n" diff --git a/src/mobility/test/waypoint-mobility-model-test.cc b/src/mobility/test/waypoint-mobility-model-test.cc index 2aeeac8e4..92704257b 100644 --- a/src/mobility/test/waypoint-mobility-model-test.cc +++ b/src/mobility/test/waypoint-mobility-model-test.cc @@ -195,7 +195,7 @@ class WaypointMobilityModelAddWaypointTest : public TestCase void DoRun() override; void DoTeardown() override; /** - * Course change calback + * Course change callback * \param model the mobility model */ void CourseChangeCallback(Ptr model); diff --git a/src/mpi/model/distributed-simulator-impl.cc b/src/mpi/model/distributed-simulator-impl.cc index acd66dfa4..2eac98979 100644 --- a/src/mpi/model/distributed-simulator-impl.cc +++ b/src/mpi/model/distributed-simulator-impl.cc @@ -164,7 +164,7 @@ DistributedSimulatorImpl::CalculateLookAhead() { NS_LOG_FUNCTION(this); - /* If runnning sequential simulation can ignore lookahead */ + /* If running sequential simulation can ignore lookahead */ if (MpiInterface::GetSize() <= 1) { m_lookAhead = Seconds(0); diff --git a/src/netanim/examples/resources-counters.cc b/src/netanim/examples/resources-counters.cc index 8d0224a68..0492d6048 100644 --- a/src/netanim/examples/resources-counters.cc +++ b/src/netanim/examples/resources-counters.cc @@ -29,7 +29,7 @@ using namespace ns3; AnimationInterface* pAnim = nullptr; -/// RGB struture +/// RGB structure struct Rgb { uint8_t r; ///< red diff --git a/src/netanim/model/animation-interface.cc b/src/netanim/model/animation-interface.cc index 3a0c041d6..974f44fcd 100644 --- a/src/netanim/model/animation-interface.cc +++ b/src/netanim/model/animation-interface.cc @@ -2199,7 +2199,7 @@ AnimationInterface::SetOutputFile(const std::string& fn, bool routing) void AnimationInterface::CheckMaxPktsPerTraceFile() { - // Start a new trace file if the current packet count exceeded nax packets per file + // Start a new trace file if the current packet count exceeded max packets per file ++m_currentPktCount; if (m_currentPktCount <= m_maxPktsPerFile) { diff --git a/src/netanim/model/animation-interface.h b/src/netanim/model/animation-interface.h index e61e7ed15..30fffe451 100644 --- a/src/netanim/model/animation-interface.h +++ b/src/netanim/model/animation-interface.h @@ -253,9 +253,9 @@ class AnimationInterface /** * \brief Helper function to set Constant Position for a given node * \param n Ptr to the node - * \param x X co-ordinate of the node - * \param y Y co-ordinate of the node - * \param z Z co-ordinate of the node + * \param x X coordinate of the node + * \param y Y coordinate of the node + * \param z Z coordinate of the node * */ static void SetConstantPosition(Ptr n, double x, double y, double z = 0); @@ -334,8 +334,8 @@ class AnimationInterface /** * \brief Helper function to set the background image * \param fileName File name of the background image - * \param x X co-ordinate of the image - * \param y Y co-ordinate of the image + * \param x X coordinate of the image + * \param y Y coordinate of the image * \param scaleX X scale of the image * \param scaleY Y scale of the image * \param opacity Opacity of the background: A value between 0.0 and 1.0. 0.0 is transparent, diff --git a/src/network/doc/error-model.rst b/src/network/doc/error-model.rst index 871494d56..430db8d8f 100644 --- a/src/network/doc/error-model.rst +++ b/src/network/doc/error-model.rst @@ -77,7 +77,7 @@ The base class API is as follows: Some models could potentially alter the contents of the packet bit buffer. * ``void ErrorModel::Reset ()``: Reset any state. * ``void ErrorModel::Enable ()``: Enable the model -* ``void ErrorModel::Disble ()``: Disable the model; IsCorrupt() will +* ``void ErrorModel::Disable ()``: Disable the model; IsCorrupt() will always return false. * ``bool ErrorModel::IsEnabled () const``: Return the enabled state diff --git a/src/network/helper/application-container.h b/src/network/helper/application-container.h index c24013631..1383e7482 100644 --- a/src/network/helper/application-container.h +++ b/src/network/helper/application-container.h @@ -140,7 +140,7 @@ class ApplicationContainer * Applications can be retrieved from the container in two ways. First, * directly by an index into the container, and second, using an iterator. * This method is used in the direct method and is used to retrieve the - * indexed Ptr. + * indexed Ptr. * * \code * uint32_t nApplications = container.GetN (); diff --git a/src/network/model/nix-vector.h b/src/network/model/nix-vector.h index 34bd86447..b3913b64c 100644 --- a/src/network/model/nix-vector.h +++ b/src/network/model/nix-vector.h @@ -34,7 +34,7 @@ namespace ns3 * * This data structure holds a vector of "neighbor-indexes" for * a simulation specific routing protocol, nix-vector routing. - * Theses neighbor-indexes correspond to the net-device which a + * These neighbor-indexes correspond to the net-device which a * node should use to route a packet. A nix-vector is built * (or fetched from a cache) on-demand. The nix-vector is * transmitted with the packet, and along each hop of the diff --git a/src/network/model/socket.h b/src/network/model/socket.h index 08513fb23..875edc572 100644 --- a/src/network/model/socket.h +++ b/src/network/model/socket.h @@ -180,7 +180,7 @@ class Socket : public Object * completed. The callback is passed back a pointer to * the same socket object. * \param connectionFailed this callback is invoked when the - * connection request initiated by the user is unsuccessfully + * connection request initiated by the user is unsuccessfuly * completed. The callback is passed back a pointer to the * same socket object. */ diff --git a/src/network/test/pcap-file-test-suite.cc b/src/network/test/pcap-file-test-suite.cc index 4a3446f51..b3b2651d4 100644 --- a/src/network/test/pcap-file-test-suite.cc +++ b/src/network/test/pcap-file-test-suite.cc @@ -1284,10 +1284,10 @@ ReadFileTestCase::DoRun() NS_TEST_ASSERT_MSG_EQ(f.Fail(), false, "Read() of known good pcap file returns error"); NS_TEST_ASSERT_MSG_EQ(tsSec, p.tsSec, - "Incorrectly read seconds timestap from known good pcap file"); + "Incorrectly read seconds timestamp from known good pcap file"); NS_TEST_ASSERT_MSG_EQ(tsUsec, p.tsUsec, - "Incorrectly read microseconds timestap from known good pcap file"); + "Incorrectly read microseconds timestamp from known good pcap file"); NS_TEST_ASSERT_MSG_EQ(inclLen, p.inclLen, "Incorrectly read included length from known good packet"); diff --git a/src/network/test/test-data-rate.cc b/src/network/test/test-data-rate.cc index befff3620..e52678f0d 100644 --- a/src/network/test/test-data-rate.cc +++ b/src/network/test/test-data-rate.cc @@ -198,7 +198,7 @@ class DataRateTestCase2 : public DataRateTestCase }; DataRateTestCase2::DataRateTestCase2() - : DataRateTestCase("Test arithmatic on DateRate") + : DataRateTestCase("Test arithmetic on DateRate") { } diff --git a/src/network/utils/data-rate.h b/src/network/utils/data-rate.h index 6df2ade7b..d4f3ac2bc 100644 --- a/src/network/utils/data-rate.h +++ b/src/network/utils/data-rate.h @@ -57,7 +57,7 @@ namespace ns3 * * A unit. * * Whitespace is allowed but not required between the numeric value and - * multipler or unit. + * multiplier or unit. * * Supported multiplier prefixes: * @@ -165,7 +165,7 @@ class DataRate * * \return DataRate object representing the product of this object with rhs * - * \param rhs the double to multipy to this datarate + * \param rhs the double to multiply to this datarate */ DataRate& operator*=(double rhs); @@ -174,7 +174,7 @@ class DataRate * * \return DataRate object representing the product of this object with rhs * - * \param rhs the uint64_t to multipy to this datarate + * \param rhs the uint64_t to multiply to this datarate */ DataRate operator*(uint64_t rhs) const; @@ -183,7 +183,7 @@ class DataRate * * \return DataRate object representing the product of this object with rhs * - * \param rhs the uint64_t to multipy to this datarate + * \param rhs the uint64_t to multiply to this datarate */ DataRate& operator*=(uint64_t rhs); diff --git a/src/network/utils/llc-snap-header.h b/src/network/utils/llc-snap-header.h index 5aa8781e9..a02837470 100644 --- a/src/network/utils/llc-snap-header.h +++ b/src/network/utils/llc-snap-header.h @@ -29,7 +29,7 @@ namespace ns3 { /** - * The length in octects of the LLC/SNAP header + * The length in octets of the LLC/SNAP header */ static const uint16_t LLC_SNAP_HEADER_LENGTH = 8; diff --git a/src/network/utils/queue-size.h b/src/network/utils/queue-size.h index 46830dbc3..832ab0f2d 100644 --- a/src/network/utils/queue-size.h +++ b/src/network/utils/queue-size.h @@ -66,7 +66,7 @@ enum QueueSizeUnit * * A unit. * * Whitespace is allowed but not required between the numeric value and - * multipler or unit. + * multiplier or unit. * * Supported multiplier prefixes: * diff --git a/src/nix-vector-routing/doc/nix-vector-routing.rst b/src/nix-vector-routing/doc/nix-vector-routing.rst index f13c20ad6..16ab9c0cf 100644 --- a/src/nix-vector-routing/doc/nix-vector-routing.rst +++ b/src/nix-vector-routing/doc/nix-vector-routing.rst @@ -166,7 +166,7 @@ There are examples which use both IPv4 and IPv6 networking. n2 has 3 neighbors i.e. n1, n3 and n0. The n2 net-device for n1 -- n2 p2p link was created before the n2 net-device for n2 -- n3 p2p link which was before the n2 netdevice for n0 -- n2 p2p link. This, n3 - has neighbor-index of 01 (n1 has 00 and n0 has 10) with repect to n2. + has neighbor-index of 01 (n1 has 00 and n0 has 10) with respect to n2. Thus, the nix-vector for the path from n0 to n3 is 101. diff --git a/src/nix-vector-routing/model/nix-vector-routing.h b/src/nix-vector-routing/model/nix-vector-routing.h index 7a8001f1f..957a2c155 100644 --- a/src/nix-vector-routing/model/nix-vector-routing.h +++ b/src/nix-vector-routing/model/nix-vector-routing.h @@ -487,7 +487,7 @@ class NixVectorRouting : public std::enable_if_tm_state.InsertNeighborTuple(neigbor); - neigbor.neighborMainAddr = Ipv4Address("10.0.0.3"); - protocol->m_state.InsertNeighborTuple(neigbor); + NeighborTuple neighbor; + neighbor.status = NeighborTuple::STATUS_SYM; + neighbor.willingness = OLSR_WILL_DEFAULT; + neighbor.neighborMainAddr = Ipv4Address("10.0.0.2"); + protocol->m_state.InsertNeighborTuple(neighbor); + neighbor.neighborMainAddr = Ipv4Address("10.0.0.3"); + protocol->m_state.InsertNeighborTuple(neighbor); TwoHopNeighborTuple tuple; tuple.expirationTime = Seconds(3600); tuple.neighborMainAddr = Ipv4Address("10.0.0.2"); @@ -149,9 +149,9 @@ OlsrMprTestCase::DoRun() * * Node 1 must select nodes 2, 3 and 7 (since it is WILL_ALWAYS) as MPRs. */ - neigbor.willingness = OLSR_WILL_ALWAYS; - neigbor.neighborMainAddr = Ipv4Address("10.0.0.7"); - protocol->m_state.InsertNeighborTuple(neigbor); + neighbor.willingness = OLSR_WILL_ALWAYS; + neighbor.neighborMainAddr = Ipv4Address("10.0.0.7"); + protocol->m_state.InsertNeighborTuple(neighbor); protocol->MprComputation(); mpr = state.GetMprSet(); @@ -171,9 +171,9 @@ OlsrMprTestCase::DoRun() * Node 1 must select nodes 2, 3 and 7 (since it is WILL_ALWAYS) as MPRs. * Node 1 must NOT select node 8 as MPR since it is WILL_NEVER */ - neigbor.willingness = OLSR_WILL_NEVER; - neigbor.neighborMainAddr = Ipv4Address("10.0.0.8"); - protocol->m_state.InsertNeighborTuple(neigbor); + neighbor.willingness = OLSR_WILL_NEVER; + neighbor.neighborMainAddr = Ipv4Address("10.0.0.8"); + protocol->m_state.InsertNeighborTuple(neighbor); tuple.neighborMainAddr = Ipv4Address("10.0.0.8"); tuple.twoHopNeighborAddr = Ipv4Address("10.0.0.9"); protocol->m_state.InsertTwoHopNeighborTuple(tuple); diff --git a/src/propagation/examples/jakes-propagation-model-example.cc b/src/propagation/examples/jakes-propagation-model-example.cc index e46eddd62..545fdb41c 100644 --- a/src/propagation/examples/jakes-propagation-model-example.cc +++ b/src/propagation/examples/jakes-propagation-model-example.cc @@ -28,7 +28,7 @@ using namespace ns3; /** * \ingroup propagation * \brief Constructs a JakesPropagationlossModel and print the loss value as a function of time into - * std::cout. Distribution and correlation statistics is compared woth a theoretical ones using R + * std::cout. Distribution and correlation statistics is compared with a theoretical ones using R * package (http://www.r-project.org/). Scripts are presented within comments. */ class JakesPropagationExample diff --git a/src/propagation/model/channel-condition-model.h b/src/propagation/model/channel-condition-model.h index 92893f374..a6ee23243 100644 --- a/src/propagation/model/channel-condition-model.h +++ b/src/propagation/model/channel-condition-model.h @@ -103,7 +103,7 @@ class ChannelCondition : public Object ~ChannelCondition() override; /** - * Get the LosConditionValue contaning the information about the LOS/NLOS + * Get the LosConditionValue containing the information about the LOS/NLOS * state of the channel * * \return the LosConditionValue @@ -119,7 +119,7 @@ class ChannelCondition : public Object void SetLosCondition(LosConditionValue losCondition); /** - * Get the O2iConditionValue contaning the information about the O2I + * Get the O2iConditionValue containing the information about the O2I * state of the channel * * \return the O2iConditionValue @@ -127,7 +127,7 @@ class ChannelCondition : public Object O2iConditionValue GetO2iCondition() const; /** - * Set the O2iConditionValue contaning the information about the O2I + * Set the O2iConditionValue containing the information about the O2I * state of the channel * * \param o2iCondition the O2iConditionValue @@ -135,7 +135,7 @@ class ChannelCondition : public Object void SetO2iCondition(O2iConditionValue o2iCondition); /** - * Get the O2iLowHighConditionValue contaning the information about the O2I + * Get the O2iLowHighConditionValue containing the information about the O2I * building penetration losses (low or high) * * \return the O2iLowHighConditionValue @@ -143,7 +143,7 @@ class ChannelCondition : public Object O2iLowHighConditionValue GetO2iLowHighCondition() const; /** - * Set the O2iLowHighConditionValue contaning the information about the O2I + * Set the O2iLowHighConditionValue containing the information about the O2I * building penetration losses (low or high) * * \param o2iLowHighCondition the O2iLowHighConditionValue @@ -569,8 +569,8 @@ class ThreeGppChannelConditionModel : public ChannelConditionModel Time m_updatePeriod; //!< the update period for the channel condition double m_o2iThreshold{ - 0}; //!< the threshold for determing what is the ratio of channels with O2I - double m_o2iLowLossThreshold{0}; //!< the threshold for determing what is the ratio of low - + 0}; //!< the threshold for determining what is the ratio of channels with O2I + double m_o2iLowLossThreshold{0}; //!< the threshold for determining what is the ratio of low - //!< high O2I building penetration losses double m_linkO2iConditionToAntennaHeight{ false}; //!< the indicator that determines whether the O2I/O2O condition is determined based diff --git a/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc b/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc index 98dd432f5..b53eda38a 100644 --- a/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc +++ b/src/propagation/test/three-gpp-propagation-loss-model-test-suite.cc @@ -1020,7 +1020,7 @@ class ThreeGppShadowingTestCase : public TestCase * to be used * \param hBs the BS height in meters * \param hUt the UT height in meters - * \param distance the intial distance between the BS and the UT + * \param distance the initial distance between the BS and the UT * \param shadowingEnabled true if shadowging must be enabled */ void RunTest(uint16_t testNum, diff --git a/src/sixlowpan/doc/sixlowpan.rst b/src/sixlowpan/doc/sixlowpan.rst index 5975a1dc4..17858987c 100644 --- a/src/sixlowpan/doc/sixlowpan.rst +++ b/src/sixlowpan/doc/sixlowpan.rst @@ -144,7 +144,7 @@ where part of the nodes are using HC1 and part IPHC because this would lead to c what the IPv6 address of a node is. Due to this, the nodes configured to use IPHC will drop the packets compressed with HC1 -and viceversa. The drop is logged in the drop trace as ``DROP_DISALLOWED_COMPRESSION``. +and vice-versa. The drop is logged in the drop trace as ``DROP_DISALLOWED_COMPRESSION``. Using 6LoWPAN with IPv4 (or other L3 protocols) diff --git a/src/sixlowpan/model/sixlowpan-net-device.cc b/src/sixlowpan/model/sixlowpan-net-device.cc index 5a271985f..24adaee63 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.cc +++ b/src/sixlowpan/model/sixlowpan-net-device.cc @@ -2356,7 +2356,7 @@ SixLowPanNetDevice::DoFragmentation(Ptr packet, NS_ASSERT_MSG(l2Mtu > frag1Hdr.GetSerializedSize(), "6LoWPAN: can not fragment, 6LoWPAN headers are bigger than MTU"); - // All the headers are substracted to get remaining units for data + // All the headers are subtracted to get remaining units for data size = l2Mtu - frag1Hdr.GetSerializedSize() - compressedHeaderSize - extraHdrSize; size -= size % 8; size += compressedHeaderSize; @@ -2877,7 +2877,7 @@ SixLowPanNetDevice::FindUnicastCompressionContext(Ipv6Address address, uint8_t& { if (address.HasPrefix(context.contextPrefix)) { - NS_LOG_LOGIC("Fount context " + NS_LOG_LOGIC("Found context " << +contextId << " " << Ipv6Address::GetOnes().CombinePrefix(context.contextPrefix) << context.contextPrefix << " matching"); @@ -2920,7 +2920,7 @@ SixLowPanNetDevice::FindMulticastCompressionContext(Ipv6Address address, uint8_t addressBytes[9] == contextBytes[5] && addressBytes[10] == contextBytes[6] && addressBytes[11] == contextBytes[7]) { - NS_LOG_LOGIC("Fount context " + NS_LOG_LOGIC("Found context " << +contextId << " " << Ipv6Address::GetOnes().CombinePrefix(context.contextPrefix) << context.contextPrefix << " matching"); diff --git a/src/sixlowpan/model/sixlowpan-net-device.h b/src/sixlowpan/model/sixlowpan-net-device.h index 7e78be402..ed19dea73 100644 --- a/src/sixlowpan/model/sixlowpan-net-device.h +++ b/src/sixlowpan/model/sixlowpan-net-device.h @@ -80,7 +80,7 @@ class SixLowPanNetDevice : public NetDevice DROP_FRAGMENT_TIMEOUT = 1, //!< Fragment timeout exceeded DROP_FRAGMENT_BUFFER_FULL, //!< Fragment buffer size exceeded DROP_UNKNOWN_EXTENSION, //!< Unsupported compression kind - DROP_DISALLOWED_COMPRESSION, //!< HC1 while in IPHC mode or viceversa + DROP_DISALLOWED_COMPRESSION, //!< HC1 while in IPHC mode or vice-versa DROP_SATETFUL_DECOMPRESSION_PROBLEM, //!< Decompression failed due to missing or expired //!< context }; @@ -178,7 +178,7 @@ class SixLowPanNetDevice : public NetDevice uint32_t ifindex); /** - * TracedCallback signature fo packet drop events + * TracedCallback signature for packet drop events * * \param [in] reason The reason for the drop. * \param [in] packet The packet. @@ -382,7 +382,7 @@ class SixLowPanNetDevice : public NetDevice * \param [in] packet The packet to be compressed. * \param [in] src The MAC source address. * \param [in] dst The MAC destination address. - * \return true if the packet can not be decompressed due to wrong context informations. + * \return true if the packet can not be decompressed due to wrong context information. */ bool DecompressLowPanIphc(Ptr packet, const Address& src, const Address& dst); @@ -407,7 +407,7 @@ class SixLowPanNetDevice : public NetDevice * \param [in] srcAddress The IPv6 source address. * \param [in] dstAddress The IPv6 destination address. * \return A std::pair containing the decompressed header type and a flag - true if the packet - * can not be decompressed due to wrong context informations. + * can not be decompressed due to wrong context information. */ std::pair DecompressLowPanNhc(Ptr packet, const Address& src, @@ -641,7 +641,7 @@ class SixLowPanNetDevice : public NetDevice Ptr m_rng; //!< Rng for the fragments tag. /** - * Structure holding the informations for a context (used in compression and decompression) + * Structure holding the information for a context (used in compression and decompression) */ struct ContextEntry { diff --git a/src/spectrum/doc/spectrum.rst b/src/spectrum/doc/spectrum.rst index 17c24858c..1f8775881 100644 --- a/src/spectrum/doc/spectrum.rst +++ b/src/spectrum/doc/spectrum.rst @@ -314,7 +314,7 @@ Output * Both ``SingleModelSpectrumChannel`` and ``MultiModelSpectrumChannel`` provide a trace source called ``PathLoss`` which is fired whenever a new path loss value is - calclulated. **Note**: only single-frequency path loss is accounted + calculated. **Note**: only single-frequency path loss is accounted for, see the attribute description. * The example implementations described in :ref:`sec-example-model-implementations` also provide some trace sources. @@ -991,8 +991,8 @@ Python companion script. In particular, reference ECDFs are obtained from the ch model of [TR38901]_. In turn, the reference ECDFs (one for each LoS condition, channel model scenario and carrier frequency combination) are compared to FTR distributions ECDFs obtained using different values of the parameters. Finally, the parameters which provide the best fit (in a goodness-of-fit sense) for -the specific scenario, LOS condition and carrier frequency are found. The paramters to test are picked initially -by performing an exhaustive seach within a discrete grid of possible values, and then by iteratively refining +the specific scenario, LOS condition and carrier frequency are found. The parameters to test are picked initially +by performing an exhaustive search within a discrete grid of possible values, and then by iteratively refining the previous search runs by scanning the neighborhood of the most recent identified values. In such regard, the Anderson-Darling statistical test is used to rank the various FTR distributions and eventually pick the one providing the closest approximation to the reference statistics. diff --git a/src/spectrum/model/half-duplex-ideal-phy.h b/src/spectrum/model/half-duplex-ideal-phy.h index 75712218e..f77e6be5c 100644 --- a/src/spectrum/model/half-duplex-ideal-phy.h +++ b/src/spectrum/model/half-duplex-ideal-phy.h @@ -210,7 +210,7 @@ class HalfDuplexIdealPhy : public SpectrumPhy Ptr m_mobility; //!< Mobility model Ptr m_antenna; //!< Antenna model - Ptr m_netDevice; //!< NetDevice connected to theis phy + Ptr m_netDevice; //!< NetDevice connected to this phy Ptr m_channel; //!< Channel Ptr m_txPsd; //!< Tx power spectral density diff --git a/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc b/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc index 6b7e76645..c1a93f060 100644 --- a/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc +++ b/src/spectrum/model/three-gpp-spectrum-propagation-loss-model.cc @@ -272,7 +272,7 @@ ThreeGppSpectrumPropagationLossModel::GetLongTerm( longTerm; // vector containing the long term component for each cluster // check if the channel matrix was generated considering a as the s-node and - // b as the u-node or viceversa + // b as the u-node or vice-versa PhasedArrayModel::ComplexVector sW; PhasedArrayModel::ComplexVector uW; if (!channelMatrix->IsReverse(aPhasedArrayModel->GetId(), bPhasedArrayModel->GetId())) diff --git a/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h b/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h index 217475a58..c2da53961 100644 --- a/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h +++ b/src/spectrum/model/two-ray-spectrum-propagation-loss-model.h @@ -321,7 +321,8 @@ class TwoRaySpectrumPropagationLossModel : public PhasedArraySpectrumPropagation std::string m_scenario; //!< the 3GPP scenario /** - * Chanel condition model used to retrieve the LOS/NLOS condition of the communicating endpoints + * Channel condition model used to retrieve the LOS/NLOS condition of the communicating + * endpoints */ Ptr m_channelConditionModel; }; diff --git a/src/spectrum/test/spectrum-value-test.cc b/src/spectrum/test/spectrum-value-test.cc index 3fddc0643..7d2104e15 100644 --- a/src/spectrum/test/spectrum-value-test.cc +++ b/src/spectrum/test/spectrum-value-test.cc @@ -54,10 +54,10 @@ class SpectrumValueTestCase : public TestCase private: /** - * Check that two SpectrumValue are equal withing a tolerance + * Check that two SpectrumValue are equal within a tolerance * \param x first SpectrumValue * \param y second SpectrumValue - * \return true if the two values are withing the tolerance + * \return true if the two values are within the tolerance */ bool MoreOrLessEqual(SpectrumValue x, SpectrumValue y); diff --git a/src/spectrum/utils/two-ray-to-three-gpp-ch-calibration.py b/src/spectrum/utils/two-ray-to-three-gpp-ch-calibration.py index 873d76a8f..a48f02c81 100644 --- a/src/spectrum/utils/two-ray-to-three-gpp-ch-calibration.py +++ b/src/spectrum/utils/two-ray-to-three-gpp-ch-calibration.py @@ -44,7 +44,7 @@ parser.add_argument("--fit_out_fname", default="two-ray-splm-fitted-params.txt", parser.add_argument("--c_plus_plus_out_fname", default="two-ray-cplusplus-fitted-params.txt", help="Filename of the fit results, encoded as a C++ data structure to be imported in ns-3") parser.add_argument("--figs_folder", default="FiguresTwoRayThreeGppChCalibration/", - help="utput folder for the fit results figures") + help="Output folder for the fit results figures") parser.add_argument("--epsilon", default=1e-7, help="Tolerance value for the preliminary tests") parser.add_argument("--preliminary_fit_test", default=True, diff --git a/src/stats/model/average.h b/src/stats/model/average.h index 76cc89549..f145adf91 100644 --- a/src/stats/model/average.h +++ b/src/stats/model/average.h @@ -200,7 +200,7 @@ class Average * Print avg (err) [min, max] * \param os The output stream * \param x The Average value to print - * \return the ouput stream. + * \return the output stream. */ template std::ostream& diff --git a/src/tap-bridge/doc/tap.rst b/src/tap-bridge/doc/tap.rst index 37dc903e2..cafd1002a 100644 --- a/src/tap-bridge/doc/tap.rst +++ b/src/tap-bridge/doc/tap.rst @@ -233,7 +233,7 @@ configuration of the virtual hosts may be dictated by another system and not be changeable to suit ns-3. For example, a particular VM scheme may create virtual "vethx" or "vmnetx" devices that appear local to virtual hosts. In order to connect to such systems, one would need to manually create TAP devices -on the host system and brigde these TAP devices to the existing (VM) virtual +on the host system and bridge these TAP devices to the existing (VM) virtual devices. The job of the Tap Bridge in this case is to extend the bridge to join a ns-3 net device. diff --git a/src/tap-bridge/examples/tap-csma-virtual-machine.cc b/src/tap-bridge/examples/tap-csma-virtual-machine.cc index 25bab83f5..44bbf0fdf 100644 --- a/src/tap-bridge/examples/tap-csma-virtual-machine.cc +++ b/src/tap-bridge/examples/tap-csma-virtual-machine.cc @@ -21,7 +21,7 @@ // The actual steps required to configure the virtual machines can be rather // involved, so we don't go into that here. Please have a look at one of // our HOWTOs on the nsnam wiki for more details about how to get the -// system confgured. For an example, have a look at "HOWTO Use Linux +// system configured. For an example, have a look at "HOWTO Use Linux // Containers to set up virtual networks" which uses this code as an // example. // diff --git a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc index 2d023140b..226b40fb4 100644 --- a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc +++ b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc @@ -21,7 +21,7 @@ // The actual steps required to configure the virtual machines can be rather // involved, so we don't go into that here. Please have a look at one of // our HOWTOs on the nsnam wiki for more details about how to get the -// system confgured. For an example, have a look at "HOWTO Use Linux +// system configured. For an example, have a look at "HOWTO Use Linux // Containers to set up virtual networks" which uses this code as an // example. // diff --git a/src/tap-bridge/model/tap-bridge.cc b/src/tap-bridge/model/tap-bridge.cc index ed248bc14..238be0819 100644 --- a/src/tap-bridge/model/tap-bridge.cc +++ b/src/tap-bridge/model/tap-bridge.cc @@ -292,7 +292,7 @@ TapBridge::CreateTap() // In ConfigureLocal mode, the user is asking the TapBridge to do the // configuration and create a TAP with the provided "DeviceName" with which // the user can later do what she wants. We need to extract values for the - // MAC address, IP address, net mask, etc, from the simualtion itself and + // MAC address, IP address, net mask, etc, from the simulation itself and // use them to initialize corresponding values on the created tap device. // // In UseBridge mode, the user is asking us to use an existing tap device diff --git a/src/tap-bridge/model/tap-creator.cc b/src/tap-bridge/model/tap-creator.cc index ec6e20511..c5d4093e4 100644 --- a/src/tap-bridge/model/tap-creator.cc +++ b/src/tap-bridge/model/tap-creator.cc @@ -474,7 +474,7 @@ main(int argc, char* argv[]) // in order to keep the main simulation program from having to be run with // root privileges. We need root privileges to be able to futz with the // Tap device underlying all of this. So all of these hoops are to allow - // us to exeucte the following code: + // us to execute the following code: // LOG("Creating Tap"); int sock = CreateTap(dev, gw, ip, mac, operatingMode, netmask); diff --git a/src/test/csma-system-test-suite.cc b/src/test/csma-system-test-suite.cc index f973c0318..a710da265 100644 --- a/src/test/csma-system-test-suite.cc +++ b/src/test/csma-system-test-suite.cc @@ -788,7 +788,7 @@ class CsmaPingTestCase : public TestCase void SinkRx(Ptr, const Address&); /** - * Sink called when a PING ois received. + * Sink called when a PING is received. */ void PingRtt(std::string, uint16_t, Time); @@ -1146,7 +1146,7 @@ CsmaStarTestCase::DoRun() // assign addresses to them as well. We put all of the fill devices into // a single device container, so the first nFill devices are associated // with the channel connected to spokeDevices.Get (0), the second nFill - // devices afe associated with the channel connected to spokeDevices.Get (1) + // devices are associated with the channel connected to spokeDevices.Get (1) // etc. // Ipv4AddressHelper address; diff --git a/src/test/doc/tests.h b/src/test/doc/tests.h index 09a5bf2a0..cfcd709b3 100644 --- a/src/test/doc/tests.h +++ b/src/test/doc/tests.h @@ -61,7 +61,7 @@ * \brief Performance System Tests * * Note: these tests are (for real) scripts to be run. - * The ouput is the time (in nanoseconds) that the test + * The output is the time (in nanoseconds) that the test * required to perform the requested write operations. */ 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 1434325fc..87f59097f 100644 --- a/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc +++ b/src/test/ns3tc/fq-cobalt-queue-disc-test-suite.cc @@ -1626,7 +1626,7 @@ FqCobaltQueueDiscL4sMode::DoRun() "Cobalt keeps drop_next as now and the next packet is marked. With " "second dequeue count increases to 2, drop_next becomes now plus around" "70ms which is less than the running time(140), and as the queue delay " - "is persistantly higher than 5ms, second packet is marked."); + "is persistently higher than 5ms, second packet is marked."); NS_TEST_EXPECT_MSG_EQ(q1->GetStats().GetNDroppedPackets(CobaltQueueDisc::TARGET_EXCEEDED_DROP), 0, "There should not be any dropped packets"); diff --git a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc index 22514f685..13c5a783e 100644 --- a/src/test/ns3tcp/ns3tcp-loss-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-loss-test-suite.cc @@ -101,7 +101,7 @@ class Ns3TcpLossTestCase : public TestCase std::string m_tcpModel; //!< The TCP model name. /** - * Check that the transmitted packets are consitent with the trace. + * Check that the transmitted packets are consistent with the trace. * This callback is hooked to ns3::Ipv4L3Protocol/Tx. * * \param context The callback context (unused). diff --git a/src/test/ns3tcp/ns3tcp-socket-writer.h b/src/test/ns3tcp/ns3tcp-socket-writer.h index d91120412..bb0ec229b 100644 --- a/src/test/ns3tcp/ns3tcp-socket-writer.h +++ b/src/test/ns3tcp/ns3tcp-socket-writer.h @@ -43,7 +43,7 @@ class SocketWriter : public Application /** * Setup the socket. * \param node The node owning the socket. - * \param peer The destinaiton address. + * \param peer The destination address. */ void Setup(Ptr node, Address peer); /** diff --git a/src/test/ns3tcp/ns3tcp-state-test-suite.cc b/src/test/ns3tcp/ns3tcp-state-test-suite.cc index 57160cec1..a6fa1203e 100644 --- a/src/test/ns3tcp/ns3tcp-state-test-suite.cc +++ b/src/test/ns3tcp/ns3tcp-state-test-suite.cc @@ -98,7 +98,7 @@ class Ns3TcpStateTestCase : public TestCase bool m_needToClose; //!< Check if the sending socket need to be closed. /** - * Check that the transmitted packets are consitent with the trace. + * Check that the transmitted packets are consistent with the trace. * This callback is hooked to ns3::Ipv4L3Protocol/Tx. * * \param context The callback context (unused). @@ -111,7 +111,7 @@ class Ns3TcpStateTestCase : public TestCase Ptr ipv4, uint32_t interface); /** - * Check that the received packets are consitent with the trace. + * Check that the received packets are consistent with the trace. * This callback is hooked to ns3::Ipv4L3Protocol/Tx. * * \param context The callback context (unused). diff --git a/src/test/traced/traced-callback-typedef-test-suite.cc b/src/test/traced/traced-callback-typedef-test-suite.cc index f4f7d5b98..1058fae02 100644 --- a/src/test/traced/traced-callback-typedef-test-suite.cc +++ b/src/test/traced/traced-callback-typedef-test-suite.cc @@ -143,7 +143,7 @@ TypeName(int N) /** * \ingroup system-tests-traced * - * Returns a sting representing the type of a class. + * Returns a string representing the type of a class. */ #define TYPENAME(T) \ template <> \ @@ -249,7 +249,7 @@ class TracedCbSink public: /** * \brief Sink function, called by a TracedCallback. - * \tparam Ts prameters of the TracedCallback. + * \tparam Ts parameters of the TracedCallback. */ static void Sink(Ts...) { @@ -325,7 +325,7 @@ TracedCallbackTypedefTestCase::TracedCallbackTypedefTestCase() /** * \ingroup system-tests-traced * - * Check the TracedCallback duplicate by checking if it maches the TracedCallback + * Check the TracedCallback duplicate by checking if it matches the TracedCallback * it is supposed to be equal to. */ #define DUPE(U, T1) \ diff --git a/src/topology-read/examples/topology-example-sim.cc b/src/topology-read/examples/topology-example-sim.cc index e6a0b8865..07321bcfb 100644 --- a/src/topology-read/examples/topology-example-sim.cc +++ b/src/topology-read/examples/topology-example-sim.cc @@ -35,7 +35,7 @@ /** * \ingroup topology - * Example of TopologyReader: read in a topology in a specificed format. + * Example of TopologyReader: read in a topology in a specified format. * * This example can be used with the following parameters: * - --format=Inet --input=src/topology-read/examples/Inet_small_toposample.txt diff --git a/src/traffic-control/doc/cobalt.rst b/src/traffic-control/doc/cobalt.rst index ab6ae6a4a..4b73465da 100644 --- a/src/traffic-control/doc/cobalt.rst +++ b/src/traffic-control/doc/cobalt.rst @@ -122,7 +122,7 @@ The suite includes 2 test cases: * Test 1: Simple enqueue/dequeue with no drops. * Test 2: Change of BLUE's drop probability upon queue full (Activation of Blue). -* Test 3: This test verfies ECN marking. +* Test 3: This test verifies ECN marking. * Test 4: CE threshold marking test. The test suite can be run using the following commands: diff --git a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc index cd30072c3..8dc17bcf7 100644 --- a/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc +++ b/src/traffic-control/examples/codel-vs-pfifo-asymmetric.cc @@ -71,7 +71,7 @@ NS_LOG_COMPONENT_DEFINE("CoDelPfifoFastAsymmetricTest"); /** * TCP Congestion window tracker. * - * \param stream The ouput stream. + * \param stream The output stream. * \param oldval Old value. * \param newval New value. */ @@ -107,7 +107,7 @@ TraceCwnd(std::string cwndTrFileName) /** * Traffic Control Sojourn tracker. * - * \param stream The ouput stream. + * \param stream The output stream. * \param newval New value. */ static void @@ -142,7 +142,7 @@ TraceSojourn(std::string sojournTrFileName) /** * Traffic Control Queue length tracker. * - * \param stream The ouput stream. + * \param stream The output stream. * \param oldval Old value. * \param newval New value. */ @@ -178,7 +178,7 @@ TraceQueueLength(std::string queueLengthTrFileName) /** * Traffic control drop trace. * - * \param stream The ouput stream. + * \param stream The output stream. * \param item The dropped item. */ static void @@ -213,7 +213,7 @@ TraceEveryDrop(std::string everyDropTrFileName) /** * Traffic Control Dropping state trace. * - * \param stream The ouput stream. + * \param stream The output stream. * \param oldVal Old value. * \param newVal New value. */ diff --git a/src/traffic-control/examples/fqcodel-l4s-example.cc b/src/traffic-control/examples/fqcodel-l4s-example.cc index 15f6a7d3a..8dcfdba75 100644 --- a/src/traffic-control/examples/fqcodel-l4s-example.cc +++ b/src/traffic-control/examples/fqcodel-l4s-example.cc @@ -257,7 +257,7 @@ * --------------- * --n0TcpType: First TCP type (bic, dctcp, or reno) [bic] * --n1TcpType: Second TCP type (cubic, dctcp, or reno) [] - * --scenarioNum: Scenario number from the scenarios avalaible in the file (1-9) [0] + * --scenarioNum: Scenario number from the scenarios available in the file (1-9) [0] * --bottleneckQueueType: n2 queue type (fq or codel) [fq] * --baseRtt: base RTT [80ms] * --useCeThreshold: use CE threshold [false] @@ -532,7 +532,7 @@ main(int argc, char* argv[]) cmd.AddValue("n0TcpType", "n0 TCP type (bic, dctcp, or reno)", n0TcpType); cmd.AddValue("n1TcpType", "n1 TCP type (bic, dctcp, or reno)", n1TcpType); cmd.AddValue("scenarioNum", - "Scenario number from the scenarios avalaible in the file (1-9)", + "Scenario number from the scenarios available in the file (1-9)", scenarioNum); cmd.AddValue("bottleneckQueueType", "n2 queue type (fq or codel)", queueType); cmd.AddValue("baseRtt", "base RTT", baseRtt); diff --git a/src/traffic-control/model/cobalt-queue-disc.cc b/src/traffic-control/model/cobalt-queue-disc.cc index 566a12fea..34f5feb52 100644 --- a/src/traffic-control/model/cobalt-queue-disc.cc +++ b/src/traffic-control/model/cobalt-queue-disc.cc @@ -452,7 +452,7 @@ CobaltQueueDisc::CobaltShouldDrop(Ptr item, int64_t now) // If L4S mode is enabled then check if the packet is ECT1 or CE and // if sojourn time is greater than CE threshold then the packet is marked. - // If packet is marked succesfully then the CoDel steps can be skipped. + // If packet is marked successfully then the CoDel steps can be skipped. if (item && m_useL4s) { uint8_t tosByte = 0; diff --git a/src/traffic-control/model/cobalt-queue-disc.h b/src/traffic-control/model/cobalt-queue-disc.h index c349727e5..e3eb3c138 100644 --- a/src/traffic-control/model/cobalt-queue-disc.h +++ b/src/traffic-control/model/cobalt-queue-disc.h @@ -216,7 +216,7 @@ class CobaltQueueDisc : public QueueDisc /** * Called to decide whether the current packet should be dropped based on decisions taken by - * Blue and Codel working parallely + * Blue and Codel working parallelly * * \return true if the packet should be dropped, false otherwise * \param item current packet diff --git a/src/traffic-control/test/cobalt-queue-disc-test-suite.cc b/src/traffic-control/test/cobalt-queue-disc-test-suite.cc index 197a293e3..7fd8bbdd1 100644 --- a/src/traffic-control/test/cobalt-queue-disc-test-suite.cc +++ b/src/traffic-control/test/cobalt-queue-disc-test-suite.cc @@ -998,7 +998,7 @@ CobaltQueueDiscCeThresholdTest::DoRun() Time dequeueInterval = MicroSeconds(1100); DequeueWithDelay(queue, modeSize, 11, dequeueInterval); - // First mark occured for the packet enqueued at 11ms, ideally TCP would decrease sending rate + // First mark occurred for the packet enqueued at 11ms, ideally TCP would decrease sending rate // which can be simulated by increasing interval between subsequent enqueues, so packets are now // enqueued with a delay 1.2ms. Time waitUntilFirstMark = MilliSeconds(11); diff --git a/src/traffic-control/test/codel-queue-disc-test-suite.cc b/src/traffic-control/test/codel-queue-disc-test-suite.cc index 1613aeb0e..ef8d20401 100644 --- a/src/traffic-control/test/codel-queue-disc-test-suite.cc +++ b/src/traffic-control/test/codel-queue-disc-test-suite.cc @@ -1125,7 +1125,7 @@ CoDelQueueDiscBasicMark::Dequeue(Ptr queue, uint32_t modeSize, u nPacketsBeforeFirstMark, "Number of packets in the queue before drop should be equal" "to number of packets in the queue before first mark as the behavior " - "untill packet N should be the same."); + "until packet N should be the same."); NS_TEST_ASSERT_MSG_EQ( currentCeThreshMarkCount, 0, diff --git a/src/traffic-control/test/tbf-queue-disc-test-suite.cc b/src/traffic-control/test/tbf-queue-disc-test-suite.cc index e2d2b5fc2..85e981eb7 100644 --- a/src/traffic-control/test/tbf-queue-disc-test-suite.cc +++ b/src/traffic-control/test/tbf-queue-disc-test-suite.cc @@ -477,7 +477,7 @@ TbfQueueDiscTestCase::RunTbfTest(QueueSizeUnit mode) } // The pattern being checked is a pattern of dequeue followed by blocked. The delay between - // enqueues is not sufficient to allow ptokens to refill befor the next dequeue. The first + // enqueues is not sufficient to allow ptokens to refill before the next dequeue. The first // enqueue is at 1.08s in the future, and the attempted dequeue is at 1.10s in the future. The // first dequeue will always succeed. The second enqueue is 1.12s and attempted dequeue is // at 1.14s in the future, but the last dequeue was 0.04s prior; only 800 tokens can be refilled diff --git a/src/uan/doc/uan.rst b/src/uan/doc/uan.rst index 9397bb9af..d00d601d5 100644 --- a/src/uan/doc/uan.rst +++ b/src/uan/doc/uan.rst @@ -294,7 +294,7 @@ Regarding Seagliders, the batteries used into the AUV are Electrochem 3B36 Lithi .. note:: - should I insert the li-ion model deatils here? I think it is better to put them into an Energy-related chapter.. + should I insert the li-ion model details here? I think it is better to put them into an Energy-related chapter.. Scope and Limitations ===================== diff --git a/src/uan/model/uan-header-common.cc b/src/uan/model/uan-header-common.cc index d064c6cf9..9167a86d2 100644 --- a/src/uan/model/uan-header-common.cc +++ b/src/uan/model/uan-header-common.cc @@ -145,7 +145,7 @@ UanHeaderCommon::GetProtocolNumber() const return 0; } -// Inherrited methods +// Inherited methods uint32_t UanHeaderCommon::GetSerializedSize() const diff --git a/src/uan/model/uan-header-rc.h b/src/uan/model/uan-header-rc.h index cdbc4972d..3c433a8d2 100644 --- a/src/uan/model/uan-header-rc.h +++ b/src/uan/model/uan-header-rc.h @@ -93,7 +93,7 @@ class UanHeaderRcData : public Header */ void Print(std::ostream& os, Time::Unit unit) const; - // Inherrited methods + // Inherited methods uint32_t GetSerializedSize() const override; void Serialize(Buffer::Iterator start) const override; uint32_t Deserialize(Buffer::Iterator start) override; @@ -211,7 +211,7 @@ class UanHeaderRcRts : public Header */ void Print(std::ostream& os, Time::Unit unit) const; - // Inherrited methods + // Inherited methods uint32_t GetSerializedSize() const override; void Serialize(Buffer::Iterator start) const override; uint32_t Deserialize(Buffer::Iterator start) override; @@ -315,7 +315,7 @@ class UanHeaderRcCtsGlobal : public Header */ void Print(std::ostream& os, Time::Unit unit) const; - // Inherrited methods + // Inherited methods uint32_t GetSerializedSize() const override; void Serialize(Buffer::Iterator start) const override; uint32_t Deserialize(Buffer::Iterator start) override; @@ -433,7 +433,7 @@ class UanHeaderRcCts : public Header */ void Print(std::ostream& os, Time::Unit unit) const; - // Inherrited methods + // Inherited methods uint32_t GetSerializedSize() const override; void Serialize(Buffer::Iterator start) const override; uint32_t Deserialize(Buffer::Iterator start) override; @@ -500,7 +500,7 @@ class UanHeaderRcAck : public Header */ uint8_t GetNoNacks() const; - // Inherrited methods + // Inherited methods uint32_t GetSerializedSize() const override; void Serialize(Buffer::Iterator start) const override; uint32_t Deserialize(Buffer::Iterator start) override; diff --git a/src/uan/model/uan-phy-dual.cc b/src/uan/model/uan-phy-dual.cc index 54d91e070..52a4aa190 100644 --- a/src/uan/model/uan-phy-dual.cc +++ b/src/uan/model/uan-phy-dual.cc @@ -237,7 +237,7 @@ UanPhyDual::GetTypeId() MakeTraceSourceAccessor(&UanPhyDual::m_rxOkLogger), "ns3::UanPhy::TracedCallback") .AddTraceSource("RxError", - "A packet was received unsuccessfully.", + "A packet was received unsuccessfuly.", MakeTraceSourceAccessor(&UanPhyDual::m_rxErrLogger), "ns3::UanPhy::TracedCallback") .AddTraceSource("Tx", diff --git a/src/uan/model/uan-phy-dual.h b/src/uan/model/uan-phy-dual.h index 596044037..5d17a676d 100644 --- a/src/uan/model/uan-phy-dual.h +++ b/src/uan/model/uan-phy-dual.h @@ -240,7 +240,7 @@ class UanPhyDual : public UanPhy /** A packet was received successfully. */ ns3::TracedCallback, double, UanTxMode> m_rxOkLogger; - /** A packet was received unsuccessfully. */ + /** A packet was received unsuccessfuly. */ ns3::TracedCallback, double, UanTxMode> m_rxErrLogger; /** A packet was sent from this Phy. */ ns3::TracedCallback, double, UanTxMode> m_txLogger; diff --git a/src/uan/model/uan-phy-gen.cc b/src/uan/model/uan-phy-gen.cc index af5823ecb..ee238448a 100644 --- a/src/uan/model/uan-phy-gen.cc +++ b/src/uan/model/uan-phy-gen.cc @@ -620,7 +620,7 @@ UanPhyGen::GetTypeId() MakeTraceSourceAccessor(&UanPhyGen::m_rxOkLogger), "ns3::UanPhy::TracedCallback") .AddTraceSource("RxError", - "A packet was received unsuccessfully.", + "A packet was received unsuccessfuly.", MakeTraceSourceAccessor(&UanPhyGen::m_rxErrLogger), "ns3::UanPhy::TracedCallback") .AddTraceSource("Tx", diff --git a/src/uan/model/uan-phy.h b/src/uan/model/uan-phy.h index 3625241cf..9bfeba43a 100644 --- a/src/uan/model/uan-phy.h +++ b/src/uan/model/uan-phy.h @@ -85,7 +85,7 @@ class UanPhyCalcSinr : public Object * Convert kilopascals to dB re 1 uPa. * * \param kp Value in kilopascals. - * \return Valeu in dB re 1 uPa + * \return Value in dB re 1 uPa */ inline double KpToDb(double kp) const { diff --git a/src/wave/doc/wave.rst b/src/wave/doc/wave.rst index b103376ee..f01e9e862 100644 --- a/src/wave/doc/wave.rst +++ b/src/wave/doc/wave.rst @@ -110,7 +110,7 @@ of an OcbWifiMac. 5. ConfigureEdca This method will allow the user to set EDCA parameters of WAVE channels - including CCH ans SCHs. And the OcbWifiMac itself also uses this method + including CCH and SCHs. And the OcbWifiMac itself also uses this method to configure default 802.11p EDCA parameters. 6. Wildcard BSSID @@ -140,7 +140,7 @@ to wifi MAC classes, then a relevant subclass is defined; if some 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 inherting +class called ``ns3:: WaveNetDevice``. This class is a subclass inheriting from ``ns3::NetDeivce``, composed of the objects of ``ns3::ChannelScheduler``, ``ns3::ChannelManager``, ``ns3::ChannelCoordinator`` and ``ns3::VsaManager`` diff --git a/src/wave/examples/vanet-routing-compare.cc b/src/wave/examples/vanet-routing-compare.cc index 99ef2cf65..fe0854b3b 100644 --- a/src/wave/examples/vanet-routing-compare.cc +++ b/src/wave/examples/vanet-routing-compare.cc @@ -448,7 +448,7 @@ class RoutingHelper : public Object void SetupRoutingMessages(NodeContainer& c, Ipv4InterfaceContainer& adhocTxInterfaces); /** - * \brief Sets up a routing packet for tranmission + * \brief Sets up a routing packet for transmission * \param addr destination address * \param node source node * \return Socket to be used for sending/receiving a routed data packet diff --git a/src/wave/model/channel-coordinator.h b/src/wave/model/channel-coordinator.h index b372860c5..298a0a765 100644 --- a/src/wave/model/channel-coordinator.h +++ b/src/wave/model/channel-coordinator.h @@ -242,7 +242,7 @@ class ChannelCoordinator : public Object Time m_schi; ///< SchInterval Time m_gi; ///< GuardInterval - /// Listeners typdef + /// Listeners typedef typedef std::vector> Listeners; /// Listeners iterator typedef typedef std::vector>::iterator ListenersI; diff --git a/src/wave/model/ocb-wifi-mac.h b/src/wave/model/ocb-wifi-mac.h index c56f05ecb..17b1152ba 100644 --- a/src/wave/model/ocb-wifi-mac.h +++ b/src/wave/model/ocb-wifi-mac.h @@ -63,13 +63,13 @@ class OcbWifiMac : public WifiMac * \param oi Organization Identifier field * see 7.3.1.31 Organization Identifier field and 10.3.29 Vendor-specific action * - * management information can be transmitted over vender specific action frame. + * management information can be transmitted over vendor specific action frame. * This will be mainly called by IEEE Std 1609.4 to send WSA from IEEE Std 1609.3 */ void SendVsc(Ptr vsc, Mac48Address peer, OrganizationIdentifier oi); /** * \param oi Organization Identifier - * \param cb callback to invoke whenever a vender specific action frame has been received and + * \param cb callback to invoke whenever a vendor specific action frame has been received and * must be forwarded to the higher layers. every node shall register first if it wants to * receive specific vendor specific content. */ diff --git a/src/wifi/doc/source/wifi-testing.rst b/src/wifi/doc/source/wifi-testing.rst index 7e2a6def7..eba46048b 100644 --- a/src/wifi/doc/source/wifi-testing.rst +++ b/src/wifi/doc/source/wifi-testing.rst @@ -262,7 +262,7 @@ By default, the program ``src/wifi/examples/wifi-bianchi.cc`` simulates an 802.11a adhoc ring scenario, with a PHY rate set to 54 Mbit/s, and loop from 5 stations to 50 stations, by a step of 5 stations. It generates a plt file, which allows user to quickly -generate an eps file using gnuplot and vizualize the graph. +generate an eps file using gnuplot and visualize the graph. :: @@ -279,7 +279,7 @@ The user has the possibility to select the standard (only 11a, 11b or 11g currently supported), to select the PHY rate (in Mbit/s), as well as to choose between an adhoc or an infrastructure configuration. -When run for 802.11g 6 Mbit/s in infrastucture mode, the output is: +When run for 802.11g 6 Mbit/s in infrastructure mode, the output is: :: diff --git a/src/wifi/examples/reference/Bianchi11a.m b/src/wifi/examples/reference/Bianchi11a.m index 4a35576e9..2383789f3 100644 --- a/src/wifi/examples/reference/Bianchi11a.m +++ b/src/wifi/examples/reference/Bianchi11a.m @@ -40,7 +40,7 @@ T_GI = 800e-9; % guard interval in seconds T_SYMBOL = 3.2e-6 + T_GI; % symbol duration in seconds T_LPHY = 20e-6; % PHY preamble & header duration in seconds L_SERVICE = 16; % service field length in bits -L_TAIL = 6; % tail lengthh in bits +L_TAIL = 6; % tail length in bits L_MAC = (24 + 4) * 8; % MAC header size in bits L_APP_HDR = 8 * 6; % bits added by the upper layer(s) T_SIFS = 16e-6; diff --git a/src/wifi/examples/reference/Bianchi11g.m b/src/wifi/examples/reference/Bianchi11g.m index d9a7397c5..ea94d8be5 100644 --- a/src/wifi/examples/reference/Bianchi11g.m +++ b/src/wifi/examples/reference/Bianchi11g.m @@ -41,7 +41,7 @@ T_SYMBOL = 3.2e-6 + T_GI; % symbol duration in seconds T_LPHY = 20e-6; % PHY preamble & header duration in seconds T_SIG_EXT = 6e-6; % signal extension duration in seconds L_SERVICE = 16; % service field length in bits -L_TAIL = 6; % tail lengthh in bits +L_TAIL = 6; % tail length in bits L_MAC = (24 + 4) * 8; % MAC header size in bits L_APP_HDR = 8 * 6; % bits added by the upper layer(s) T_SIFS = 10e-6; diff --git a/src/wifi/examples/reference/bianchi11ax.py b/src/wifi/examples/reference/bianchi11ax.py index 72d682597..43dbff0de 100644 --- a/src/wifi/examples/reference/bianchi11ax.py +++ b/src/wifi/examples/reference/bianchi11ax.py @@ -36,7 +36,7 @@ def bianchi_ax(data_rate, ack_rate, k, difs): T_PHY_ACK = 20e-6 # PHY preamble & header duration in seconds (for ACK) T_PHY_DATA = 44e-6 # PHY preamble & header duration in seconds (for DATA) L_SERVICE = 16 # service field length in bits - L_TAIL = 6 # tail lengthh in bits + L_TAIL = 6 # tail length in bits L_MAC = (30) * 8 # MAC header size in bits L_APP_HDR = 8 * 8 # bits added by the upper layer(s) T_SIFS = 16e-6 diff --git a/src/wifi/examples/wifi-bianchi.cc b/src/wifi/examples/wifi-bianchi.cc index 15a663e28..f444318db 100644 --- a/src/wifi/examples/wifi-bianchi.cc +++ b/src/wifi/examples/wifi-bianchi.cc @@ -76,14 +76,14 @@ std::map std::map packetsTransmitted; ///< Map that stores the total packets transmitted per STA std::map - psduFailed; ///< Map that stores the total number of unsuccessfully received PSDUS (for which + psduFailed; ///< Map that stores the total number of unsuccessfuly received PSDUS (for which ///< the PHY header was successfully received) per STA (including PSDUs not ///< addressed to that STA) std::map psduSucceeded; ///< Map that stores the total number of successfully received PSDUs per STA ///< (including PSDUs not addressed to that STA) std::map phyHeaderFailed; ///< Map that stores the total number of - ///< unsuccessfully received PHY headers per STA + ///< unsuccessfuly received PHY headers per STA std::map rxEventWhileTxing; ///< Map that stores the number of reception events per STA that occurred ///< while PHY was already transmitting a PPDU @@ -2532,10 +2532,10 @@ Experiment::Run(const WifiHelper& helper, MobilityHelper mobility; Ptr positionAlloc = CreateObject(); mobility.SetMobilityModel("ns3::ConstantPositionMobilityModel"); - // Set postion for AP + // Set position for AP positionAlloc->Add(Vector(1.0, 1.0, 0.0)); - // Set postion for STAs + // Set position for STAs double angle = (static_cast(360) / (nNodes - 1)); for (uint32_t i = 0; i < (nNodes - 1); ++i) { diff --git a/src/wifi/examples/wifi-phy-test.cc b/src/wifi/examples/wifi-phy-test.cc index c41223cc8..f14af3c0e 100644 --- a/src/wifi/examples/wifi-phy-test.cc +++ b/src/wifi/examples/wifi-phy-test.cc @@ -175,7 +175,7 @@ class CollisionExperiment uint32_t nPackets; ///< number of packets }; - /// Output struture + /// Output structure struct Output { uint32_t receivedA; ///< received A diff --git a/src/wifi/examples/wifi-test-interference-helper.cc b/src/wifi/examples/wifi-test-interference-helper.cc index ecb16467a..5f118219a 100644 --- a/src/wifi/examples/wifi-test-interference-helper.cc +++ b/src/wifi/examples/wifi-test-interference-helper.cc @@ -71,9 +71,9 @@ using namespace ns3; NS_LOG_COMPONENT_DEFINE("test-interference-helper"); -bool checkResults = false; //!< True if results have to be checked. -bool expectRxASuccessfull = false; //!< True if Rx from A is expected to be successful. -bool expectRxBSuccessfull = false; //!< True if Rx from B is expected to be successful. +bool checkResults = false; //!< True if results have to be checked. +bool expectRxASuccessful = false; //!< True if Rx from A is expected to be successful. +bool expectRxBSuccessful = false; //!< True if Rx from B is expected to be successful. /// InterferenceExperiment class InterferenceExperiment @@ -307,7 +307,7 @@ InterferenceExperiment::Run(struct InterferenceExperiment::Input input) m_txA->Dispose(); rx->Dispose(); - if (checkResults && (m_droppedA == expectRxASuccessfull || m_droppedB == expectRxBSuccessfull)) + if (checkResults && (m_droppedA == expectRxASuccessful || m_droppedB == expectRxBSuccessful)) { NS_LOG_ERROR("Results are not expected!"); exit(1); @@ -344,12 +344,12 @@ main(int argc, char* argv[]) cmd.AddValue("enableCapture", "Enable/disable physical layer capture", input.captureEnabled); cmd.AddValue("captureMargin", "Margin used for physical layer capture", input.captureMargin); cmd.AddValue("checkResults", "Used to check results at the end of the test", checkResults); - cmd.AddValue("expectRxASuccessfull", + cmd.AddValue("expectRxASuccessful", "Indicate whether packet A is expected to be successfully received", - expectRxASuccessfull); - cmd.AddValue("expectRxBSuccessfull", + expectRxASuccessful); + cmd.AddValue("expectRxBSuccessful", "Indicate whether packet B is expected to be successfully received", - expectRxBSuccessfull); + expectRxBSuccessful); cmd.Parse(argc, argv); input.interval = MicroSeconds(delay); diff --git a/src/wifi/model/block-ack-manager.h b/src/wifi/model/block-ack-manager.h index 3f8d8d38a..05aa5ec8c 100644 --- a/src/wifi/model/block-ack-manager.h +++ b/src/wifi/model/block-ack-manager.h @@ -364,7 +364,7 @@ class BlockAckManager : public Object void SetTxOkCallback(TxOk callback); /** * \param callback the callback to invoke when a - * packet transmission was completed unsuccessfully. + * packet transmission was completed unsuccessfuly. */ void SetTxFailedCallback(TxFailed callback); /** diff --git a/src/wifi/model/channel-access-manager.h b/src/wifi/model/channel-access-manager.h index a4fc067a2..42f924104 100644 --- a/src/wifi/model/channel-access-manager.h +++ b/src/wifi/model/channel-access-manager.h @@ -170,7 +170,7 @@ class ChannelAccessManager : public Object void NotifyRxEndOkNow(); /** * Notify the Txop that a packet reception was just - * completed unsuccessfully. + * completed unsuccessfuly. */ void NotifyRxEndErrorNow(); /** diff --git a/src/wifi/model/he/he-phy.cc b/src/wifi/model/he/he-phy.cc index a554a5016..513bfe6ab 100644 --- a/src/wifi/model/he/he-phy.cc +++ b/src/wifi/model/he/he-phy.cc @@ -877,8 +877,8 @@ HePhy::DoEndReceivePayload(Ptr ppdu) if (m_endRxPayloadEvents.empty()) { // We've got the last PPDU of the UL-OFDMA transmission. - // Indicate a successfull reception is terminated if at least one HE TB PPDU - // has been successfully received, otherwise indicate a unsuccessfull reception is + // Indicate a successful reception is terminated if at least one HE TB PPDU + // has been successfully received, otherwise indicate a unsuccessful reception is // terminated. if (m_rxHeTbPpdus > 0) { diff --git a/src/wifi/model/he/he-phy.h b/src/wifi/model/he/he-phy.h index 12b6127f0..9dd3d5a59 100644 --- a/src/wifi/model/he/he-phy.h +++ b/src/wifi/model/he/he-phy.h @@ -239,7 +239,7 @@ class HePhy : public VhtPhy /** * Fire a EndOfHeSigA callback (if connected) once HE-SIG-A field has been received. - * This method is scheduled immediatly after end of HE-SIG-A, once + * This method is scheduled immediately after end of HE-SIG-A, once * field processing is finished. * * \param params the HE-SIG-A parameters diff --git a/src/wifi/model/phy-entity.h b/src/wifi/model/phy-entity.h index a3768e0bb..50f19a010 100644 --- a/src/wifi/model/phy-entity.h +++ b/src/wifi/model/phy-entity.h @@ -731,7 +731,7 @@ class PhyEntity : public SimpleRefCount uint16_t staId, const std::vector& statusPerMpdu); /** - * Perform amendment-specific actions when the payload is unsuccessfully received. + * Perform amendment-specific actions when the payload is unsuccessfuly received. * * \param psdu the PSDU that we failed to received * \param snr the SNR of the received PSDU in linear scale diff --git a/src/wifi/model/vht/vht-phy.cc b/src/wifi/model/vht/vht-phy.cc index c00df82d8..068d130d5 100644 --- a/src/wifi/model/vht/vht-phy.cc +++ b/src/wifi/model/vht/vht-phy.cc @@ -552,7 +552,7 @@ VhtPhy::GetCcaThreshold(const Ptr ppdu, WifiChannelListType chan { case WIFI_CHANLIST_PRIMARY: { // Start of a PPDU for which its power measured within the primary 20 MHz channel is at - // or above the CCA sensitivy threshold. + // or above the CCA sensitivity threshold. return m_wifiPhy->GetCcaSensitivityThreshold(); } case WIFI_CHANLIST_SECONDARY: diff --git a/src/wifi/model/wifi-mac-trailer.h b/src/wifi/model/wifi-mac-trailer.h index e929df247..d6ef8a749 100644 --- a/src/wifi/model/wifi-mac-trailer.h +++ b/src/wifi/model/wifi-mac-trailer.h @@ -26,7 +26,7 @@ namespace ns3 { /** - * The length in octects of the IEEE 802.11 MAC FCS field + * The length in octets of the IEEE 802.11 MAC FCS field */ static const uint16_t WIFI_MAC_FCS_LENGTH = 4; diff --git a/src/wifi/model/wifi-mac.cc b/src/wifi/model/wifi-mac.cc index 46ea3f207..fee30a79b 100644 --- a/src/wifi/model/wifi-mac.cc +++ b/src/wifi/model/wifi-mac.cc @@ -295,7 +295,7 @@ WifiMac::GetTypeId() TypeId::OBSOLETE, "Use the AckedMpdu trace instead.") .AddTraceSource("TxErrHeader", - "The header of unsuccessfully transmitted packet.", + "The header of unsuccessfuly transmitted packet.", MakeTraceSourceAccessor(&WifiMac::m_txErrCallback), "ns3::WifiMacHeader::TracedCallback", TypeId::OBSOLETE, diff --git a/src/wifi/model/wifi-phy-state-helper.cc b/src/wifi/model/wifi-phy-state-helper.cc index 1d25e7c3e..16e0ed1c9 100644 --- a/src/wifi/model/wifi-phy-state-helper.cc +++ b/src/wifi/model/wifi-phy-state-helper.cc @@ -55,7 +55,7 @@ WifiPhyStateHelper::GetTypeId() MakeTraceSourceAccessor(&WifiPhyStateHelper::m_rxOkTrace), "ns3::WifiPhyStateHelper::RxOkTracedCallback") .AddTraceSource("RxError", - "A packet has been received unsuccessfully.", + "A packet has been received unsuccessfuly.", MakeTraceSourceAccessor(&WifiPhyStateHelper::m_rxErrorTrace), "ns3::WifiPhyStateHelper::RxEndErrorTracedCallback") .AddTraceSource("Tx", diff --git a/src/wifi/model/wifi-phy-state-helper.h b/src/wifi/model/wifi-phy-state-helper.h index 7b4ce4a43..769fd3138 100644 --- a/src/wifi/model/wifi-phy-state-helper.h +++ b/src/wifi/model/wifi-phy-state-helper.h @@ -54,9 +54,9 @@ struct RxSignalInfo; typedef Callback, RxSignalInfo, WifiTxVector, std::vector> RxOkCallback; /** - * Callback if PSDU unsuccessfully received + * Callback if PSDU unsuccessfuly received * - * arg1: PSDU received unsuccessfully + * arg1: PSDU received unsuccessfuly */ typedef Callback> RxErrorCallback; diff --git a/src/wifi/model/wifi-remote-station-manager.h b/src/wifi/model/wifi-remote-station-manager.h index f5c611367..bb8af3bed 100644 --- a/src/wifi/model/wifi-remote-station-manager.h +++ b/src/wifi/model/wifi-remote-station-manager.h @@ -878,7 +878,7 @@ class WifiRemoteStationManager : public Object * \param address the address of the receiver * \param nSuccessfulMpdus number of successfully transmitted MPDUs * A value of 0 means that the Block ACK was missed. - * \param nFailedMpdus number of unsuccessfully transmitted MPDUs + * \param nFailedMpdus number of unsuccessfuly transmitted MPDUs * \param rxSnr received SNR of the block ack frame itself * \param dataSnr data SNR reported by remote station * \param dataTxVector the TXVECTOR of the MPDUs we sent @@ -1342,7 +1342,7 @@ class WifiRemoteStationManager : public Object * \param station the station that sent the DATA to us * \param nSuccessfulMpdus number of successfully transmitted MPDUs. * A value of 0 means that the Block ACK was missed. - * \param nFailedMpdus number of unsuccessfully transmitted MPDUs. + * \param nFailedMpdus number of unsuccessfuly transmitted MPDUs. * \param rxSnr received SNR of the block ack frame itself * \param dataSnr data SNR reported by remote station * \param dataChannelWidth the channel width (in MHz) of the A-MPDU we sent diff --git a/src/wifi/model/wifi-tx-vector.h b/src/wifi/model/wifi-tx-vector.h index fc626b98b..e74f394a8 100644 --- a/src/wifi/model/wifi-tx-vector.h +++ b/src/wifi/model/wifi-tx-vector.h @@ -100,7 +100,7 @@ using RuAllocation = std::vector; class WifiTxVector { public: - /// map of HE MU specific user info paramters indexed by STA-ID + /// map of HE MU specific user info parameters indexed by STA-ID typedef std::map HeMuUserInfoMap; @@ -509,7 +509,7 @@ class WifiTxVector * \param os the output stream * \param v the WifiTxVector to stringify * - * \return ouput stream + * \return output stream */ std::ostream& operator<<(std::ostream& os, const WifiTxVector& v); diff --git a/src/wifi/test/channel-access-manager-test.cc b/src/wifi/test/channel-access-manager-test.cc index e88673ee2..0eda79947 100644 --- a/src/wifi/test/channel-access-manager-test.cc +++ b/src/wifi/test/channel-access-manager-test.cc @@ -367,11 +367,11 @@ class ChannelAccessManagerTest : public TestCase * \param ackDelay the delay of the Ack after txEnd * \param from the index of the requesting Txop */ - void AddAccessRequestWithSuccessfullAck(uint64_t at, - uint64_t txTime, - uint64_t expectedGrantTime, - uint32_t ackDelay, - uint32_t from); + void AddAccessRequestWithSuccessfulAck(uint64_t at, + uint64_t txTime, + uint64_t expectedGrantTime, + uint32_t ackDelay, + uint32_t from); /** * Add access request with successful Ack * \param txTime the transmit time @@ -759,7 +759,7 @@ ChannelAccessManagerTest::AddAccessRequest(uint64_t at, uint64_t expectedGrantTime, uint32_t from) { - AddAccessRequestWithSuccessfullAck(at, txTime, expectedGrantTime, 0, from); + AddAccessRequestWithSuccessfulAck(at, txTime, expectedGrantTime, 0, from); } template @@ -779,11 +779,11 @@ ChannelAccessManagerTest::AddAccessRequestWithAckTimeout(uint64_t at, template void -ChannelAccessManagerTest::AddAccessRequestWithSuccessfullAck(uint64_t at, - uint64_t txTime, - uint64_t expectedGrantTime, - uint32_t ackDelay, - uint32_t from) +ChannelAccessManagerTest::AddAccessRequestWithSuccessfulAck(uint64_t at, + uint64_t txTime, + uint64_t expectedGrantTime, + uint32_t ackDelay, + uint32_t from) { NS_ASSERT(ackDelay < m_ackTimeoutValue); Simulator::Schedule(MicroSeconds(at) - Now(), @@ -1043,7 +1043,7 @@ ChannelAccessManagerTest::DoRun() StartTest(4, 6, 10); AddTxop(0); // high priority DCF AddTxop(2); // low priority DCF - AddAccessRequestWithSuccessfullAck(20, 20, 34, 2, 1); + AddAccessRequestWithSuccessfulAck(20, 20, 34, 2, 1); AddAccessRequest(55, 10, 62, 0); EndTest(); diff --git a/src/wifi/test/examples-to-run.py b/src/wifi/test/examples-to-run.py index 82925f154..49b35dfc1 100644 --- a/src/wifi/test/examples-to-run.py +++ b/src/wifi/test/examples-to-run.py @@ -463,11 +463,11 @@ cpp_examples = [ ("wifi-manager-example --wifiManager=MinstrelHt --standard=802.11ax-6GHz --serverChannelWidth=160 --clientChannelWidth=160 --serverShortGuardInterval=800 --clientShortGuardInterval=800 --serverNss=4 --clientNss=4 --stepTime=0.1", "False", "False"), ("wifi-manager-example --wifiManager=MinstrelHt --standard=802.11ax-6GHz --serverChannelWidth=160 --clientChannelWidth=160 --serverShortGuardInterval=1600 --clientShortGuardInterval=1600 --serverNss=4 --clientNss=4 --stepTime=0.1", "True", "False"), ("wifi-manager-example --wifiManager=MinstrelHt --standard=802.11ax-6GHz --serverChannelWidth=160 --clientChannelWidth=160 --serverShortGuardInterval=3200 --clientShortGuardInterval=3200 --serverNss=4 --clientNss=4 --stepTime=0.1", "True", "False"), - ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), - ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=17 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT_SU --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), - ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=20 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT_SU --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), - ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=27 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT_SU --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=0", "True", "True"), - ("wifi-test-interference-helper --enableCapture=1 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessfull=0 --expectRxBSuccessfull=1", "True", "False"), + ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessful=0 --expectRxBSuccessful=0", "True", "True"), + ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=17 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT_SU --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessful=0 --expectRxBSuccessful=0", "True", "True"), + ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=20 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT_SU --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessful=0 --expectRxBSuccessful=0", "True", "True"), + ("wifi-test-interference-helper --enableCapture=0 --txPowerA=5 --txPowerB=15 --delay=27 --standard=WIFI_PHY_STANDARD_80211ac --preamble=WIFI_PREAMBLE_VHT_SU --txModeA=VhtMcs0 --txModeB=VhtMcs0 --checkResults=1 --expectRxASuccessful=0 --expectRxBSuccessful=0", "True", "True"), + ("wifi-test-interference-helper --enableCapture=1 --txPowerA=5 --txPowerB=15 --delay=10 --txModeA=OfdmRate6Mbps --txModeB=OfdmRate6Mbps --checkResults=1 --expectRxASuccessful=0 --expectRxBSuccessful=1", "True", "False"), ("wifi-bianchi --validate --phyMode=OfdmRate54Mbps --nMinStas=5 --nMaxStas=10 --duration=5", "False", "False"), # TODO: run from N=5 to N=50 for 100s (TAKES_FOREVER) when issue #170 is fixed ("wifi-bianchi --validate --phyMode=OfdmRate6Mbps --nMinStas=5 --nMaxStas=10 --duration=15", "True", "False"), # TODO: run from N=5 to N=50 for 400s (TAKES_FOREVER) when issue #170 is fixed ("wifi-bianchi --validate --phyMode=OfdmRate54Mbps --nMinStas=5 --nMaxStas=10 --duration=5 --infra", "False", "False"), # TODO: run from N=5 to N=50 for 100s (TAKES_FOREVER) when issue #170 is fixed diff --git a/src/wifi/test/tx-duration-test.cc b/src/wifi/test/tx-duration-test.cc index ea982ddca..2d7733b31 100644 --- a/src/wifi/test/tx-duration-test.cc +++ b/src/wifi/test/tx-duration-test.cc @@ -1308,7 +1308,7 @@ class HeSigBDurationTest : public TestCase private: /** - * Build a TXVECTOR for HE MU with the given bandwidth and user informations. + * Build a TXVECTOR for HE MU with the given bandwidth and user information. * * \param bw the channel width of the PPDU in MHz * \param userInfos the list of HE MU specific user transmission parameters diff --git a/src/wifi/test/wifi-aggregation-test.cc b/src/wifi/test/wifi-aggregation-test.cc index 40e93ca97..3a2dc681a 100644 --- a/src/wifi/test/wifi-aggregation-test.cc +++ b/src/wifi/test/wifi-aggregation-test.cc @@ -584,7 +584,7 @@ TwoLevelAggregationTest::DoRun() * \ingroup tests * * \brief 802.11ax aggregation test which permits 64 or 256 MPDUs in A-MPDU according to the - * negociated buffer size. + * negotiated buffer size. */ class HeAggregationTest : public TestCase { @@ -708,7 +708,7 @@ HeAggregationTest::DoRunSubTest(uint16_t bufferSize) m_mac->GetBEQueue()->GetBaManager()->UpdateOriginatorAgreement(respHdr, hdr.GetAddr1(), 0); /* - * Test behavior when 300 packets are ready for transmission but negociated buffer size is 64 + * Test behavior when 300 packets are ready for transmission but negotiated buffer size is 64 */ Ptr htFem = DynamicCast(fem); Ptr mpduAggregator = htFem->GetMpduAggregator(); @@ -741,7 +741,7 @@ HeAggregationTest::DoRunSubTest(uint16_t bufferSize) NS_TEST_EXPECT_MSG_EQ(mpduList.empty(), false, "MPDU aggregation failed"); NS_TEST_EXPECT_MSG_EQ(mpduList.size(), bufferSize, - "A-MPDU should countain " << bufferSize << " MPDUs"); + "A-MPDU should contain " << bufferSize << " MPDUs"); uint16_t expectedRemainingPacketsInQueue = 300 - bufferSize; NS_TEST_EXPECT_MSG_EQ(m_mac->GetBEQueue()->GetWifiMacQueue()->GetNPackets(), expectedRemainingPacketsInQueue, diff --git a/src/wifi/test/wifi-eht-info-elems-test.cc b/src/wifi/test/wifi-eht-info-elems-test.cc index 955c2afc1..0d625f31c 100644 --- a/src/wifi/test/wifi-eht-info-elems-test.cc +++ b/src/wifi/test/wifi-eht-info-elems-test.cc @@ -125,7 +125,7 @@ BasicMultiLinkElementTest::DoRun() commonInfo.m_bssParamsChangeCount = 1; - // Adding BSS Paraemeters Change Count + // Adding BSS Parameters Change Count TestHeaderSerialization(GetMultiLinkElement(commonInfo, {}), m_frameType); commonInfo.m_mediumSyncDelayInfo = diff --git a/src/wifi/test/wifi-mac-ofdma-test.cc b/src/wifi/test/wifi-mac-ofdma-test.cc index b10e8ce9e..eebfcad6a 100644 --- a/src/wifi/test/wifi-mac-ofdma-test.cc +++ b/src/wifi/test/wifi-mac-ofdma-test.cc @@ -672,7 +672,7 @@ OfdmaAckSequenceTest::CheckResults(Time sifs, Time slotTime, uint8_t aifsn) CtrlTriggerHeader trigger; CtrlBAckResponseHeader blockAck; Time tEnd; // TX end for a frame - Time tStart; // TX start fot the next frame + Time tStart; // TX start for the next frame Time tolerance = NanoSeconds(500); // due to propagation delay Time ifs = (m_txopLimit > 0 ? sifs : sifs + aifsn * slotTime); Time navEnd; diff --git a/src/wifi/test/wifi-phy-cca-test.cc b/src/wifi/test/wifi-phy-cca-test.cc index 4c58c78c0..652cfe3d0 100644 --- a/src/wifi/test/wifi-phy-cca-test.cc +++ b/src/wifi/test/wifi-phy-cca-test.cc @@ -289,7 +289,7 @@ WifiPhyCcaThresholdsTest::RunOne() //----------------------------------------------------------------------------------------------------------------------------------- - // OFDM PHY: 20 MHz non-HT PPDU in primary channel (20 MHz) if power above CCA sensitivty + // OFDM PHY: 20 MHz non-HT PPDU in primary channel (20 MHz) if power above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_OFDM), CreateDummyNonHtPpdu(), @@ -312,14 +312,14 @@ WifiPhyCcaThresholdsTest::RunOne() //----------------------------------------------------------------------------------------------------------------------------------- - // HT PHY: 20 MHz HT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty + // HT PHY: 20 MHz HT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_HT), CreateDummyHtPpdu(20), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); - // HT PHY: 40 MHz HT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty + // HT PHY: 40 MHz HT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_HT), CreateDummyHtPpdu(40), @@ -354,29 +354,29 @@ WifiPhyCcaThresholdsTest::RunOne() //----------------------------------------------------------------------------------------------------------------------------------- - // VHT PHY: 20 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty - // threshold + // VHT PHY: 20 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA + // sensitivity threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_VHT), CreateDummyVhtPpdu(20), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); - // VHT PHY: 40 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty - // threshold + // VHT PHY: 40 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA + // sensitivity threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_VHT), CreateDummyVhtPpdu(40), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); - // VHT PHY: 80 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty - // threshold + // VHT PHY: 80 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA + // sensitivity threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_VHT), CreateDummyVhtPpdu(80), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); // VHT PHY: 160 MHz VHT PPDU in primary channel (20 MHz) if power in primary above CCA - // sensitivty threshold + // sensitivity threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_VHT), CreateDummyVhtPpdu(160), WIFI_CHANLIST_PRIMARY, @@ -454,28 +454,28 @@ WifiPhyCcaThresholdsTest::RunOne() //----------------------------------------------------------------------------------------------------------------------------------- - // HE PHY: 20 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty + // HE PHY: 20 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_HE), CreateDummyHePpdu(20), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); - // HE PHY: 40 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty + // HE PHY: 40 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_HE), CreateDummyHePpdu(40), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); - // HE PHY: 80 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty + // HE PHY: 80 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_HE), CreateDummyHePpdu(80), WIFI_CHANLIST_PRIMARY, m_CcaSensitivityDbm); - // HE PHY: 160 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivty + // HE PHY: 160 MHz HE PPDU in primary channel (20 MHz) if power in primary above CCA sensitivity // threshold VerifyCcaThreshold(m_phy->GetPhyEntity(WIFI_MOD_CLASS_HE), CreateDummyHePpdu(160), diff --git a/src/wifi/test/wifi-phy-ofdma-test.cc b/src/wifi/test/wifi-phy-ofdma-test.cc index 4e46af407..68dba0ca4 100644 --- a/src/wifi/test/wifi-phy-ofdma-test.cc +++ b/src/wifi/test/wifi-phy-ofdma-test.cc @@ -633,7 +633,7 @@ TestDlOfdmaPhyTransmission::CheckResultsSta1(uint32_t expectedRxSuccess, "The number of successfully received packets by STA 1 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxFailureSta1, expectedRxFailure, - "The number of unsuccessfully received packets by STA 1 is not correct!"); + "The number of unsuccessfuly received packets by STA 1 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesSta1, expectedRxBytes, "The number of bytes received by STA 1 is not correct!"); @@ -649,7 +649,7 @@ TestDlOfdmaPhyTransmission::CheckResultsSta2(uint32_t expectedRxSuccess, "The number of successfully received packets by STA 2 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxFailureSta2, expectedRxFailure, - "The number of unsuccessfully received packets by STA 2 is not correct!"); + "The number of unsuccessfuly received packets by STA 2 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesSta2, expectedRxBytes, "The number of bytes received by STA 2 is not correct!"); @@ -665,7 +665,7 @@ TestDlOfdmaPhyTransmission::CheckResultsSta3(uint32_t expectedRxSuccess, "The number of successfully received packets by STA 3 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxFailureSta3, expectedRxFailure, - "The number of unsuccessfully received packets by STA 3 is not correct!"); + "The number of unsuccessfuly received packets by STA 3 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesSta3, expectedRxBytes, "The number of bytes received by STA 3 is not correct!"); @@ -1006,7 +1006,7 @@ TestDlOfdmaPhyTransmission::RunOne() m_phySta3, WifiPhyState::CCA_BUSY); - // One PSDU of 1000 bytes should have been unsuccessfully received by STA 1 (since interference + // One PSDU of 1000 bytes should have been unsuccessfuly received by STA 1 (since interference // occupies RU 1) Simulator::Schedule(Seconds(3.1), &TestDlOfdmaPhyTransmission::CheckResultsSta1, this, 0, 1, 0); // One PSDU of 1500 bytes should have been successfully received by STA 2 @@ -1082,7 +1082,7 @@ TestDlOfdmaPhyTransmission::RunOne() 1, 0, 1000); - // One PSDU of 1500 bytes should have been unsuccessfully received by STA 2 (since interference + // One PSDU of 1500 bytes should have been unsuccessfuly received by STA 2 (since interference // occupies RU 2) Simulator::Schedule(Seconds(4.1), &TestDlOfdmaPhyTransmission::CheckResultsSta2, this, 0, 1, 0); // No PSDU should have been received by STA3 @@ -1144,10 +1144,10 @@ TestDlOfdmaPhyTransmission::RunOne() m_phySta3, WifiPhyState::CCA_BUSY); - // One PSDU of 1000 bytes should have been unsuccessfully received by STA 1 (since interference + // One PSDU of 1000 bytes should have been unsuccessfuly received by STA 1 (since interference // occupies RU 1) Simulator::Schedule(Seconds(5.1), &TestDlOfdmaPhyTransmission::CheckResultsSta1, this, 0, 1, 0); - // One PSDU of 1500 bytes should have been unsuccessfully received by STA 2 (since interference + // One PSDU of 1500 bytes should have been unsuccessfuly received by STA 2 (since interference // occupies RU 2) Simulator::Schedule(Seconds(5.1), &TestDlOfdmaPhyTransmission::CheckResultsSta2, this, 0, 1, 0); // No PSDU should have been received by STA3 @@ -1496,7 +1496,7 @@ TestDlOfdmaPhyPuncturing::CheckResultsSta1(uint32_t expectedRxSuccess, "The number of successfully received packets by STA 1 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxFailureSta1, expectedRxFailure, - "The number of unsuccessfully received packets by STA 1 is not correct!"); + "The number of unsuccessfuly received packets by STA 1 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesSta1, expectedRxBytes, "The number of bytes received by STA 1 is not correct!"); @@ -1512,7 +1512,7 @@ TestDlOfdmaPhyPuncturing::CheckResultsSta2(uint32_t expectedRxSuccess, "The number of successfully received packets by STA 2 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxFailureSta2, expectedRxFailure, - "The number of unsuccessfully received packets by STA 2 is not correct!"); + "The number of unsuccessfuly received packets by STA 2 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesSta2, expectedRxBytes, "The number of bytes received by STA 2 is not correct!"); @@ -1710,7 +1710,7 @@ TestDlOfdmaPhyPuncturing::RunOne() if (m_indexSubchannel < 2) // interference in RU 1 { - // One PSDU of 1000 bytes should have been unsuccessfully received by STA 1 + // One PSDU of 1000 bytes should have been unsuccessfuly received by STA 1 Simulator::Schedule(Seconds(1.1), &TestDlOfdmaPhyPuncturing::CheckResultsSta1, this, @@ -1734,7 +1734,7 @@ TestDlOfdmaPhyPuncturing::RunOne() 1, 0, 1000); - // One PSDU of 1500 bytes should have been unsuccessfully received by STA 2 + // One PSDU of 1500 bytes should have been unsuccessfuly received by STA 2 Simulator::Schedule(Seconds(1.1), &TestDlOfdmaPhyPuncturing::CheckResultsSta2, this, @@ -2905,8 +2905,8 @@ class OfdmaTestPhyListener : public ns3::WifiPhyListener } /** - * Return whether last RX has been successfull. - * \return true if last RX has been successfull, false otherwise + * Return whether last RX has been successful. + * \return true if last RX has been successful, false otherwise */ bool IsLastRxSuccess() const { @@ -2918,7 +2918,7 @@ class OfdmaTestPhyListener : public ns3::WifiPhyListener uint32_t m_notifyRxEnd{0}; ///< count number of RX end notifications Time m_lastRxStart{Seconds(0)}; ///< last time a RX start notification has been received Time m_lastRxEnd{Seconds(0)}; ///< last time a RX end notification has been received - bool m_lastRxSuccess{false}; ///< flag whether last RX has been successfull + bool m_lastRxSuccess{false}; ///< flag whether last RX has been successful }; /** @@ -3503,7 +3503,7 @@ TestUlOfdmaPhyTransmission::CheckRxFromSta1(uint32_t expectedSuccess, NS_TEST_ASSERT_MSG_EQ( m_countRxFailureFromSta1, expectedFailures, - "The number of unsuccessfully received packets from STA 1 is not correct!"); + "The number of unsuccessfuly received packets from STA 1 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesFromSta1, expectedBytes, "The number of bytes received from STA 1 is not correct!"); @@ -3520,7 +3520,7 @@ TestUlOfdmaPhyTransmission::CheckRxFromSta2(uint32_t expectedSuccess, NS_TEST_ASSERT_MSG_EQ( m_countRxFailureFromSta2, expectedFailures, - "The number of unsuccessfully received packets from STA 2 is not correct!"); + "The number of unsuccessfuly received packets from STA 2 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesFromSta2, expectedBytes, "The number of bytes received from STA 2 is not correct!"); @@ -3871,7 +3871,7 @@ TestUlOfdmaPhyTransmission::ScheduleTest(Time delay, 0); if (!solicited) { - // UID of TB PPDUs will be different than the one of the preceeding frame + // UID of TB PPDUs will be different than the one of the preceding frame ++uid; } else @@ -4142,7 +4142,7 @@ TestUlOfdmaPhyTransmission::RunOne() * are sent on RU 1 for STA 1 and RU 2 for STA 2. * The difference between solicited and unsolicited lies in that their PPDU * ID correspond to the one of the immediately preceding HE SU PPDU (thus - * mimicing trigger frame reception). + * mimicking trigger frame reception). */ //--------------------------------------------------------------------------- @@ -5030,7 +5030,7 @@ TestPhyPaddingExclusion::CheckRxFromSta1(uint32_t expectedSuccess, NS_TEST_ASSERT_MSG_EQ( m_countRxFailureFromSta1, expectedFailures, - "The number of unsuccessfully received packets from STA 1 is not correct!"); + "The number of unsuccessfuly received packets from STA 1 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesFromSta1, expectedBytes, "The number of bytes received from STA 1 is not correct!"); @@ -5047,7 +5047,7 @@ TestPhyPaddingExclusion::CheckRxFromSta2(uint32_t expectedSuccess, NS_TEST_ASSERT_MSG_EQ( m_countRxFailureFromSta2, expectedFailures, - "The number of unsuccessfully received packets from STA 2 is not correct!"); + "The number of unsuccessfuly received packets from STA 2 is not correct!"); NS_TEST_ASSERT_MSG_EQ(m_countRxBytesFromSta2, expectedBytes, "The number of bytes received from STA 2 is not correct!"); diff --git a/src/wifi/test/wifi-phy-reception-test.cc b/src/wifi/test/wifi-phy-reception-test.cc index 5f6742890..fc6878e75 100644 --- a/src/wifi/test/wifi-phy-reception-test.cc +++ b/src/wifi/test/wifi-phy-reception-test.cc @@ -117,7 +117,7 @@ class TestThresholdPreambleDetectionWithoutFrameCapture : public TestCase /** * Check the number of received packets * \param expectedSuccessCount the number of successfully received packets - * \param expectedFailureCount the number of unsuccessfully received packets + * \param expectedFailureCount the number of unsuccessfuly received packets */ void CheckRxPacketCount(uint32_t expectedSuccessCount, uint32_t expectedFailureCount); @@ -790,7 +790,7 @@ class TestThresholdPreambleDetectionWithFrameCapture : public TestCase /** * Check the number of received packets * \param expectedSuccessCount the number of successfully received packets - * \param expectedFailureCount the number of unsuccessfully received packets + * \param expectedFailureCount the number of unsuccessfuly received packets */ void CheckRxPacketCount(uint32_t expectedSuccessCount, uint32_t expectedFailureCount); @@ -2613,8 +2613,8 @@ class TestAmpduReception : public TestCase uint8_t m_rxSuccessBitmapAmpdu1; ///< bitmap of successfully received MPDUs in A-MPDU #1 uint8_t m_rxSuccessBitmapAmpdu2; ///< bitmap of successfully received MPDUs in A-MPDU #2 - uint8_t m_rxFailureBitmapAmpdu1; ///< bitmap of unsuccessfully received MPDUs in A-MPDU #1 - uint8_t m_rxFailureBitmapAmpdu2; ///< bitmap of unsuccessfully received MPDUs in A-MPDU #2 + uint8_t m_rxFailureBitmapAmpdu1; ///< bitmap of unsuccessfuly received MPDUs in A-MPDU #1 + uint8_t m_rxFailureBitmapAmpdu2; ///< bitmap of unsuccessfuly received MPDUs in A-MPDU #2 uint8_t m_rxDroppedBitmapAmpdu1; ///< bitmap of dropped MPDUs in A-MPDU #1 uint8_t m_rxDroppedBitmapAmpdu2; ///< bitmap of dropped MPDUs in A-MPDU #2 @@ -4334,7 +4334,7 @@ class TestUnsupportedBandwidthReception : public TestCase std::vector statusPerMpdu); /** - * Function called upon a PSDU received unsuccessfully + * Function called upon a PSDU received unsuccessfuly * \param psdu the PSDU */ void RxFailure(Ptr psdu); diff --git a/src/wifi/test/wifi-phy-thresholds-test.cc b/src/wifi/test/wifi-phy-thresholds-test.cc index 07d2330ce..d1953c20b 100644 --- a/src/wifi/test/wifi-phy-thresholds-test.cc +++ b/src/wifi/test/wifi-phy-thresholds-test.cc @@ -110,7 +110,7 @@ class WifiPhyThresholdsTest : public TestCase Ptr m_phy; ///< PHY object uint32_t m_rxSuccess; ///< count number of successfully received packets - uint32_t m_rxFailure; ///< count number of unsuccessfully received packets + uint32_t m_rxFailure; ///< count number of unsuccessfuly received packets uint32_t m_rxDropped; ///< count number of dropped packets uint32_t m_stateChanged; ///< count number of PHY state change uint32_t m_rxStateCount; ///< count number of PHY state change to RX state @@ -406,7 +406,7 @@ WifiPhyThresholdsStrongWifiSignalTest::DoRun() NS_TEST_ASSERT_MSG_EQ(m_rxDropped + m_rxFailure, 0, - "Packet reception should have been successfull"); + "Packet reception should have been successful"); NS_TEST_ASSERT_MSG_EQ(m_rxSuccess, 1, "Packet should have been successfully received"); NS_TEST_ASSERT_MSG_EQ(m_ccabusyStateCount, 2, "State should have moved to CCA_BUSY once"); NS_TEST_ASSERT_MSG_EQ( diff --git a/src/wifi/test/wifi-test.cc b/src/wifi/test/wifi-test.cc index 2a66c365a..c6a3dc249 100644 --- a/src/wifi/test/wifi-test.cc +++ b/src/wifi/test/wifi-test.cc @@ -2582,7 +2582,7 @@ class Issue40TestCase : public TestCase uint16_t m_rxCount; ///< Count number of successfully received data packets uint16_t m_txCount; ///< Count number of transmitted data packets uint16_t - m_txMacFinalDataFailedCount; ///< Count number of unsuccessfully transmitted data packets + m_txMacFinalDataFailedCount; ///< Count number of unsuccessfuly transmitted data packets }; Issue40TestCase::Issue40TestCase() @@ -2699,7 +2699,7 @@ Issue40TestCase::RunOne(bool useAmpdu) staDevice.Get(0)->GetAddress()); // Transmit a second data packet once the station is away from the access point: it should be - // sent with the same high modulation and be unsuccessfully received + // sent with the same high modulation and be unsuccessfuly received Simulator::Schedule(Seconds(2.0), &Issue40TestCase::SendPackets, this, @@ -3505,7 +3505,7 @@ IdealRateManagerMimoTest::DoRun() staDevice.Get(0)->GetAddress()); // Selected NSS should be 2 since both TX and RX support 2 antennas Simulator::Schedule(Seconds(9.2), &IdealRateManagerMimoTest::CheckLastSelectedNss, this, 2); - // Selecte rate should be the same as without diversity, as it uses 2 spatial streams so there + // Selected rate should be the same as without diversity, as it uses 2 spatial streams so there // is no more benefits from diversity in AWGN channels Simulator::Schedule(Seconds(9.2), &IdealRateManagerMimoTest::CheckLastSelectedMode, diff --git a/src/wifi/test/wifi-txop-test.cc b/src/wifi/test/wifi-txop-test.cc index bf4eb7247..3957839c5 100644 --- a/src/wifi/test/wifi-txop-test.cc +++ b/src/wifi/test/wifi-txop-test.cc @@ -339,7 +339,7 @@ void WifiTxopTest::CheckResults() { Time tEnd; // TX end for a frame - Time tStart; // TX start fot the next frame + Time tStart; // TX start for the next frame Time txopStart; // TXOP start time Time tolerance = NanoSeconds(50); // due to propagation delay Time sifs = DynamicCast(m_apDevices.Get(0))->GetPhy()->GetSifs(); diff --git a/src/wimax/examples/wimax-ipv4.cc b/src/wimax/examples/wimax-ipv4.cc index 4de5b58ac..738bc5624 100644 --- a/src/wimax/examples/wimax-ipv4.cc +++ b/src/wimax/examples/wimax-ipv4.cc @@ -28,7 +28,7 @@ // scheduling type UGS, the second one rtPS and the third one BE. // Senders SSs send some stamped IP packets with variable bitrate to receiver SSs // through the BS station. receiver SSs receive the IP packets analyze them and -// based on a sequnece number decide if all the packets are coorectly received +// based on a sequence number decide if all the packets are coorectly received // +-----+ +-----+ +-----+ // | SS0 | | SS1 | | SS2 | diff --git a/src/wimax/model/bs-net-device.cc b/src/wimax/model/bs-net-device.cc index d68647bb4..398e09818 100644 --- a/src/wimax/model/bs-net-device.cc +++ b/src/wimax/model/bs-net-device.cc @@ -920,7 +920,7 @@ BaseStationNetDevice::CreateMapMessages() /*either DCD and UCD must be created first because CCC is set during their creation, or CCC must be calculated first so that it could be set during - creation of DL-MAP and UL-MAP and then set duirng creation of DCD and UCD*/ + creation of DL-MAP and UL-MAP and then set during creation of DCD and UCD*/ if (sendDcd) { diff --git a/src/wimax/model/bs-scheduler.cc b/src/wimax/model/bs-scheduler.cc index 952a85b34..001bafa21 100644 --- a/src/wimax/model/bs-scheduler.cc +++ b/src/wimax/model/bs-scheduler.cc @@ -99,7 +99,7 @@ BSScheduler::CheckForFragmentation(Ptr connection, NS_LOG_INFO("BS Scheduler, CheckForFragmentation"); if (connection->GetType() != Cid::TRANSPORT) { - NS_LOG_INFO("\t No Transport connction, Fragmentation IS NOT possible"); + NS_LOG_INFO("\t No Transport connection, Fragmentation IS NOT possible"); return false; } uint32_t availableByte = GetBs()->GetPhy()->GetNrBytes(availableSymbols, modulationType); diff --git a/src/wimax/model/bs-uplink-scheduler-rtps.h b/src/wimax/model/bs-uplink-scheduler-rtps.h index e47f45956..5fcdda338 100644 --- a/src/wimax/model/bs-uplink-scheduler-rtps.h +++ b/src/wimax/model/bs-uplink-scheduler-rtps.h @@ -188,7 +188,7 @@ class UplinkSchedulerRtps : public UplinkScheduler void SetupServiceFlow(SSRecord* ssRecord, ServiceFlow* serviceFlow) override; /** - * Process bandwidth requet function + * Process bandwidth request function * \param bwRequestHdr the bandwidth request header */ void ProcessBandwidthRequest(const BandwidthRequestHeader& bwRequestHdr) override; diff --git a/src/wimax/model/bs-uplink-scheduler-simple.h b/src/wimax/model/bs-uplink-scheduler-simple.h index 9e8403992..21097dfda 100644 --- a/src/wimax/model/bs-uplink-scheduler-simple.h +++ b/src/wimax/model/bs-uplink-scheduler-simple.h @@ -143,7 +143,7 @@ class UplinkSchedulerSimple : public UplinkScheduler void SetupServiceFlow(SSRecord* ssRecord, ServiceFlow* serviceFlow) override; /** - * Process bandwidth requet function + * Process bandwidth request function * \param bwRequestHdr the bandwidth request header */ void ProcessBandwidthRequest(const BandwidthRequestHeader& bwRequestHdr) override; diff --git a/src/wimax/model/cid.cc b/src/wimax/model/cid.cc index 91c4c2f4d..5ff759324 100644 --- a/src/wimax/model/cid.cc +++ b/src/wimax/model/cid.cc @@ -114,7 +114,7 @@ operator!=(const Cid& lhs, const Cid& rhs) } /** - * \brief output stream output opertor + * \brief output stream output operator * \param os output stream * \param cid CID * \returns output stream diff --git a/src/wimax/model/dl-mac-messages.h b/src/wimax/model/dl-mac-messages.h index 92b0440e2..0109b5aff 100644 --- a/src/wimax/model/dl-mac-messages.h +++ b/src/wimax/model/dl-mac-messages.h @@ -511,7 +511,7 @@ class OfdmDlMapIe uint16_t GetSize() const; /** - * Wrtie item + * Write item * \param start the iterator * \returns the updated iterator */ diff --git a/src/wimax/model/ofdm-downlink-frame-prefix.h b/src/wimax/model/ofdm-downlink-frame-prefix.h index 2a44e17f3..aa7653745 100644 --- a/src/wimax/model/ofdm-downlink-frame-prefix.h +++ b/src/wimax/model/ofdm-downlink-frame-prefix.h @@ -166,7 +166,7 @@ class OfdmDownlinkFramePrefix : public Header void SetConfigurationChangeCount(uint8_t configurationChangeCount); /** * Add DL frame prefix element field - * \param dlFramePrefixElement the DL frane prefix element + * \param dlFramePrefixElement the DL frame prefix element */ void AddDlFramePrefixElement(DlFramePrefixIe dlFramePrefixElement); /** diff --git a/src/wimax/model/simple-ofdm-wimax-channel.h b/src/wimax/model/simple-ofdm-wimax-channel.h index ab9c7e3f7..a6c2e88ea 100644 --- a/src/wimax/model/simple-ofdm-wimax-channel.h +++ b/src/wimax/model/simple-ofdm-wimax-channel.h @@ -109,7 +109,7 @@ class SimpleOfdmWimaxChannel : public WimaxChannel private: /** - * Attach functiion + * Attach function * \param phy the phy layer */ void DoAttach(Ptr phy) override; diff --git a/src/wimax/model/simple-ofdm-wimax-phy.cc b/src/wimax/model/simple-ofdm-wimax-phy.cc index ad78fa200..c53ba37e2 100644 --- a/src/wimax/model/simple-ofdm-wimax-phy.cc +++ b/src/wimax/model/simple-ofdm-wimax-phy.cc @@ -926,7 +926,7 @@ SimpleOfdmWimaxPhy::DoGetFrameDuration(uint8_t frameDurationCode) const } /* - Retruns number of blocks (FEC blocks) the burst will be split in. + Returns number of blocks (FEC blocks) the burst will be split in. The size of the block is specific for each modulation type. */ uint16_t diff --git a/src/wimax/model/ss-link-manager.h b/src/wimax/model/ss-link-manager.h index c61777a82..420d7fdb6 100644 --- a/src/wimax/model/ss-link-manager.h +++ b/src/wimax/model/ss-link-manager.h @@ -78,7 +78,7 @@ class SSLinkManager : public Object */ bool GetRangingIntervalFound() const; /** - * Ser NR ranging trans opps + * Set NR ranging trans opps * \param nrRangingTransOpps the NR ranging trans opps */ void SetNrRangingTransOpps(uint8_t nrRangingTransOpps); @@ -90,7 +90,7 @@ class SSLinkManager : public Object /// Increment NR invited polls received void IncrementNrInvitedPollsRecvd(); /** - * Get DL map sync timeput event + * Get DL map sync timeout event * \returns the event ID */ EventId GetDlMapSyncTimeoutEvent(); diff --git a/src/wimax/model/ss-service-flow-manager.h b/src/wimax/model/ss-service-flow-manager.h index 11c2e4b41..3e4f95950 100644 --- a/src/wimax/model/ss-service-flow-manager.h +++ b/src/wimax/model/ss-service-flow-manager.h @@ -96,7 +96,7 @@ class SsServiceFlowManager : public ServiceFlowManager EventId GetDsaRspTimeoutEvent() const; /** * Get DSA ack timeout event - * \returns the DSA ack timeput event + * \returns the DSA ack timeout event */ EventId GetDsaAckTimeoutEvent() const; diff --git a/src/wimax/model/ul-job.h b/src/wimax/model/ul-job.h index 7977add5c..693a2d977 100644 --- a/src/wimax/model/ul-job.h +++ b/src/wimax/model/ul-job.h @@ -184,7 +184,7 @@ class PriorityUlJob : public Object void SetPriority(int priority); /** - * Get UL job functiion + * Get UL job function * \returns the UL job */ Ptr GetUlJob(); diff --git a/test.py b/test.py index 2e77e4de2..94df16aa9 100755 --- a/test.py +++ b/test.py @@ -754,7 +754,7 @@ def make_paths(): # ... # } # -# You need to add a supression name which will only be printed out by valgrind in +# You need to add a suppression name which will only be printed out by valgrind in # verbose mode (but it needs to be there in any case). The entire stack frame is # shown to completely characterize the error, but in most cases you won't need # all of that info. For example, if you want to turn off all errors that happen diff --git a/utils/codespell-ignored-lines b/utils/codespell-ignored-lines new file mode 100644 index 000000000..085de63b9 --- /dev/null +++ b/utils/codespell-ignored-lines @@ -0,0 +1,46 @@ +#lollipop-counter.h: 341, 343 + LollipopCounter ans = val; + return ans; + +#arp-header.cc: 202 + ReadFrom(i, m_macDest, hardwareAddressLen); // Read THA (size HLN) + +#csma-net-device.cc: 351-352 + Ptr padd = Create(buffer, 46 - p->GetSize()); + p->AddAtEnd(padd); + +#epc-gtpu-header.h: 236 + * This field is used to co-ordinate the data transmission for acknowledged mode + +#mobility-model.cc:100, 102 + Vector oPosition = other->DoGetPosition(); + return CalculateDistance(position, oPosition); + +#statistics.rst:299-300 + read ANS + if [ "$ANS" = "yes" -o "$ANS" = "y" ] + +#wifi-example-db.sh:34-35 + read ANS + if [ "$ANS" = "yes" -o "$ANS" = "y" ] + +#doxygen.warnings.report.sh:483, 485, 544, 549, 556, 561 +filterin= + filterin=$( \ +# if [ "$filterin" != "" ] ; then +# echo "$filterin" +if [ "$filterin" != "" ] ; then + echo "$filterin" + +#./src/visualizer/visualizer/hud.py:93-94 + tbe = math.log10(dx_over_ndiv)#; /* looking for approx. 'ndiv' divisions in a length 'dx' */ + div = pow(10, rint(tbe))#; /* div: power of 10 closest to dx/ndiv */ + +#./utils/tests/test-ns3.py:2944 + 'convert {image} -colorspace HSI -channel b -separate +channel -scale 1x1 -format "%[fx:100*u]" info:' + +#./doc/tutorial/source/introduction.rst: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 diff --git a/utils/codespell-ignored-words b/utils/codespell-ignored-words new file mode 100644 index 000000000..7ccab4b3e --- /dev/null +++ b/utils/codespell-ignored-words @@ -0,0 +1,72 @@ +#Core +anid +anumber +bu +mone +peripherial +studi +thre + +#Network +ot +nd + +#Internet +devicec +ect +iif +nce +inflight + +#Internet Apps +clen + +#Buildings +nin + +#DSR +cleanp + +#LTE +commun +couting +ue +ues + +#Netanim +writen + +#Spectrum +inh + +#Wave +aci +ois + +#Wifi +fo + +#Traffic Control +taht + +#Wimax +opps + +#Propagation +alos +clos + +#Examples +clienta + +#Brite +brite + +#Mesh +inport + +#Visualizer +inout + +#Utils +filetest diff --git a/utils/codespell_ignored_words b/utils/codespell_ignored_words deleted file mode 100644 index e69de29bb..000000000