From 8d1b7b1391eb58cced8dd18258878991fbb17186 Mon Sep 17 00:00:00 2001
From: Alexander Krotov
Date: Thu, 28 Jun 2018 12:51:39 +0300
Subject: [PATCH] Spellcheck the rest of ns-3
---
CHANGES.html | 24 +++++++-------
RELEASE_NOTES | 20 ++++++------
bindings/python/rad_util.py | 6 ++--
doc/manual/source/callbacks.rst | 2 +-
doc/manual/source/documentation.rst | 6 ++--
doc/manual/source/hash-functions.rst | 2 +-
doc/manual/source/new-modules.rst | 2 +-
doc/tutorial/source/tracing.rst | 6 ++--
src/brite/doc/brite.rst | 2 +-
src/brite/examples/brite-MPI-example.cc | 2 +-
src/brite/helper/brite-topology-helper.cc | 2 +-
src/brite/test/test.conf | 2 +-
src/click/model/ipv4-click-routing.cc | 4 +--
src/click/model/ipv4-click-routing.h | 2 +-
src/click/model/ipv4-l3-click-protocol.h | 2 +-
src/dsdv/doc/dsdv.rst | 2 +-
src/dsdv/model/dsdv-packet-queue.cc | 2 +-
src/dsr/model/dsr-fs-header.h | 4 +--
src/dsr/model/dsr-network-queue.h | 4 +--
src/dsr/model/dsr-option-header.h | 22 ++++++-------
src/dsr/model/dsr-options.cc | 2 +-
src/dsr/model/dsr-passive-buff.h | 2 +-
src/dsr/model/dsr-rcache.cc | 2 +-
src/dsr/model/dsr-routing.cc | 6 ++--
src/dsr/model/dsr-routing.h | 4 +--
src/fd-net-device/examples/fd-tap-ping.cc | 2 +-
.../helper/emu-fd-net-device-helper.cc | 2 +-
.../helper/planetlab-tap-creator.cc | 2 +-
src/fd-net-device/wscript | 2 +-
src/flow-monitor/helper/flow-monitor-helper.h | 2 +-
src/internet/doc/ipv6.rst | 2 +-
src/internet/doc/routing-overview.rst | 2 +-
src/internet/doc/tcp.rst | 10 +++---
.../model/global-route-manager-impl.cc | 2 +-
.../model/global-route-manager-impl.h | 2 +-
src/internet/model/global-router-interface.cc | 2 +-
src/internet/model/global-routing.h | 2 +-
src/internet/model/icmpv6-header.h | 32 +++++++++----------
src/internet/model/icmpv6-l4-protocol.cc | 4 +--
src/internet/model/ipv4-end-point.h | 2 +-
src/internet/model/ipv4-interface.cc | 2 +-
src/internet/model/ipv6-address-generator.cc | 2 +-
src/internet/model/ipv6-end-point.h | 2 +-
src/internet/model/ipv6-extension-header.h | 16 +++++-----
src/internet/model/ipv6-header.h | 2 +-
src/internet/model/ipv6-option-header.h | 10 +++---
src/internet/model/nsc-tcp-socket-impl.cc | 2 +-
src/internet/model/pending-data.cc | 2 +-
src/internet/model/pending-data.h | 2 +-
src/internet/model/tcp-congestion-ops.cc | 2 +-
src/internet/model/tcp-congestion-ops.h | 4 +--
src/internet/model/tcp-highspeed.cc | 2 +-
src/internet/model/tcp-hybla.cc | 2 +-
src/internet/model/tcp-recovery-ops.h | 2 +-
src/internet/model/tcp-rx-buffer.cc | 4 +--
src/internet/model/tcp-rx-buffer.h | 6 ++--
src/internet/model/tcp-socket-base.cc | 6 ++--
src/internet/model/tcp-socket-base.h | 2 +-
src/internet/model/tcp-socket-state.h | 2 +-
src/internet/model/tcp-socket.h | 12 +++----
src/internet/model/tcp-tx-buffer.cc | 4 +--
src/internet/model/tcp-tx-buffer.h | 4 +--
src/internet/test/ipv4-test.cc | 2 +-
.../test/ipv6-extension-header-test-suite.cc | 4 +--
src/internet/test/ipv6-test.cc | 2 +-
.../test/tcp-advertised-window-test.cc | 2 +-
src/internet/test/tcp-datasentcb-test.cc | 2 +-
src/internet/test/tcp-ecn-test.cc | 10 +++---
src/internet/test/tcp-general-test.h | 4 +--
src/internet/test/tcp-prr-recovery-test.cc | 6 ++--
src/lr-wpan/doc/lr-wpan.rst | 2 +-
src/lr-wpan/model/lr-wpan-csmaca.h | 4 +--
src/lr-wpan/model/lr-wpan-mac-header.cc | 4 +--
src/lr-wpan/model/lr-wpan-mac.h | 2 +-
src/lr-wpan/model/lr-wpan-phy.cc | 2 +-
src/lr-wpan/model/lr-wpan-phy.h | 2 +-
src/lr-wpan/test/lr-wpan-ack-test.cc | 2 +-
src/lte/test/lte-test-cell-selection.h | 2 +-
src/mesh/model/dot11s/hwmp-protocol.cc | 2 +-
src/mesh/model/dot11s/hwmp-protocol.h | 2 +-
.../model/dot11s/ie-dot11s-configuration.h | 2 +-
src/mesh/model/dot11s/ie-dot11s-prep.h | 2 +-
src/mesh/model/dot11s/ie-dot11s-preq.h | 2 +-
src/mesh/model/dot11s/ie-dot11s-rann.h | 6 ++--
.../model/dot11s/peer-management-protocol.h | 4 +--
src/mesh/model/flame/flame-rtable.cc | 2 +-
src/mesh/test/flame/flame-regression.h | 2 +-
src/mpi/model/null-message-simulator-impl.h | 4 +--
src/mpi/model/remote-channel-bundle.h | 4 +--
.../examples/colors-link-description.cc | 2 +-
src/netanim/examples/dumbbell-animation.cc | 2 +-
src/netanim/examples/resources-counters.cc | 2 +-
src/netanim/model/animation-interface.h | 6 ++--
.../model/ipv4-nix-vector-routing.cc | 10 +++---
.../model/ipv4-nix-vector-routing.h | 2 +-
src/olsr/model/olsr-routing-protocol.cc | 4 +--
src/openflow/model/openflow-interface.cc | 2 +-
src/sixlowpan/doc/sixlowpan.rst | 2 +-
.../examples/example-ping-lr-wpan.cc | 2 +-
.../helper/tv-spectrum-transmitter-helper.h | 4 +--
src/spectrum/model/half-duplex-ideal-phy.cc | 6 ++--
.../model/multi-model-spectrum-channel.h | 4 +--
src/spectrum/model/waveform-generator.cc | 2 +-
src/tap-bridge/doc/tap.rst | 2 +-
.../examples/tap-wifi-virtual-machine.cc | 2 +-
.../examples/tap-wifi-virtual-machine.py | 2 +-
src/tap-bridge/model/tap-bridge.cc | 2 +-
src/topology-read/doc/topology.h | 2 +-
.../model/inet-topology-reader.h | 4 +--
.../model/orbis-topology-reader.h | 2 +-
src/traffic-control/doc/queue-discs.rst | 2 +-
src/traffic-control/doc/tbf.rst | 2 +-
src/traffic-control/model/red-queue-disc.cc | 4 +--
.../model/traffic-control-layer.h | 2 +-
src/visualizer/visualizer/core.py | 2 +-
src/visualizer/visualizer/ipython_view.py | 10 +++---
src/wave/doc/wave.rst | 16 +++++-----
src/wave/examples/vanet-routing-compare.cc | 2 +-
src/wave/examples/wave-simple-device.cc | 2 +-
src/wave/helper/wave-bsm-stats.h | 2 +-
src/wave/model/bsm-application.cc | 4 +--
src/wave/model/bsm-application.h | 2 +-
src/wave/model/vendor-specific-action.h | 2 +-
src/wave/test/mac-extension-test-suite.cc | 2 +-
testpy.supp | 2 +-
waf-tools/misc.py | 2 +-
126 files changed, 252 insertions(+), 252 deletions(-)
diff --git a/CHANGES.html b/CHANGES.html
index 615786106..d564d396a 100644
--- a/CHANGES.html
+++ b/CHANGES.html
@@ -152,12 +152,12 @@ or with a string value with 'b' (bytes) or 'p' (packets) suffix, such as:
Included the TCP SACK-based loss recovery algorithm outlined in RFC 6675.
Added TCP SACK and the SACK emulation. Added an Attribute to TcpSocketBase class,
called "Sack", to enable or disable the SACK option usage.
-In 'src/wifi', several changes were made to enable partial 802.11ax High Effiency (HE) support:
+In 'src/wifi', several changes were made to enable partial 802.11ax High Efficiency (HE) support:
- A new standard value has been added that enables the new 11ax data rates.
- A new 11ax preamble has been added.
- A new attribute was added to configure the guard interval duration for High Efficiency (HE) PHY entities. This attribute can be set using the YansWifiPhyHelper.
- - A new information element has been added: HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilites information element is used to advertise the HE capabilites of the node to other nodes in the network.
+ - A new information element has been added: HeCapabilities. This information element is added to the MAC frame header if the node is a HE node. This HeCapabilites information element is used to advertise the HE capabilities of the node to other nodes in the network.
A new class were added for the RRPAA WiFi rate control mechanism.
@@ -168,7 +168,7 @@ or with a string value with 'b' (bytes) or 'p' (packets) suffix, such as:
InstallSingleEnbDevice and InstalSingeUeDevice functions of LteHelper are now constructing LteEnbDevice and LteUeDevice
according to CA architecture. Each device, UE and eNodeB contains an instance of component carrier manager, and may
have several component carrier instances.
- SAP interfaces are extended to include CA message exchange funtionality.
+ SAP interfaces are extended to include CA message exchange functionality.
RRC connection procedure is extended to allow RRC connection reconfiguration for the configuration of the secondary carriers.
RRC measurement reporting is extended to allow measurement reporting from the secondary carriers.
LTE traces are extended to include component carrier id.
@@ -443,7 +443,7 @@ register callbacks used for flow control.
Added the concept of Congestion State Machine inside TcpSocketBase.
Merged Fast Recovery and Fast Retransmit inside TcpSocketBase.
Some member variables have been moved from TcpSocketBase inside TcpSocketState. Attributes are not touched.
- Congestion control splitted from TcpSocketBase as subclass of TcpCongestionOps.
+ Congestion control split from TcpSocketBase as subclass of TcpCongestionOps.
Added Rx and Tx callbacks on TcpSocketBase.
Added BytesInFlight trace source on TcpSocketBase. The trace is updated when the implementation requests the value.
Added attributes about the number of connection and data retransmission attempts.
@@ -462,7 +462,7 @@ register callbacks used for flow control.
Users of advanced queues (RED, CoDel) who have been using them directly in the NetDevice will need to adjust to the following changes:
- - RED and CoDel are no longer specializations of the Queue classe, but are now specializations of the new QueueDisc class. This means that RED and CoDel can now be installed in the context of the new Traffic Control layer instead of as queues in (some) NetDevices. The reason for such a change is to make the ns-3 stack much more similar to that of real operating systems (Linux has been taken as a reference). Queuing disciplines such as RED and CoDel can now be tested with all the NetDevices, including WifiNetDevices.
+ - RED and CoDel are no longer specializations of the Queue class, but are now specializations of the new QueueDisc class. This means that RED and CoDel can now be installed in the context of the new Traffic Control layer instead of as queues in (some) NetDevices. The reason for such a change is to make the ns-3 stack much more similar to that of real operating systems (Linux has been taken as a reference). Queuing disciplines such as RED and CoDel can now be tested with all the NetDevices, including WifiNetDevices.
- NetDevices still use queues to buffer packets. The only subclass of Queue currently available for this purpose is DropTailQueue. If one wants to approximate the old behavior, one needs to set the DropTailQueue MaxPackets attribute to very low values, e.g., 1.
- The Traffic Control layer features a mechanism by which packets dropped by the NetDevice are requeued in the queue disc (more precisely: if NetDevice::Send returns false, the packet is requeued), so that they are retransmitted later. This means that the MAC drop traces may include packets that have not been actually lost, because they have been dropped by the device, requeued by the traffic control layer and successfully retransmitted. To get the correct number of packets that have been actually lost, one has to subtract the number of packets requeued from the number of packets dropped as reported by the MAC drop trace.
@@ -498,7 +498,7 @@ This section is for behavioral changes to the models that were not due to a bug
A new helper (VhtWifiMacHelper) was added to set up a Very high throughput (VHT) MAC entity.
A new standard value has been added that enables the new 11ac data rates.
A new 11ac preamble has been added.
- A new information element has been added: VhtCapabilities. This information element is added to the MAC frame header if the node is a VHT node. This VhtCapabilites information element is used to advertise the VHT capabilites of the node to other nodes in the network.
+ A new information element has been added: VhtCapabilities. This information element is added to the MAC frame header if the node is a VHT node. This VhtCapabilites information element is used to advertise the VHT capabilities of the node to other nodes in the network.
The ArpCache API was extended to allow the manual removal of ArpCache entries and the addition of permanent (static) entries for IPv4.
@@ -557,7 +557,7 @@ distributed geographic coordinates.
Changed behavior:
This section is for behavioral changes to the models that were not due to a bug fix.
- - In Wi-Fi, HT stations (802.11n) now support two-level aggregation. The InterferenceHelper now distinguishes between the PLCP and regular payload reception, for higher fidelity modeling. ACKs are now sent using legacy rates and preambles. Acces points now establish BSSBasicRateSet for control frame transmissions. PLCP header and PLCP payload reception have been decoupled to improve PHY layer modeling accuracy. RTS/CTS with A-MPDU is now fully supported.
+
- In Wi-Fi, HT stations (802.11n) now support two-level aggregation. The InterferenceHelper now distinguishes between the PLCP and regular payload reception, for higher fidelity modeling. ACKs are now sent using legacy rates and preambles. Access points now establish BSSBasicRateSet for control frame transmissions. PLCP header and PLCP payload reception have been decoupled to improve PHY layer modeling accuracy. RTS/CTS with A-MPDU is now fully supported.
- The mesh module was made more compliant to the IEEE 802.11s-2012 standard and packet traces are now parseable by Wireshark.
@@ -642,7 +642,7 @@ This section is for behavioral changes to the models that were not due to a bug
A new TraceSource has been added to TCP sockets: SlowStartThreshold.
- New method CommmandLine::AddValue (name, attibutePath) to provide a
+ New method CommandLine::AddValue (name, attibutePath) to provide a
shorthand argument "name" for the Attribute "path". This also has
the effect of including the help string for the Attribute in the
Usage message.
@@ -694,7 +694,7 @@ This section is for behavioral changes to the models that were not due to a bug
all schedulers were updated to interact with FR entity via FFR-SAP. Only PF, PSS, CQA,
FD-TBFQ, TD-TBFQ schedulers supports Frequency Reuse functionality. In the beginning
- of scheduling process, schedulers ask FR entity for avaiable RBGs and then ask if UE
+ of scheduling process, schedulers ask FR entity for available RBGs and then ask if UE
can be scheduled on RB
eNB RRC interacts with FFR entity via RRC-FFR SAP
new DL-CQI generation approach was implemented. Now DL-CQI is computed from control channel as signal
@@ -953,7 +953,7 @@ failure.
New attributes were added to help the user setup a High Throughput (HT) PHY entity. These attributes can be set using the YansWifiPhyHelper
A new standard value has been added that enables the new 11n data rates.
New 11n preambles has been added (Mixed format and greenfield). To be able to change Tx duration according to the preamble used, a new class TxVector has been added to carry the transmission parameters (mode, preamble, stbc,..). Several functions have been updated to allow the passage of TxVector instead of WifiMode in MacLow, WifiRemoteStationManager, WifiPhy, YansWifiPhy,..
- A new information element has been added: HTCapabilities. This information element is added to the MAC frame header if the node is an HT node. This HTCapabilites information element is used to advertise the HT capabilites of the node to other nodes in the network
+ A new information element has been added: HTCapabilities. This information element is added to the MAC frame header if the node is an HT node. This 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
@@ -1425,7 +1425,7 @@ instead of CXXDEFINES
In the mobility module, there is a new MobilityModel::GetRelativeSpeed() method returning the relative speed of two objects.
A new Ipv6AddressGenerator class was added to generate sequential
addresses from a provided base prefix and interfaceId. It also will detect
-duplicate address assigments.
+duplicate address assignments.
Changes to existing API:
@@ -1538,7 +1538,7 @@ C++ native types. It is a 64.64 integer type which means that it is a 128bit int
64 bits of fractional precision. The existing Time type is now automatically convertible to
int64x64_t to allow arbitrarily complex arithmetic operations on the content of Time
objects. The implementation of int64x64_t is based on the previously-existing
-HighPrecision type and supercedes it.
+HighPrecision type and supersedes it.
diff --git a/RELEASE_NOTES b/RELEASE_NOTES
index 8af6c5847..537ac1e27 100644
--- a/RELEASE_NOTES
+++ b/RELEASE_NOTES
@@ -242,7 +242,7 @@ Bugs fixed
- Bug 2534 - traffic-control: ARED and PIE examples should return 1 upon exit
- Bug 2535 - utils: memory leak in bench-simulator.cc
- Bug 2536 - wimax: fixed dead assignment and potential memory leak in wimax
-- Bug 2537 - traffic-control: Fix dead assigment on CoDel::DoDequeue
+- Bug 2537 - traffic-control: Fix dead assignment on CoDel::DoDequeue
- Bug 2538 - tap-bridge: fixed dead assignment on tap-bridge
- Bug 2540 - mesh: fixed dead assignment on mesh/ie-dot11s-perr
- Bug 2541 - wifi: preamble not assigned correctly
@@ -527,7 +527,7 @@ New user-visible features
error models
3) The WiFi helper API for the WifiMac sublayer, and the configuration
of HT modes and parameters, has been simplified
- 4) Better support for backward compatibilty with legacy modes
+ 4) Better support for backward compatibility with legacy modes
- (wifi) 802.11g was made backward compatible with 802.11b networks
@@ -1444,7 +1444,7 @@ New user-visible features
Bugs fixed
----------
- bug 1256 - Unnecessary SND.NXT advance, missing ACK for Out of Order segments
-- bug 1318 - Ipv6L3Protocol::LocalDeliver can get stuck in an infinte loop
+- bug 1318 - Ipv6L3Protocol::LocalDeliver can get stuck in an infinite loop
- bug 1409 - Add an attribute "SystemId" to configure the ID for MPI
- bug 1421 - Frequency dependent propagation loss models need uniform Frequency / Lambda attribute
- bug 1434 - DSR throughput not comparable to other protocols for manet example
@@ -1457,7 +1457,7 @@ Bugs fixed
- bug 1563 - Reduce valgrind test scope
- bug 1564 - Packet meta data isn't shown in dumbbell-animation.xml
- bug 1566 - WiFi SNR tag improvements
-- bug 1568 - Deserialized addresses are implicity marked as Mac48Address
+- bug 1568 - Deserialized addresses are implicitly marked as Mac48Address
- bug 1569 - droptail_vs_red example doesn't run
- bug 1570 - Valgrind errors in new test examples
- bug 1574 - Node color overwritten, by mobility updates in netanim
@@ -2022,7 +2022,7 @@ since ns-3.10, in many cases referencing the Bugzilla bug number.
- bug 1047 - Multicast routes on nodes with >16 interfaces
- bug 1048 - suggested MatrixPropagationLossModel::SetLoss() API change
- bug 1049 - Issues with OLSR HNA messages sent by multiple gateways
- - bug 1052 - olsr::RoutingProtocol::LinkTupleUpdated incorrect detection of asymetric link with multiple interface nodes
+ - bug 1052 - olsr::RoutingProtocol::LinkTupleUpdated incorrect detection of asymmetric link with multiple interface nodes
- bug 1054 - ipv6 InternetStackHelper EnablePcapIpv6All() broken
- bug 1056 - CSMA: padding not handled correctly for LLC encapsulation
- bug 1058 - InternetStackHelper pitfall: calling Install before adding routing protocols
@@ -2508,7 +2508,7 @@ many cases referencing the Bugzilla bug number
- bug 860 - waf sometimes dies while executing ns3header or gen_ns3_module_header tasks in case of
parallel jobs
- bug 862 - NotifyInterfaceUp() Adds network route even when netmask is /32
- - bug 863 - Wrong Scalar arithmetics
+ - bug 863 - Wrong Scalar arithmetic
- bug 864 - Invalid return value in UdpSocketImpl::Send and Ipv4RawSocketImpl::Send
- bug 865 - Ipv4RawSocketImpl::RecvFrom does not return from address all the time.
- bug 866 - WiMAX mobility models not aggregated to Node
@@ -2520,7 +2520,7 @@ many cases referencing the Bugzilla bug number
- bug 877 - python bindings broken with multiple inheritance ?
- bug 880 - Node sending a packet to itself via 127.0.0.1 aborts
- bug 885 - Error in Ascii tracing in Python examples
- - bug 888 - Writing ascii trace to addtional tests fails
+ - bug 888 - Writing ascii trace to additional tests fails
- bug 891 - WiMAX device helper does not include propagation loss model by default
- bug 894 - ./waf --run error message upon segfault
- bug 895 - SimpleOfdmWimaxPhy SNR computation
@@ -2624,7 +2624,7 @@ many cases referencing the Bugzilla bug number
- bug 738 ReceiveErrorModel called too late
- Fix NSC improper response to FIN
- Fixed bug in serialization of PbbAddressBlock.
- - Fix bug 780 (problem in RoutingTableComputation with asymetric links),
+ - Fix bug 780 (problem in RoutingTableComputation with asymmetric links),
while adding debugging methods to OLSR.
- bug 759: Ipv6 uses wrong outgoing interface.
- bug 770: IPv6 size calculation for unknown options is wrong.
@@ -2827,7 +2827,7 @@ New user-visible features
and simulated networks.
d) A new build option (ns-3-allinone) has been provided to make it easier for
- users to download and bulid commonly used ns-3 configurations.
+ users to download and build commonly used ns-3 configurations.
e) The ns-3 calendar queue scheduler has been ported to ns-3.
@@ -3082,7 +3082,7 @@ Release 3.0.12 (2008/04/07)
attribute support to all in-tree models
- Add a mid-level helper API to build simulation topologies
and perform simple ascii and pcap link-level tracing.
- - Large amount of structural changes to accomodate the needs
+ - Large amount of structural changes to accommodate the needs
of the upcoming python bindings
- new rate control algorithm (RRAA) and a jakes propagation model
in the 802.11 model (Federico Maguolo).
diff --git a/bindings/python/rad_util.py b/bindings/python/rad_util.py
index bf6fc5592..cf8c8a7c8 100644
--- a/bindings/python/rad_util.py
+++ b/bindings/python/rad_util.py
@@ -274,7 +274,7 @@ def lcm(a, b, precision=None):
>>> str(lcm(1.5e-8, 2.5e-8, precision=1e9))
'7.5e-08'
- By (an arbitary) definition:
+ By (an arbitrary) definition:
>>> lcm(0, 0)
0
@@ -390,7 +390,7 @@ def trim(l):
index = int(len(l_sort) / 2) # Integer division correct
median = float(l_sort[index] + l_sort[index-1]) / 2
else:
- # int divsion gives mid value when count from 0
+ # int division gives mid value when count from 0
index = int(len(l_sort) / 2)
median = l_sort[index]
# Calculate IQR.
@@ -414,7 +414,7 @@ def nice_units(value, dp=0, sigfigs=None, suffix='', space=' ',
sigfigs -- number of significant figures to display (rounded)
This overrides dp if set.
suffix -- optional unit suffix to append to unit multiplier
- space -- seperator between value and unit multiplier (default: ' ')
+ space -- separator between value and unit multiplier (default: ' ')
use_extra_prefixes -- use hecto, deka, deci and centi as well if set.
(default: False)
use_full_name -- use full name for multiplier symbol,
diff --git a/doc/manual/source/callbacks.rst b/doc/manual/source/callbacks.rst
index 30b4e4de6..70ef94567 100644
--- a/doc/manual/source/callbacks.rst
+++ b/doc/manual/source/callbacks.rst
@@ -446,7 +446,7 @@ does precisely that. In this case, when ``two ()`` is invoked::
int result = two (1.0);
-will result in a call tothe ``CbTwo`` member function (method) on the object
+will result in a call to the ``CbTwo`` member function (method) on the object
pointed to by ``&cb``.
Building Null Callbacks
diff --git a/doc/manual/source/documentation.rst b/doc/manual/source/documentation.rst
index fab053b12..78890a755 100644
--- a/doc/manual/source/documentation.rst
+++ b/doc/manual/source/documentation.rst
@@ -276,7 +276,7 @@ for every class
* Documentation for any ``Trace`` sources defined by the class.
* The memory footprint for each class.
-Doxygen operates by scaning the source code, looking for
+Doxygen operates by scanning the source code, looking for
specially marked comments. It also creates a cross reference,
indicating *where* each file, class, method, and variable is used.
@@ -529,11 +529,11 @@ usage for |ns3|.
/**
* \defgroup foo Foo protocol.
- * Implemenation of the Foo protocol.
+ * Implementation of the Foo protocol.
*/
The symbol ``foo`` is how other items can add themselves to this group.
- The string following that will be the title for the group. Any futher
+ The string following that will be the title for the group. Any further
text will be the detailed description for the group page.
* Document each file, assigning it to the relevant group. In a header file::
diff --git a/doc/manual/source/hash-functions.rst b/doc/manual/source/hash-functions.rst
index 88bea60f2..b311bea7e 100644
--- a/doc/manual/source/hash-functions.rst
+++ b/doc/manual/source/hash-functions.rst
@@ -76,7 +76,7 @@ Using an Alternative Hash Function
**********************************
The default hash function is murmur3_. FNV1a_ is also available. To specify
-the hash function explicitly, use this contructor::
+the hash function explicitly, use this constructor::
Hasher hasher = Hasher ( Create () );
diff --git a/doc/manual/source/new-modules.rst b/doc/manual/source/new-modules.rst
index 4ee246eda..d765016ca 100644
--- a/doc/manual/source/new-modules.rst
+++ b/doc/manual/source/new-modules.rst
@@ -213,7 +213,7 @@ with include statements like
#include "ns3/spectrum-model.h"
Headers used strictly internally in your implementation should not
-be included here. They are still accessible to your implemenation by
+be included here. They are still accessible to your implementation by
include statements like
.. sourcecode:: cpp
diff --git a/doc/tutorial/source/tracing.rst b/doc/tutorial/source/tracing.rst
index 2389f3715..f2659dbb0 100644
--- a/doc/tutorial/source/tracing.rst
+++ b/doc/tutorial/source/tracing.rst
@@ -720,7 +720,7 @@ you to the documentation for the latest stable release of |ns3|. If
you select the "API Documentation" link, you will be taken to the
|ns3| API documentation page.
-In the sidebar you should see a hierachy that begins
+In the sidebar you should see a hierarchy that begins
* ns-3
@@ -1216,7 +1216,7 @@ return type for a ``TracedValue`` callback function is always
The ``.AddTraceSource`` in the ``GetTypeId`` method provides the
"hooks" used for connecting the trace source to the outside world
through the Config system. We already discussed the first three
-agruments to ``AddTraceSource``: the Attribute name for the Config
+arguments to ``AddTraceSource``: the Attribute name for the Config
system, a help string, and the address of the TracedValue class data
member.
@@ -1511,7 +1511,7 @@ models, you probably want to understand this section.
The most common way to start pumping events is to start an
``Application``. This is done as the result of the following
-(hopefully) familar lines of an |ns3| script::
+(hopefully) familiar lines of an |ns3| script::
ApplicationContainer apps = ...
apps.Start (Seconds (1.0));
diff --git a/src/brite/doc/brite.rst b/src/brite/doc/brite.rst
index 2760e3d93..a1addd6ae 100644
--- a/src/brite/doc/brite.rst
+++ b/src/brite/doc/brite.rst
@@ -46,7 +46,7 @@ Design
To generate the BRITE topology, ns-3 helpers call out to the external BRITE library,
and using a standard BRITE configuration file, the BRITE code builds a graph with nodes
-and edges according to this configuration file. Please see the BRITE documenation
+and edges according to this configuration file. Please see the BRITE documentation
or the example configuration files in src/brite/examples/conf_files to get a better
grasp of BRITE configuration options. The graph built by BRITE is returned to ns-3,
and a ns-3 implementation of the graph is built. Leaf nodes for each AS are available
diff --git a/src/brite/examples/brite-MPI-example.cc b/src/brite/examples/brite-MPI-example.cc
index cdc33adc3..f5c3c46ca 100644
--- a/src/brite/examples/brite-MPI-example.cc
+++ b/src/brite/examples/brite-MPI-example.cc
@@ -102,7 +102,7 @@ main (int argc, char *argv[])
NodeContainer client;
NodeContainer server;
- //For this example will use AS 0 and AS 1 which will be on seperate systems
+ //For this example will use AS 0 and AS 1 which will be on separate systems
//due to the mod divide used to assign AS to system.
//GetSystemNumberForAs (uint32_t) can be used to determine which system an
diff --git a/src/brite/helper/brite-topology-helper.cc b/src/brite/helper/brite-topology-helper.cc
index 0b2182b94..6e48a2103 100644
--- a/src/brite/helper/brite-topology-helper.cc
+++ b/src/brite/helper/brite-topology-helper.cc
@@ -353,7 +353,7 @@ void BriteTopologyHelper::GenerateBriteTopology (void)
BuildBriteNodeInfoList ();
BuildBriteEdgeInfoList ();
- //brite automatically spits out the seed values used to a seperate file so no need to keep this anymore
+ //brite automatically spits out the seed values used to a separate file so no need to keep this anymore
if (generateSeedFile)
{
remove ("briteSeedFile.txt");
diff --git a/src/brite/test/test.conf b/src/brite/test/test.conf
index 4ea8d3266..316c49f03 100644
--- a/src/brite/test/test.conf
+++ b/src/brite/test/test.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/click/model/ipv4-click-routing.cc b/src/click/model/ipv4-click-routing.cc
index efe888236..f6ef9c1d5 100644
--- a/src/click/model/ipv4-click-routing.cc
+++ b/src/click/model/ipv4-click-routing.cc
@@ -179,7 +179,7 @@ Ipv4ClickRouting::GetInterfaceId (const char *ifname)
// be used in the Click configuration files.
// Thus eth0 will refer to the first network device of
// the node, and is to be named so in the Click graph.
- // This function is called by Click during the intialisation
+ // This function is called by Click during the initialisation
// phase of the Click graph, during which it tries to map
// interface IDs to interface names. The return value
// corresponds to the interface ID that Click will use.
@@ -798,7 +798,7 @@ int simclick_sim_command (simclick_node_t *simnode, int cmd, ...)
// the size variable and return an error code.
// Otherwise return the bytes actually writte into the buffer in size.
- // Append key/value pair, seperated by \0.
+ // Append key/value pair, separated by \0.
std::map defines = clickInstance->GetDefines ();
std::map::const_iterator it = defines.begin ();
while (it != defines.end ())
diff --git a/src/click/model/ipv4-click-routing.h b/src/click/model/ipv4-click-routing.h
index f590814d5..475d35d1d 100644
--- a/src/click/model/ipv4-click-routing.h
+++ b/src/click/model/ipv4-click-routing.h
@@ -205,7 +205,7 @@ private:
struct timeval GetTimevalFromNow () const;
/**
- * \brief This method has to be scheduled everytime Click calls SIMCLICK_SCHEDULE
+ * \brief This method has to be scheduled every time Click calls SIMCLICK_SCHEDULE
*/
void RunClickEvent ();
diff --git a/src/click/model/ipv4-l3-click-protocol.h b/src/click/model/ipv4-l3-click-protocol.h
index e98ea07de..0ea238493 100644
--- a/src/click/model/ipv4-l3-click-protocol.h
+++ b/src/click/model/ipv4-l3-click-protocol.h
@@ -128,7 +128,7 @@ public:
* \param device network device
* \param p the packet
* \param protocol protocol value
- * \param from address of the correspondant
+ * \param from address of the correspondent
* \param to address of the destination
* \param packetType type of the packet
*/
diff --git a/src/dsdv/doc/dsdv.rst b/src/dsdv/doc/dsdv.rst
index 46914b70b..f1d43ef05 100644
--- a/src/dsdv/doc/dsdv.rst
+++ b/src/dsdv/doc/dsdv.rst
@@ -31,7 +31,7 @@ Each node uses 2 mechanisms to send out the DSDV updates. They are,
2. Trigger Updates
Trigger Updates are small updates in-between the periodic updates. These updates are sent out whenever a node
receives a DSDV packet that caused a change in its routing table. The original paper did not clearly mention
- when for what change in the table should a DSDV update be sent out. The current implemntation sends out an update
+ when for what change in the table should a DSDV update be sent out. The current implementation sends out an update
irrespective of the change in the routing table.
The updates are accepted based on the metric for a particular node. The first factor determinig the acceptance of
diff --git a/src/dsdv/model/dsdv-packet-queue.cc b/src/dsdv/model/dsdv-packet-queue.cc
index df7da03ea..fd11bfe43 100644
--- a/src/dsdv/model/dsdv-packet-queue.cc
+++ b/src/dsdv/model/dsdv-packet-queue.cc
@@ -65,7 +65,7 @@ PacketQueue::Enqueue (QueueEntry & entry)
}
numPacketswithdst = GetCountForPacketsWithDst (entry.GetIpv4Header ().GetDestination ());
NS_LOG_DEBUG ("Number of packets with this destination: " << numPacketswithdst);
- /** For Brock Paper comparision*/
+ /** For Brock Paper comparison*/
if (numPacketswithdst >= m_maxLenPerDst || m_queue.size () >= m_maxLen)
{
NS_LOG_DEBUG ("Max packets reached for this destination. Not queuing any further packets");
diff --git a/src/dsr/model/dsr-fs-header.h b/src/dsr/model/dsr-fs-header.h
index 9dfd8f1c4..bce0335e4 100644
--- a/src/dsr/model/dsr-fs-header.h
+++ b/src/dsr/model/dsr-fs-header.h
@@ -148,7 +148,7 @@ public:
*/
uint16_t GetPayloadLength () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -297,7 +297,7 @@ public:
*/
virtual ~DsrRoutingHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
diff --git a/src/dsr/model/dsr-network-queue.h b/src/dsr/model/dsr-network-queue.h
index 4a162b7cc..6d77fef37 100644
--- a/src/dsr/model/dsr-network-queue.h
+++ b/src/dsr/model/dsr-network-queue.h
@@ -156,8 +156,8 @@ public:
return tstamp;
}
/**
- * Set inserted tiem stamp function
- * \param time tje inserted timestamp
+ * Set inserted time stamp function
+ * \param time the inserted timestamp
*/
void SetInsertedTimeStamp (Time time)
{
diff --git a/src/dsr/model/dsr-option-header.h b/src/dsr/model/dsr-option-header.h
index ea7fc8cc6..a23ee49ed 100644
--- a/src/dsr/model/dsr-option-header.h
+++ b/src/dsr/model/dsr-option-header.h
@@ -98,7 +98,7 @@ public:
*/
uint8_t GetLength () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -169,7 +169,7 @@ public:
*/
virtual ~DsrOptionPad1Header ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -219,7 +219,7 @@ public:
*/
virtual ~DsrOptionPadnHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -348,7 +348,7 @@ public:
*/
uint16_t GetId () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -500,7 +500,7 @@ public:
*/
Ipv4Address GetNodeAddress (uint8_t index) const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -641,7 +641,7 @@ public:
*/
uint8_t GetSalvage () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -793,7 +793,7 @@ public:
*/
virtual Ipv4Address GetErrorDst () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -949,7 +949,7 @@ public:
*/
Ipv4Address GetOriginalDst () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -1096,7 +1096,7 @@ public:
*/
uint16_t GetUnsupported () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -1195,7 +1195,7 @@ public:
*/
uint16_t GetAckId () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -1302,7 +1302,7 @@ public:
*/
Ipv4Address GetRealDst () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
diff --git a/src/dsr/model/dsr-options.cc b/src/dsr/model/dsr-options.cc
index 2afcf18f5..a96f2a0e9 100644
--- a/src/dsr/model/dsr-options.cc
+++ b/src/dsr/model/dsr-options.cc
@@ -588,7 +588,7 @@ uint8_t DsrOptionRreq::Process (Ptr packet, Ptr dsrP, Ipv4Addres
if (dupRequest)
{
- // We have received this same route reqeust before, not forwarding it now
+ // We have received this same route request before, not forwarding it now
NS_LOG_LOGIC ("Duplicate request. Drop!");
m_dropTrace (packet); // call drop trace
return 0;
diff --git a/src/dsr/model/dsr-passive-buff.h b/src/dsr/model/dsr-passive-buff.h
index 4dc3f1987..d90e4e22d 100644
--- a/src/dsr/model/dsr-passive-buff.h
+++ b/src/dsr/model/dsr-passive-buff.h
@@ -309,7 +309,7 @@ public:
}
/**
* Get passive buffer timeout
- * \returns the passive buffer tiemout
+ * \returns the passive buffer timeout
*/
Time GetPassiveBufferTimeout () const
{
diff --git a/src/dsr/model/dsr-rcache.cc b/src/dsr/model/dsr-rcache.cc
index fa92e0746..cd4465452 100644
--- a/src/dsr/model/dsr-rcache.cc
+++ b/src/dsr/model/dsr-rcache.cc
@@ -404,7 +404,7 @@ DsrRouteCache::RebuildBestRouteTable (Ipv4Address source)
m_bestRoutesTable_link.clear ();
for (std::map::iterator i = pre.begin (); i != pre.end (); ++i)
{
- // loop for all vertexes
+ // loop for all vertices
DsrRouteCacheEntry::IP_VECTOR route;
Ipv4Address iptemp = i->first;
diff --git a/src/dsr/model/dsr-routing.cc b/src/dsr/model/dsr-routing.cc
index eb9fef549..fd9585427 100644
--- a/src/dsr/model/dsr-routing.cc
+++ b/src/dsr/model/dsr-routing.cc
@@ -1850,7 +1850,7 @@ DsrRouting::SendPacketFromBuffer (DsrOptionSRHeader const &sourceRoute, Ipv4Addr
}
}
/*
- * Here we try to find data packet from send buffer, if packet with this destiantion found, send it out
+ * Here we try to find data packet from send buffer, if packet with this destination found, send it out
*/
else if (m_errorBuffer.Find (destination))
{
@@ -2032,7 +2032,7 @@ DsrRouting::CallCancelPacketTimer (uint16_t ackId, Ipv4Header const& ipv4Header,
Ipv4Address sender = ipv4Header.GetDestination ();
Ipv4Address receiver = ipv4Header.GetSource ();
/*
- * Create a packet to fill maintenance buffer, not used to compare with maintainance entry
+ * Create a packet to fill maintenance buffer, not used to compare with maintenance entry
* The reason is ack header doesn't have the original packet copy
*/
Ptr mainP = Create ();
@@ -3478,7 +3478,7 @@ DsrRouting::Receive (Ptr p,
rerrUnsupportHeader.SetSalvage (salvage); // Set the value about whether to salvage a packet or not
/*
- * The unknow option error is not supported currently in this implementation, and it's also not likely to
+ * The unknown option error is not supported currently in this implementation, and it's also not likely to
* happen in simulations
*/
// SendError (rerrUnsupportHeader, 0, protocol); // Send the error packet
diff --git a/src/dsr/model/dsr-routing.h b/src/dsr/model/dsr-routing.h
index e1b8f1234..04cb4132a 100644
--- a/src/dsr/model/dsr-routing.h
+++ b/src/dsr/model/dsr-routing.h
@@ -729,9 +729,9 @@ private:
DsrErrorBuffer m_errorBuffer; ///< The error buffer to save the error messages
- uint32_t m_maxMaintainLen; ///< Max # of entries for maintainance buffer
+ uint32_t m_maxMaintainLen; ///< Max # of entries for maintenance buffer
- Time m_maxMaintainTime; ///< Time out for maintainance buffer
+ Time m_maxMaintainTime; ///< Time out for maintenance buffer
uint32_t m_maxCacheLen; ///< Max # of cache entries for route cache
diff --git a/src/fd-net-device/examples/fd-tap-ping.cc b/src/fd-net-device/examples/fd-tap-ping.cc
index d43bdc794..ca47e5ee0 100644
--- a/src/fd-net-device/examples/fd-tap-ping.cc
+++ b/src/fd-net-device/examples/fd-tap-ping.cc
@@ -51,7 +51,7 @@
// So for Linux systems, make sure to configure:
// # echo 1 > /proc/sys/net/ipv4/ip_forward
//
-// Also enable natting so the ICMP replys from the remote host can reach
+// Also enable natting so the ICMP replies from the remote host can reach
// back the TAP.
// - TAP-network-address is the same as 'tapNetwork'
// - TAP-network-mask is the same as 'tapMask'
diff --git a/src/fd-net-device/helper/emu-fd-net-device-helper.cc b/src/fd-net-device/helper/emu-fd-net-device-helper.cc
index 26f42580f..ddeda66ec 100644
--- a/src/fd-net-device/helper/emu-fd-net-device-helper.cc
+++ b/src/fd-net-device/helper/emu-fd-net-device-helper.cc
@@ -248,7 +248,7 @@ EmuFdNetDeviceHelper::CreateFileDescriptor (void) const
// we wait for the child (the socket creator) to complete and read the
// socket it created using the ancillary data mechanism.
//
- // Tom Goff reports the possiblility of a deadlock when trying to acquire the
+ // Tom Goff reports the possibility of a deadlock when trying to acquire the
// python GIL here. He says that this might be due to trying to access Python
// objects after fork() without calling PyOS_AfterFork() to properly reset
// Python state (including the GIL). There is no code to cause the problem
diff --git a/src/fd-net-device/helper/planetlab-tap-creator.cc b/src/fd-net-device/helper/planetlab-tap-creator.cc
index ca5a64874..c1c46b0cc 100644
--- a/src/fd-net-device/helper/planetlab-tap-creator.cc
+++ b/src/fd-net-device/helper/planetlab-tap-creator.cc
@@ -123,7 +123,7 @@ TunAlloc (int iftype, char *if_name)
/* passing type param */
ret = send (control_fd, &iftype, sizeof(iftype), 0);
- ABORT_IF (ret != sizeof(iftype), "Could not send paramater to Vsys control socket", 0);
+ ABORT_IF (ret != sizeof(iftype), "Could not send parameter to Vsys control socket", 0);
return ReceiveVifFd (control_fd, if_name);
diff --git a/src/fd-net-device/wscript b/src/fd-net-device/wscript
index 5c2722756..d6dbe7aea 100644
--- a/src/fd-net-device/wscript
+++ b/src/fd-net-device/wscript
@@ -6,7 +6,7 @@ from waflib import Options
def options(opt):
opt.add_option('--force-planetlab',
- help=('Forces compilation of PlanetLab even if not suported by the local system'),
+ help=('Forces compilation of PlanetLab even if not supported by the local system'),
dest='force_planetlab', default=False, action="store_true")
def configure(conf):
diff --git a/src/flow-monitor/helper/flow-monitor-helper.h b/src/flow-monitor/helper/flow-monitor-helper.h
index 41c952ba0..f0ba5cbf4 100644
--- a/src/flow-monitor/helper/flow-monitor-helper.h
+++ b/src/flow-monitor/helper/flow-monitor-helper.h
@@ -46,7 +46,7 @@ public:
/**
* \brief Set an attribute for the to-be-created FlowMonitor object
* \param n1 attribute name
- * \param v1 attibute value
+ * \param v1 attribute value
*/
void SetMonitorAttribute (std::string n1, const AttributeValue &v1);
diff --git a/src/internet/doc/ipv6.rst b/src/internet/doc/ipv6.rst
index 33d47dfd2..8bfab1f08 100644
--- a/src/internet/doc/ipv6.rst
+++ b/src/internet/doc/ipv6.rst
@@ -343,7 +343,7 @@ This will enable forwarding on the node *0* and will setup a default route in
requires that Ipv6StaticRouting is present in the nodes.
The IPv6 routing helpers enable the user to perform specific tasks on the
-particular routing algorith and to print the routing tables.
+particular routing algorithm and to print the routing tables.
Attributes
diff --git a/src/internet/doc/routing-overview.rst b/src/internet/doc/routing-overview.rst
index 8c3d6c0b0..4a8ddc68e 100644
--- a/src/internet/doc/routing-overview.rst
+++ b/src/internet/doc/routing-overview.rst
@@ -38,7 +38,7 @@ consisting of two methods: RouteOutput () and RouteInput (). For packets
traveling outbound from a host, the transport protocol will query Ipv4 for the
Ipv4RoutingProtocol object interface, and will request a route via
Ipv4RoutingProtocol::RouteOutput (). A Ptr to Ipv4Route object is returned.
-This is analagous to a dst_cache entry in Linux. The Ipv4Route is carried down
+This is analogous to a dst_cache entry in Linux. The Ipv4Route is carried down
to the Ipv4L3Protocol to avoid a second lookup there. However, some cases (e.g.
Ipv4 raw sockets) will require a call to RouteOutput()
directly from Ipv4L3Protocol.
diff --git a/src/internet/doc/tcp.rst b/src/internet/doc/tcp.rst
index b48ff2014..a1f83250e 100644
--- a/src/internet/doc/tcp.rst
+++ b/src/internet/doc/tcp.rst
@@ -1153,7 +1153,7 @@ necessary because window updates can be lost.
Doxygen documentation. As a brief summary, the strategy is to have a class
that sets up a TCP connection, and that calls protected members of itself.
In this way, subclasses can implement the necessary members, which will
- be called by the main TcpGeneralTest class when events occour. For example,
+ be called by the main TcpGeneralTest class when events occur. For example,
after processing an ACK, the method ProcessedAck will be invoked. Subclasses
interested in checking some particular things which must have happened during
an ACK processing, should implement the ProcessedAck method and check
@@ -1284,7 +1284,7 @@ RECEIVER. As said before, check the Doxygen documentation for class TcpGeneralTe
to be aware of the various possibilities that it offers.
.. note::
- By design, we choose to mantain a close relationship between TcpSocketBase
+ By design, we choose to maintain a close relationship between TcpSocketBase
and TcpGeneralTest: they are connected by a friendship relation. Since
friendship is not passed through inheritance, if one discovers that one
needs to access or to modify a private (or protected) member of TcpSocketBase,
@@ -1369,7 +1369,7 @@ If we run the experiment, enabling the logging, we can see the following:
The output is cut to show the threeway handshake. As we can see from the headers,
the rWnd of RECEIVER is set to 0, and thankfully our tests are not failing.
-Now we need to test for the persistent timer, which sould be started by
+Now we need to test for the persistent timer, which should be started by
the SENDER after it receives the SYN-ACK. Since the Rx method is called before
any computation on the received packet, we should utilize another method, namely
ProcessedAck, which is the method called after each processed ACK. In the
@@ -1426,7 +1426,7 @@ We divide the events by simulated time. At line 1, we check everything that
happens before the 6.0 seconds mark; for instance, that no data packets are sent,
and that the state remains OPEN for both sender and receiver.
-Since the persist timeout is initialized at 6 seconds (excercise left for the
+Since the persist timeout is initialized at 6 seconds (exercise left for the
reader: edit the test, getting this value from the Attribute system), we need
to check (line 6) between 6.0 and 7.0 simulated seconds that the probe is sent.
Only one probe is allowed, and this is the reason for the check at line 11.
@@ -1557,7 +1557,7 @@ and then, hit "Run".
This code magically runs without any reported errors; however, in real cases,
when you discover a bug you should expect the existing test to fail (this
could indicate a well-written test and a bad-writted model, or a bad-written
- test; hopefull the first situation). Correcting bugs is an iterative
+ test; hopefully the first situation). Correcting bugs is an iterative
process. For instance, commits created to make this test case running without
errors are 11633:6b74df04cf44, (others to be merged).
diff --git a/src/internet/model/global-route-manager-impl.cc b/src/internet/model/global-route-manager-impl.cc
index e9a44b74f..8945a84b7 100644
--- a/src/internet/model/global-route-manager-impl.cc
+++ b/src/internet/model/global-route-manager-impl.cc
@@ -151,7 +151,7 @@ SPFVertex::~SPFVertex ()
// delete children
while (m_children.size () > 0)
{
- // pop out children one by one. Some children may disapper
+ // pop out children one by one. Some children may disappear
// when deleting some other children in the list. As a result,
// it is necessary to use pop to walk through all children, instead
// of using iterator.
diff --git a/src/internet/model/global-route-manager-impl.h b/src/internet/model/global-route-manager-impl.h
index a1e90444a..c440f5ad7 100644
--- a/src/internet/model/global-route-manager-impl.h
+++ b/src/internet/model/global-route-manager-impl.h
@@ -864,7 +864,7 @@ private:
void SPFVertexAddParent (SPFVertex* v);
/**
- * \brief Search for a link between two vertexes.
+ * \brief Search for a link between two vertices.
*
* This method is derived from quagga ospf_get_next_link ()
*
diff --git a/src/internet/model/global-router-interface.cc b/src/internet/model/global-router-interface.cc
index 944daafe2..ab5ff9c1f 100644
--- a/src/internet/model/global-router-interface.cc
+++ b/src/internet/model/global-router-interface.cc
@@ -682,7 +682,7 @@ GlobalRouter::DiscoverLSAs ()
}
//
- // We have a net device that we need to check out. If it suports
+ // We have a net device that we need to check out. If it supports
// broadcast and is not a point-point link, then it will be either a stub
// network or a transit network depending on the number of routers on
// the segment. We add the appropriate link record to the LSA.
diff --git a/src/internet/model/global-routing.h b/src/internet/model/global-routing.h
index b80cf82cf..45af3568c 100644
--- a/src/internet/model/global-routing.h
+++ b/src/internet/model/global-routing.h
@@ -43,7 +43,7 @@
* If the topology changes during the simulation, by default, routing
* will not adjust. There are two ways to make it adjust.
* - Set the attribute Ipv4GlobalRouting::RespondToInterfaceEvents to true
- * - Manually call the sequence of GlobalRouteManager methods to delte global
+ * - Manually call the sequence of GlobalRouteManager methods to delete global
* routes, build global routing database, and initialize routes.
* There is a helper method that encapsulates this
* (Ipv4GlobalRoutingHelper::RecomputeRoutingTables())
diff --git a/src/internet/model/icmpv6-header.h b/src/internet/model/icmpv6-header.h
index ff0025433..8d6c8472c 100644
--- a/src/internet/model/icmpv6-header.h
+++ b/src/internet/model/icmpv6-header.h
@@ -173,7 +173,7 @@ public:
void SetChecksum (uint16_t checksum);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -285,7 +285,7 @@ public:
void SetLength (uint8_t len);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -382,7 +382,7 @@ public:
void SetIpv6Target (Ipv6Address target);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -510,7 +510,7 @@ public:
void SetFlagO (bool o);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -676,7 +676,7 @@ public:
void SetFlagH (bool h);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -797,7 +797,7 @@ public:
void SetReserved (uint32_t reserved);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -883,7 +883,7 @@ public:
void SetDestination (Ipv6Address destination);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -997,7 +997,7 @@ public:
void SetSeq (uint16_t seq);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1076,7 +1076,7 @@ public:
void SetPacket (Ptr p);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1162,7 +1162,7 @@ public:
void SetMtu (uint32_t mtu);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1242,7 +1242,7 @@ public:
void SetPacket (Ptr p);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1329,7 +1329,7 @@ public:
void SetPtr (uint32_t ptr);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1427,7 +1427,7 @@ public:
void SetMtu (uint32_t mtu);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1573,7 +1573,7 @@ public:
void SetPrefix (Ipv6Address prefix);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1685,7 +1685,7 @@ public:
void SetAddress (Address addr);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
@@ -1759,7 +1759,7 @@ public:
void SetPacket (Ptr packet);
/**
- * \brief Print informations.
+ * \brief Print information.
* \param os output stream
*/
virtual void Print (std::ostream& os) const;
diff --git a/src/internet/model/icmpv6-l4-protocol.cc b/src/internet/model/icmpv6-l4-protocol.cc
index 5bac99d92..a7154f6d4 100644
--- a/src/internet/model/icmpv6-l4-protocol.cc
+++ b/src/internet/model/icmpv6-l4-protocol.cc
@@ -366,7 +366,7 @@ void Icmpv6L4Protocol::HandleRA (Ptr packet, Ipv6Address const &src, Ipv
}
break;
default:
- /* unknow option, quit */
+ /* unknown option, quit */
next = false;
}
}
@@ -1436,7 +1436,7 @@ void Icmpv6L4Protocol::FunctionDadTimeout (Ptr icmpv6, Ipv6Int
if (!ipv6->IsForwarding (ipv6->GetInterfaceForDevice (interface->GetDevice ())) && addr.IsLinkLocal ())
{
/* \todo Add random delays before sending RS
- * because all nodes start at the same time, there will be many of RS arround 1 second of simulation time
+ * because all nodes start at the same time, there will be many of RS around 1 second of simulation time
*/
Simulator::Schedule (Seconds (0.0), &Icmpv6L4Protocol::SendRS, PeekPointer (icmpv6), ifaddr.GetAddress (), Ipv6Address::GetAllRoutersMulticast (), interface->GetDevice ()->GetAddress ());
}
diff --git a/src/internet/model/ipv4-end-point.h b/src/internet/model/ipv4-end-point.h
index 8b4e6fd83..abcaea08e 100644
--- a/src/internet/model/ipv4-end-point.h
+++ b/src/internet/model/ipv4-end-point.h
@@ -87,7 +87,7 @@ public:
uint16_t GetPeerPort (void);
/**
- * \brief Set the peer informations (address and port).
+ * \brief Set the peer information (address and port).
* \param address peer address
* \param port peer port
*/
diff --git a/src/internet/model/ipv4-interface.cc b/src/internet/model/ipv4-interface.cc
index 7ad075eff..6cddf0cfc 100644
--- a/src/internet/model/ipv4-interface.cc
+++ b/src/internet/model/ipv4-interface.cc
@@ -57,7 +57,7 @@ Ipv4Interface::GetTypeId (void)
/**
* By default, Ipv4 interface are created in the "down" state
- * with no IP addresses. Before becoming useable, the user must
+ * with no IP addresses. Before becoming usable, the user must
* invoke SetUp on them once an Ipv4 address and mask have been set.
*/
Ipv4Interface::Ipv4Interface ()
diff --git a/src/internet/model/ipv6-address-generator.cc b/src/internet/model/ipv6-address-generator.cc
index 1cf14634a..39ce39a2a 100644
--- a/src/internet/model/ipv6-address-generator.cc
+++ b/src/internet/model/ipv6-address-generator.cc
@@ -548,7 +548,7 @@ Ipv6AddressGeneratorImpl::AddAllocated (const Ipv6Address address)
// couldn't have been extended to include this new address since the
// code immediately above would have been executed and that next lower
// block extended upward. So we know it's safe to extend the current
- // block down to includ the new address.
+ // block down to include the new address.
//
for (uint32_t j = 0; j < 16; j++)
{
diff --git a/src/internet/model/ipv6-end-point.h b/src/internet/model/ipv6-end-point.h
index c8a1226da..22ec736d9 100644
--- a/src/internet/model/ipv6-end-point.h
+++ b/src/internet/model/ipv6-end-point.h
@@ -96,7 +96,7 @@ public:
uint16_t GetPeerPort ();
/**
- * \brief Set the peer informations (address and port).
+ * \brief Set the peer information (address and port).
* \param addr peer address
* \param port peer port
*/
diff --git a/src/internet/model/ipv6-extension-header.h b/src/internet/model/ipv6-extension-header.h
index 6af093b24..72e7cb27e 100644
--- a/src/internet/model/ipv6-extension-header.h
+++ b/src/internet/model/ipv6-extension-header.h
@@ -87,7 +87,7 @@ public:
uint16_t GetLength () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -246,7 +246,7 @@ public:
virtual ~Ipv6ExtensionHopByHopHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -303,7 +303,7 @@ public:
virtual ~Ipv6ExtensionDestinationHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -396,7 +396,7 @@ public:
uint32_t GetIdentification () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -488,7 +488,7 @@ public:
uint8_t GetSegmentsLeft () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -588,7 +588,7 @@ public:
Ipv6Address GetRouterAddress (uint8_t index) const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -656,7 +656,7 @@ public:
virtual ~Ipv6ExtensionESPHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -713,7 +713,7 @@ public:
virtual ~Ipv6ExtensionAHHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
diff --git a/src/internet/model/ipv6-header.h b/src/internet/model/ipv6-header.h
index f899f4a1c..3a92a87b6 100644
--- a/src/internet/model/ipv6-header.h
+++ b/src/internet/model/ipv6-header.h
@@ -247,7 +247,7 @@ public:
Ipv6Address GetDestinationAddress (void) const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
diff --git a/src/internet/model/ipv6-option-header.h b/src/internet/model/ipv6-option-header.h
index 5b297b1d4..e5ba2408d 100644
--- a/src/internet/model/ipv6-option-header.h
+++ b/src/internet/model/ipv6-option-header.h
@@ -97,7 +97,7 @@ public:
uint8_t GetLength () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -179,7 +179,7 @@ public:
virtual ~Ipv6OptionPad1Header ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -237,7 +237,7 @@ public:
virtual ~Ipv6OptionPadnHeader ();
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -306,7 +306,7 @@ public:
uint32_t GetDataLength () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
@@ -387,7 +387,7 @@ public:
uint16_t GetValue () const;
/**
- * \brief Print some informations about the packet.
+ * \brief Print some information about the packet.
* \param os output stream
* \return info about this packet
*/
diff --git a/src/internet/model/nsc-tcp-socket-impl.cc b/src/internet/model/nsc-tcp-socket-impl.cc
index 2945af44d..1d6607b86 100644
--- a/src/internet/model/nsc-tcp-socket-impl.cc
+++ b/src/internet/model/nsc-tcp-socket-impl.cc
@@ -897,7 +897,7 @@ NscTcpSocketImpl::GetNativeNs3Errno (int error) const
{
case NSC_EADDRINUSE: // fallthrough
case NSC_EADDRNOTAVAIL: return ERROR_AFNOSUPPORT;
- case NSC_EINPROGRESS: // Altough nsc sockets are nonblocking, we pretend they're not.
+ case NSC_EINPROGRESS: // Although nsc sockets are nonblocking, we pretend they're not.
case NSC_EAGAIN: return ERROR_AGAIN;
case NSC_EISCONN: // fallthrough
case NSC_EALREADY: return ERROR_ISCONN;
diff --git a/src/internet/model/pending-data.cc b/src/internet/model/pending-data.cc
index 2e6213f39..6362834e9 100644
--- a/src/internet/model/pending-data.cc
+++ b/src/internet/model/pending-data.cc
@@ -247,4 +247,4 @@ PendingData::RemoveToSeq (const SequenceNumber32& seqFront, const SequenceNumber
return current;
}
-} //namepsace ns3
+} //namespace ns3
diff --git a/src/internet/model/pending-data.h b/src/internet/model/pending-data.h
index a87180e57..da5a6e61e 100644
--- a/src/internet/model/pending-data.h
+++ b/src/internet/model/pending-data.h
@@ -179,6 +179,6 @@ public:
uint32_t responseSize; //!< Size of response requested
};
-} //namepsace ns3
+} //namespace ns3
#endif /* PENDING_DATA_H */
diff --git a/src/internet/model/tcp-congestion-ops.cc b/src/internet/model/tcp-congestion-ops.cc
index 1d46ba044..c82cf0609 100644
--- a/src/internet/model/tcp-congestion-ops.cc
+++ b/src/internet/model/tcp-congestion-ops.cc
@@ -189,7 +189,7 @@ TcpNewReno::IncreaseWindow (Ptr tcb, uint32_t segmentsAcked)
* slow start we receive a cumulative ACK, it counts only for 1 SMSS of
* increase, wasting the others.
*
- * // Uncorrect assert, I am sorry
+ * // Incorrect assert, I am sorry
* NS_ASSERT (segmentsAcked == 0);
*/
}
diff --git a/src/internet/model/tcp-congestion-ops.h b/src/internet/model/tcp-congestion-ops.h
index 0fb2312b2..6b2bd6f15 100644
--- a/src/internet/model/tcp-congestion-ops.h
+++ b/src/internet/model/tcp-congestion-ops.h
@@ -36,7 +36,7 @@ namespace ns3 {
* \brief Congestion control abstract class
*
* The design is inspired on what Linux v4.0 does (but it has been
- * in place since years). The congestion control is splitted from the main
+ * in place since years). The congestion control is split from the main
* socket code, and it is a pluggable component. An interface has been defined;
* variables are maintained in the TcpSocketState class, while subclasses of
* TcpCongestionOps operate over an instance of that class.
@@ -140,7 +140,7 @@ public:
}
/**
- * \brief Trigger events/calculations on occurance congestion window event
+ * \brief Trigger events/calculations on occurrence congestion window event
*
* This function mimics the function cwnd_event in Linux.
* The function is called in case of congestion window events.
diff --git a/src/internet/model/tcp-highspeed.cc b/src/internet/model/tcp-highspeed.cc
index efc2f08fb..85ffa3e4b 100644
--- a/src/internet/model/tcp-highspeed.cc
+++ b/src/internet/model/tcp-highspeed.cc
@@ -86,7 +86,7 @@ TcpHighSpeed::Fork (void)
* For instance, when it is equal to 2, we need to increase the window by the
* quantity 2/w. But, this means that one segment acked is equivalent (from
* the point of view of incrementing cWnd) to two segments acked in NewReno
- * (1/w + 1/w). That a coefficent is, in other word, the weight of each segment
+ * (1/w + 1/w). That a coefficient is, in other word, the weight of each segment
* acked. More weight, less ACK are necessary to increment cWnd, which is
* exactly the Highspeed principle.
*
diff --git a/src/internet/model/tcp-hybla.cc b/src/internet/model/tcp-hybla.cc
index 2c1ea7622..5c7213189 100644
--- a/src/internet/model/tcp-hybla.cc
+++ b/src/internet/model/tcp-hybla.cc
@@ -143,7 +143,7 @@ TcpHybla::CongestionAvoidance (Ptr tcb, uint32_t segmentsAcked)
if (m_cWndCnt >= 1.0)
{
- // double to int truncates everytime.
+ // double to int truncates every time.
uint32_t inc = static_cast (m_cWndCnt);
m_cWndCnt -= inc;
diff --git a/src/internet/model/tcp-recovery-ops.h b/src/internet/model/tcp-recovery-ops.h
index ce23da0b3..0fc26835a 100644
--- a/src/internet/model/tcp-recovery-ops.h
+++ b/src/internet/model/tcp-recovery-ops.h
@@ -42,7 +42,7 @@ class TcpSocketState;
* \brief recovery abstract class
*
* The design is inspired by the TcpCongestionOps class in ns-3. The fast
- * recovery is splitted from the main socket code, and it is a pluggable
+ * recovery is split from the main socket code, and it is a pluggable
* component. Subclasses of TcpRecoveryOps should modify TcpSocketState variables
* upon three condition:
*
diff --git a/src/internet/model/tcp-rx-buffer.cc b/src/internet/model/tcp-rx-buffer.cc
index 6a658df93..74c8f137d 100644
--- a/src/internet/model/tcp-rx-buffer.cc
+++ b/src/internet/model/tcp-rx-buffer.cc
@@ -326,7 +326,7 @@ TcpRxBuffer::UpdateSackList (const SequenceNumber32 &head, const SequenceNumber3
m_sackList.pop_back ();
}
- // Please note that, if a block b is discarded and then a block contiguos
+ // Please note that, if a block b is discarded and then a block contiguous
// to b is received, only that new block (without the b part) is reported.
// This is perfectly fine for the RFC point (a), given that we do not report any
// overlapping blocks shortly after.
@@ -405,4 +405,4 @@ TcpRxBuffer::Extract (uint32_t maxSize)
return outPkt;
}
-} //namepsace ns3
+} //namespace ns3
diff --git a/src/internet/model/tcp-rx-buffer.h b/src/internet/model/tcp-rx-buffer.h
index 911e62b4e..ff9675b6e 100644
--- a/src/internet/model/tcp-rx-buffer.h
+++ b/src/internet/model/tcp-rx-buffer.h
@@ -56,7 +56,7 @@ class Packet;
* SACK list
* ---------
*
- * An interesting feature of this class is the ability to mantain an ordered
+ * An interesting feature of this class is the ability to maintain an ordered
* SACK list, under the definition of RFC 2018. When a out-of-order segment
* reaches this buffer, an ACK will be sent out, and the SACK list is
* generated or updated. From RFC 2018:
@@ -186,7 +186,7 @@ private:
* \brief Update the sack list, with the block seq starting at the beginning
*
* Note: the maximum size of the block list is 4. Caller is free to
- * drop blocks at the end to accomodate header size; from RFC 2018:
+ * drop blocks at the end to accommodate header size; from RFC 2018:
*
* > The data receiver SHOULD include as many distinct SACK blocks as
* > possible in the SACK option. Note that the maximum available
@@ -228,6 +228,6 @@ private:
std::map > m_data; //!< Corresponding data (may be null)
};
-} //namepsace ns3
+} //namespace ns3
#endif /* TCP_RX_BUFFER_H */
diff --git a/src/internet/model/tcp-socket-base.cc b/src/internet/model/tcp-socket-base.cc
index 5167488d4..23c0534d9 100644
--- a/src/internet/model/tcp-socket-base.cc
+++ b/src/internet/model/tcp-socket-base.cc
@@ -419,7 +419,7 @@ TcpSocketBase::~TcpSocketBase (void)
/*
* Upon Bind, an Ipv4Endpoint is allocated and set to m_endPoint, and
* DestroyCallback is set to TcpSocketBase::Destroy. If we called
- * m_tcp->DeAllocate, it wil destroy its Ipv4EndpointDemux::DeAllocate,
+ * m_tcp->DeAllocate, it will destroy its Ipv4EndpointDemux::DeAllocate,
* which in turn destroys my m_endPoint, and in turn invokes
* TcpSocketBase::Destroy to nullify m_node, m_endPoint, and m_tcp.
*/
@@ -753,7 +753,7 @@ TcpSocketBase::ShutdownSend (void)
{
if (m_state == ESTABLISHED || m_state == CLOSE_WAIT)
{
- NS_LOG_INFO ("Emtpy tx buffer, send fin");
+ NS_LOG_INFO ("Empty tx buffer, send fin");
SendEmptyPacket (TcpHeader::FIN);
if (m_state == ESTABLISHED)
@@ -4008,7 +4008,7 @@ TcpSocketBase::ProcessOptionTimestamp (const Ptr option,
Ptr ts = DynamicCast (option);
- // This is valid only when no overflow occours. It happens
+ // This is valid only when no overflow occurs. It happens
// when a connection last longer than 50 days.
if (m_tcb->m_rcvTimestampValue > ts->GetTimestamp ())
{
diff --git a/src/internet/model/tcp-socket-base.h b/src/internet/model/tcp-socket-base.h
index 16fdd64f8..25f016c08 100644
--- a/src/internet/model/tcp-socket-base.h
+++ b/src/internet/model/tcp-socket-base.h
@@ -1248,7 +1248,7 @@ protected:
bool m_limitedTx {true}; //!< perform limited transmit
// Transmission Control Block
- Ptr m_tcb; //!< Congestion control informations
+ Ptr m_tcb; //!< Congestion control information
Ptr m_congestionControl; //!< Congestion control
Ptr m_recoveryOps; //!< Recovery Algorithm
diff --git a/src/internet/model/tcp-socket-state.h b/src/internet/model/tcp-socket-state.h
index feb045340..12381df77 100644
--- a/src/internet/model/tcp-socket-state.h
+++ b/src/internet/model/tcp-socket-state.h
@@ -27,7 +27,7 @@ namespace ns3 {
/**
* \brief Data structure that records the congestion state of a connection
*
- * In this data structure, basic informations that should be passed between
+ * In this data structure, basic information that should be passed between
* socket and the congestion control algorithm are saved. Through the code,
* it will be referred as Transmission Control Block (TCB), but there are some
* differencies. In the RFCs, the TCB contains all the variables that defines
diff --git a/src/internet/model/tcp-socket.h b/src/internet/model/tcp-socket.h
index e8787261d..1398a7add 100644
--- a/src/internet/model/tcp-socket.h
+++ b/src/internet/model/tcp-socket.h
@@ -229,24 +229,24 @@ private:
virtual bool GetTcpNoDelay (void) const = 0;
/**
- * \brief Set the timout for persistent connection
+ * \brief Set the timeout for persistent connection
*
- * When the timout expires, send 1-byte data to probe for the window
+ * When the timeout expires, send 1-byte data to probe for the window
* size at the receiver when the local knowledge tells that the
* receiver has zero window size
*
- * \param timeout the persistent timout
+ * \param timeout the persistent timeout
*/
virtual void SetPersistTimeout (Time timeout) = 0;
/**
- * \brief Get the timout for persistent connection
+ * \brief Get the timeout for persistent connection
*
- * When the timout expires, send 1-byte data to probe for the window
+ * When the timeout expires, send 1-byte data to probe for the window
* size at the receiver when the local knowledge tells that the
* receiver has zero window size
*
- * \returns the persistent timout
+ * \returns the persistent timeout
*/
virtual Time GetPersistTimeout (void) const = 0;
diff --git a/src/internet/model/tcp-tx-buffer.cc b/src/internet/model/tcp-tx-buffer.cc
index b327653d4..bb1c17e24 100644
--- a/src/internet/model/tcp-tx-buffer.cc
+++ b/src/internet/model/tcp-tx-buffer.cc
@@ -403,7 +403,7 @@ TcpTxBuffer::GetPacketFromList (PacketList &list, const SequenceNumber32 &listSt
NS_LOG_FUNCTION (this << numBytes << seq);
/*
- * Our possibilites are sketched out in the following:
+ * Our possibilities are sketched out in the following:
*
* |------| |----| |----|
* GetList (m_data) = | | --> | | --> | |
@@ -1452,4 +1452,4 @@ operator<< (std::ostream & os, TcpTxBuffer const & tcpTxBuf)
return os;
}
-} // namepsace ns3
+} // namespace ns3
diff --git a/src/internet/model/tcp-tx-buffer.h b/src/internet/model/tcp-tx-buffer.h
index efb778251..ca8cdd945 100644
--- a/src/internet/model/tcp-tx-buffer.h
+++ b/src/internet/model/tcp-tx-buffer.h
@@ -346,7 +346,7 @@ public:
* \brief Set the entire sent list as lost (typically after an RTO)
*
* Used to set all the sent list as lost, so the bytes in flight is not counting
- * them as in flight, but we will continue to use SACK informations for
+ * them as in flight, but we will continue to use SACK information for
* recovering the timeout.
*
* Moreover, reset the retransmit flag for every item.
@@ -634,6 +634,6 @@ std::ostream & operator<< (std::ostream & os, TcpTxBuffer const & tcpTxBuf);
*/
std::ostream & operator<< (std::ostream & os, TcpTxItem const & item);
-} // namepsace ns3
+} // namespace ns3
#endif /* TCP_TX_BUFFER_H */
diff --git a/src/internet/test/ipv4-test.cc b/src/internet/test/ipv4-test.cc
index 272a27093..46f85688f 100644
--- a/src/internet/test/ipv4-test.cc
+++ b/src/internet/test/ipv4-test.cc
@@ -110,7 +110,7 @@ Ipv4L3ProtocolTestCase::DoRun (void)
num = interface->GetNAddresses ();
NS_TEST_ASSERT_MSG_EQ (num, 2, "Should find 2 addresses??");
- /* Test Ipv4Address::RemoveAddress(i, addresss) */
+ /* Test Ipv4Address::RemoveAddress(i, address) */
bool result = ipv4->RemoveAddress (index, Ipv4Address
("192.168.0.2"));
NS_TEST_ASSERT_MSG_EQ (true, result, "Unable to remove Address??");
diff --git a/src/internet/test/ipv6-extension-header-test-suite.cc b/src/internet/test/ipv6-extension-header-test-suite.cc
index a764d3ce5..db34dcc7a 100644
--- a/src/internet/test/ipv6-extension-header-test-suite.cc
+++ b/src/internet/test/ipv6-extension-header-test-suite.cc
@@ -144,7 +144,7 @@ public:
* \ingroup internet-test
* \ingroup tests
*
- * \brief IPv6 extensions Test: Option with alignement.
+ * \brief IPv6 extensions Test: Option with alignment.
*/
class OptionWithAlignmentHeader : public Ipv6OptionHeader
{
@@ -174,7 +174,7 @@ public:
* \ingroup internet-test
* \ingroup tests
*
- * \brief IPv6 extensions Test: Test the option with alignement.
+ * \brief IPv6 extensions Test: Test the option with alignment.
*/
class TestOptionWithAlignment : public TestCase
{
diff --git a/src/internet/test/ipv6-test.cc b/src/internet/test/ipv6-test.cc
index 0d25ba28d..54ddc2c1f 100644
--- a/src/internet/test/ipv6-test.cc
+++ b/src/internet/test/ipv6-test.cc
@@ -153,7 +153,7 @@ Ipv6L3ProtocolTestCase::DoRun ()
num = interface->GetNAddresses ();
NS_TEST_ASSERT_MSG_EQ (num, 1, "Number of addresses should be 1??");
- /* Test Ipv6Address::RemoveAddress(index, addresss) */
+ /* Test Ipv6Address::RemoveAddress(index, address) */
index = ipv6->GetInterfaceForAddress ("2001:ffff:5678:9001::2");
bool result = ipv6->RemoveAddress (index, Ipv6Address
("2001:ffff:5678:9001::2"));
diff --git a/src/internet/test/tcp-advertised-window-test.cc b/src/internet/test/tcp-advertised-window-test.cc
index 338e0fafa..0da1ba192 100644
--- a/src/internet/test/tcp-advertised-window-test.cc
+++ b/src/internet/test/tcp-advertised-window-test.cc
@@ -264,7 +264,7 @@ TcpDropRatioErrorModel::ShouldDrop (const Ipv4Header &ipHeader, const TcpHeader
*
* m_rxBuffer->MaxRxSequence () - m_rxBuffer->NextRxSequence ()
*
- * instead ofthe previous
+ * instead of the previous
*
* m_rxBuffer->MaxBufferSize ()
*
diff --git a/src/internet/test/tcp-datasentcb-test.cc b/src/internet/test/tcp-datasentcb-test.cc
index 075832c26..f0970f29a 100644
--- a/src/internet/test/tcp-datasentcb-test.cc
+++ b/src/internet/test/tcp-datasentcb-test.cc
@@ -105,7 +105,7 @@ public:
/**
* Constructor.
- * \param desc Test desctiption.
+ * \param desc Test description.
* \param size Packet size.
* \param packets Number of packets.
*/
diff --git a/src/internet/test/tcp-ecn-test.cc b/src/internet/test/tcp-ecn-test.cc
index 2ffed30b0..23ed79f04 100644
--- a/src/internet/test/tcp-ecn-test.cc
+++ b/src/internet/test/tcp-ecn-test.cc
@@ -57,7 +57,7 @@ public:
* \brief Constructor
*
* \param testcase test case number
- * \param desc Description about the ECN capabilities of sender and reciever
+ * \param desc Description about the ECN capabilities of sender and receiver
*/
TcpEcnTest (uint32_t testcase, const std::string &desc);
@@ -437,11 +437,11 @@ TcpEcnTest::Rx (const Ptr p, const TcpHeader &h, SocketWho who)
NS_TEST_ASSERT_MSG_NE (((h.GetFlags ()) & TcpHeader::SYN), 0, "SYN should be received as first message at the receiver");
if (m_testcase == 2 || m_testcase == 4 || m_testcase == 5 ||m_testcase == 6)
{
- NS_TEST_ASSERT_MSG_NE (((h.GetFlags ()) & TcpHeader::ECE) && ((h.GetFlags ()) & TcpHeader::CWR), 0, "The flags ECE + CWR should be set in the TCP header of first message receieved at receiver when sender is ECN Capable");
+ NS_TEST_ASSERT_MSG_NE (((h.GetFlags ()) & TcpHeader::ECE) && ((h.GetFlags ()) & TcpHeader::CWR), 0, "The flags ECE + CWR should be set in the TCP header of first message received at receiver when sender is ECN Capable");
}
else
{
- NS_TEST_ASSERT_MSG_EQ (((h.GetFlags ()) & TcpHeader::ECE) && ((h.GetFlags ()) & TcpHeader::CWR), 0, "The flags ECE + CWR should not be set in the TCP header of first message receieved at receiver when sender is not ECN Capable");
+ NS_TEST_ASSERT_MSG_EQ (((h.GetFlags ()) & TcpHeader::ECE) && ((h.GetFlags ()) & TcpHeader::CWR), 0, "The flags ECE + CWR should not be set in the TCP header of first message received at receiver when sender is not ECN Capable");
}
}
else if (m_receiverReceived == 1)
@@ -461,11 +461,11 @@ TcpEcnTest::Rx (const Ptr p, const TcpHeader &h, SocketWho who)
NS_TEST_ASSERT_MSG_NE (((h.GetFlags ()) & TcpHeader::SYN) && ((h.GetFlags ()) & TcpHeader::ACK), 0, "SYN+ACK received as first message at sender");
if (m_testcase == 4 || m_testcase == 5 || m_testcase == 6)
{
- NS_TEST_ASSERT_MSG_NE ((h.GetFlags () & TcpHeader::ECE), 0, "The flag ECE should be set in the TCP header of first message receieved at sender when both receiver and sender are ECN Capable");
+ NS_TEST_ASSERT_MSG_NE ((h.GetFlags () & TcpHeader::ECE), 0, "The flag ECE should be set in the TCP header of first message received at sender when both receiver and sender are ECN Capable");
}
else
{
- NS_TEST_ASSERT_MSG_EQ (((h.GetFlags ()) & TcpHeader::ECE), 0, "The flag ECE should not be set in the TCP header of first message receieved at sender when either receiver or sender are not ECN Capable");
+ NS_TEST_ASSERT_MSG_EQ (((h.GetFlags ()) & TcpHeader::ECE), 0, "The flag ECE should not be set in the TCP header of first message received at sender when either receiver or sender are not ECN Capable");
}
}
if (m_senderReceived == 3 && m_testcase == 5)
diff --git a/src/internet/test/tcp-general-test.h b/src/internet/test/tcp-general-test.h
index 885f74578..d2100e0d7 100644
--- a/src/internet/test/tcp-general-test.h
+++ b/src/internet/test/tcp-general-test.h
@@ -372,7 +372,7 @@ protected:
virtual void DoRun (void);
/**
- * \brief Change the configuration of the evironment
+ * \brief Change the configuration of the environment
*/
virtual void ConfigureEnvironment (void);
@@ -479,7 +479,7 @@ protected:
Time GetRto (SocketWho who);
/**
- * \brief Get the minimun RTO attribute
+ * \brief Get the minimum RTO attribute
*
* \param who node to get the parameter from
* \return minimum RTO time
diff --git a/src/internet/test/tcp-prr-recovery-test.cc b/src/internet/test/tcp-prr-recovery-test.cc
index e23c3ef24..aee46aa19 100644
--- a/src/internet/test/tcp-prr-recovery-test.cc
+++ b/src/internet/test/tcp-prr-recovery-test.cc
@@ -114,7 +114,7 @@ PrrRecoveryTest::DoRun ()
recovery->EnterRecovery (m_state, 3, m_unAckDataCount, 0);
NS_TEST_ASSERT_MSG_GT_OR_EQ (m_state->m_cWnd.Get (), m_cWnd + m_segmentSize,
- "There should be atleast one transmission on entering recovery");
+ "There should be at least one transmission on entering recovery");
for (uint32_t iterator = 0; iterator < m_bytesSent; )
{
@@ -130,12 +130,12 @@ PrrRecoveryTest::DoRun ()
if (m_bytesInFlight > m_state->m_ssThresh)
{
NS_TEST_ASSERT_MSG_LT_OR_EQ (m_state->m_cWnd.Get (), m_cWnd,
- "Updated cwnd should be less than or equal to the exising cwnd");
+ "Updated cwnd should be less than or equal to the existing cwnd");
}
else
{
NS_TEST_ASSERT_MSG_GT_OR_EQ (m_state->m_cWnd.Get (), m_cWnd,
- "Updated cwnd should be greater than or equal to the exising cwnd");
+ "Updated cwnd should be greater than or equal to the existing cwnd");
}
}
diff --git a/src/lr-wpan/doc/lr-wpan.rst b/src/lr-wpan/doc/lr-wpan.rst
index ce4a0e61f..d5e7dbba1 100644
--- a/src/lr-wpan/doc/lr-wpan.rst
+++ b/src/lr-wpan/doc/lr-wpan.rst
@@ -90,7 +90,7 @@ MAC
###
The MAC at present implements the unslotted CSMA/CA variant, without beaconing.
-Currently there is no support for coordinators and the relavant APIs.
+Currently there is no support for coordinators and the relevant APIs.
The implemented MAC is similar to Contiki's NullMAC, i.e., a MAC without sleep
features. The radio is assumed to be always active (receiving or transmitting),
diff --git a/src/lr-wpan/model/lr-wpan-csmaca.h b/src/lr-wpan/model/lr-wpan-csmaca.h
index ce1471274..92b573159 100644
--- a/src/lr-wpan/model/lr-wpan-csmaca.h
+++ b/src/lr-wpan/model/lr-wpan-csmaca.h
@@ -174,7 +174,7 @@ public:
/**
* Start CSMA-CA algorithm (step 1), initialize NB, BE for both slotted and unslotted
- * CSMA-CA. For the slotted intialize CW plus also start on the backoff boundary
+ * CSMA-CA. For the slotted initialize CW plus also start on the backoff boundary
*/
void Start (void);
@@ -265,7 +265,7 @@ private:
bool m_isSlotted;
/**
- * The MAC instance for which this CSMAÄ/CA implemenation is configured.
+ * The MAC instance for which this CSMAÄ/CA implementation is configured.
*/
Ptr m_mac;
diff --git a/src/lr-wpan/model/lr-wpan-mac-header.cc b/src/lr-wpan/model/lr-wpan-mac-header.cc
index 7be76acd9..ec349d2d3 100644
--- a/src/lr-wpan/model/lr-wpan-mac-header.cc
+++ b/src/lr-wpan/model/lr-wpan-mac-header.cc
@@ -31,7 +31,7 @@ LrWpanMacHeader::LrWpanMacHeader ()
SetType (LRWPAN_MAC_DATA); // Assume Data frame
SetSecDisable (); // Assume there is No Aux Sec but
SetNoFrmPend (); // No Frame Pending
- SetNoAckReq (); // No Ack Frame will be expected from recepient
+ SetNoAckReq (); // No Ack Frame will be expected from recipient
SetNoPanIdComp (); // No PAN Id Compression since no addresses
SetFrmCtrlRes (0); // Initialize the 3 reserved bits to 0
SetDstAddrMode (NOADDR); // Assume there will be no src and dst address
@@ -47,7 +47,7 @@ LrWpanMacHeader::LrWpanMacHeader (enum LrWpanMacType wpanMacType,
SetSeqNum (seqNum);
SetSecDisable (); // Assume there is No Aux Sec but
SetNoFrmPend (); // No Frame Pending
- SetNoAckReq (); // No Ack Frame will be expected from recepient
+ SetNoAckReq (); // No Ack Frame will be expected from recipient
SetNoPanIdComp (); // No PAN Id Compression since no addresses
SetFrmCtrlRes (0); // Initialize the 3 reserved bits to 0
SetDstAddrMode (NOADDR); // Assume there will be no src and dst address
diff --git a/src/lr-wpan/model/lr-wpan-mac.h b/src/lr-wpan/model/lr-wpan-mac.h
index 05495eb8d..63e95176c 100644
--- a/src/lr-wpan/model/lr-wpan-mac.h
+++ b/src/lr-wpan/model/lr-wpan-mac.h
@@ -414,7 +414,7 @@ public:
/**
* 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/model/lr-wpan-phy.cc b/src/lr-wpan/model/lr-wpan-phy.cc
index a72785f65..a2c2745db 100644
--- a/src/lr-wpan/model/lr-wpan-phy.cc
+++ b/src/lr-wpan/model/lr-wpan-phy.cc
@@ -363,7 +363,7 @@ LrWpanPhy::StartRx (Ptr spectrumRxParams)
CheckInterference ();
// Add the incoming packet to the current interference after we have
- // checked for successfull reception of the current packet for the time
+ // checked for successful reception of the current packet for the time
// before the additional interference.
m_signal->AddSignal (lrWpanRxParams->psd);
}
diff --git a/src/lr-wpan/model/lr-wpan-phy.h b/src/lr-wpan/model/lr-wpan-phy.h
index f76be662f..9c34e6abf 100644
--- a/src/lr-wpan/model/lr-wpan-phy.h
+++ b/src/lr-wpan/model/lr-wpan-phy.h
@@ -558,7 +558,7 @@ private:
/**
* Cancel an ongoing ED procedure. This is called when the transceiver is
- * switched off or set to TX mode. This calls the appropiate confirm callback
+ * switched off or set to TX mode. This calls the appropriate confirm callback
* of the MAC.
*
* \param state the new state which is the cause for canceling ED
diff --git a/src/lr-wpan/test/lr-wpan-ack-test.cc b/src/lr-wpan/test/lr-wpan-ack-test.cc
index cf6e85ee9..4426e983a 100644
--- a/src/lr-wpan/test/lr-wpan-ack-test.cc
+++ b/src/lr-wpan/test/lr-wpan-ack-test.cc
@@ -184,7 +184,7 @@ LrWpanAckTestCase::DoRun (void)
// immediately answers with a reply packet on reception of the request.
// We expect the ACK of the request packet to always arrive at node 1 before
// the reply packet sent by node 2.
- // The same is repeated for extened addressing mode.
+ // The same is repeated for extended addressing mode.
// Enable calculation of FCS in the trailers. Only necessary when interacting with real devices or wireshark.
// GlobalValue::Bind ("ChecksumEnabled", BooleanValue (true));
diff --git a/src/lte/test/lte-test-cell-selection.h b/src/lte/test/lte-test-cell-selection.h
index 4697a4ca2..6db9fc15a 100644
--- a/src/lte/test/lte-test-cell-selection.h
+++ b/src/lte/test/lte-test-cell-selection.h
@@ -78,7 +78,7 @@ public:
* \param relPosX relative position to the inter site distance in X
* \param relPosY relative position to the inter site distance in Y
* \param isCsgMember if true, simulation is allowed access to CSG cell
- * \param checkPoint the tiem int he simulation when the UE is verified
+ * \param checkPoint the time in the simulation when the UE is verified
* \param expectedCellId1 ///< The cell ID that the UE is expected to attach to (0 means that the UE should not attach to any cell).
* \param expectedCellId2 ///< An alternative cell ID that the UE is expected to attach to (0 means that this no alternative cell is expected).
*/
diff --git a/src/mesh/model/dot11s/hwmp-protocol.cc b/src/mesh/model/dot11s/hwmp-protocol.cc
index 8688d21cc..30b165ebc 100644
--- a/src/mesh/model/dot11s/hwmp-protocol.cc
+++ b/src/mesh/model/dot11s/hwmp-protocol.cc
@@ -921,7 +921,7 @@ HwmpProtocol::GetPerrReceivers (std::vector failedDest)
retval.push_back (precursors[j]);
}
}
- //Check if we have dublicates in retval and precursors:
+ //Check if we have duplicates in retval and precursors:
for (unsigned int i = 0; i < retval.size (); i++)
{
for (unsigned int j = i+1; j < retval.size (); j++)
diff --git a/src/mesh/model/dot11s/hwmp-protocol.h b/src/mesh/model/dot11s/hwmp-protocol.h
index adf464a7a..695cf9335 100644
--- a/src/mesh/model/dot11s/hwmp-protocol.h
+++ b/src/mesh/model/dot11s/hwmp-protocol.h
@@ -117,7 +117,7 @@ public:
bool Install (Ptr);
/**
* Peer link status function
- * \param meshPontAddress The MAC address of the mesh pont
+ * \param meshPontAddress The MAC address of the mesh point
* \param peerAddress The MAC address of the peer
* \param interface The interface number
* \param status The status of the peer link
diff --git a/src/mesh/model/dot11s/ie-dot11s-configuration.h b/src/mesh/model/dot11s/ie-dot11s-configuration.h
index 36368f6e1..a3318cfb8 100644
--- a/src/mesh/model/dot11s/ie-dot11s-configuration.h
+++ b/src/mesh/model/dot11s/ie-dot11s-configuration.h
@@ -96,7 +96,7 @@ public:
*/
uint8_t GetUint8 () const;
bool acceptPeerLinks; ///< accept peer links
- bool MCCASupported; ///< MCCA suported
+ bool MCCASupported; ///< MCCA supported
bool MCCAEnabled; ///< MCCA enabled
bool forwarding; ///< forwarding?
bool beaconTimingReport; ///< beacon timing report
diff --git a/src/mesh/model/dot11s/ie-dot11s-prep.h b/src/mesh/model/dot11s/ie-dot11s-prep.h
index d551974b7..d006771d9 100644
--- a/src/mesh/model/dot11s/ie-dot11s-prep.h
+++ b/src/mesh/model/dot11s/ie-dot11s-prep.h
@@ -98,7 +98,7 @@ public:
uint32_t GetTtl () const;
/**
* Get destination address function
- * \returns the destiantion MAC address
+ * \returns the destination MAC address
*/
Mac48Address GetDestinationAddress () const;
/**
diff --git a/src/mesh/model/dot11s/ie-dot11s-preq.h b/src/mesh/model/dot11s/ie-dot11s-preq.h
index ec0df3787..17007f914 100644
--- a/src/mesh/model/dot11s/ie-dot11s-preq.h
+++ b/src/mesh/model/dot11s/ie-dot11s-preq.h
@@ -84,7 +84,7 @@ private:
bool m_rf; ///< RF
bool m_usn; ///< USN
Mac48Address m_destinationAddress; ///< destination address
- uint32_t m_destSeqNumber; ///< destiantion sequence number
+ uint32_t m_destSeqNumber; ///< destination sequence number
/**
* equality operator
diff --git a/src/mesh/model/dot11s/ie-dot11s-rann.h b/src/mesh/model/dot11s/ie-dot11s-rann.h
index 767975b7e..b2b93d66b 100644
--- a/src/mesh/model/dot11s/ie-dot11s-rann.h
+++ b/src/mesh/model/dot11s/ie-dot11s-rann.h
@@ -58,7 +58,7 @@ public:
void SetOriginatorAddress (Mac48Address originator_address);
/**
* Set destination sequence number value
- * \param dest_seq_number the destiantion sequence number
+ * \param dest_seq_number the destination sequence number
*/
void SetDestSeqNumber (uint32_t dest_seq_number);
/**
@@ -89,7 +89,7 @@ public:
Mac48Address GetOriginatorAddress ();
/**
* Get destination sequence number value
- * \returns the destiantion sequence number
+ * \returns the destination sequence number
*/
uint32_t GetDestSeqNumber ();
/**
@@ -113,7 +113,7 @@ public:
virtual void Print (std::ostream &os) const;
private:
- uint8_t m_flags; ///< falgs
+ uint8_t m_flags; ///< flags
uint8_t m_hopcount; ///< hop count
uint8_t m_ttl; ///< TTL
Mac48Address m_originatorAddress; ///< originator address
diff --git a/src/mesh/model/dot11s/peer-management-protocol.h b/src/mesh/model/dot11s/peer-management-protocol.h
index fb99aceed..6b3ba444b 100644
--- a/src/mesh/model/dot11s/peer-management-protocol.h
+++ b/src/mesh/model/dot11s/peer-management-protocol.h
@@ -242,7 +242,7 @@ private:
PeerManagementProtocol (const PeerManagementProtocol &);
/**
- * Initiate link functon
+ * Initiate link function
*
* \param interface the interface to use
* \param peerAddress the peer address
@@ -288,7 +288,7 @@ private:
void NotifyLinkClose (Mac48Address peerMp, Mac48Address peerIface, Mac48Address myIface, uint32_t interface);
private:
PeerManagementProtocolMacMap m_plugins; ///< plugins
- Mac48Address m_address; ///< addresss
+ Mac48Address m_address; ///< address
Ptr m_meshId; ///< mesh ID
uint16_t m_lastAssocId; ///< last associated ID
diff --git a/src/mesh/model/flame/flame-rtable.cc b/src/mesh/model/flame/flame-rtable.cc
index e6ffcdc5c..19218b059 100644
--- a/src/mesh/model/flame/flame-rtable.cc
+++ b/src/mesh/model/flame/flame-rtable.cc
@@ -41,7 +41,7 @@ FlameRtable::GetTypeId ()
.SetGroupName ("Mesh")
.AddConstructor ()
.AddAttribute ( "Lifetime",
- "The lifetime of the routing enrty",
+ "The lifetime of the routing entry",
TimeValue (Seconds (120)), MakeTimeAccessor (
&FlameRtable::m_lifetime),
MakeTimeChecker ()
diff --git a/src/mesh/test/flame/flame-regression.h b/src/mesh/test/flame/flame-regression.h
index 05e209d1e..eee542f32 100644
--- a/src/mesh/test/flame/flame-regression.h
+++ b/src/mesh/test/flame/flame-regression.h
@@ -81,7 +81,7 @@ private:
/// Create nodes function
void CreateNodes ();
- /// Creat devices function
+ /// Create devices function
void CreateDevices ();
/// Install application function
void InstallApplications ();
diff --git a/src/mpi/model/null-message-simulator-impl.h b/src/mpi/model/null-message-simulator-impl.h
index 2231d436c..c1eb32bfe 100644
--- a/src/mpi/model/null-message-simulator-impl.h
+++ b/src/mpi/model/null-message-simulator-impl.h
@@ -148,9 +148,9 @@ private:
void RescheduleNullMessageEvent (uint32_t nodeSysId);
/**
- * \param systemId SystemID to compute guarentee time for
+ * \param systemId SystemID to compute guarantee time for
*
- * \return Guarentee time
+ * \return Guarantee time
*
* Calculate the guarantee time for incoming RemoteChannelBundel
* from task nodeSysId. No message should arrive from task
diff --git a/src/mpi/model/remote-channel-bundle.h b/src/mpi/model/remote-channel-bundle.h
index d92a92e34..641cb165e 100644
--- a/src/mpi/model/remote-channel-bundle.h
+++ b/src/mpi/model/remote-channel-bundle.h
@@ -128,9 +128,9 @@ private:
std::map < uint32_t, Ptr < Channel > > m_channels;
/*
- * Guarentee time for the incoming Channels from MPI task remote_rank.
+ * Guarantee time for the incoming Channels from MPI task remote_rank.
* No PacketMessage will ever arrive on any incoming channel in this bundle with a
- * ReceiveTime less than this. Intialized to StartTime.
+ * ReceiveTime less than this. Initialized to StartTime.
*/
Time m_guaranteeTime;
diff --git a/src/netanim/examples/colors-link-description.cc b/src/netanim/examples/colors-link-description.cc
index 45c6cfae0..03891061f 100644
--- a/src/netanim/examples/colors-link-description.cc
+++ b/src/netanim/examples/colors-link-description.cc
@@ -151,7 +151,7 @@ int main (int argc, char *argv[])
pAnim = new AnimationInterface (animFile);
Simulator::Schedule (Seconds (1), modify);
- // Set up the acutal simulation
+ // Set up the actual simulation
Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
Simulator::Run ();
diff --git a/src/netanim/examples/dumbbell-animation.cc b/src/netanim/examples/dumbbell-animation.cc
index 1615b9b43..40956d93a 100644
--- a/src/netanim/examples/dumbbell-animation.cc
+++ b/src/netanim/examples/dumbbell-animation.cc
@@ -97,7 +97,7 @@ int main (int argc, char *argv[])
anim.EnablePacketMetadata (); // Optional
anim.EnableIpv4L3ProtocolCounters (Seconds (0), Seconds (10)); // Optional
- // Set up the acutal simulation
+ // Set up the actual simulation
Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
Simulator::Run ();
diff --git a/src/netanim/examples/resources-counters.cc b/src/netanim/examples/resources-counters.cc
index ba01f106b..f51705e30 100644
--- a/src/netanim/examples/resources-counters.cc
+++ b/src/netanim/examples/resources-counters.cc
@@ -188,7 +188,7 @@ int main (int argc, char *argv[])
Simulator::Schedule (Seconds (0.1), modify);
- // Set up the acutal simulation
+ // Set up the actual simulation
Ipv4GlobalRoutingHelper::PopulateRoutingTables ();
Simulator::Run ();
diff --git a/src/netanim/model/animation-interface.h b/src/netanim/model/animation-interface.h
index b86a3a08b..28794a58f 100644
--- a/src/netanim/model/animation-interface.h
+++ b/src/netanim/model/animation-interface.h
@@ -754,7 +754,7 @@ private:
*/
void AddByteTag (uint64_t animUid, Ptr p);
/**
- * WriteN functon
+ * WriteN function
* \param data the data t write
* \param count the number of bytes to write
* \param f the file to write to
@@ -995,7 +995,7 @@ private:
*/
void WifiPhyTxDropTrace (std::string context, Ptr p);
/**
- * wifi Phy recieve drop trace function
+ * wifi Phy receive drop trace function
* \param context the context
* \param p the packet
*/
@@ -1234,7 +1234,7 @@ private:
* Update position function
* \param n the node
* \param v the vector
- * \returns the postition vector
+ * \returns the position vector
*/
Vector UpdatePosition (Ptr n, Vector v);
/**
diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
index b47581649..5636978ec 100644
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.cc
@@ -268,7 +268,7 @@ Ipv4NixVectorRouting::BuildNixVector (const std::vector< Ptr > & parentVec
continue;
}
- // this function takes in the local net dev, and channnel, and
+ // this function takes in the local net dev, and channel, and
// writes to the netDeviceContainer the adjacent net devs
NetDeviceContainer netDeviceContainer;
GetAdjacentNetDevices (localNetDevice, channel, netDeviceContainer);
@@ -390,7 +390,7 @@ Ipv4NixVectorRouting::FindTotalNeighbors (void)
continue;
}
- // this function takes in the local net dev, and channnel, and
+ // this function takes in the local net dev, and channel, and
// writes to the netDeviceContainer the adjacent net devs
NetDeviceContainer netDeviceContainer;
GetAdjacentNetDevices (localNetDevice, channel, netDeviceContainer);
@@ -462,7 +462,7 @@ Ipv4NixVectorRouting::FindNetDeviceForNixIndex (uint32_t nodeIndex, Ipv4Address
continue;
}
- // this function takes in the local net dev, and channnel, and
+ // this function takes in the local net dev, and channel, and
// writes to the netDeviceContainer the adjacent net devs
NetDeviceContainer netDeviceContainer;
GetAdjacentNetDevices (localNetDevice, channel, netDeviceContainer);
@@ -827,7 +827,7 @@ Ipv4NixVectorRouting::BFS (uint32_t numberOfNodes, Ptr source,
return false;
}
- // this function takes in the local net dev, and channnel, and
+ // this function takes in the local net dev, and channel, and
// writes to the netDeviceContainer the adjacent net devs
NetDeviceContainer netDeviceContainer;
GetAdjacentNetDevices (oif, channel, netDeviceContainer);
@@ -883,7 +883,7 @@ Ipv4NixVectorRouting::BFS (uint32_t numberOfNodes, Ptr source,
continue;
}
- // this function takes in the local net dev, and channnel, and
+ // this function takes in the local net dev, and channel, and
// writes to the netDeviceContainer the adjacent net devs
NetDeviceContainer netDeviceContainer;
GetAdjacentNetDevices (localNetDevice, channel, netDeviceContainer);
diff --git a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
index a2e2aa1dd..5e43acf65 100644
--- a/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
+++ b/src/nix-vector-routing/model/ipv4-nix-vector-routing.h
@@ -147,7 +147,7 @@ private:
/**
* Iterates through the node list and finds the one
* corresponding to the given Ipv4Address
- * \param dest detination node IP
+ * \param dest destination node IP
* \return The node with the specified IP.
*/
Ptr GetNodeByIp (Ipv4Address dest);
diff --git a/src/olsr/model/olsr-routing-protocol.cc b/src/olsr/model/olsr-routing-protocol.cc
index 88cdb7fc6..90e4a12d7 100644
--- a/src/olsr/model/olsr-routing-protocol.cc
+++ b/src/olsr/model/olsr-routing-protocol.cc
@@ -2902,7 +2902,7 @@ RoutingProtocol::RouteOutput (Ptr p, const Ipv4Header &header, PtrSetSource (ifAddr.GetLocal ());
@@ -3001,7 +3001,7 @@ bool RoutingProtocol::RouteInput (Ptr p,
}
else
{
- /// \todo Implment IP aliasing and OLSR
+ /// \todo Implement IP aliasing and OLSR
NS_FATAL_ERROR ("XXX Not implemented yet: IP aliasing and OLSR");
}
rtentry->SetSource (ifAddr.GetLocal ());
diff --git a/src/openflow/model/openflow-interface.cc b/src/openflow/model/openflow-interface.cc
index 63e2cd686..67caf5a1a 100644
--- a/src/openflow/model/openflow-interface.cc
+++ b/src/openflow/model/openflow-interface.cc
@@ -898,7 +898,7 @@ ExecuteActions (Ptr swtch, uint64_t packet_uid, ofpbuf*
* freeing the original buffer is wasteful. So the following code is
* slightly obscure just to avoid that. */
int prev_port;
- size_t max_len = 0; // Initialze to make compiler happy
+ size_t max_len = 0; // Initialize to make compiler happy
uint16_t in_port = key->flow.in_port; // ntohs(key->flow.in_port);
uint8_t *p = (uint8_t *)actions;
diff --git a/src/sixlowpan/doc/sixlowpan.rst b/src/sixlowpan/doc/sixlowpan.rst
index 9c81357d8..a85d501d1 100644
--- a/src/sixlowpan/doc/sixlowpan.rst
+++ b/src/sixlowpan/doc/sixlowpan.rst
@@ -46,7 +46,7 @@ with PointToPointNedevice, CsmaNetDevice and LrWpanNetDevice).
For this reason, the module implements a virtual NetDevice, and all the calls are passed
without modifications to the underlying NetDevice. The only important difference is in
-GetMtu behaviour. It will always return *at least* 1280 bytes, as is the minumum IPv6 MTU.
+GetMtu behaviour. It will always return *at least* 1280 bytes, as is the minimum IPv6 MTU.
The module does provide some attributes and some tracesources.
The attributes are:
diff --git a/src/sixlowpan/examples/example-ping-lr-wpan.cc b/src/sixlowpan/examples/example-ping-lr-wpan.cc
index 81e12184a..60b3f87d6 100644
--- a/src/sixlowpan/examples/example-ping-lr-wpan.cc
+++ b/src/sixlowpan/examples/example-ping-lr-wpan.cc
@@ -81,7 +81,7 @@ int main (int argc, char** argv)
ipv6.SetBase (Ipv6Address ("2001:2::"), Ipv6Prefix (64));
Ipv6InterfaceContainer deviceInterfaces;
deviceInterfaces = ipv6.Assign (devices);
- // check if adresses are assigned
+ // check if addresses are assigned
//std::cout<< deviceInterfaces.GetAddress(0,1)< GenerateRegionalTransmitterIndices (const double startFrequencies[],
@@ -309,7 +309,7 @@ private:
* Installs each randomly generated regional TV transmitter
*
* @param region the region that the transmitters are in
- * @param transmitterIndicesToCreate a list contaning the channel number
+ * @param transmitterIndicesToCreate a list containing the channel number
* indices (for region's start frequencies array) that transmitters will be
* created for; this is returned from GenerateRegionalTransmitterIndices()
* @param transmitterLocations a list containing the vectors
diff --git a/src/spectrum/model/half-duplex-ideal-phy.cc b/src/spectrum/model/half-duplex-ideal-phy.cc
index c57410555..7d4480ba0 100644
--- a/src/spectrum/model/half-duplex-ideal-phy.cc
+++ b/src/spectrum/model/half-duplex-ideal-phy.cc
@@ -116,7 +116,7 @@ HalfDuplexIdealPhy::GetTypeId (void)
MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxStartTrace),
"ns3::Packet::TracedCallback")
.AddTraceSource ("TxEnd",
- "Trace fired when a previosuly started transmission is finished",
+ "Trace fired when a previously started transmission is finished",
MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyTxEndTrace),
"ns3::Packet::TracedCallback")
.AddTraceSource ("RxStart",
@@ -128,11 +128,11 @@ HalfDuplexIdealPhy::GetTypeId (void)
MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxAbortTrace),
"ns3::Packet::TracedCallback")
.AddTraceSource ("RxEndOk",
- "Trace fired when a previosuly started RX terminates successfully",
+ "Trace fired when a previously started RX terminates successfully",
MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndOkTrace),
"ns3::Packet::TracedCallback")
.AddTraceSource ("RxEndError",
- "Trace fired when a previosuly started RX terminates with an error (packet is corrupted)",
+ "Trace fired when a previously started RX terminates with an error (packet is corrupted)",
MakeTraceSourceAccessor (&HalfDuplexIdealPhy::m_phyRxEndErrorTrace),
"ns3::Packet::TracedCallback")
;
diff --git a/src/spectrum/model/multi-model-spectrum-channel.h b/src/spectrum/model/multi-model-spectrum-channel.h
index 1e7e001b6..1db2c4590 100644
--- a/src/spectrum/model/multi-model-spectrum-channel.h
+++ b/src/spectrum/model/multi-model-spectrum-channel.h
@@ -147,7 +147,7 @@ private:
/**
* This method checks if m_rxSpectrumModelInfoMap contains an entry
* for the given TX SpectrumModel. If such entry exists, it returns
- * an interator pointing to it. If not, it creates a new entry in
+ * an iterator pointing to it. If not, it creates a new entry in
* m_txSpectrumMpodelInfoMap, and returns an iterator to it.
*
* @param txSpectrumModel The TX SpectrumModel being considered
@@ -159,7 +159,7 @@ private:
/**
* Used internally to reschedule transmission after the propagation delay.
*
- * @param params The signal paramters.
+ * @param params The signal parameters.
* @param receiver A pointer to the receiver SpectrumPhy.
*/
virtual void StartRx (Ptr params, Ptr receiver);
diff --git a/src/spectrum/model/waveform-generator.cc b/src/spectrum/model/waveform-generator.cc
index 844d99055..3e947e385 100644
--- a/src/spectrum/model/waveform-generator.cc
+++ b/src/spectrum/model/waveform-generator.cc
@@ -88,7 +88,7 @@ WaveformGenerator::GetTypeId (void)
MakeTraceSourceAccessor (&WaveformGenerator::m_phyTxStartTrace),
"ns3::Packet::TracedCallback")
.AddTraceSource ("TxEnd",
- "Trace fired when a previosuly started transmission is finished",
+ "Trace fired when a previously started transmission is finished",
MakeTraceSourceAccessor (&WaveformGenerator::m_phyTxEndTrace),
"ns3::Packet::TracedCallback")
;
diff --git a/src/tap-bridge/doc/tap.rst b/src/tap-bridge/doc/tap.rst
index 089aa1db3..2cf83d8a0 100644
--- a/src/tap-bridge/doc/tap.rst
+++ b/src/tap-bridge/doc/tap.rst
@@ -230,7 +230,7 @@ set to "mytap" and the "Mode" attribute would be set to "UseBridge".
This mode is especially useful in the case of virtualization where the
configuration of the virtual hosts may be dictated by another system and
-not be changable to suit ns-3. For example, a particular VM scheme may create
+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
diff --git a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
index 400d590f0..d50e113d1 100644
--- a/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
+++ b/src/tap-bridge/examples/tap-wifi-virtual-machine.cc
@@ -115,7 +115,7 @@ main (int argc, char *argv[])
wifiMac.SetType ("ns3::AdhocWifiMac");
//
- // Configure the physcial layer.
+ // Configure the physical layer.
//
YansWifiChannelHelper wifiChannel = YansWifiChannelHelper::Default ();
YansWifiPhyHelper wifiPhy = YansWifiPhyHelper::Default ();
diff --git a/src/tap-bridge/examples/tap-wifi-virtual-machine.py b/src/tap-bridge/examples/tap-wifi-virtual-machine.py
index 6cd9e7ce7..ba3fbf4b3 100644
--- a/src/tap-bridge/examples/tap-wifi-virtual-machine.py
+++ b/src/tap-bridge/examples/tap-wifi-virtual-machine.py
@@ -58,7 +58,7 @@ def main(argv):
wifiMac.SetType ("ns3::AdhocWifiMac");
#
- # Configure the physcial layer.
+ # Configure the physical layer.
#
wifiChannel = ns.wifi.YansWifiChannelHelper.Default()
wifiPhy = ns.wifi.YansWifiPhyHelper.Default()
diff --git a/src/tap-bridge/model/tap-bridge.cc b/src/tap-bridge/model/tap-bridge.cc
index 2eb4b2736..c2e23f907 100644
--- a/src/tap-bridge/model/tap-bridge.cc
+++ b/src/tap-bridge/model/tap-bridge.cc
@@ -339,7 +339,7 @@ TapBridge::CreateTap (void)
NS_LOG_INFO ("Encoded Unix socket as \"" << path << "\"");
//
- // Tom Goff reports the possiblility of a deadlock when trying to acquire the
+ // Tom Goff reports the possibility of a deadlock when trying to acquire the
// python GIL here. He says that this might be due to trying to access Python
// objects after fork() without calling PyOS_AfterFork() to properly reset
// Python state (including the GIL). Originally these next three lines were
diff --git a/src/topology-read/doc/topology.h b/src/topology-read/doc/topology.h
index e8960dcf8..1ad8eb676 100644
--- a/src/topology-read/doc/topology.h
+++ b/src/topology-read/doc/topology.h
@@ -16,7 +16,7 @@
* - ns3::InetTopologyReader for Inet 3.0 traces (http://topology.eecs.umich.edu/inet/)
* - ns3::RocketfuelTopologyReader for Rocketfuel traces (http://www.cs.washington.edu/research/networking/rocketfuel/)
*
- * See the ns-3 modules manual for further informations.
+ * See the ns-3 modules manual for further information.
*
* Examples can be found in the directory src/topology-read/examples/
*/
diff --git a/src/topology-read/model/inet-topology-reader.h b/src/topology-read/model/inet-topology-reader.h
index 6ac6cbcd0..77e0515ba 100644
--- a/src/topology-read/model/inet-topology-reader.h
+++ b/src/topology-read/model/inet-topology-reader.h
@@ -36,7 +36,7 @@ namespace ns3 {
* \brief Topology file reader (Inet-format type).
*
* This class takes an input file in Inet format and extracts all
- * the informations needed to build the topology
+ * the information needed to build the topology
* (i.e.number of nodes, links and links structure).
* It have been tested with Inet 3.0
* http://topology.eecs.umich.edu/inet/
@@ -62,7 +62,7 @@ public:
* This method opens an input stream and reads the Inet-format file.
* From the first line it takes the total number of nodes and links.
* Then discards a number of rows equals to total nodes (containing
- * useless geographical informations).
+ * useless geographical information).
* Then reads until the end of the file (total links number rows) and saves
* the structure of every single link in the topology.
*
diff --git a/src/topology-read/model/orbis-topology-reader.h b/src/topology-read/model/orbis-topology-reader.h
index 6c208317d..4052913fe 100644
--- a/src/topology-read/model/orbis-topology-reader.h
+++ b/src/topology-read/model/orbis-topology-reader.h
@@ -36,7 +36,7 @@ namespace ns3 {
* \brief Topology file reader (Orbis-format type).
*
* This class takes an input file in Orbis format and extracts all
- * the informations needed to build the topology
+ * the information needed to build the topology
* (i.e.number of nodes, links and links structure).
* It have been tested with Orbis 0.70
* http://www.sysnet.ucsd.edu/~pmahadevan/topo_research/topo.html
diff --git a/src/traffic-control/doc/queue-discs.rst b/src/traffic-control/doc/queue-discs.rst
index 1c29ea565..815b0516f 100644
--- a/src/traffic-control/doc/queue-discs.rst
+++ b/src/traffic-control/doc/queue-discs.rst
@@ -276,7 +276,7 @@ interface). In particular:
* when notified that a netdevice queue interface has been aggregated, traffic control \
aware devices can cache the pointer to the \
- netdevice queue interface created by the traffic contol layer into a member variable. \
+ netdevice queue interface created by the traffic control layer into a member variable. \
Also, multi-queue devices can set the number of device transmission queues and set the \
select queue callback through the netdevice queue interface
diff --git a/src/traffic-control/doc/tbf.rst b/src/traffic-control/doc/tbf.rst
index c927fd71d..d1e36e734 100644
--- a/src/traffic-control/doc/tbf.rst
+++ b/src/traffic-control/doc/tbf.rst
@@ -81,7 +81,7 @@ References
.. [Ref1] A. Kuznetsov and D. Torokhov; Linux Cross Reference Source Code; Available online at ``_.
-.. [Ref2] J. Vehent; Journey to the Center of the Linux Kernel: Traffic Control, Shaping and QoS; Available online at ``_.
+.. [Ref2] J. Vehent; Journey to the Center of the Linux Kernel: Traffic Control, Shaping and QoS; Available online at ``_.
.. [Ref3] Practical IP Network QoS: TBF queuing discipline; Available online at ``_.
diff --git a/src/traffic-control/model/red-queue-disc.cc b/src/traffic-control/model/red-queue-disc.cc
index 032c50b0a..5b6123ca2 100644
--- a/src/traffic-control/model/red-queue-disc.cc
+++ b/src/traffic-control/model/red-queue-disc.cc
@@ -710,7 +710,7 @@ RedQueueDisc::DropEarly (Ptr item, uint32_t qSize)
return 0; // no drop/mark
}
-// Returns a probability using these function parameters for the DropEarly funtion
+// Returns a probability using these function parameters for the DropEarly function
double
RedQueueDisc::CalculatePNew (void)
{
@@ -756,7 +756,7 @@ RedQueueDisc::CalculatePNew (void)
return p;
}
-// Returns a probability using these function parameters for the DropEarly funtion
+// Returns a probability using these function parameters for the DropEarly function
double
RedQueueDisc::ModifyP (double p, uint32_t size)
{
diff --git a/src/traffic-control/model/traffic-control-layer.h b/src/traffic-control/model/traffic-control-layer.h
index 4cfc661a7..18af04d79 100644
--- a/src/traffic-control/model/traffic-control-layer.h
+++ b/src/traffic-control/model/traffic-control-layer.h
@@ -180,7 +180,7 @@ public:
* \param device network device
* \param p the packet
* \param protocol next header value
- * \param from address of the correspondant
+ * \param from address of the correspondent
* \param to address of the destination
* \param packetType type of the packet
*/
diff --git a/src/visualizer/visualizer/core.py b/src/visualizer/visualizer/core.py
index 7206347bb..56b8b18fe 100644
--- a/src/visualizer/visualizer/core.py
+++ b/src/visualizer/visualizer/core.py
@@ -676,7 +676,7 @@ class ShowTransmissionsMode(object):
## @var NONE
# none
## @var SELECTED
- # seleced
+ # selected
## @var __slots__
# enumeration
__slots__ = []
diff --git a/src/visualizer/visualizer/ipython_view.py b/src/visualizer/visualizer/ipython_view.py
index b5d4d1a7f..31c8665e3 100644
--- a/src/visualizer/visualizer/ipython_view.py
+++ b/src/visualizer/visualizer/ipython_view.py
@@ -252,7 +252,7 @@ class IterableIPShell:
def _getHistory(self):
"""!
- Get's the command string of the current history level.
+ Gets the command string of the current history level.
@param self this object
@return: Historic command string.
@@ -274,7 +274,7 @@ class IterableIPShell:
def complete(self, line):
"""!
- Returns an auto completed line and/or posibilities for completion.
+ Returns an auto completed line and/or possibilities for completion.
@param line: Given line so far.
@return: Line completed as for as possible, and possible further completions.
@@ -513,7 +513,7 @@ class ConsoleView(gtk.TextView):
def onKeyPress(self, widget, event):
"""!
Key press callback used for correcting behavior for console-like
- interfaces. For example 'home' should go to prompt, not to begining of
+ interfaces. For example 'home' should go to prompt, not to beginning of
line.
@param widget: Widget that key press accored in.
@@ -597,9 +597,9 @@ class IPythonView(ConsoleView, IterableIPShell):
def raw_input(self, prompt=''):
"""!
- Custom raw_input() replacement. Get's current line from console buffer.
+ Custom raw_input() replacement. Gets current line from console buffer.
- @param prompt: Prompt to print. Here for compatability as replacement.
+ @param prompt: Prompt to print. Here for compatibility as replacement.
@return The current command line text.
"""
if self.interrupt:
diff --git a/src/wave/doc/wave.rst b/src/wave/doc/wave.rst
index f7b2b08db..ef38a5cae 100644
--- a/src/wave/doc/wave.rst
+++ b/src/wave/doc/wave.rst
@@ -133,7 +133,7 @@ of an OcbWifiMac.
MAC extension layer
###################
-Although 1609.4 is still in the MAC layer, the implemention
+Although 1609.4 is still in the MAC layer, the implementation
approach for |ns3| does not do much modification in the
source code of the wifi module. Instead, if some feature is related
to wifi MAC classes, then a relevant subclass is defined; if some
@@ -146,7 +146,7 @@ from ``ns3::NetDeivce``, composed of the objects of
``ns3::ChannelCoordinator`` and ``ns3::VsaManager``
classes to provide the features described in 1609.4 while still
containing the objects of ``ns3::OcbWifiMac`` and ``ns3::WifiPhy``
-classes. Morever, ``ns3::OcbWifiMac`` class is further extended with
+classes. Moreover, ``ns3::OcbWifiMac`` class is further extended with
support for IEEE 1609.4 associating with ``ns3::HigherLayerTxVectorTag``
and ``ns3::WaveMacLow``. The main work of the WaveNetDevice is to create
objects, configure, check arguments and provide new APIs for multiple
@@ -186,7 +186,7 @@ channel operation as follows:
4. SetChannelManager and GetChannelManager
class ``ns3::ChannelManager`` is a WAVE channel set which contains
- valid WAVE channel numbers. Morever, the tx information in this channel
+ valid WAVE channel numbers. Moreover, the tx information in this channel
set such as data rate and tx power level is used for transmitting management frames.
5. SetVsaManager and GetVsaManager
@@ -280,7 +280,7 @@ channel number, priority,
data rate and tx power level (expiration time is not supported now).
For IP datagrams, the Send () method is a virtual method from ``ns3::NetDevice`` that implements the service primitive MA-UNITDATA.
Users should insert QoS tags into packets themselves if they want to use QoS.
-Morever, a tx profile should be registered
+Moreover, a tx profile should be registered
before the Send method is called for transmit; the profile contains SCH number, data rate, power level and adaptable mode.
For management information, StartVsa method implements the service primitive
MLMEX-VSA. The tx information is already configured
@@ -382,7 +382,7 @@ routing protocols.
The current module provides two helpers to create two kinds of NetDevice.
The first is an object of WifiNetDevice (802.11p device) which mainly
contains class ``ns3::OcbWifiMac`` to enable OCB mode. The second
-is an object of WaveNetDevice (WAVE device) which contains addtional
+is an object of WaveNetDevice (WAVE device) which contains additional
classes ``ns3::ChannelScheduler``, ``ns3::ChannelManager``,
``ns3::ChannelCoordinator`` and ``ns3::VsaManager`` to support
multi-channel operation mode. The reason to provide a special 802.11p
@@ -475,7 +475,7 @@ is described as below:
From the above diagram, WaveHelper is not the subclass of WifiHelper and should only
use QosWaveMacHelper because WAVE MAC layer is based on QoS mechanism. But
-the WaveHelper is recommened if there is a need for multiple channel operation.
+the WaveHelper is recommended if there is a need for multiple channel operation.
Usage is as follows:
::
@@ -854,7 +854,7 @@ with new assignment mechanisms. Usage is as follows:
::
WaveHelper helper = WaveHelper::Default ();
- helper.helper.CreateMacForChannel (ChannelManager::GetWaveChannels ()); // create all 7 MAC entites for WAVE
+ helper.helper.CreateMacForChannel (ChannelManager::GetWaveChannels ()); // create all 7 MAC entities for WAVE
helper.CreatePhys (2); // or other number which should be less than 7
helper.SetChannelScheduler ("ns3::AnotherScheduler"); // The AnotherScheduler should be implemented by users.
helper.SetRemoteStationManager ("ns3::ConstantRateWifiManager"); // or other rate control algorithms
@@ -918,7 +918,7 @@ The ``ns3::VanetRoutingExample`` example was studied using mobility trace
files in the Raleigh, NC USA area generated using Simulation for Urban
Mobility (SUMO). Three environments were studied: a) an open highway
scenario, b) a residential neighborhood scenario, and c) and urban downtown
-scenario. For each environment, a contant number of 50-750 vehicles was
+scenario. For each environment, a constant number of 50-750 vehicles was
maintained for 2000 simulation seconds (> 30 minutes). The mobility trace
file were played back using ``ns3::Ns2MobilityHelper``. All vehicular nodes
transmitted a 200-byte BSM at 10 Hz and the PDR was determined for
diff --git a/src/wave/examples/vanet-routing-compare.cc b/src/wave/examples/vanet-routing-compare.cc
index 9d2298710..4068332b3 100644
--- a/src/wave/examples/vanet-routing-compare.cc
+++ b/src/wave/examples/vanet-routing-compare.cc
@@ -219,7 +219,7 @@ public:
/**
* \brief Increment the number of bytes transmitted
- * \param txBytes the number of addtional bytes transmitted
+ * \param txBytes the number of additional bytes transmitted
* \return none
*/
void IncTxBytes (uint32_t txBytes);
diff --git a/src/wave/examples/wave-simple-device.cc b/src/wave/examples/wave-simple-device.cc
index 3655a23ba..de0d1658f 100644
--- a/src/wave/examples/wave-simple-device.cc
+++ b/src/wave/examples/wave-simple-device.cc
@@ -72,7 +72,7 @@ private:
*/
bool Receive (Ptr dev, Ptr pkt, uint16_t mode, const Address &sender);
/**
- * Receive VSA functon
+ * Receive VSA function
* \param pkt the packet
* \param address the address
* \returns true if successful
diff --git a/src/wave/helper/wave-bsm-stats.h b/src/wave/helper/wave-bsm-stats.h
index f1def8548..baa9855a7 100644
--- a/src/wave/helper/wave-bsm-stats.h
+++ b/src/wave/helper/wave-bsm-stats.h
@@ -143,7 +143,7 @@ public:
int GetExpectedRxPktCount (int index);
/**
- * \brief Increments the count of actual packets recevied within range(index)
+ * \brief Increments the count of actual packets received within range(index)
* \param index index for statistics
* \return the count of actual packets received within range(index)
*/
diff --git a/src/wave/model/bsm-application.cc b/src/wave/model/bsm-application.cc
index 3c46bdcd1..d92ea894f 100644
--- a/src/wave/model/bsm-application.cc
+++ b/src/wave/model/bsm-application.cc
@@ -125,9 +125,9 @@ void BsmApplication::StartApplication () // Called at time specified by Start
// 2) Transmit delay requirements - The US
// minimum performance requirements for V2V
// BSM transmission expect a random delay of
- // +/- 5 ms, to avoid simultanous transmissions
+ // +/- 5 ms, to avoid simultaneous transmissions
// by all vehicles congesting the channel. Thus,
- // we need to adjust the start trasmission time by
+ // we need to adjust the start transmission time by
// some value, t_tx_delay.
// Therefore, the actual transmit time should be:
// t_start = t_time + t_drift + t_tx_delay
diff --git a/src/wave/model/bsm-application.h b/src/wave/model/bsm-application.h
index fe28bd986..dfc3510b4 100644
--- a/src/wave/model/bsm-application.h
+++ b/src/wave/model/bsm-application.h
@@ -175,7 +175,7 @@ private:
* for V2V Safety Systems Version 1.0, December 17, 2014
* max transmit delay (default 10ms) */
Time m_txMaxDelay;
- Time m_prevTxDelay; ///< prevous transmit delay
+ Time m_prevTxDelay; ///< previous transmit delay
};
} // namespace ns3
diff --git a/src/wave/model/vendor-specific-action.h b/src/wave/model/vendor-specific-action.h
index 3c3c3ab81..5536b6896 100644
--- a/src/wave/model/vendor-specific-action.h
+++ b/src/wave/model/vendor-specific-action.h
@@ -190,7 +190,7 @@ private:
/**
* \param mac a pointer to the mac object which is calling this callback
* \param oi the organization identifier of vendor specific action frame
- * \param packet the vendor specifc content packet received
+ * \param packet the vendor specific content packet received
* \param sender the address of the sender
* \returns true if the callback could handle the packet successfully;
* false otherwise.
diff --git a/src/wave/test/mac-extension-test-suite.cc b/src/wave/test/mac-extension-test-suite.cc
index dc0d0fd42..2e7cb875e 100644
--- a/src/wave/test/mac-extension-test-suite.cc
+++ b/src/wave/test/mac-extension-test-suite.cc
@@ -347,7 +347,7 @@ private:
*/
bool Receive (Ptr dev, Ptr pkt, uint16_t mode, const Address &sender);
/**
- * Receive VSA functon
+ * Receive VSA function
* \param pkt the packet
* \param address the address
* \returns true if successful
diff --git a/testpy.supp b/testpy.supp
index ff7deb13f..cdf12c8e9 100644
--- a/testpy.supp
+++ b/testpy.supp
@@ -1,5 +1,5 @@
{
- Supress invalid read size errors in SendPreq() when using HwmpProtocolMac
+ Suppress invalid read size errors in SendPreq() when using HwmpProtocolMac
Memcheck:Addr8
fun:*HwmpProtocolMac*SendPreq*
}
diff --git a/waf-tools/misc.py b/waf-tools/misc.py
index 61f98a58b..6c53dd861 100644
--- a/waf-tools/misc.py
+++ b/waf-tools/misc.py
@@ -45,7 +45,7 @@ def action_process_file_func(tsk):
@feature('cmd')
def apply_cmd(self):
- "call a command everytime"
+ "call a command every time"
if not self.fun: raise Errors.WafError('cmdobj needs a function!')
tsk = Task.TaskBase()
tsk.fun = self.fun