Fix spelling

* account
* address
* adjacency
* alignment
* anymore
* ascii
* assumption
* blithely
* canonical
* compound
* consecutive
* control
* diagnostics
* disassociation
* fairly
* fallthrough
* greatest
* identification
* multihop
* multiplexed
* nonexistent
* notifiable
* notwithstanding
* number
* polynomial
* preexisting
* proprietary
* quenches
* reassociation
* redefinition
* refresh
* solicitation
* specifying
* support
* the

Signed-off-by: Josh Soref <[email protected]>
(backported from commit 38050da48ed59d6a85df524f015fdbff439366c1)

[skip ci]

diff --git a/CHANGES b/CHANGES
index 6dc610ed0c91b10a0eaecf88cf1494da16527e38..ef1812da8af529ff81578f93318ef92a2d3bf964 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -928,7 +928,7 @@ Wed.        April 25, 2007. [email protected].  Summary for 3.9.6 tcpdump release
         RFC 4340.
        Add support for per-VLAN spanning tree and per-VLAN rapid spanning tree
        Add support for Multiple-STP as per 802.1s
-       Add support for the cisco propriatry 'dynamic trunking protocol'
+       Add support for the cisco proprietary 'dynamic trunking protocol'
        Add support for the cisco proprietary VTP protocol
        Update dhcp6 options table as per IETF standardization activities
 

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 996966b28e238c162db552014106086be595f905..d340dbd66fd398d06f5a2bc5d7b20d233e06c465 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -1011,7 +1011,7 @@ if(EXISTS ${CMAKE_SOURCE_DIR}/.devel OR EXISTS ${CMAKE_BINARY_DIR}/.devel)
         # __declspec(align), because the only structures whose layout
         # we precisely specify are those that get overlaid on packet
         # data, and in those every element is an array of octets so
-        # that we have full control over the size and aligmnet, and,
+        # that we have full control over the size and alignment, and,
         # apparently, jmp_buf has such a declaration on x86, meaning
         # that everything that includes netdissect.h, i.e. almost every
         # file in tcpdump, gets a warning.

