Fix various typos

CHANGES.md

@@ -23,7 +23,7 @@ Bugs fixed in 3.7.0
 - Add 'transport' to the Contact header for UAC scenarios (by Martin Flaska)
 - Update built-in scenarios to Copy Record-Route from INVITE to 200OK to comply with RFC 3261 (by kadabusha)
 - Fix for local_port keyword using TCP or TLS (by Felippe Silvestre)
-- Correct handling of IMS-AKA RES values contianing null bytes (by Sergey Zyrianov)
+- Correct handling of IMS-AKA RES values containing null bytes (by Sergey Zyrianov)
 - Fix potential overwrite of auth value when calculating auth (by ZhaohuiLiu)
 - Diagnostics improvements:
   - Print, rather than lose, any buffered response time data on exit (by Orgad Shaneh)
@@ -137,7 +137,7 @@ BREAKING(!) changes in 3.6.0
 * Automatic filenames (trace files, error files, etc..) are now created in
   the current working directory instead of in the directory of the scenario
   file. (Issue #399, reported by @sergey-safarov.)
-* Only validates SSL certficate if CA-file is separately specified!
+* Only validates SSL certificate if CA-file is separately specified!
   (PR #335, by Patrick Wildt @bluerise.)
 * Angle brackets `<` and `>` need to be escaped inside XML attributes.
   See #414. So, not `regexp="<(sip:.*)>"` but `regexp="&lt;(sip:.*)&gt;"`.

cpplint.py

@@ -223,7 +223,7 @@
   'whitespace/todo'
   ]
 
-# The default state of the category filter. This is overrided by the --filter=
+# The default state of the category filter. This is overridden by the --filter=
 # flag. By default all errors are on, so only add here categories that should be
 # off by default (i.e., categories that must be enabled by the --filter= flags).
 # All entries here should start with a '-' or '+', as in the --filter= flag.
@@ -3634,7 +3634,7 @@ def UpdateIncludeState(filename, include_state, io=codecs):
     io: The io factory to use to read the file. Provided for testability.
 
   Returns:
-    True if a header was succesfully added. False otherwise.
+    True if a header was successfully added. False otherwise.
   """
   headerfile = None
   try:
@@ -3706,7 +3706,7 @@ def CheckForIncludeWhatYouUse(filename, clean_lines, include_state, error,
   # Let's copy the include_state so it is only messed up within this function.
   include_state = include_state.copy()
 
-  # Did we find the header for this file (if any) and succesfully load it?
+  # Did we find the header for this file (if any) and successfully load it?
   header_found = False
 
   # Use the absolute path so that matching works properly.

docs/3PCC_extended.rst

@@ -8,7 +8,7 @@ each one of them being connected to a remote host.
 The SIPp instance which initiates the call is launched in "master"
 mode. The others are launched in "slave" mode. Slave SIPp instances
 have names, given in the command line (for example, s1, s2...sN for
-the slaves and m for the master) Correspondances between instances
+the slaves and m for the master) Correspondences between instances
 names and their addresses must be stored in a file (provided by
 ``-slave_cfg`` command line argument), in the following format::
 

docs/controlling.rst

@@ -93,7 +93,7 @@ You can resume the traffic by pressing 'p' again.
 To quit SIPp, press the 'q' key. SIPp will stop placing new calls and
 wait until all current calls go to their end. SIPp will then exit.
 
-You can also force SIPp to quit immediatly by pressing the 'Q' key.
+You can also force SIPp to quit immediately by pressing the 'Q' key.
 Current calls will be terminated by sending a BYE or CANCEL message
 (depending if the calls have been established or not). The same
 behaviour is obtained by pressing 'q' twice.
@@ -133,7 +133,7 @@ It is then possible to control SIPp like this:
   All keys available through keyboard are also available in the remote
   control interface
 
-You could also have a small shell script to automate a serie of
+You could also have a small shell script to automate a series of
 action. For example, this script will increase the call rate by 10
 more new calls/s every 5 seconds, wait at this call rate for one
 minute and exit SIPp:

docs/installation.rst

@@ -128,7 +128,7 @@ Installing SIPp
 
     + Copy the `WinPcap developer package`_ to "C:\cygwin\lib\WpdPack"
     + Remove or rename "pthread.h" in "C:\cygwin\lib\WpdPack\Include", as
-      it interfers with pthread.h from cygwin
+      it interferes with pthread.h from cygwin
     + Compile according to the instructions above.
 
 .. _GNU GPL license: https://www.gnu.org/copyleft/gpl.html

docs/perftest.rst

@@ -79,7 +79,7 @@ this scheduling.
   watchdog_major_maxtriggers: The watchdog timer is designed to provide
   feedback if your call load is causing SIPp's scheduler to be
   overwhelmed. The watchdog task sets a timer that should fire every
-  watchdog_interval milliseconds (by defualt 400ms). If the timer is not
+  watchdog_interval milliseconds (by default 400ms). If the timer is not
   serviced for more than watchdog_minor_threshold milliseconds (by
   default 500s), then a "minor" trigger is recorded. If the number of
   minor triggers is more than watchdog_minor_maxtriggers; the watchdog

docs/rstFlatTable.py

@@ -22,7 +22,7 @@
 
     * *auto span* rightmost cell of a table row over the missing cells on the
       right side of that table-row.  With Option ``:fill-cells:`` this behavior
-      can changed from *auto span* to *auto fill*, which automaticly inserts
+      can changed from *auto span* to *auto fill*, which automatically inserts
       (empty) cells instead of spanning the last cell.
 
     Options:
@@ -173,7 +173,7 @@ def buildTableNode(self):
         for colwidth in colwidths:
             colspec = nodes.colspec(colwidth=colwidth)
             # FIXME: It seems, that the stub method only works well in the
-            # absence of rowspan (observed by the html buidler, the docutils-xml
+            # absence of rowspan (observed by the html builder, the docutils-xml
             # build seems OK).  This is not extraordinary, because there exists
             # no table directive (except *this* flat-table) which allows to
             # define coexistent of rowspan and stubs (there was no use-case

docs/scenarios/actions.rst

@@ -506,7 +506,7 @@ setdest
 
 The setdest action allows you to change the remote end point for a
 call. The parameters are the transport, host, and port to connect the
-call to. There are certain limitations baed on SIPp's design: you can
+call to. There are certain limitations based on SIPp's design: you can
 not change the transport for a call; and if you are using TCP then
 multi-socket support must be selected (i.e. -t tn must be specified).
 Also, be aware that frequently using setdest may reduce SIPp's

docs/scenarios/keywords.rst

@@ -11,7 +11,7 @@ Keyword list
   in the last message received (except if it was a retransmission). If the header was not present or if
   no message has been received, the '[last_*]' keyword is discarded, and all bytes
   until the end of the line are also discarded. If the specified header
-  was present several times in the message, all occurences are
+  was present several times in the message, all occurrences are
   concatenated (CRLF separated) to be used in place of the '[last_*]' keyword.
 
 ``[last_cseq_number]``
@@ -88,7 +88,7 @@ Keyword list
 =============
 :Description: A call_id identifies a call and is generated by SIPp for each new call. In client mode, it is mandatory
   to use the value generated by SIPp in the "Call-ID" header. Otherwise, SIPp will not recognise the answer to the
-  message sent as being part of an existing call. Note: [call_id] can be pre-pended with an arbitrary string using
+  message sent as being part of an existing call. Note: [call_id] can be prepended with an arbitrary string using
   '///'. Example: Call-ID: ABCDEFGHIJ///[call_id] - it will still be recognized by SIPp as part of the same call.
 
 ``[peer_tag_param]``

docs/sipp.rst

@@ -43,7 +43,7 @@ the screen view by pressing 1 to 9 keys on the keyboard.
 
 
 + Key '1': Scenario screen. It displays a call flow of the scenario as
-  well as some important informations.
+  well as some important information.
 
 .. image:: sipp-03.jpg
 
@@ -60,8 +60,8 @@ the screen view by pressing 1 to 9 keys on the keyboard.
 
 .. image:: sipp-05.jpg
 
-+ Key '4': Variables screen. It displays informations on actions in
-  scenario as well as scenario variable informations.
++ Key '4': Variables screen. It displays information on actions in
+  scenario as well as scenario variable information.
 
 .. image:: sipp-06.jpg
 

docs/statistics.rst

@@ -109,7 +109,7 @@ Detailed Message Counts
 ```````````````````````
 
 The SIPp screens provide detailed information about the number of
-messages sent or recieved, retransmissions, messages lost, and the
+messages sent or received, retransmissions, messages lost, and the
 number of unexpected messages for each scenario element. Although
 these screens can be parsed, it is much simpler to parse a CSV file.
 To produce a CSV file that contains the per-message information

include/call.hpp

@@ -164,7 +164,7 @@ class call : virtual public task, virtual public listener, public virtual socket
     unsigned long int last_recv_invite_cseq;
 
     /* Recv message characteristics when we sent a valid message
-     *  (scneario, no retrans) just after a valid reception. This was
+     *  (scenario, no retrans) just after a valid reception. This was
      * a cause relationship, so the next time this cookie will be recvd,
      * we will retransmit the same message we sent this time */
     unsigned long  recv_retrans_hash;

include/jlsrtp.hpp

@@ -146,12 +146,12 @@ class JLSRTP
         /**
          * isBase64
          *
-         * Checks whether the given character satisfies base64 criterias (true) or not (false)
+         * Checks whether the given character satisfies base64 criteria (true) or not (false)
          *
          * @param[in]   c   Unsigned character to examine
          *
-         * @return  TRUE    Given character satisfies base64 criterias
-         * @return  FALSE   Given character DOES NOT satisfy base64 criterias
+         * @return  TRUE    Given character satisfies base64 criteria
+         * @return  FALSE   Given character DOES NOT satisfy base64 criteria
          */
         bool isBase64(unsigned char c);
 
@@ -846,7 +846,7 @@ class JLSRTP
          *
          * Sets the cryptographic context ID (<SSRC, IPAddress, Port>) to use
          *
-         * @param[in]   id  Cryptograhic context ID (<SSRC, IPAddress, Port>) to use
+         * @param[in]   id  Cryptographic context ID (<SSRC, IPAddress, Port>) to use
          */
         void setID(CryptoContextID id);
 
@@ -927,7 +927,7 @@ class JLSRTP
          * @return  -5  Error extracting SRTP payload
          * @return  -6  Error issuing authentication tag
          * @return  -7  Error encountered while computing packet IV
-         * @return  -8  Error encoutnered while setting packet IV
+         * @return  -8  Error encountered while setting packet IV
          * @return  -9  Error updating rollover counter
          * @return  -10 Error updating SL
          */

include/stat.hpp

@@ -344,19 +344,19 @@ class CStat
      * in the format given in parameter.
      *
      * @param P_tv.
-     * @return a pointer on a static string containing formated time
+     * @return a pointer on a static string containing formatted time
      */
     static char* formatTime (struct timeval* P_tv, bool with_epoch = false);
 
     /**
      * setRepartitionCallLength
      * - set the unsigned int table passed in parameter as the repartition table
-     *   for call length. This is done by calling the initRepartition methode on
+     *   for call length. This is done by calling the initRepartition method on
      *   the M_CallLengthRepartition variable.
-     * - set the char* list of int (must be separeted with coma as the
+     * - set the char* list of int (must be separated with coma as the
      *   repartition table for call length
      *   This is done by calling the createIntegerTable to transform the char*
-     *   list into unsigned int list. Then the initRepartition methode is
+     *   list into unsigned int list. Then the initRepartition method is
      *   call with the created unsigned int list and the M_CallLengthRepartition
      *   variable
      *
@@ -407,7 +407,7 @@ class CStat
      *
      * @param P_ms.
      *
-     * @return a pointer on a static string containing formated time
+     * @return a pointer on a static string containing formatted time
      */
     static char* msToHHMMSS (unsigned long P_ms);
 
@@ -419,7 +419,7 @@ class CStat
      *
      * @param P_ms.
      *
-     * @return a pointer on a static string containing formated time
+     * @return a pointer on a static string containing formatted time
      */
     static char* msToHHMMSSus (unsigned long P_ms);
 
@@ -478,7 +478,7 @@ class CStat
 
     /**
      * initRepartition
-     * This methode is used to create the repartition table with a table of
+     * This method is used to create the repartition table with a table of
      * unsigned int the reparition is created like following, with Vi the given
      * value in the table
      * 0    <= x <  V1
@@ -495,7 +495,7 @@ class CStat
      * createIntegerTable
      * this method try to create a table of unsigned int with the list of char*
      * passed in parameters
-     * if it succed, it's return true (1)
+     * if it succeed, it's return true (1)
      * else it's return false (0)
      */
     int  createIntegerTable(char * P_listeStr,
@@ -545,7 +545,7 @@ class CStat
 
     /**
      * UpdateAverageCounter
-     * This methode compute the real moyenne with the passed value on the given
+     * This method compute the real moyenne with the passed value on the given
      * counter
      */
     void updateAverageCounter(E_CounterName P_SumCounter,

include/variables.hpp

@@ -54,13 +54,13 @@ class CCallVariable
     bool isRegExp();
     bool isString();
 
-    // WARNING : setMatchingValue does't allocate the memory for the matching value
+    // WARNING : setMatchingValue doesn't allocate the memory for the matching value
     // but the destructor free the memory
     void setMatchingValue(char* P_matchingValue);
     char* getMatchingValue();
 
     /* When the variable is used for a string, these functions should be called. */
-    // WARNING : setString does't allocate the memory for the matching value
+    // WARNING : setString doesn't allocate the memory for the matching value
     // but the destructor free the memory
     void setString(char *s);
     char *getString();

src/call.cpp

@@ -4564,7 +4564,7 @@ bool call::process_incoming(const char* msg, const struct sockaddr_storage* src)
              *
              * This case appears when the UAS has send a 200 but not received
              * a ACK yet. Thus, the UAS retransmit the 200 (invite transaction)
-             * until it receives a ACK. In this case, it nevers sends the 200
+             * until it receives a ACK. In this case, it never sends the 200
              * from the  BYE, until it has reveiced the previous 200. Thus,
              * the UAC retransmit the BYE, and this BYE is considered as an
              * unexpected.
@@ -5274,7 +5274,7 @@ bool call::process_incoming(const char* msg, const struct sockaddr_storage* src)
                     if (int checkTxn = call_scenario->messages[search_index]->response_txn) {
                         /* This is a reply to an old transaction. */
                         if (!strcmp(transactions[checkTxn - 1].txnID, txn)) {
-                            /* This reply is provisional, so it should have no effect if we recieve it out-of-order. */
+                            /* This reply is provisional, so it should have no effect if we receive it out-of-order. */
                             if (reply_code >= 100 && reply_code <= 199) {
                                 TRACE_MSG("-----------------------------------------------\n"
                                           "Ignoring provisional %s message for transaction %s:\n\n%s\n",

src/rtpstream.cpp

@@ -691,7 +691,7 @@ static unsigned long rtpstream_playrtptask(taskentry_t* taskinfo,
                 }
                 else
                 {
-                    /* copy from end and then begining of file. does not handle the */
+                    /* copy from end and then beginning of file. does not handle the */
                     /* case where file is shorter than the packet length!! */
                     memcpy(udp_send_audio.buffer + sizeof(rtp_header_t), taskinfo->audio_current_file_bytes, taskinfo->audio_file_bytes_left);
                     memcpy(udp_send_audio.buffer + sizeof(rtp_header_t) + taskinfo->audio_file_bytes_left, taskinfo->audio_file_bytes_start, taskinfo->audio_bytes_per_packet - taskinfo->audio_file_bytes_left);
@@ -941,7 +941,7 @@ static unsigned long rtpstream_playrtptask(taskentry_t* taskinfo,
                 }
                 else
                 {
-                    /* copy from end and then begining of file. does not handle the */
+                    /* copy from end and then beginning of file. does not handle the */
                     /* case where file is shorter than the packet length!! */
                     memcpy(udp_send_video.buffer + sizeof(rtp_header_t), taskinfo->video_current_file_bytes, taskinfo->video_file_bytes_left);
                     memcpy(udp_send_video.buffer + sizeof(rtp_header_t) + taskinfo->video_file_bytes_left, taskinfo->video_file_bytes_start, taskinfo->video_bytes_per_packet - taskinfo->video_file_bytes_left);
@@ -1546,7 +1546,7 @@ static void rtpstream_stop_task(rtpstream_callinfo_t* callinfo)
                     }
                 }
             }
-            /* then ask the thread to destory this task (and its memory) */
+            /* then ask the thread to destroy this task (and its memory) */
             pthread_mutex_lock(&(taskinfo->parent_thread->tasklist_mutex));
             taskinfo->parent_thread->del_pending++;
             taskinfo->flags |= TI_KILLTASK;

src/scenario.cpp

@@ -745,7 +745,7 @@ scenario::scenario(char * filename, int deflt)
             for (int i = 0; i < currentNbVarNames; i++) {
                 int id = allocVars->find(currentTabVarName[i], false);
                 if (id == -1) {
-                    ERROR("Could not reference non-existant variable '%s'", currentTabVarName[i]);
+                    ERROR("Could not reference non-existent variable '%s'", currentTabVarName[i]);
                 }
             }
             freeStringTable(currentTabVarName, currentNbVarNames);
@@ -1185,7 +1185,7 @@ CSample *parse_distribution(bool oldstyle = false)
 
 
 /* 3pcc extended mode:
- * get the correspondances between
+ * get the correspondences between
  * slave and master names and their
  * addresses */
 
@@ -1862,7 +1862,7 @@ void scenario::getCommonAttributes(message *message)
 }
 
 // char* manipulation : create a int[] from a char*
-// test first is the char* is formed by int separeted by coma
+// test first is the char* is formed by int separated by coma
 // and then create the table
 
 int isWellFormed(char * P_listeStr, int * nombre)

src/screen.cpp

@@ -401,7 +401,7 @@ void ScreenPrinter::draw_scenario_screen()
              */
             last_artpstream_rate_out= ((double)TempABytes)/ ms_since_last_tick;
             last_vrtpstream_rate_out= ((double)TempVBytes)/ ms_since_last_tick;
-            /* Potential race condition betwen multiple threads updating the
+            /* Potential race condition between multiple threads updating the
              * rtpstream_bytes value. We subtract the saved TempBytes value
              * rather than setting it to zero to minimise the chances of missing
              * an update to rtpstream_bytes [update between printing stats and