diff --git a/addrtoname.c b/addrtoname.c
index d3c352f59686b384f8255ac37cc5bda408b222b5..f2a13a33068b0c45453512d91d18dbda161a3b31 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -1115,7 +1115,7 @@ static const struct ipxsap_ent {
        { 0x030a, "GalacticommWorldgroupServer" },
        { 0x030c, "IntelNetport2/HP JetDirect/HP Quicksilver" },
        { 0x0320, "AttachmateGateway" },
-       { 0x0327, "MicrosoftDiagnostiocs" },
+       { 0x0327, "MicrosoftDiagnostics" },
        { 0x0328, "WATCOM SQL Server" },
        { 0x0335, "MultiTechSystems MultisynchCommServer" },
        { 0x0343, "Xylogics RemoteAccessServer/LANModem" },

diff --git a/extract.h b/extract.h
index d7d803dfb277ceeb0e95ca485e80a57d4ee7ba52..c1b486d37a7e0ad4a4d869b910e4ffcce10bb499 100644 (file)
--- a/extract.h
+++ b/extract.h
@@ -261,7 +261,7 @@ EXTRACT_IPV4_TO_HOST_ORDER(const void *p)
  * quantities the hard way - fetch the bytes one at a time and
  * assemble them.
  *
- * XXX - ARM is a special case.  ARMv1 through ARMv5 didn't suppory
+ * XXX - ARM is a special case.  ARMv1 through ARMv5 didn't support
  * unaligned loads; ARMv6 and later support it *but* have a bit in
  * the system control register that the OS can set and that causes
  * unaligned loads to fault rather than succeeding.

diff --git a/ftmacros.h b/ftmacros.h
index 7975463b3a6924738ef7e1ffa72370f11006ada6..ba95c4aac1bf648678ba883525d230c721349081 100644 (file)
--- a/ftmacros.h
+++ b/ftmacros.h
@@ -64,7 +64,7 @@
   /*
    * We need this to get the versions of socket functions that
    * use socklen_t.  Define it only if it's not already defined,
-   * so we don't get redefiniton warnings.
+   * so we don't get redefinition warnings.
    */
   #ifndef _XOPEN_SOURCE_EXTENDED
     #define _XOPEN_SOURCE_EXTENDED

diff --git a/makemib b/makemib
index 97e78754ff7b8e80aa62e1b2d7e40dcc9f148dab..f734bb7333a0e44564ba47df51def4ff1bc9a9f8 100755 (executable)
--- a/makemib
+++ b/makemib
@@ -36,7 +36,7 @@
 #
 # This script needs to be run by "gawk" (GNU awk).  "nawk" will work, but
 # dump will get a recursion error if you process LARGE mibs.  While it would
-# by farily easy to rewrite this not to use recursion (and also easy to
+# by fairly easy to rewrite this not to use recursion (and also easy to
 # eliminate use of gsub and functions to use classic "awk"), you have to
 # order the structure declarations in defined-first order for the compiler
 # not to barf; too bad tsort doesn't take arguments.

diff --git a/mib.h b/mib.h
index 6c8e63c978b5262528d2cd1e0a91a6c5f1ac511a..4f83e6b89125c12b81317daaa17e28f1ac1d64cd 100644 (file)
--- a/mib.h
+++ b/mib.h
@@ -765,13 +765,13 @@ _icmpInParmProbs_obj = {
        "icmpInParmProbs", 5, 0,
        NULL, &_icmpInTimeExcds_obj
 },
-_icmpInSrcQuenchs_obj = {
-       "icmpInSrcQuenchs", 6, 0,
+_icmpInSrcQuenches_obj = {
+       "icmpInSrcQuenches", 6, 0,
        NULL, &_icmpInParmProbs_obj
 },
 _icmpInRedirects_obj = {
        "icmpInRedirects", 7, 0,
-       NULL, &_icmpInSrcQuenchs_obj
+       NULL, &_icmpInSrcQuenches_obj
 },
 _icmpInEchos_obj = {
        "icmpInEchos", 8, 0,
@@ -817,13 +817,13 @@ _icmpOutParmProbs_obj = {
        "icmpOutParmProbs", 18, 0,
        NULL, &_icmpOutTimeExcds_obj
 },
-_icmpOutSrcQuenchs_obj = {
-       "icmpOutSrcQuenchs", 19, 0,
+_icmpOutSrcQuenches_obj = {
+       "icmpOutSrcQuenches", 19, 0,
        NULL, &_icmpOutParmProbs_obj
 },
 _icmpOutRedirects_obj = {
        "icmpOutRedirects", 20, 0,
-       NULL, &_icmpOutSrcQuenchs_obj
+       NULL, &_icmpOutSrcQuenches_obj
 },
 _icmpOutEchos_obj = {
        "icmpOutEchos", 21, 0,

diff --git a/nameser.h b/nameser.h
index 75e672b14c21dfe180f7683e92f9b67b9960faca..08b680e01abccae6a0a5c766967134baf0ef9659 100644 (file)
--- a/nameser.h
+++ b/nameser.h
@@ -87,7 +87,7 @@
 #define UPDATEMA       0xd             /* modify all named resource record */
 
 #define ZONEINIT       0xe             /* initial zone transfer */
-#define ZONEREF                0xf             /* incremental zone referesh */
+#define ZONEREF                0xf             /* incremental zone refresh */
 
 /*
  * Undefine various #defines from various System V-flavored OSes (Solaris,
@@ -112,7 +112,7 @@
 #define NOERROR                0               /* no error */
 #define FORMERR                1               /* format error */
 #define SERVFAIL       2               /* server failure */
-#define NXDOMAIN       3               /* non existent domain */
+#define NXDOMAIN       3               /* nonexistent domain */
 #define NOTIMP         4               /* not implemented */
 #define REFUSED                5               /* query refused */
        /* non standard */
@@ -125,7 +125,7 @@
 #define T_NS           2               /* authoritative server */
 #define T_MD           3               /* mail destination */
 #define T_MF           4               /* mail forwarder */
-#define T_CNAME                5               /* connonical name */
+#define T_CNAME                5               /* canonical name */
 #define T_SOA          6               /* start of authority zone */
 #define T_MB           7               /* mailbox domain name */
 #define T_MG           8               /* mail group member */

diff --git a/print-802_11.c b/print-802_11.c
index 28d4d6f1f7a69c3247d5d8f733af44cc49343273..50abc6c0f4fa7baba6bf39758b274063e15580d3 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -67,7 +67,7 @@
 #define        IEEE802_11_STATUS_LEN           2
 #define        IEEE802_11_REASON_LEN           2
 
-/* Length of previous AP in reassocation frame */
+/* Length of previous AP in reassociation frame */
 #define        IEEE802_11_AP_LEN               6
 
 #define        T_MGMT 0x0  /* management */
@@ -1744,7 +1744,7 @@ handle_action(netdissect_options *ndo,
        case 7: ND_PRINT("HT "); PRINT_HT_ACTION(GET_U_1(p + 1)); break;
        case 13: ND_PRINT("MeshAction "); PRINT_MESH_ACTION(GET_U_1(p + 1)); break;
        case 14:
-               ND_PRINT("MultiohopAction ");
+               ND_PRINT("MultihopAction");
                PRINT_MULTIHOP_ACTION(GET_U_1(p + 1)); break;
        case 15:
                ND_PRINT("SelfprotectAction ");

diff --git a/print-802_15_4.c b/print-802_15_4.c
index fd75b159562205fc91f383c629cf37488e908aab..8853d44f5ebae5204f1a6c695115bd7f516c29e2 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -250,7 +250,7 @@ static const char *p_mlme_short_names[] = {
        "TVWS PHY Operating Mode Description IE",       /* 0x2b */
        "TVWS Device Capabilities IE",                  /* 0x2c */
        "TVWS Device Category IE",                      /* 0x2d */
-       "TVWS Device Identiication IE",                 /* 0x2e */
+       "TVWS Device Identification IE",                /* 0x2e */
        "TVWS Device Location IE",                      /* 0x2f */
        "TVWS Channel Information Query IE",            /* 0x30 */
        "TVWS Channel Information Source IE",           /* 0x31 */
@@ -418,7 +418,7 @@ static const char *mac_c_names[] = {
 #define FC_ADDRESSING_MODE_LONG         0x03
 
 /*
- * IEEE 802.15.4 CRC 16 function. This is using CCITT polynomical of 0x1021,
+ * IEEE 802.15.4 CRC 16 function. This is using the CCITT polynomial of 0x1021,
  * but the initial value is 0, and the bits are reversed for both in and out.
  * See section 7.2.10 of 802.15.4-2015 for more information.
  */
@@ -470,7 +470,7 @@ ieee802_15_4_reverse32(uint32_t x)
 }
 
 /*
- * IEEE 802.15.4 CRC 32 function. This is using ANSI X3.66-1979 polynomical of
+ * IEEE 802.15.4 CRC 32 function. This is using the ANSI X3.66-1979 polynomial of
  * 0x04C11DB7, but the initial value is 0, and the bits are reversed for both
  * in and out. See section 7.2.10 of 802.15.4-2015 for more information.
  */
@@ -1303,7 +1303,7 @@ ieee802_15_4_print_mlme_ie_list(netdissect_options *ndo,
 }
 
 /*
- * Multiplexd IE (802.15.9) parsing and printing.
+ * Multiplexed IE (802.15.9) parsing and printing.
  *
  * Returns number of bytes consumed from packet or -1 in case of error.
  */
@@ -1664,7 +1664,7 @@ ieee802_15_4_print_command_data(netdissect_options *ndo,
                        return caplen;
                }
                break;
-       case 0x03: /* Diassociation Notification command */
+       case 0x03: /* Disassociation Notification command */
                if (caplen != 1) {
                        ND_PRINT("Invalid Disassociation Notification command length");
                        return -1;
@@ -2038,19 +2038,19 @@ ieee802_15_4_std_frames(netdissect_options *ndo,
        }
 
        switch (security_level) {
-       case 0: /*FALLTHOUGH */
+       case 0: /*FALLTHROUGH */
        case 4:
                miclen = 0;
                break;
-       case 1: /*FALLTHOUGH */
+       case 1: /*FALLTHROUGH */
        case 5:
                miclen = 4;
                break;
-       case 2: /*FALLTHOUGH */
+       case 2: /*FALLTHROUGH */
        case 6:
                miclen = 8;
                break;
-       case 3: /*FALLTHOUGH */
+       case 3: /*FALLTHROUGH */
        case 7:
                miclen = 16;
                break;
@@ -2360,19 +2360,19 @@ ieee802_15_4_mp_frame(netdissect_options *ndo,
        }
 
        switch (security_level) {
-       case 0: /*FALLTHOUGH */
+       case 0: /*FALLTHROUGH */
        case 4:
                miclen = 0;
                break;
-       case 1: /*FALLTHOUGH */
+       case 1: /*FALLTHROUGH */
        case 5:
                miclen = 4;
                break;
-       case 2: /*FALLTHOUGH */
+       case 2: /*FALLTHROUGH */
        case 6:
                miclen = 8;
                break;
-       case 3: /*FALLTHOUGH */
+       case 3: /*FALLTHROUGH */
        case 7:
                miclen = 16;
                break;

diff --git a/print-atm.c b/print-atm.c
index 904fc4792e9258ff187bcdb8a8e22239a5fa19d9..51c53b0fb09fd9d7495e536eab5a167b63ca6712 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -106,7 +106,7 @@
 #define B_BEARER               0x5e    /* broadband bearer capability */
 #define B_LOWER                        0x5f    /* broadband lower information */
 #define CALLING_PARTY          0x6c    /* calling party number */
-#define CALLED_PARTY           0x70    /* called party nmber */
+#define CALLED_PARTY           0x70    /* called party number */
 
 #define Q2931                  0x09
 

diff --git a/print-bgp.c b/print-bgp.c
index 113af14e5b02ebe0833792f827d14ef36c074f05..dfb6f015417e04715072c9d279e5014a680d4f58 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -1598,7 +1598,7 @@ check_add_path(netdissect_options *ndo, const u_char *pptr, u_int length,
     }
 
     /*
-     * Scan through the NLRI information under the assumpetion that
+     * Scan through the NLRI information under the assumption that
      * it doesn't have path IDs.
      */
     for (offset = 0; offset < length;) {

diff --git a/print-ether.c b/print-ether.c
index 504d51c53c2f5d0f208032090343515a5b845cdb..3a62771bfc0e3ecd32b4a8dab588f73246dc9b82 100644 (file)
--- a/print-ether.c
+++ b/print-ether.c
@@ -412,7 +412,7 @@ invalid:
 }
 
 /*
- * Print an Ethernet frame while specyfing a non-standard Ethernet header
+ * Print an Ethernet frame while specifying a non-standard Ethernet header
  * length.
  * This might be encapsulated within another frame; we might be passed
  * a pointer to a function that can print header information for that

diff --git a/print-icmp6.c b/print-icmp6.c
index 75bcc8b01afdcbbff7cd04e3b082ee571ed43762..f2937e49b4d6206c5193f61e52bd6f8557ebfa97 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -526,7 +526,7 @@ struct nd_rpl_security {
 #endif
 };
 
-/* section 6.2.1, DODAG Information Solication (DIS_IS) */
+/* section 6.2.1, DODAG Information Solicitation (DIS_IS) */
 struct nd_rpl_dis_is {
     nd_uint8_t rpl_dis_flags;
     nd_uint8_t rpl_dis_reserved;

diff --git a/print-isoclns.c b/print-isoclns.c
index df11797209dd4f1565e5e2182fb0194d28bf6b91..cb06e19a07a78c3fd5412116f263ce72396102ef 100644 (file)
--- a/print-isoclns.c
+++ b/print-isoclns.c
@@ -207,7 +207,7 @@ static const struct tok esis_option_values[] = {
     { ESIS_OPTION_SECURITY,        "Security" },
     { ESIS_OPTION_ES_CONF_TIME,    "ES Configuration Time" },
     { ESIS_OPTION_PRIORITY,        "Priority" },
-    { ESIS_OPTION_ADDRESS_MASK,    "Addressk Mask" },
+    { ESIS_OPTION_ADDRESS_MASK,    "Address Mask" },
     { ESIS_OPTION_SNPA_MASK,       "SNPA Mask" },
     { 0, NULL }
 };
@@ -612,7 +612,7 @@ static const struct tok isis_lsp_istype_values[] = {
 #define ISIS_PTP_ADJ_INIT 1
 #define ISIS_PTP_ADJ_DOWN 2
 
-static const struct tok isis_ptp_adjancey_values[] = {
+static const struct tok isis_ptp_adjacency_values[] = {
     { ISIS_PTP_ADJ_UP,    "Up" },
     { ISIS_PTP_ADJ_INIT,  "Initializing" },
     { ISIS_PTP_ADJ_DOWN,  "Down" },
@@ -3148,7 +3148,7 @@ isis_print(netdissect_options *ndo,
            tlv_ptp_adj = (const struct isis_tlv_ptp_adj *)tptr;
            if(tlen>=1) {
                ND_PRINT("\n\t      Adjacency State: %s (%u)",
-                      tok2str(isis_ptp_adjancey_values, "unknown", GET_U_1(tptr)),
+                      tok2str(isis_ptp_adjacency_values, "unknown", GET_U_1(tptr)),
                       GET_U_1(tptr));
                tlen--;
            }

diff --git a/print-lisp.c b/print-lisp.c
index 756fff0ffc5a7392eed749b7ffea684636b9cc86..fc2006f4cb8a9cd260288cc6739bde070558f0f7 100644 (file)
--- a/print-lisp.c
+++ b/print-lisp.c
@@ -129,12 +129,12 @@ enum {
 };
 
 static const struct tok lisp_type [] = {
-       { 0, "LISP-Reserved"                    },
-       { 1, "LISP-Map-Request"                 },
-       { 2, "LISP-Map-Reply"                   },
-       { 3, "LISP-Map-Register"                },
-       { 4, "LISP-Map-Notify"                  },
-       { 8, "LISP-Encapsulated-Contol-Message" },
+       { 0, "LISP-Reserved"                     },
+       { 1, "LISP-Map-Request"                  },
+       { 2, "LISP-Map-Reply"                    },
+       { 3, "LISP-Map-Register"                 },
+       { 4, "LISP-Map-Notify"                   },
+       { 8, "LISP-Encapsulated-Control-Message" },
        { 0, NULL }
 };
 

diff --git a/print-ppp.c b/print-ppp.c
index 38505355182ca15067ea3e0b6ac76a8345cc6ece..0a8e2c2877f48e7b2a14ff260042464bc00229e3 100644 (file)
--- a/print-ppp.c
+++ b/print-ppp.c
@@ -194,7 +194,7 @@ static const char *lcpconfopts[] = {
        "deprecated(12)",       /* used to be a Multi-Link-Procedure*/
        "Call-Back",            /* (13) */
        "deprecated(14)",       /* used to be a Connect-Time */
-       "deprecated(15)",       /* used to be a Compund-Frames */
+       "deprecated(15)",       /* used to be a Compound-Frames */
        "deprecated(16)",       /* used to be a Nominal-Data-Encap */
        "MRRU",                 /* (17) */
        "12-Bit seq #",         /* (18) */
@@ -859,7 +859,7 @@ handle_chap(netdissect_options *ndo,
         * don't know which flavor of CHAP (i.e. CHAP-MD5, MS-CHAPv1,
         * MS-CHAPv2) is used at this point, we can't decode packet
         * specifically to each algorithms. Instead, we simply decode
-        * the GCD (Gratest Common Denominator) for all algorithms.
+        * the GCD (Greatest Common Denominator) for all algorithms.
         */
        switch (code) {
        case CHAP_CHAL:

diff --git a/print-radius.c b/print-radius.c
index 39dd2b86026ad7d430fe76b91aaf51f1d2c4630d..e26ba567fb30325a00327fadbe00b38aba7fdeb7 100644 (file)
--- a/print-radius.c
+++ b/print-radius.c
@@ -112,38 +112,38 @@
 
 /* Radius packet codes */
 /* https://www.iana.org/assignments/radius-types/radius-types.xhtml#radius-types-27 */
-#define RADCMD_ACCESS_REQ   1 /* Access-Request      */
-#define RADCMD_ACCESS_ACC   2 /* Access-Accept       */
-#define RADCMD_ACCESS_REJ   3 /* Access-Reject       */
-#define RADCMD_ACCOUN_REQ   4 /* Accounting-Request  */
-#define RADCMD_ACCOUN_RES   5 /* Accounting-Response */
-#define RADCMD_ACCESS_CHA  11 /* Access-Challenge    */
-#define RADCMD_STATUS_SER  12 /* Status-Server       */
-#define RADCMD_STATUS_CLI  13 /* Status-Client       */
-#define RADCMD_DISCON_REQ  40 /* Disconnect-Request  */
-#define RADCMD_DISCON_ACK  41 /* Disconnect-ACK      */
-#define RADCMD_DISCON_NAK  42 /* Disconnect-NAK      */
-#define RADCMD_COA_REQ     43 /* CoA-Request         */
-#define RADCMD_COA_ACK     44 /* CoA-ACK             */
-#define RADCMD_COA_NAK     45 /* CoA-NAK             */
-#define RADCMD_RESERVED   255 /* Reserved            */
+#define RADCMD_ACCESS_REQ    1 /* Access-Request      */
+#define RADCMD_ACCESS_ACC    2 /* Access-Accept       */
+#define RADCMD_ACCESS_REJ    3 /* Access-Reject       */
+#define RADCMD_ACCOUNT_REQ   4 /* Accounting-Request  */
+#define RADCMD_ACCOUNT_RES   5 /* Accounting-Response */
+#define RADCMD_ACCESS_CHA   11 /* Access-Challenge    */
+#define RADCMD_STATUS_SER   12 /* Status-Server       */
+#define RADCMD_STATUS_CLI   13 /* Status-Client       */
+#define RADCMD_DISCON_REQ   40 /* Disconnect-Request  */
+#define RADCMD_DISCON_ACK   41 /* Disconnect-ACK      */
+#define RADCMD_DISCON_NAK   42 /* Disconnect-NAK      */
+#define RADCMD_COA_REQ      43 /* CoA-Request         */
+#define RADCMD_COA_ACK      44 /* CoA-ACK             */
+#define RADCMD_COA_NAK      45 /* CoA-NAK             */
+#define RADCMD_RESERVED    255 /* Reserved            */
 
 static const struct tok radius_command_values[] = {
-    { RADCMD_ACCESS_REQ, "Access-Request" },
-    { RADCMD_ACCESS_ACC, "Access-Accept" },
-    { RADCMD_ACCESS_REJ, "Access-Reject" },
-    { RADCMD_ACCOUN_REQ, "Accounting-Request" },
-    { RADCMD_ACCOUN_RES, "Accounting-Response" },
-    { RADCMD_ACCESS_CHA, "Access-Challenge" },
-    { RADCMD_STATUS_SER, "Status-Server" },
-    { RADCMD_STATUS_CLI, "Status-Client" },
-    { RADCMD_DISCON_REQ, "Disconnect-Request" },
-    { RADCMD_DISCON_ACK, "Disconnect-ACK" },
-    { RADCMD_DISCON_NAK, "Disconnect-NAK" },
-    { RADCMD_COA_REQ,    "CoA-Request" },
-    { RADCMD_COA_ACK,    "CoA-ACK" },
-    { RADCMD_COA_NAK,    "CoA-NAK" },
-    { RADCMD_RESERVED,   "Reserved" },
+    { RADCMD_ACCESS_REQ,  "Access-Request" },
+    { RADCMD_ACCESS_ACC,  "Access-Accept" },
+    { RADCMD_ACCESS_REJ,  "Access-Reject" },
+    { RADCMD_ACCOUNT_REQ, "Accounting-Request" },
+    { RADCMD_ACCOUNT_RES, "Accounting-Response" },
+    { RADCMD_ACCESS_CHA,  "Access-Challenge" },
+    { RADCMD_STATUS_SER,  "Status-Server" },
+    { RADCMD_STATUS_CLI,  "Status-Client" },
+    { RADCMD_DISCON_REQ,  "Disconnect-Request" },
+    { RADCMD_DISCON_ACK,  "Disconnect-ACK" },
+    { RADCMD_DISCON_NAK,  "Disconnect-NAK" },
+    { RADCMD_COA_REQ,     "CoA-Request" },
+    { RADCMD_COA_ACK,     "CoA-ACK" },
+    { RADCMD_COA_NAK,     "CoA-NAK" },
+    { RADCMD_RESERVED,    "Reserved" },
     { 0, NULL}
 };
 

diff --git a/print-sctp.c b/print-sctp.c
index e000ed7d478a0f26a1c4cfe4ac2c717f2146ca4d..7d1f51be0713d7722283de10a8d2056a4f93f39b 100644 (file)
--- a/print-sctp.c
+++ b/print-sctp.c
@@ -293,7 +293,7 @@ struct sctpUnifiedAbortHeavy{
 };
 
 /* For the graceful shutdown we must carry
- * the tag (in common header)  and the highest consequitive acking value
+ * the tag (in common header)  and the highest consecutive acking value
  */
 struct sctpShutdown {
   nd_uint32_t TSN_Seen;

diff --git a/print-sflow.c b/print-sflow.c
index 895d2546c37218b2317afeec6bb9f354e71050ef..1d6e79ddd509834630b6e296b02cdd307fc419e2 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -690,7 +690,7 @@ sflow_print_flow_records(netdissect_options *ndo,
 
        sflow_flow_record = (const struct sflow_flow_record_t *)tptr;
 
-       /* so, the funky encoding means we cannot blythly mask-off
+       /* so, the funky encoding means we cannot blithely mask-off
           bits, we must also check the enterprise. */
 
        enterprise = GET_BE_U_4(sflow_flow_record->format);

diff --git a/print-snmp.c b/print-snmp.c
index d05a5d383dd413b45d5dd67654ad1734147545e7..7301e345316bb1c6924f8d4eec81d574209b0a8a 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -1090,7 +1090,7 @@ smi_print_value(netdissect_options *ndo,
        }
 
        if (NOTIFY_CLASS(pduid) && smiNode->access < SMI_ACCESS_NOTIFY) {
-           ND_PRINT("[notNotifyable]");
+           ND_PRINT("[notNotifiable]");
        }
 
        if (READ_CLASS(pduid) && smiNode->access < SMI_ACCESS_READ_ONLY) {

diff --git a/print-telnet.c b/print-telnet.c
index ea7464f0dc4de500b93fed19678caf1b64731448..1dc6f1c5d0d1e9fe4802cd2c74763de7e9b5c9df 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -117,7 +117,7 @@ static const char *telcmds[] = {
 #define TELOPT_NAOVTS  14      /* negotiate about vertical tab stops */
 #define TELOPT_NAOVTD  15      /* negotiate about vertical tab disposition */
 #define TELOPT_NAOLFD  16      /* negotiate about output LF disposition */
-#define TELOPT_XASCII  17      /* extended ascic character set */
+#define TELOPT_XASCII  17      /* extended ascii character set */
 #define        TELOPT_LOGOUT   18      /* force logout */
 #define        TELOPT_BM       19      /* byte macro */
 #define        TELOPT_DET      20      /* data entry terminal */

diff --git a/tcpdump.1.in b/tcpdump.1.in
index 9c720d04acef4bd9c0fb5c0c1f6fcc270eab0e23..79be0344835edd45ab56c2e13a9da73a785c80f8 100644 (file)
--- a/tcpdump.1.in
+++ b/tcpdump.1.in
@@ -407,7 +407,7 @@ which should include a time format as defined by
 .BR strftime (3).
 If no time format is specified, each new file will overwrite the previous.
 Whenever a generated filename is not unique, tcpdump will overwrite the
-pre-existing data; providing a time specification that is coarser than the
+preexisting data; providing a time specification that is coarser than the
 capture period is therefore not advised.
 .IP
 If used in conjunction with the
@@ -1680,7 +1680,7 @@ The op (Query) and response code
 (NoError) were omitted, as was the class (C_IN) of the A record.
 .LP
 In the second example, \fIhelios\fP responds to query 2 with a
-response code of non-existent domain (NXDomain) with no answers,
+response code of nonexistent domain (NXDomain) with no answers,
 one name server and no authority records.
 The `*' indicates that
 the \fIauthoritative answer\fP bit was set.

diff --git a/tcpdump.c b/tcpdump.c
index 7cdbd8af4bc54622039710b475593d32db5fa05c..e8c6b816281b63df089014c67f62af51ba097355 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -808,7 +808,7 @@ droproot(const char *username, const char *chroot_dir)
        } else
                error("Couldn't find user '%.32s'", username);
 #ifdef HAVE_LIBCAP_NG
-       /* We don't need CAP_SETUID, CAP_SETGID and CAP_SYS_CHROOT any more. */
+       /* We don't need CAP_SETUID, CAP_SETGID and CAP_SYS_CHROOT anymore. */
 DIAG_OFF_ASSIGN_ENUM
        capng_updatev(
                CAPNG_DROP,
@@ -979,7 +979,7 @@ tstamp_precision_to_string(int precision)
  * along the lines of ioctl(), the fact that ioctl() operations are
  * largely specific to particular character devices but fcntl() operations
  * are either generic to all descriptors or generic to all descriptors for
- * regular files nonwithstanding.
+ * regular files notwithstanding.
  *
  * The Capsicum people decided that fine-grained control of descriptor
  * operations was required, so that you need to grant permission for