Fix spaces before tabs in indentation

diff --git a/CHANGES b/CHANGES
index 0383cbdced533d3845208766f28c008458bd242d..10a48e3de5407986045bc8916fef918b326ec8e8 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -915,7 +915,7 @@ Mon.    September 10, 2007.  [email protected].  Summary for 3.9.8 tcpdump relea
 
 Wed.   July 23, 2007.  [email protected].  Summary for 3.9.7 libpcap release
 
 
 Wed.   July 23, 2007.  [email protected].  Summary for 3.9.7 libpcap release
 

-       NFS: Print unsigned values as such.
+       NFS: Print unsigned values as such.

        RX: parse safely.
        BGP: fixes for IPv6-less builds.
        801.1ag: use standard codepoint.
        RX: parse safely.
        BGP: fixes for IPv6-less builds.
        801.1ag: use standard codepoint.


@@ -987,7 +987,7 @@ Tue.        September 19, 2006. [email protected]. Summary for 3.9.5 tcpdump release
        Lots of minor cosmetic changes to output printers
 
 
        Lots of minor cosmetic changes to output printers
 
 

-Mon.   September 19, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
+Mon.   September 19, 2005.  [email protected]. Summary for 3.9.4 tcpdump release

        Decoder support for more Juniper link-layer types
        Fix a potential buffer overflow (although it can't occur in
                practice).
        Decoder support for more Juniper link-layer types
        Fix a potential buffer overflow (although it can't occur in
                practice).


@@ -1006,7 +1006,7 @@ Mon.      September 19, 2005.  [email protected]. Summary for 3.9.4 tcpdump release
                those TLVs as system IDs, not as node IDs.
        Support for DCCP.
 
                those TLVs as system IDs, not as node IDs.
        Support for DCCP.
 

-Tue.   July 5, 2005.  [email protected]. Summary for 3.9.3 tcpdump release
+Tue.   July 5, 2005.  [email protected]. Summary for 3.9.3 tcpdump release

 
        Option to chroot() when dropping privs
        Fixes for compiling on nearly every platform,
 
        Option to chroot() when dropping privs
        Fixes for compiling on nearly every platform,

diff --git a/Makefile.in b/Makefile.in
index a8323d3cbc887b4436e88de88ef7d5818f347e35..05fdd25569133dafa4f06a9884041033c46c6a07 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1,5 +1,5 @@
 #  Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997
 #  Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997

-#      The Regents of the University of California.  All rights reserved.
+#      The Regents of the University of California.  All rights reserved.

 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that: (1) source code distributions
 #
 #  Redistribution and use in source and binary forms, with or without
 #  modification, are permitted provided that: (1) source code distributions

diff --git a/README.md b/README.md
index a1f2ee6c2a8bc73738cce9ce1bce9e252a34a31b..566b7b7a874fa7fc719acb35d152725359291dc2 100644 (file)
--- a/README.md
+++ b/README.md
@@ -58,7 +58,7 @@ LBL.  To insure that there would be no vestige of proprietary code in
 tcpdump, Steve wrote these pieces from the specification given by the
 manual entry, with no access to the source of tcpdump or etherfind.
 ```text
 tcpdump, Steve wrote these pieces from the specification given by the
 manual entry, with no access to the source of tcpdump or etherfind.
 ```text

-formerly from  Lawrence Berkeley National Laboratory
+formerly from  Lawrence Berkeley National Laboratory

                Network Research Group <[email protected]>
                ftp://ftp.ee.lbl.gov/old/tcpdump.tar.Z (3.4)
 ```
                Network Research Group <[email protected]>
                ftp://ftp.ee.lbl.gov/old/tcpdump.tar.Z (3.4)
 ```

diff --git a/addrtostr.c b/addrtostr.c
index 62cc298ae28a0aaa7b501dd0bb71ca00fb8d123c..c3bdb8af342cb9585d5ce7cbccab29f7b04920fb 100644 (file)
--- a/addrtostr.c
+++ b/addrtostr.c
@@ -71,7 +71,7 @@ addrtostr (const void *src, char *dst, size_t size)
        return NULL;
     }
     for (i = 0; i < 4; ++i) {
        return NULL;
     }
     for (i = 0; i < 4; ++i) {

-       int n = *srcaddr++;
+       int n = *srcaddr++;

        int non_zerop = 0;
 
        if (non_zerop || n / 100 > 0) {
        int non_zerop = 0;
 
        if (non_zerop || n / 100 > 0) {


@@ -167,7 +167,7 @@ addrtostr6 (const void *src, char *dst, size_t size)
     if (best.base != -1 && i >= best.base && i < (best.base + best.len))
     {
       if (i == best.base)
     if (best.base != -1 && i >= best.base && i < (best.base + best.len))
     {
       if (i == best.base)

-        APPEND_CHAR(':');
+         APPEND_CHAR(':');

       continue;
     }
 
       continue;
     }
 

diff --git a/atime.awk b/atime.awk
index b42dec24018682e088d62be0202566f974ec4561..fa1c7a18715e5c8f7090938caea34edac6fbe095 100644 (file)
--- a/atime.awk
+++ b/atime.awk
@@ -1,4 +1,4 @@
-$6 ~ /^ack/ && $5 !~ /[SFR]/   {
+$6 ~ /^ack/ && $5 !~ /[SFR]/   {

        # given a tcpdump ftp trace, output one line for each ack
        # in the form
        #   <ack time> <seq no>
        # given a tcpdump ftp trace, output one line for each ack
        # in the form
        #   <ack time> <seq no>

diff --git a/chdlc.h b/chdlc.h
index d5a2d915eada8cf489ffb07e3ede20dd88e1d65d..14bdb258cf011b862921c179957a1359ea847052 100644 (file)
--- a/chdlc.h
+++ b/chdlc.h
@@ -19,7 +19,7 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 

-#define CHDLC_HDRLEN           4
+#define CHDLC_HDRLEN           4

 #define CHDLC_UNICAST          0x0f
 #define CHDLC_BCAST            0x8f
 #define CHDLC_TYPE_SLARP       0x8035
 #define CHDLC_UNICAST          0x0f
 #define CHDLC_BCAST            0x8f
 #define CHDLC_TYPE_SLARP       0x8035

diff --git a/ethertype.h b/ethertype.h
index 8f8acff0459753da2d4f17e2e31fee44f82fc1c1..8b71b3025523b0f04eac8f4d5a40a958bf302ca5 100644 (file)
--- a/ethertype.h
+++ b/ethertype.h
@@ -174,16 +174,16 @@
 #define ETHERTYPE_LLDP          0x88cc
 #endif
 #ifndef ETHERTYPE_EAPOL
 #define ETHERTYPE_LLDP          0x88cc
 #endif
 #ifndef ETHERTYPE_EAPOL

-#define ETHERTYPE_EAPOL        0x888e
+#define ETHERTYPE_EAPOL                0x888e

 #endif
 #ifndef ETHERTYPE_REALTEK
 #endif
 #ifndef ETHERTYPE_REALTEK

-#define ETHERTYPE_REALTEK      0x8899  /* Realtek layer 2 protocols and switch tags */
+#define ETHERTYPE_REALTEK      0x8899  /* Realtek layer 2 protocols and switch tags */

 #endif
 #ifndef ETHERTYPE_AOE
 #endif
 #ifndef ETHERTYPE_AOE

-#define ETHERTYPE_AOE                  0x88a2
+#define ETHERTYPE_AOE          0x88a2

 #endif
 #ifndef ETHERTYPE_PTP
 #endif
 #ifndef ETHERTYPE_PTP

-#define ETHERTYPE_PTP                  0x88f7
+#define ETHERTYPE_PTP          0x88f7

 #endif
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000
 #endif
 #ifndef        ETHERTYPE_LOOPBACK
 #define        ETHERTYPE_LOOPBACK      0x9000

diff --git a/ip6.h b/ip6.h
index 28725d05eff971a9d0fc9898a03f230bdd71012c..f927d204ebc559126d2544d82d872fa6317a2543 100644 (file)
--- a/ip6.h
+++ b/ip6.h
@@ -1,4 +1,4 @@
-/*     NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp      */
+/*     NetBSD: ip6.h,v 1.9 2000/07/13 05:34:21 itojun Exp      */

 /*     $KAME: ip6.h,v 1.9 2000/07/02 21:01:32 itojun Exp $     */
 
 /*
 /*     $KAME: ip6.h,v 1.9 2000/07/02 21:01:32 itojun Exp $     */
 
 /*


@@ -136,7 +136,7 @@ struct ip6_dest {
 #define IP6OPT_RTALERT_LEN     4
 #define IP6OPT_RTALERT_MLD     0       /* Datagram contains an MLD message */
 #define IP6OPT_RTALERT_RSVP    1       /* Datagram contains an RSVP message */
 #define IP6OPT_RTALERT_LEN     4
 #define IP6OPT_RTALERT_MLD     0       /* Datagram contains an MLD message */
 #define IP6OPT_RTALERT_RSVP    1       /* Datagram contains an RSVP message */

-#define IP6OPT_RTALERT_ACTNET  2       /* contains an Active Networks msg */
+#define IP6OPT_RTALERT_ACTNET  2       /* contains an Active Networks msg */

 #define IP6OPT_MINLEN          2
 
 #define IP6OPT_QUICK_START     0x26    /* 00 1 00110 */
 #define IP6OPT_MINLEN          2
 
 #define IP6OPT_QUICK_START     0x26    /* 00 1 00110 */

diff --git a/ipproto.h b/ipproto.h
index baec4bdc246d59a90db9d723a0a9dc28bea21057..30be911eba5e8e7f7a251f7525631a78cd1f36b4 100644 (file)
--- a/ipproto.h
+++ b/ipproto.h
@@ -78,7 +78,7 @@ extern const char *netdb_protoname (const uint8_t);
 #define IPPROTO_FRAGMENT       44              /* IPv6 fragmentation header */
 #endif
 #ifndef IPPROTO_RSVP
 #define IPPROTO_FRAGMENT       44              /* IPv6 fragmentation header */
 #endif
 #ifndef IPPROTO_RSVP

-#define IPPROTO_RSVP           46              /* resource reservation */
+#define IPPROTO_RSVP           46              /* resource reservation */

 #endif
 #ifndef IPPROTO_GRE
 #define        IPPROTO_GRE             47              /* General Routing Encap. */
 #endif
 #ifndef IPPROTO_GRE
 #define        IPPROTO_GRE             47              /* General Routing Encap. */

diff --git a/missing/getopt_long.c b/missing/getopt_long.c
index 927028ffc34d75a61aa02f326d8632dda50a71e8..ece0006235344270a561fbccf2e7e5870fd940cf 100644 (file)
--- a/missing/getopt_long.c
+++ b/missing/getopt_long.c
@@ -70,7 +70,7 @@
 /* return values */
 #define        BADCH           (int)'?'
 #define        BADARG          ((*options == ':') ? (int)':' : (int)'?')
 /* return values */
 #define        BADCH           (int)'?'
 #define        BADARG          ((*options == ':') ? (int)':' : (int)'?')

-#define        INORDER         (int)1
+#define        INORDER         (int)1

 
 #define        EMSG            ""
 
 
 #define        EMSG            ""
 

diff --git a/missing/strlcat.c b/missing/strlcat.c
index f41207be3630f78864a58d6cda07773d2811cba1..fab7d04f3e8ee03cb34587ca6c865fa13b600993 100644 (file)
--- a/missing/strlcat.c
+++ b/missing/strlcat.c
@@ -1,5 +1,5 @@
 /*     $NetBSD: strlcat.c,v 1.5 1999/09/20 04:39:47 lukem Exp $        */
 /*     $NetBSD: strlcat.c,v 1.5 1999/09/20 04:39:47 lukem Exp $        */

-/*     from OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp   */
+/*     from OpenBSD: strlcat.c,v 1.2 1999/06/17 16:28:58 millert Exp   */

 
 /*
  * Copyright (c) 1998 Todd C. Miller <[email protected]>
 
 /*
  * Copyright (c) 1998 Todd C. Miller <[email protected]>

diff --git a/missing/strlcpy.c b/missing/strlcpy.c
index 2dc51b96295ae3e00f1f80a4aefbf8a3e6dc3cdf..9a0b6e6a54b7c8393b6ed3cf5983e5d483086708 100644 (file)
--- a/missing/strlcpy.c
+++ b/missing/strlcpy.c
@@ -1,5 +1,5 @@
 /*     $NetBSD: strlcpy.c,v 1.5 1999/09/20 04:39:47 lukem Exp $        */
 /*     $NetBSD: strlcpy.c,v 1.5 1999/09/20 04:39:47 lukem Exp $        */

-/*     from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp   */
+/*     from OpenBSD: strlcpy.c,v 1.4 1999/05/01 18:56:41 millert Exp   */

 
 /*
  * Copyright (c) 1998 Todd C. Miller <[email protected]>
 
 /*
  * Copyright (c) 1998 Todd C. Miller <[email protected]>

diff --git a/nfs.h b/nfs.h
index 76747f18c52081f4338ea41f3538847126b11fb7..87ba1a7184e8e8814ff139575736757989b106df 100644 (file)
--- a/nfs.h
+++ b/nfs.h
@@ -1,4 +1,4 @@
-/*     NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp        */
+/*     NetBSD: nfs.h,v 1.1 1996/05/23 22:49:53 fvdl Exp        */

 
 /*
  * Copyright (c) 1989, 1993
 
 /*
  * Copyright (c) 1989, 1993


@@ -120,8 +120,8 @@
 #define NFSX_V3SATTR           60      /* max. all fields filled in */
 #define NFSX_V3POSTOPATTR      (NFSX_V3FATTR + NFSX_UNSIGNED)
 #define NFSX_V3WCCDATA         (NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)
 #define NFSX_V3SATTR           60      /* max. all fields filled in */
 #define NFSX_V3POSTOPATTR      (NFSX_V3FATTR + NFSX_UNSIGNED)
 #define NFSX_V3WCCDATA         (NFSX_V3POSTOPATTR + 8 * NFSX_UNSIGNED)

-#define NFSX_V3COOKIEVERF      8
-#define NFSX_V3WRITEVERF       8
+#define NFSX_V3COOKIEVERF      8
+#define NFSX_V3WRITEVERF       8

 #define NFSX_V3CREATEVERF      8
 #define NFSX_V3STATFS          52
 #define NFSX_V3FSINFO          48
 #define NFSX_V3CREATEVERF      8
 #define NFSX_V3STATFS          52
 #define NFSX_V3FSINFO          48

diff --git a/print-802_11.c b/print-802_11.c
index d52a0338b1e7e37b6d95fccf41830923b9574612..ca49e09edca5fda9296ad7061c2bbc9dc9d919a1 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -959,8 +959,8 @@ static const char *status_text[] = {
        "Reserved",                                                                     /* 69 */
        "Reserved",                                                                     /* 70 */
        "Reserved",                                                                     /* 71 */
        "Reserved",                                                                     /* 69 */
        "Reserved",                                                                     /* 70 */
        "Reserved",                                                                     /* 71 */

-       "Invalid contents of RSNE",                             /* 72 */
-       "U-APSD coexistence is not supported",          /* 73 */
+       "Invalid contents of RSNE",                             /* 72 */
+       "U-APSD coexistence is not supported",          /* 73 */

        "Requested U-APSD coexistence mode is not supported", /* 74 */
        "Requested Interval/Duration value cannot be "
          "supported with U-APSD coexistence",          /* 75 */
        "Requested U-APSD coexistence mode is not supported", /* 74 */
        "Requested Interval/Duration value cannot be "
          "supported with U-APSD coexistence",          /* 75 */


@@ -1007,7 +1007,7 @@ static const char *status_text[] = {
          "Spectrum Management field is unacceptable", /* 103 */
        "Association denied because the requesting STA "
          "does not support VHT features",                      /* 104 */
          "Spectrum Management field is unacceptable", /* 103 */
        "Association denied because the requesting STA "
          "does not support VHT features",                      /* 104 */

-       "Enablement denied",                                            /* 105 */
+       "Enablement denied",                                            /* 105 */

        "Enablement denied due to restriction from an "
          "authorized GDB",                                                     /* 106 */
        "Authorization deenabled",                                      /* 107 */
        "Enablement denied due to restriction from an "
          "authorized GDB",                                                     /* 106 */
        "Authorization deenabled",                                      /* 107 */

diff --git a/print-802_15_4.c b/print-802_15_4.c
index 1895be7ca19b9a8a420ffb0fd3c4723088180d2a..fd75b159562205fc91f383c629cf37488e908aab 100644 (file)
--- a/print-802_15_4.c
+++ b/print-802_15_4.c
@@ -1,7 +1,7 @@
 /*
  * Copyright (c) 2009
 /*
  * Copyright (c) 2009

- *     Siemens AG, All rights reserved.
- *     Dmitry Eremin-Solenikov ([email protected])
+ *     Siemens AG, All rights reserved.
+ *     Dmitry Eremin-Solenikov ([email protected])

  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code distributions


@@ -41,13 +41,13 @@
 /* Frame types from Table 7-1 of 802.15.4-2015 */
 static const char *ftypes[] = {
        "Beacon",                       /* 0 */
 /* Frame types from Table 7-1 of 802.15.4-2015 */
 static const char *ftypes[] = {
        "Beacon",                       /* 0 */

-       "Data",                         /* 1 */
+       "Data",                         /* 1 */

        "ACK",                          /* 2 */
        "Command",                      /* 3 */
        "Reserved",                     /* 4 */
        "Multipurpose",                 /* 5 */
        "Fragment",                     /* 6 */
        "ACK",                          /* 2 */
        "Command",                      /* 3 */
        "Reserved",                     /* 4 */
        "Multipurpose",                 /* 5 */
        "Fragment",                     /* 6 */

-       "Extended"                      /* 7 */
+       "Extended"                      /* 7 */

 };
 
 /* Element IDs for Header IEs from Table 7-7 of 802.15.4-2015 */
 };
 
 /* Element IDs for Header IEs from Table 7-7 of 802.15.4-2015 */


@@ -87,15 +87,15 @@ static const char *h_ie_names[] = {
        "Reserved 0x20",                                /* 0x20 */
        "Extended DSME PAN descriptor IE",              /* 0x21 */
        "Fragment Sequence Context Description IE",     /* 0x22 */
        "Reserved 0x20",                                /* 0x20 */
        "Extended DSME PAN descriptor IE",              /* 0x21 */
        "Fragment Sequence Context Description IE",     /* 0x22 */

-       "Simplified Superframe Specification IE",       /* 0x23 */
-       "Simplified GTS Specification IE",              /* 0x24 */
-       "LECIM Capabilities IE",                        /* 0x25 */
-       "TRLE Descriptor IE",                           /* 0x26 */
-       "RCC Capabilities IE",                          /* 0x27 */
-       "RCCN Descriptor IE",                           /* 0x28 */
-       "Global Time IE",                               /* 0x29 */
-       "Omnibus Header IE",                            /* 0x2a */
-       "DA IE",                                        /* 0x2b */
+       "Simplified Superframe Specification IE",       /* 0x23 */
+       "Simplified GTS Specification IE",              /* 0x24 */
+       "LECIM Capabilities IE",                        /* 0x25 */
+       "TRLE Descriptor IE",                           /* 0x26 */
+       "RCC Capabilities IE",                          /* 0x27 */
+       "RCCN Descriptor IE",                           /* 0x28 */
+       "Global Time IE",                               /* 0x29 */
+       "Omnibus Header IE",                            /* 0x2a */
+       "DA IE",                                        /* 0x2b */

        "Reserved 0x2c",                                /* 0x2c */
        "Reserved 0x2d",                                /* 0x2d */
        "Reserved 0x2e",                                /* 0x2e */
        "Reserved 0x2c",                                /* 0x2c */
        "Reserved 0x2d",                                /* 0x2d */
        "Reserved 0x2e",                                /* 0x2e */


@@ -179,7 +179,7 @@ static const char *h_ie_names[] = {
        "Reserved 0x7c",                                /* 0x7c */
        "Reserved 0x7d",                                /* 0x7d */
        "Header Termination 1 IE",                      /* 0x7e */
        "Reserved 0x7c",                                /* 0x7c */
        "Reserved 0x7d",                                /* 0x7d */
        "Header Termination 1 IE",                      /* 0x7e */

-       "Header Termination 2 IE"                       /* 0x7f */
+       "Header Termination 2 IE"                       /* 0x7f */

 };
 
 /* Payload IE Group IDs from Table 7-15 of 802.15.4-2015 */
 };
 
 /* Payload IE Group IDs from Table 7-15 of 802.15.4-2015 */


@@ -199,7 +199,7 @@ static const char *p_ie_names[] = {
        "Reserved 0x0c",                /* 0x0c */
        "Reserved 0x0d",                /* 0x0d */
        "Reserved 0x0e",                /* 0x0e */
        "Reserved 0x0c",                /* 0x0c */
        "Reserved 0x0d",                /* 0x0d */
        "Reserved 0x0e",                /* 0x0e */

-       "List termination"              /* 0x0f */
+       "List termination"              /* 0x0f */

 };
 
 /* Sub-ID for short format from Table 7-16 of 802.15.4-2015 */
 };
 
 /* Sub-ID for short format from Table 7-16 of 802.15.4-2015 */


@@ -239,15 +239,15 @@ static const char *p_mlme_short_names[] = {
        "All MAC Metrics IE",                           /* 0x20 */
        "Coexistence Specification IE",                 /* 0x21 */
        "SUN Device Capabilities IE",                   /* 0x22 */
        "All MAC Metrics IE",                           /* 0x20 */
        "Coexistence Specification IE",                 /* 0x21 */
        "SUN Device Capabilities IE",                   /* 0x22 */

-       "SUN FSK Generic PHY IE",                       /* 0x23 */
-       "Mode Switch Parameter IE",                     /* 0x24 */
-       "PHY Parameter Change IE",                      /* 0x25 */
-       "O-QPSK PHY Mode IE",                           /* 0x26 */
-       "PCA Allocation IE",                            /* 0x27 */
-       "LECIM DSSS Operating Mode IE",                 /* 0x28 */
-       "LECIM FSK Operating Mode IE",                  /* 0x29 */
-       "Reserved 0x2a",                                /* 0x2a */
-       "TVWS PHY Operating Mode Description IE",       /* 0x2b */
+       "SUN FSK Generic PHY IE",                       /* 0x23 */
+       "Mode Switch Parameter IE",                     /* 0x24 */
+       "PHY Parameter Change IE",                      /* 0x25 */
+       "O-QPSK PHY Mode IE",                           /* 0x26 */
+       "PCA Allocation IE",                            /* 0x27 */
+       "LECIM DSSS Operating Mode IE",                 /* 0x28 */
+       "LECIM FSK Operating Mode IE",                  /* 0x29 */
+       "Reserved 0x2a",                                /* 0x2a */
+       "TVWS PHY Operating Mode Description IE",       /* 0x2b */

        "TVWS Device Capabilities IE",                  /* 0x2c */
        "TVWS Device Category IE",                      /* 0x2d */
        "TVWS Device Identiication IE",                 /* 0x2e */
        "TVWS Device Capabilities IE",                  /* 0x2c */
        "TVWS Device Category IE",                      /* 0x2d */
        "TVWS Device Identiication IE",                 /* 0x2e */


@@ -331,7 +331,7 @@ static const char *p_mlme_short_names[] = {
        "Reserved 0x7c",                                /* 0x7c */
        "Reserved 0x7d",                                /* 0x7d */
        "Reserved 0x7e",                                /* 0x7e */
        "Reserved 0x7c",                                /* 0x7c */
        "Reserved 0x7d",                                /* 0x7d */
        "Reserved 0x7e",                                /* 0x7e */

-       "Reserved 0x7f"                                 /* 0x7f */
+       "Reserved 0x7f"                                 /* 0x7f */

 };
 
 /* Sub-ID for long format from Table 7-17 of 802.15.4-2015 */
 };
 
 /* Sub-ID for long format from Table 7-17 of 802.15.4-2015 */


@@ -351,7 +351,7 @@ static const char *p_mlme_long_names[] = {
        "Reserved 0x0c",                        /* 0x0c */
        "Reserved 0x0d",                        /* 0x0d */
        "Reserved 0x0e",                        /* 0x0e */
        "Reserved 0x0c",                        /* 0x0c */
        "Reserved 0x0d",                        /* 0x0d */
        "Reserved 0x0e",                        /* 0x0e */

-       "Reserved 0x0f"                         /* 0x0f */
+       "Reserved 0x0f"                         /* 0x0f */

 };
 
 /* MAC commands from Table 7-49 of 802.15.4-2015 */
 };
 
 /* MAC commands from Table 7-49 of 802.15.4-2015 */


@@ -390,20 +390,20 @@ static const char *mac_c_names[] = {
        "Reserved 0x1f",                                /* 0x1f */
        "RIT Data Request command",                     /* 0x20 */
        "DBS Request command",                          /* 0x21 */
        "Reserved 0x1f",                                /* 0x1f */
        "RIT Data Request command",                     /* 0x20 */
        "DBS Request command",                          /* 0x21 */

-       "DBS Response command",                         /* 0x22 */
-       "RIT Data Response command",                    /* 0x23 */
-       "Vendor Specific command",                      /* 0x24 */
-       "Reserved 0x25",                                /* 0x25 */
-       "Reserved 0x26",                                /* 0x26 */
-       "Reserved 0x27",                                /* 0x27 */
-       "Reserved 0x28",                                /* 0x28 */
-       "Reserved 0x29",                                /* 0x29 */
-       "Reserved 0x2a",                                /* 0x2a */
-       "Reserved 0x2b",                                /* 0x2b */
+       "DBS Response command",                         /* 0x22 */
+       "RIT Data Response command",                    /* 0x23 */
+       "Vendor Specific command",                      /* 0x24 */
+       "Reserved 0x25",                                /* 0x25 */
+       "Reserved 0x26",                                /* 0x26 */
+       "Reserved 0x27",                                /* 0x27 */
+       "Reserved 0x28",                                /* 0x28 */
+       "Reserved 0x29",                                /* 0x29 */
+       "Reserved 0x2a",                                /* 0x2a */
+       "Reserved 0x2b",                                /* 0x2b */

        "Reserved 0x2c",                                /* 0x2c */
        "Reserved 0x2d",                                /* 0x2d */
        "Reserved 0x2e",                                /* 0x2e */
        "Reserved 0x2c",                                /* 0x2c */
        "Reserved 0x2d",                                /* 0x2d */
        "Reserved 0x2e",                                /* 0x2e */

-       "Reserved 0x2f"                         /* 0x2f */
+       "Reserved 0x2f"                                 /* 0x2f */

 };
 
 /*
 };
 
 /*

diff --git a/print-ascii.c b/print-ascii.c
index 64b40424333fe7daefde0a74e33d647ee622cee1..27cf2df1d07441def5442f2e5ba8fe66d5dd2fc9 100644 (file)
--- a/print-ascii.c
+++ b/print-ascii.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */
+/*     $NetBSD: print-ascii.c,v 1.1 1999/09/30 14:49:12 sjg Exp $      */

 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.

diff --git a/print-bgp.c b/print-bgp.c
index c4c79b2d591ffef0b8d8560e7f8167372d927a4e..2c088c0151de0ba72752d841dcdf763282d7ae61 100644 (file)
--- a/print-bgp.c
+++ b/print-bgp.c
@@ -2330,8 +2330,8 @@ bgp_attr_print(netdissect_options *ndo,
             ND_PRINT("\n\t    %u SNPA", snpa);
             for (/*nothing*/; snpa != 0; snpa--) {
                 uint8_t snpalen;
             ND_PRINT("\n\t    %u SNPA", snpa);
             for (/*nothing*/; snpa != 0; snpa--) {
                 uint8_t snpalen;

-               if (tlen < 1)
-                   goto trunc;
+               if (tlen < 1)
+                   goto trunc;

                 snpalen = GET_U_1(tptr);
                 ND_PRINT("\n\t      %u bytes", snpalen);
                 tptr++;
                 snpalen = GET_U_1(tptr);
                 ND_PRINT("\n\t      %u bytes", snpalen);
                 tptr++;

diff --git a/print-bootp.c b/print-bootp.c
index 8449f0ff9ade8f7857bd311eb94fc0186a0ac296..d5418d976b41dc1b197c374761fb4a43db9032f9 100644 (file)
--- a/print-bootp.c
+++ b/print-bootp.c
@@ -211,8 +211,8 @@ struct bootp {
 #define        TAG_CLIENT_GUID         ((uint8_t)  97)
 #define        TAG_LDAP_URL            ((uint8_t)  95)
 /* RFC 4833, TZ codes */
 #define        TAG_CLIENT_GUID         ((uint8_t)  97)
 #define        TAG_LDAP_URL            ((uint8_t)  95)
 /* RFC 4833, TZ codes */

-#define        TAG_TZ_PCODE            ((uint8_t) 100)
-#define        TAG_TZ_TCODE            ((uint8_t) 101)
+#define        TAG_TZ_PCODE            ((uint8_t) 100)
+#define        TAG_TZ_TCODE            ((uint8_t) 101)

 #define        TAG_NETINFO_PARENT      ((uint8_t) 112)
 #define        TAG_NETINFO_PARENT_TAG  ((uint8_t) 113)
 #define        TAG_URL                 ((uint8_t) 114)
 #define        TAG_NETINFO_PARENT      ((uint8_t) 112)
 #define        TAG_NETINFO_PARENT_TAG  ((uint8_t) 113)
 #define        TAG_URL                 ((uint8_t) 114)


@@ -522,8 +522,8 @@ static const struct tok tag2str[] = {
        { TAG_CLIENT_NDI,       "bNDI" },       /* XXX 'b' */
        { TAG_CLIENT_GUID,      "bGUID" },      /* XXX 'b' */
        { TAG_LDAP_URL,         "aLDAP" },
        { TAG_CLIENT_NDI,       "bNDI" },       /* XXX 'b' */
        { TAG_CLIENT_GUID,      "bGUID" },      /* XXX 'b' */
        { TAG_LDAP_URL,         "aLDAP" },

-       { TAG_TZ_PCODE,         "aPOSIX-TZ" },
-       { TAG_TZ_TCODE,         "aTZ-Name" },
+       { TAG_TZ_PCODE,         "aPOSIX-TZ" },
+       { TAG_TZ_TCODE,         "aTZ-Name" },

        { TAG_NETINFO_PARENT,   "iNI" },
        { TAG_NETINFO_PARENT_TAG, "aNITAG" },
        { TAG_URL,              "aURL" },
        { TAG_NETINFO_PARENT,   "iNI" },
        { TAG_NETINFO_PARENT_TAG, "aNITAG" },
        { TAG_URL,              "aURL" },

diff --git a/print-domain.c b/print-domain.c
index dcfc9fd21c98b979b488ada95c3dda866c4e0f84..d2275a5e2a30efdff142b6185108f6874e8a9b27 100644 (file)
--- a/print-domain.c
+++ b/print-domain.c
@@ -517,13 +517,13 @@ const struct tok ns_type2str[] = {
        { T_CERT,       "CERT" },               /* RFC 4398 */
        { T_A6,         "A6" },                 /* RFC 6563 */
        { T_DNAME,      "DNAME" },              /* RFC 6672 */
        { T_CERT,       "CERT" },               /* RFC 4398 */
        { T_A6,         "A6" },                 /* RFC 6563 */
        { T_DNAME,      "DNAME" },              /* RFC 6672 */

-       { T_SINK,       "SINK" },
+       { T_SINK,       "SINK" },

        { T_OPT,        "OPT" },                /* RFC 6891 */
        { T_OPT,        "OPT" },                /* RFC 6891 */

-       { T_APL,        "APL" },                /* RFC 3123 */
+       { T_APL,        "APL" },                /* RFC 3123 */

        { T_DS,         "DS" },                 /* RFC 4034 */
        { T_SSHFP,      "SSHFP" },              /* RFC 4255 */
        { T_IPSECKEY,   "IPSECKEY" },           /* RFC 4025 */
        { T_DS,         "DS" },                 /* RFC 4034 */
        { T_SSHFP,      "SSHFP" },              /* RFC 4255 */
        { T_IPSECKEY,   "IPSECKEY" },           /* RFC 4025 */

-       { T_RRSIG,      "RRSIG" },              /* RFC 4034 */
+       { T_RRSIG,      "RRSIG" },              /* RFC 4034 */

        { T_NSEC,       "NSEC" },               /* RFC 4034 */
        { T_DNSKEY,     "DNSKEY" },             /* RFC 4034 */
        { T_DHCID,      "DHCID" },              /* RFC 4071 */
        { T_NSEC,       "NSEC" },               /* RFC 4034 */
        { T_DNSKEY,     "DNSKEY" },             /* RFC 4034 */
        { T_DHCID,      "DHCID" },              /* RFC 4071 */

diff --git a/print-eap.c b/print-eap.c
index e154165a455f88860f01f3843888c54c6983ae6d..78439b71c003dbf4a3ff559dba1322163b8a00b9 100644 (file)
--- a/print-eap.c
+++ b/print-eap.c
@@ -42,11 +42,11 @@ struct eap_frame_t {
 };
 
 static const struct tok eap_frame_type_values[] = {
 };
 
 static const struct tok eap_frame_type_values[] = {

-    { EAP_FRAME_TYPE_PACKET,           "EAP packet" },
-    { EAP_FRAME_TYPE_START,                    "EAPOL start" },
-    { EAP_FRAME_TYPE_LOGOFF,           "EAPOL logoff" },
-    { EAP_FRAME_TYPE_KEY,                      "EAPOL key" },
-    { EAP_FRAME_TYPE_ENCAP_ASF_ALERT,  "Encapsulated ASF alert" },
+    { EAP_FRAME_TYPE_PACKET,           "EAP packet" },
+    { EAP_FRAME_TYPE_START,            "EAPOL start" },
+    { EAP_FRAME_TYPE_LOGOFF,           "EAPOL logoff" },
+    { EAP_FRAME_TYPE_KEY,              "EAPOL key" },
+    { EAP_FRAME_TYPE_ENCAP_ASF_ALERT,  "Encapsulated ASF alert" },

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 


@@ -89,21 +89,21 @@ static const struct tok eap_type_values[] = {
     { EAP_TYPE_NO_PROPOSED,    "No proposed" },
     { EAP_TYPE_IDENTITY,       "Identity" },
     { EAP_TYPE_NOTIFICATION,    "Notification" },
     { EAP_TYPE_NO_PROPOSED,    "No proposed" },
     { EAP_TYPE_IDENTITY,       "Identity" },
     { EAP_TYPE_NOTIFICATION,    "Notification" },

-    { EAP_TYPE_NAK,            "Nak" },
+    { EAP_TYPE_NAK,            "Nak" },

     { EAP_TYPE_MD5_CHALLENGE,   "MD5-challenge" },
     { EAP_TYPE_MD5_CHALLENGE,   "MD5-challenge" },

-    { EAP_TYPE_OTP,            "OTP" },
-    { EAP_TYPE_GTC,            "GTC" },
-    { EAP_TYPE_TLS,            "TLS" },
-    { EAP_TYPE_SIM,            "SIM" },
-    { EAP_TYPE_TTLS,           "TTLS" },
-    { EAP_TYPE_AKA,            "AKA" },
-    { EAP_TYPE_FAST,           "FAST" },
+    { EAP_TYPE_OTP,            "OTP" },
+    { EAP_TYPE_GTC,            "GTC" },
+    { EAP_TYPE_TLS,            "TLS" },
+    { EAP_TYPE_SIM,            "SIM" },
+    { EAP_TYPE_TTLS,           "TTLS" },
+    { EAP_TYPE_AKA,            "AKA" },
+    { EAP_TYPE_FAST,           "FAST" },

     { EAP_TYPE_EXPANDED_TYPES,  "Expanded types" },
     { EAP_TYPE_EXPERIMENTAL,    "Experimental" },
     { 0, NULL}
 };
 
     { EAP_TYPE_EXPANDED_TYPES,  "Expanded types" },
     { EAP_TYPE_EXPERIMENTAL,    "Experimental" },
     { 0, NULL}
 };
 

-#define EAP_TLS_EXTRACT_BIT_L(x)       (((x)&0x80)>>7)
+#define EAP_TLS_EXTRACT_BIT_L(x)       (((x)&0x80)>>7)

 
 /* RFC 5216 - EAP TLS bits */
 #define EAP_TLS_FLAGS_LEN_INCLUDED             (1 << 7)
 
 /* RFC 5216 - EAP TLS bits */
 #define EAP_TLS_FLAGS_LEN_INCLUDED             (1 << 7)

diff --git a/print-eigrp.c b/print-eigrp.c
index 7e374aa5c9f7c95d97c97c8b77fa9f56e595de0e..d4eced423779acfd01385be8b288f42b246fb348 100644 (file)
--- a/print-eigrp.c
+++ b/print-eigrp.c
@@ -311,7 +311,7 @@ eigrp_print(netdissect_options *ndo, const u_char *pptr, u_int len)
             tlv_ptr.eigrp_tlv_general_parm = (const struct eigrp_tlv_general_parm_t *)tlv_tptr;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_general_parm)) {
                 ND_PRINT(" (too short, < %zu)",
             tlv_ptr.eigrp_tlv_general_parm = (const struct eigrp_tlv_general_parm_t *)tlv_tptr;
             if (tlv_tlen < sizeof(*tlv_ptr.eigrp_tlv_general_parm)) {
                 ND_PRINT(" (too short, < %zu)",

-                        sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_general_parm));
+                        sizeof(struct eigrp_tlv_header) + sizeof(*tlv_ptr.eigrp_tlv_general_parm));

                 break;
             }
 
                 break;
             }
 

diff --git a/print-forces.c b/print-forces.c
index 03ea6074616b2780269f70a28c0ab29907e02055..e8d3af3d4ffd21c69616893a55f8e40888171c91 100644 (file)
--- a/print-forces.c
+++ b/print-forces.c
@@ -35,17 +35,17 @@
 #define TLV_HDRL       4
 #define ILV_HDRL       8
 
 #define TLV_HDRL       4
 #define ILV_HDRL       8
 

-#define TOM_RSVD       0x0
-#define TOM_ASSNSETUP  0x1
-#define TOM_ASSNTEARD  0x2
-#define TOM_CONFIG     0x3
-#define TOM_QUERY      0x4
-#define TOM_EVENTNOT   0x5
-#define TOM_PKTREDIR   0x6
-#define TOM_HEARTBT    0x0F
-#define TOM_ASSNSETREP         0x11
-#define TOM_CONFIGREP  0x13
-#define TOM_QUERYREP   0x14
+#define TOM_RSVD       0x0
+#define TOM_ASSNSETUP  0x1
+#define TOM_ASSNTEARD  0x2
+#define TOM_CONFIG     0x3
+#define TOM_QUERY      0x4
+#define TOM_EVENTNOT   0x5
+#define TOM_PKTREDIR   0x6
+#define TOM_HEARTBT    0x0F
+#define TOM_ASSNSETREP 0x11
+#define TOM_CONFIGREP  0x13
+#define TOM_QUERYREP   0x14

 
 /*
  * tom_h Flags: resv1(8b):maxtlvs(4b):resv2(2b):mintlv(2b)
 
 /*
  * tom_h Flags: resv1(8b):maxtlvs(4b):resv2(2b):mintlv(2b)


@@ -250,7 +250,7 @@ struct pathdata_h {
 };
 
 #define        B_FULLD         0x1
 };
 
 #define        B_FULLD         0x1

-#define        B_SPARD         0x2
+#define        B_SPARD         0x2

 #define B_RESTV                0x4
 #define B_KEYIN                0x8
 #define B_APPND                0x10
 #define B_RESTV                0x4
 #define B_KEYIN                0x8
 #define B_APPND                0x10

diff --git a/print-icmp6.c b/print-icmp6.c
index 050b0fecd82b3cb5a4dad21ace7f2588fad9bbe6..a45974da87ce9704147e4a314edbf67f37624e2c 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -41,7 +41,7 @@
 #include "udp.h"
 #include "ah.h"
 
 #include "udp.h"
 #include "ah.h"
 

-/*     NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp   */
+/*     NetBSD: icmp6.h,v 1.13 2000/08/03 16:30:37 itojun Exp   */

 /*     $KAME: icmp6.h,v 1.22 2000/08/03 15:25:16 jinmei Exp $  */
 
 /*
 /*     $KAME: icmp6.h,v 1.22 2000/08/03 15:25:16 jinmei Exp $  */
 
 /*


@@ -103,7 +103,7 @@ struct icmp6_hdr {
 #define ICMP6_ECHO_REQUEST             128     /* echo service */
 #define ICMP6_ECHO_REPLY               129     /* echo reply */
 #define ICMP6_MEMBERSHIP_QUERY         130     /* group membership query */
 #define ICMP6_ECHO_REQUEST             128     /* echo service */
 #define ICMP6_ECHO_REPLY               129     /* echo reply */
 #define ICMP6_MEMBERSHIP_QUERY         130     /* group membership query */

-#define MLD6_LISTENER_QUERY            130     /* multicast listener query */
+#define MLD6_LISTENER_QUERY            130     /* multicast listener query */

 #define ICMP6_MEMBERSHIP_REPORT                131     /* group membership report */
 #define MLD6_LISTENER_REPORT           131     /* multicast listener report */
 #define ICMP6_MEMBERSHIP_REDUCTION     132     /* group membership termination */
 #define ICMP6_MEMBERSHIP_REPORT                131     /* group membership report */
 #define MLD6_LISTENER_REPORT           131     /* multicast listener report */
 #define ICMP6_MEMBERSHIP_REDUCTION     132     /* group membership termination */


@@ -145,10 +145,10 @@ struct icmp6_hdr {
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */
 #define ICMP6_DST_UNREACH_NOPORT       4       /* port unreachable */
 
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */
 #define ICMP6_DST_UNREACH_NOPORT       4       /* port unreachable */
 

-#define ICMP6_TIME_EXCEED_TRANSIT      0       /* ttl==0 in transit */
+#define ICMP6_TIME_EXCEED_TRANSIT      0       /* ttl==0 in transit */

 #define ICMP6_TIME_EXCEED_REASSEMBLY   1       /* ttl==0 in reass */
 
 #define ICMP6_TIME_EXCEED_REASSEMBLY   1       /* ttl==0 in reass */
 

-#define ICMP6_PARAMPROB_HEADER                 0       /* erroneous header field */
+#define ICMP6_PARAMPROB_HEADER         0       /* erroneous header field */

 #define ICMP6_PARAMPROB_NEXTHEADER     1       /* unrecognized next header */
 #define ICMP6_PARAMPROB_OPTION         2       /* unrecognized option */
 #define ICMP6_PARAMPROB_FRAGHDRCHAIN   3       /* incomplete header chain */
 #define ICMP6_PARAMPROB_NEXTHEADER     1       /* unrecognized next header */
 #define ICMP6_PARAMPROB_OPTION         2       /* unrecognized option */
 #define ICMP6_PARAMPROB_FRAGHDRCHAIN   3       /* incomplete header chain */


@@ -193,7 +193,7 @@ struct mld6_hdr {
  */
 
 struct nd_router_solicit {     /* router solicitation */
  */
 
 struct nd_router_solicit {     /* router solicitation */

-       struct icmp6_hdr        nd_rs_hdr;
+       struct icmp6_hdr        nd_rs_hdr;

        /* could be followed by options */
 };
 
        /* could be followed by options */
 };
 


@@ -427,7 +427,7 @@ struct icmp6_router_renum { /* router renumbering header */
 #define rr_type                rr_hdr.icmp6_type
 #define rr_code                rr_hdr.icmp6_code
 #define rr_cksum       rr_hdr.icmp6_cksum
 #define rr_type                rr_hdr.icmp6_type
 #define rr_code                rr_hdr.icmp6_code
 #define rr_cksum       rr_hdr.icmp6_cksum

-#define rr_seqnum      rr_hdr.icmp6_data32[0]
+#define rr_seqnum      rr_hdr.icmp6_data32[0]

 
 struct rr_pco_match {          /* match prefix part */
        nd_uint8_t              rpm_code;
 
 struct rr_pco_match {          /* match prefix part */
        nd_uint8_t              rpm_code;


@@ -811,15 +811,15 @@ rpl_printopts(netdissect_options *ndo, const uint8_t *opts, u_int length)
                         optlen = 1;
                         ND_PRINT(" opt:pad1");
                 } else {
                         optlen = 1;
                         ND_PRINT(" opt:pad1");
                 } else {

-                       if (length < RPL_GENOPTION_LEN)
-                               goto trunc;
+                       if (length < RPL_GENOPTION_LEN)
+                               goto trunc;

                        optlen = GET_U_1(opt->rpl_dio_len)+RPL_GENOPTION_LEN;
                         ND_PRINT(" opt:%s len:%u ",
                                   tok2str(rpl_subopt_values, "subopt:%u", dio_type),
                                   optlen);
                         ND_TCHECK_LEN(opt, optlen);
                         if (length < optlen)
                        optlen = GET_U_1(opt->rpl_dio_len)+RPL_GENOPTION_LEN;
                         ND_PRINT(" opt:%s len:%u ",
                                   tok2str(rpl_subopt_values, "subopt:%u", dio_type),
                                   optlen);
                         ND_TCHECK_LEN(opt, optlen);
                         if (length < optlen)

-                               goto trunc;
+                               goto trunc;

                         if (ndo->ndo_vflag > 2) {
                                 hex_print(ndo,
                                           " ",
                         if (ndo->ndo_vflag > 2) {
                                 hex_print(ndo,
                                           " ",

diff --git a/print-krb.c b/print-krb.c
index 5ff121e09e6e6c9899967efad169f3e195c4f882..3072d66eb8c3d928c071b5088c7fb04f0d9701ab 100644 (file)
--- a/print-krb.c
+++ b/print-krb.c
@@ -207,7 +207,7 @@ krb4_print(netdissect_options *ndo,
        case AUTH_MSG_ERR_REPLY:
                if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
                        return;
        case AUTH_MSG_ERR_REPLY:
                if ((cp = krb4_print_hdr(ndo, cp)) == NULL)
                        return;

-               cp += 4;          /* timestamp */
+               cp += 4;          /* timestamp */

                ND_PRINT(" %s ", tok2str(kerr2str, NULL, KTOHSP(kp, cp)));
                cp += 4;
                PRINT;
                ND_PRINT(" %s ", tok2str(kerr2str, NULL, KTOHSP(kp, cp)));
                cp += 4;
                PRINT;

diff --git a/print-l2tp.c b/print-l2tp.c
index 892155058a97449cdda760aba21850cfe887d798..a5cc378b746a322d4a3b2e7f9459a5ab9ba2082a 100644 (file)
--- a/print-l2tp.c
+++ b/print-l2tp.c
@@ -88,7 +88,7 @@
 #define        L2TP_MSGTYPE_SLI        16 /* Set-Link-Info */
 
 static const struct tok l2tp_msgtype2str[] = {
 #define        L2TP_MSGTYPE_SLI        16 /* Set-Link-Info */
 
 static const struct tok l2tp_msgtype2str[] = {

-       { L2TP_MSGTYPE_SCCRQ,   "SCCRQ" },
+       { L2TP_MSGTYPE_SCCRQ,   "SCCRQ" },

        { L2TP_MSGTYPE_SCCRP,   "SCCRP" },
        { L2TP_MSGTYPE_SCCCN,   "SCCCN" },
        { L2TP_MSGTYPE_STOPCCN, "StopCCN" },
        { L2TP_MSGTYPE_SCCRP,   "SCCRP" },
        { L2TP_MSGTYPE_SCCCN,   "SCCCN" },
        { L2TP_MSGTYPE_STOPCCN, "StopCCN" },


@@ -114,17 +114,17 @@ static const struct tok l2tp_msgtype2str[] = {
 #define L2TP_AVP_FIRM_VER              6  /* Firmware Revision */
 #define L2TP_AVP_HOST_NAME             7  /* Host Name */
 #define L2TP_AVP_VENDOR_NAME           8  /* Vendor Name */
 #define L2TP_AVP_FIRM_VER              6  /* Firmware Revision */
 #define L2TP_AVP_HOST_NAME             7  /* Host Name */
 #define L2TP_AVP_VENDOR_NAME           8  /* Vendor Name */

-#define L2TP_AVP_ASSND_TUN_ID          9  /* Assigned Tunnel ID */
+#define L2TP_AVP_ASSND_TUN_ID          9  /* Assigned Tunnel ID */

 #define L2TP_AVP_RECV_WIN_SIZE         10 /* Receive Window Size */
 #define L2TP_AVP_CHALLENGE             11 /* Challenge */
 #define L2TP_AVP_Q931_CC               12 /* Q.931 Cause Code */
 #define L2TP_AVP_CHALLENGE_RESP                13 /* Challenge Response */
 #define L2TP_AVP_RECV_WIN_SIZE         10 /* Receive Window Size */
 #define L2TP_AVP_CHALLENGE             11 /* Challenge */
 #define L2TP_AVP_Q931_CC               12 /* Q.931 Cause Code */
 #define L2TP_AVP_CHALLENGE_RESP                13 /* Challenge Response */

-#define L2TP_AVP_ASSND_SESS_ID         14 /* Assigned Session ID */
-#define L2TP_AVP_CALL_SER_NUM          15 /* Call Serial Number */
+#define L2TP_AVP_ASSND_SESS_ID         14 /* Assigned Session ID */
+#define L2TP_AVP_CALL_SER_NUM          15 /* Call Serial Number */

 #define L2TP_AVP_MINIMUM_BPS           16 /* Minimum BPS */
 #define L2TP_AVP_MAXIMUM_BPS           17 /* Maximum BPS */
 #define L2TP_AVP_BEARER_TYPE           18 /* Bearer Type */
 #define L2TP_AVP_MINIMUM_BPS           16 /* Minimum BPS */
 #define L2TP_AVP_MAXIMUM_BPS           17 /* Maximum BPS */
 #define L2TP_AVP_BEARER_TYPE           18 /* Bearer Type */

-#define L2TP_AVP_FRAMING_TYPE          19 /* Framing Type */
+#define L2TP_AVP_FRAMING_TYPE          19 /* Framing Type */

 #define L2TP_AVP_PACKET_PROC_DELAY     20 /* Packet Processing Delay (OBSOLETE) */
 #define L2TP_AVP_CALLED_NUMBER         21 /* Called Number */
 #define L2TP_AVP_CALLING_NUMBER                22 /* Calling Number */
 #define L2TP_AVP_PACKET_PROC_DELAY     20 /* Packet Processing Delay (OBSOLETE) */
 #define L2TP_AVP_CALLED_NUMBER         21 /* Called Number */
 #define L2TP_AVP_CALLING_NUMBER                22 /* Calling Number */


@@ -144,7 +144,7 @@ static const struct tok l2tp_msgtype2str[] = {
 #define L2TP_AVP_RANDOM_VECTOR         36 /* Random Vector */
 #define L2TP_AVP_PRIVATE_GRP_ID                37 /* Private Group ID */
 #define L2TP_AVP_RX_CONN_SPEED         38 /* (Rx) Connect Speed */
 #define L2TP_AVP_RANDOM_VECTOR         36 /* Random Vector */
 #define L2TP_AVP_PRIVATE_GRP_ID                37 /* Private Group ID */
 #define L2TP_AVP_RX_CONN_SPEED         38 /* (Rx) Connect Speed */

-#define L2TP_AVP_SEQ_REQUIRED          39 /* Sequencing Required */
+#define L2TP_AVP_SEQ_REQUIRED          39 /* Sequencing Required */

 #define L2TP_AVP_PPP_DISCON_CC         46 /* PPP Disconnect Cause Code - RFC 3145 */
 
 static const struct tok l2tp_avp2str[] = {
 #define L2TP_AVP_PPP_DISCON_CC         46 /* PPP Disconnect Cause Code - RFC 3145 */
 
 static const struct tok l2tp_avp2str[] = {

diff --git a/print-lldp.c b/print-lldp.c
index a04f054ed48372655a849df00b09e61eb3ab762b..7895c1adb4a10e9c5440c4e7f94c64e396ad174e 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -143,7 +143,7 @@ static const struct tok lldp_cap_values[] = {
 #define LLDP_PRIVATE_8021_SUBTYPE_PFC_CONFIGURATION      11
 #define LLDP_PRIVATE_8021_SUBTYPE_APPLICATION_PRIORITY   12
 #define LLDP_PRIVATE_8021_SUBTYPE_EVB                    13
 #define LLDP_PRIVATE_8021_SUBTYPE_PFC_CONFIGURATION      11
 #define LLDP_PRIVATE_8021_SUBTYPE_APPLICATION_PRIORITY   12
 #define LLDP_PRIVATE_8021_SUBTYPE_EVB                    13

-#define LLDP_PRIVATE_8021_SUBTYPE_CDCP                          14
+#define LLDP_PRIVATE_8021_SUBTYPE_CDCP                  14

 
 static const struct tok lldp_8021_subtype_values[] = {
     { LLDP_PRIVATE_8021_SUBTYPE_PORT_VLAN_ID, "Port VLAN Id"},
 
 static const struct tok lldp_8021_subtype_values[] = {
     { LLDP_PRIVATE_8021_SUBTYPE_PORT_VLAN_ID, "Port VLAN Id"},


@@ -511,10 +511,10 @@ static const struct tok lldp_pmd_capability_values[] = {
 #define LLDP_MDI_PAIR_CONTROL_ABILITY          (1 <<  3)
 
 static const struct tok lldp_mdi_values[] = {
 #define LLDP_MDI_PAIR_CONTROL_ABILITY          (1 <<  3)
 
 static const struct tok lldp_mdi_values[] = {

-    { LLDP_MDI_PORT_CLASS,             "PSE"},
-    { LLDP_MDI_POWER_SUPPORT,          "supported"},
-    { LLDP_MDI_POWER_STATE,            "enabled"},
-    { LLDP_MDI_PAIR_CONTROL_ABILITY,   "can be controlled"},
+    { LLDP_MDI_PORT_CLASS,             "PSE"},
+    { LLDP_MDI_POWER_SUPPORT,          "supported"},
+    { LLDP_MDI_POWER_STATE,            "enabled"},
+    { LLDP_MDI_PAIR_CONTROL_ABILITY,   "can be controlled"},

     { 0, NULL}
 };
 
     { 0, NULL}
 };
 

diff --git a/print-lwres.c b/print-lwres.c
index 1c195a4d68795e07888968d1797d62449e7494b8..f6ed8f3cfd878dc1406556932910747216fd0fa6 100644 (file)
--- a/print-lwres.c
+++ b/print-lwres.c
@@ -182,7 +182,7 @@ static const struct tok opcode[] = {
        { LWRES_OPCODE_GETADDRSBYNAME,  "getaddrsbyname", },
        { LWRES_OPCODE_GETNAMEBYADDR,   "getnamebyaddr", },
        { LWRES_OPCODE_GETRDATABYNAME,  "getrdatabyname", },
        { LWRES_OPCODE_GETADDRSBYNAME,  "getaddrsbyname", },
        { LWRES_OPCODE_GETNAMEBYADDR,   "getnamebyaddr", },
        { LWRES_OPCODE_GETRDATABYNAME,  "getrdatabyname", },

-       { 0,                            NULL, },
+       { 0,                            NULL, },

 };
 
 /* print-domain.c */
 };
 
 /* print-domain.c */

diff --git a/print-mpls.c b/print-mpls.c
index 43ea1511faf71b5e4b22af48448e447d53663dcd..c9be496497626ebd5d15bd3a44032d7f8d32f69c 100644 (file)
--- a/print-mpls.c
+++ b/print-mpls.c
@@ -75,7 +75,7 @@ mpls_print(netdissect_options *ndo, const u_char *bp, u_int length)
                label_entry = GET_BE_U_4(p);
                ND_PRINT("%s(label %u",
                       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",
                label_entry = GET_BE_U_4(p);
                ND_PRINT("%s(label %u",
                       (label_stack_depth && ndo->ndo_vflag) ? "\n\t" : " ",

-                              MPLS_LABEL(label_entry));
+                       MPLS_LABEL(label_entry));

                label_stack_depth++;
                if (ndo->ndo_vflag &&
                    MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))
                label_stack_depth++;
                if (ndo->ndo_vflag &&
                    MPLS_LABEL(label_entry) < sizeof(mpls_labelname) / sizeof(mpls_labelname[0]))

diff --git a/print-ntp.c b/print-ntp.c
index f4ea80f611ae9d91cc24842c28e2d4d21cb6b670..d41f515218beb6ff995da398f1707eb5bfd6be34 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -177,7 +177,7 @@ static const struct tok ntp_leapind_values[] = {
 
 static const struct tok ntp_stratum_values[] = {
        { UNSPECIFIED,  "unspecified" },
 
 static const struct tok ntp_stratum_values[] = {
        { UNSPECIFIED,  "unspecified" },

-       { PRIM_REF,     "primary reference" },
+       { PRIM_REF,     "primary reference" },

        { 0, NULL }
 };
 
        { 0, NULL }
 };
 


@@ -298,16 +298,16 @@ ntp_time_print(netdissect_options *ndo,
        p_ntp_delta(ndo, &(bp->org_timestamp), &(bp->xmt_timestamp));
 
        /* FIXME: this code is not aware of any extension fields */
        p_ntp_delta(ndo, &(bp->org_timestamp), &(bp->xmt_timestamp));
 
        /* FIXME: this code is not aware of any extension fields */

-       if (length == NTP_TIMEMSG_MINLEN + 4) {         /* Optional: key-id (crypto-NAK) */
+       if (length == NTP_TIMEMSG_MINLEN + 4) { /* Optional: key-id (crypto-NAK) */

                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));

-       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 16) {     /* Optional: key-id + 128-bit digest */
+       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 16) {     /* Optional: key-id + 128-bit digest */

                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
                         GET_BE_U_4(bp->message_digest),
                         GET_BE_U_4(bp->message_digest + 4),
                         GET_BE_U_4(bp->message_digest + 8),
                         GET_BE_U_4(bp->message_digest + 12));
                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
                         GET_BE_U_4(bp->message_digest),
                         GET_BE_U_4(bp->message_digest + 4),
                         GET_BE_U_4(bp->message_digest + 8),
                         GET_BE_U_4(bp->message_digest + 12));

-       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */
+       } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */

                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",
                         GET_BE_U_4(bp->message_digest),
                ND_PRINT("\n\tKey id: %u", GET_BE_U_4(bp->key_id));
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",
                         GET_BE_U_4(bp->message_digest),

diff --git a/print-realtek.c b/print-realtek.c
index 2aae3fe46c5ce169563c29aa73783be7f6ecf60f..3105bf7f86afaf23dcb408c17f101739b4b69a67 100644 (file)
--- a/print-realtek.c
+++ b/print-realtek.c
@@ -117,7 +117,7 @@ rrcp_print(netdissect_options *ndo,
                tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
        if (rrcp_opcode==RRCP_OPCODE_GET_CONFIGURATION ||
            rrcp_opcode==RRCP_OPCODE_SET_CONFIGURATION){
                tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));
        if (rrcp_opcode==RRCP_OPCODE_GET_CONFIGURATION ||
            rrcp_opcode==RRCP_OPCODE_SET_CONFIGURATION){

-           ND_PRINT(" addr=0x%04x, data=0x%08x",
+           ND_PRINT(" addr=0x%04x, data=0x%08x",

                     GET_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
        }
                     GET_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     GET_LE_U_4(cp + RRCP_REG_DATA_OFFSET));
        }

diff --git a/print-ripng.c b/print-ripng.c
index c4f4ea3a1db2178d1ec4d35546f9f82704551812..224c17fe2cf8093a86a588b7efa8f92ec1136a4c 100644 (file)
--- a/print-ripng.c
+++ b/print-ripng.c
@@ -128,7 +128,7 @@ ripng_print(netdissect_options *ndo, const u_char *dat, unsigned int length)
                if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6)))
                        goto invalid;
                length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));
                if (length_left < (sizeof(struct rip6) - sizeof(struct netinfo6)))
                        goto invalid;
                length_left -= (sizeof(struct rip6) - sizeof(struct netinfo6));

-               j = length_left / sizeof(*ni);
+               j = length_left / sizeof(*ni);

                if (j == 1) {
                        if (GET_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
                            && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {
                if (j == 1) {
                        if (GET_U_1(rp->rip6_nets->rip6_metric) == HOPCNT_INFINITY6
                            && ND_IN6_IS_ADDR_UNSPECIFIED(&rp->rip6_nets->rip6_dest)) {

diff --git a/print-rx.c b/print-rx.c
index dbef71c05be4846dfc2f0c2b09e6a9979cae368d..0a1a8d12d40d167b3fc518184b0506a2f14da78d 100644 (file)
--- a/print-rx.c
+++ b/print-rx.c
@@ -441,17 +441,17 @@ static const char *voltype[] = { "read-write", "read-only", "backup" };
 
 static const struct tok afs_fs_errors[] = {
        { 101,          "salvage volume" },
 
 static const struct tok afs_fs_errors[] = {
        { 101,          "salvage volume" },

-       { 102,          "no such vnode" },
-       { 103,          "no such volume" },
-       { 104,          "volume exist" },
-       { 105,          "no service" },
-       { 106,          "volume offline" },
-       { 107,          "voline online" },
-       { 108,          "diskfull" },
-       { 109,          "diskquota exceeded" },
-       { 110,          "volume busy" },
-       { 111,          "volume moved" },
-       { 112,          "AFS IO error" },
+       { 102,          "no such vnode" },
+       { 103,          "no such volume" },
+       { 104,          "volume exist" },
+       { 105,          "no service" },
+       { 106,          "volume offline" },
+       { 107,          "voline online" },
+       { 108,          "diskfull" },
+       { 109,          "diskquota exceeded" },
+       { 110,          "volume busy" },
+       { 111,          "volume moved" },
+       { 112,          "AFS IO error" },

        { 0xffffff9c,   "restarting fileserver" }, /* -100, sic! */
        { 0,            NULL }
 };
        { 0xffffff9c,   "restarting fileserver" }, /* -100, sic! */
        { 0,            NULL }
 };

diff --git a/print-sflow.c b/print-sflow.c
index 31067110fdee983cf502fb982e343ff4bb0efca3..ea947ba2b4f0ce10d57332c600cf7184037a98a5 100644 (file)
--- a/print-sflow.c
+++ b/print-sflow.c
@@ -120,22 +120,22 @@ struct sflow_expanded_flow_sample_t {
     nd_uint32_t records;
 };
 
     nd_uint32_t records;
 };
 

-#define        SFLOW_FLOW_RAW_PACKET                   1
-#define        SFLOW_FLOW_ETHERNET_FRAME               2
-#define        SFLOW_FLOW_IPV4_DATA                    3
-#define        SFLOW_FLOW_IPV6_DATA                    4
-#define        SFLOW_FLOW_EXTENDED_SWITCH_DATA         1001
-#define        SFLOW_FLOW_EXTENDED_ROUTER_DATA         1002
-#define        SFLOW_FLOW_EXTENDED_GATEWAY_DATA        1003
-#define        SFLOW_FLOW_EXTENDED_USER_DATA           1004
-#define        SFLOW_FLOW_EXTENDED_URL_DATA            1005
-#define        SFLOW_FLOW_EXTENDED_MPLS_DATA           1006
-#define        SFLOW_FLOW_EXTENDED_NAT_DATA            1007
-#define        SFLOW_FLOW_EXTENDED_MPLS_TUNNEL         1008
-#define        SFLOW_FLOW_EXTENDED_MPLS_VC             1009
-#define        SFLOW_FLOW_EXTENDED_MPLS_FEC            1010
-#define        SFLOW_FLOW_EXTENDED_MPLS_LVP_FEC        1011
-#define        SFLOW_FLOW_EXTENDED_VLAN_TUNNEL         1012
+#define        SFLOW_FLOW_RAW_PACKET                   1
+#define        SFLOW_FLOW_ETHERNET_FRAME               2
+#define        SFLOW_FLOW_IPV4_DATA                    3
+#define        SFLOW_FLOW_IPV6_DATA                    4
+#define        SFLOW_FLOW_EXTENDED_SWITCH_DATA         1001
+#define        SFLOW_FLOW_EXTENDED_ROUTER_DATA         1002
+#define        SFLOW_FLOW_EXTENDED_GATEWAY_DATA        1003
+#define        SFLOW_FLOW_EXTENDED_USER_DATA           1004
+#define        SFLOW_FLOW_EXTENDED_URL_DATA            1005
+#define        SFLOW_FLOW_EXTENDED_MPLS_DATA           1006
+#define        SFLOW_FLOW_EXTENDED_NAT_DATA            1007
+#define        SFLOW_FLOW_EXTENDED_MPLS_TUNNEL         1008
+#define        SFLOW_FLOW_EXTENDED_MPLS_VC             1009
+#define        SFLOW_FLOW_EXTENDED_MPLS_FEC            1010
+#define        SFLOW_FLOW_EXTENDED_MPLS_LVP_FEC        1011
+#define        SFLOW_FLOW_EXTENDED_VLAN_TUNNEL         1012

 
 static const struct tok sflow_flow_type_values[] = {
     { SFLOW_FLOW_RAW_PACKET, "Raw packet"},
 
 static const struct tok sflow_flow_type_values[] = {
     { SFLOW_FLOW_RAW_PACKET, "Raw packet"},

diff --git a/print-sunrpc.c b/print-sunrpc.c
index 82bfd8a9d92a4583767cade34485af8f54995820..7eeb42dcc243963ca1c839f1eec16fd61bc7ba5a 100644 (file)
--- a/print-sunrpc.c
+++ b/print-sunrpc.c
@@ -105,10 +105,10 @@
  * The following procedures are supported by the protocol:
  *
  * PMAPPROC_NULL() returns ()
  * The following procedures are supported by the protocol:
  *
  * PMAPPROC_NULL() returns ()

- *     takes nothing, returns nothing
+ *     takes nothing, returns nothing

  *
  * PMAPPROC_SET(struct pmap) returns (bool_t)
  *
  * PMAPPROC_SET(struct pmap) returns (bool_t)

- *     TRUE is success, FALSE is failure.  Registers the tuple
+ *     TRUE is success, FALSE is failure.  Registers the tuple

  *     [prog, vers, prot, port].
  *
  * PMAPPROC_UNSET(struct pmap) returns (bool_t)
  *     [prog, vers, prot, port].
  *
  * PMAPPROC_UNSET(struct pmap) returns (bool_t)


@@ -122,9 +122,9 @@
  * PMAPPROC_DUMP() RETURNS (struct pmaplist *)
  *
  * PMAPPROC_CALLIT(unsigned, unsigned, unsigned, string<>)
  * PMAPPROC_DUMP() RETURNS (struct pmaplist *)
  *
  * PMAPPROC_CALLIT(unsigned, unsigned, unsigned, string<>)

- *     RETURNS (port, string<>);
+ *     RETURNS (port, string<>);

  * usage: encapsulatedresults = PMAPPROC_CALLIT(prog, vers, proc, encapsulatedargs);
  * usage: encapsulatedresults = PMAPPROC_CALLIT(prog, vers, proc, encapsulatedargs);

- *     Calls the procedure on the local machine.  If it is not registered,
+ *     Calls the procedure on the local machine.  If it is not registered,

  *     this procedure is quite; ie it does not return error information!!!
  *     This procedure only is supported on rpc/udp and calls via
  *     rpc/udp.  This routine only passes null authentication parameters.
  *     this procedure is quite; ie it does not return error information!!!
  *     This procedure only is supported on rpc/udp and calls via
  *     rpc/udp.  This routine only passes null authentication parameters.

diff --git a/print-telnet.c b/print-telnet.c
index b0283f2047f7a38b305194a3066ab70ea69b8a60..ea7464f0dc4de500b93fed19678caf1b64731448 100644 (file)
--- a/print-telnet.c
+++ b/print-telnet.c
@@ -1,4 +1,4 @@
-/*     $NetBSD: print-telnet.c,v 1.2 1999/10/11 12:40:12 sjg Exp $     */
+/*     $NetBSD: print-telnet.c,v 1.2 1999/10/11 12:40:12 sjg Exp $     */

 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.
 
 /*-
  * Copyright (c) 1997, 1998 The NetBSD Foundation, Inc.


@@ -59,7 +59,7 @@
 #include "extract.h"
 
 
 #include "extract.h"
 
 

-/*     NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp      */
+/*     NetBSD: telnet.h,v 1.9 2001/06/11 01:50:50 wiz Exp      */

 
 /*
  * Definitions for the TELNET protocol.
 
 /*
  * Definitions for the TELNET protocol.


@@ -108,8 +108,8 @@ static const char *telcmds[] = {
 #define        TELOPT_STATUS   5       /* give status */
 #define        TELOPT_TM       6       /* timing mark */
 #define        TELOPT_RCTE     7       /* remote controlled transmission and echo */
 #define        TELOPT_STATUS   5       /* give status */
 #define        TELOPT_TM       6       /* timing mark */
 #define        TELOPT_RCTE     7       /* remote controlled transmission and echo */

-#define TELOPT_NAOL    8       /* negotiate about output line width */
-#define TELOPT_NAOP    9       /* negotiate about output page size */
+#define TELOPT_NAOL    8       /* negotiate about output line width */
+#define TELOPT_NAOP    9       /* negotiate about output page size */

 #define TELOPT_NAOCRD  10      /* negotiate about CR disposition */
 #define TELOPT_NAOHTS  11      /* negotiate about horizontal tabstops */
 #define TELOPT_NAOHTD  12      /* negotiate about horizontal tab disposition */
 #define TELOPT_NAOCRD  10      /* negotiate about CR disposition */
 #define TELOPT_NAOHTS  11      /* negotiate about horizontal tabstops */
 #define TELOPT_NAOHTD  12      /* negotiate about horizontal tab disposition */

diff --git a/print-udp.c b/print-udp.c
index aa132678c6371d5676e2394aa7234d9ffbf1c77a..2d998d6461c67532e3ef9df4b0d74ad759d8c7ff 100644 (file)
--- a/print-udp.c
+++ b/print-udp.c
@@ -81,14 +81,14 @@ struct rtcp_rr {
 #define RTCP_PT_SR     200
 #define RTCP_PT_RR     201
 #define RTCP_PT_SDES   202
 #define RTCP_PT_SR     200
 #define RTCP_PT_RR     201
 #define RTCP_PT_SDES   202

-#define        RTCP_SDES_CNAME 1
-#define        RTCP_SDES_NAME  2
-#define        RTCP_SDES_EMAIL 3
-#define        RTCP_SDES_PHONE 4
-#define        RTCP_SDES_LOC   5
-#define        RTCP_SDES_TOOL  6
-#define        RTCP_SDES_NOTE  7
-#define        RTCP_SDES_PRIV  8
+#define    RTCP_SDES_CNAME     1
+#define    RTCP_SDES_NAME      2
+#define    RTCP_SDES_EMAIL     3
+#define    RTCP_SDES_PHONE     4
+#define    RTCP_SDES_LOC       5
+#define    RTCP_SDES_TOOL      6
+#define    RTCP_SDES_NOTE      7
+#define    RTCP_SDES_PRIV      8

 #define RTCP_PT_BYE    203
 #define RTCP_PT_APP    204
 
 #define RTCP_PT_BYE    203
 #define RTCP_PT_APP    204
 

diff --git a/print-vqp.c b/print-vqp.c
index a26cd0e3274561042bbd51bd0b0e5a5569d47225..1b2f6bfe022bc3e05da944702b00be7c46cad46e 100644 (file)
--- a/print-vqp.c
+++ b/print-vqp.c
@@ -28,7 +28,7 @@
 #include "extract.h"
 #include "addrtoname.h"
 
 #include "extract.h"
 #include "addrtoname.h"
 

-#define VQP_VERSION                            1
+#define VQP_VERSION 1

 
 /*
  * VQP common header
 
 /*
  * VQP common header

diff --git a/smbutil.c b/smbutil.c
index f33a323fbf2c7c4037ec7ffd8a84c62c40e25aa3..97217a8d9fc6a8a4def9fbd160b9217e37cd2d92 100644 (file)
--- a/smbutil.c
+++ b/smbutil.c
@@ -388,7 +388,7 @@ unistr(netdissect_options *ndo, char (*buf)[MAX_UNISTR_SIZE+1],
        }
     }
     if (!use_unicode) {
        }
     }
     if (!use_unicode) {

-       while (strsize != 0) {
+       while (strsize != 0) {

            c = GET_U_1(s);
            s++;
            strsize--;
            c = GET_U_1(s);
            s++;
            strsize--;

diff --git a/stime.awk b/stime.awk
index 61891f247b950240feb7953db75f168e3ef2ea13..429cf012c9e037ab31535d65c9f50071dc06d677 100644 (file)
--- a/stime.awk
+++ b/stime.awk
@@ -1,4 +1,4 @@
-$6 !~ /^ack/ && $5 !~ /[SFR]/  {
+$6 !~ /^ack/ && $5 !~ /[SFR]/  {

        # given a tcpdump ftp trace, output one line for each send
        # in the form
        #   <send time> <seq no>
        # given a tcpdump ftp trace, output one line for each send
        # in the form
        #   <send time> <seq no>

diff --git a/tests/TESTLIST b/tests/TESTLIST
index ecc73304441cf2138246c7e704289415a94c99dc..0f300a6dab905742c2a6edfa77a191a2d956e231 100644 (file)
--- a/tests/TESTLIST
+++ b/tests/TESTLIST
@@ -136,7 +136,7 @@ mpls-over-udp-v  mpls-over-udp.pcap  mpls-over-udp-v.out -v
 # ospf3_mp-vv
 # ospf3_nbma-vv
 # ospf2-seg-fault-1-v (fuzzed pcap)
 # ospf3_mp-vv
 # ospf3_nbma-vv
 # ospf2-seg-fault-1-v (fuzzed pcap)

-ospf3_auth-vv  ospf3_auth.pcapng                       ospf3_auth-vv.out       -v -v
+ospf3_auth-vv  ospf3_auth.pcapng                       ospf3_auth-vv.out       -v -v

 
 # IKEv2 tests
 ikev2four      ikev2four.pcap          ikev2four.out   -v
 
 # IKEv2 tests
 ikev2four      ikev2four.pcap          ikev2four.out   -v


@@ -342,9 +342,9 @@ dns_udp_8053-T dns_udp_8053.pcap dns_udp_8053-T.out -vv -T domain
 dnssec-vv      dnssec.pcap             dnssec-vv.out           -vv
 
 #IPv6 tests
 dnssec-vv      dnssec.pcap             dnssec-vv.out           -vv
 
 #IPv6 tests

-ipv6-bad-version       ipv6-bad-version.pcap   ipv6-bad-version.out
+ipv6-bad-version       ipv6-bad-version.pcap   ipv6-bad-version.out

 ipv6-routing-header    ipv6-routing-header.pcap        ipv6-routing-header.out -v
 ipv6-routing-header    ipv6-routing-header.pcap        ipv6-routing-header.out -v

-ipv6-srh-ext-header    ipv6-srh-ext-header.pcap        ipv6-srh-ext-header.out -v
+ipv6-srh-ext-header    ipv6-srh-ext-header.pcap        ipv6-srh-ext-header.out -v

 ipv6-srh-insert-cksum  ipv6-srh-insert-cksum.pcap      ipv6-srh-insert-cksum.out -v
 ipv6-srh-ipproto-ether-v ipv6-srh-ipproto-ether.pcap ipv6-srh-ipproto-ether-v.out -v
 ipv6-srh-ipproto-ether-ev ipv6-srh-ipproto-ether.pcap ipv6-srh-ipproto-ether-ev.out -ev
 ipv6-srh-insert-cksum  ipv6-srh-insert-cksum.pcap      ipv6-srh-insert-cksum.out -v
 ipv6-srh-ipproto-ether-v ipv6-srh-ipproto-ether.pcap ipv6-srh-ipproto-ether-v.out -v
 ipv6-srh-ipproto-ether-ev ipv6-srh-ipproto-ether.pcap ipv6-srh-ipproto-ether-ev.out -ev

diff --git a/udp.h b/udp.h
index 4f6fa3806b48e832e1768a993b8374633c178150..9c04d23d672a013cfe8b018beb3c525c4d488ce1 100644 (file)
--- a/udp.h
+++ b/udp.h
@@ -78,7 +78,7 @@ struct udphdr {
 #define SNMPTRAP_PORT                  162     /*XXX*/
 #endif
 #ifndef PTP_EVENT_PORT
 #define SNMPTRAP_PORT                  162     /*XXX*/
 #endif
 #ifndef PTP_EVENT_PORT

-#define PTP_EVENT_PORT                 319 /* IANA */
+#define PTP_EVENT_PORT                 319 /* IANA */

 #endif
 #ifndef PTP_GENERAL_PORT
 #define PTP_GENERAL_PORT               320 /* IANA */
 #endif
 #ifndef PTP_GENERAL_PORT
 #define PTP_GENERAL_PORT               320 /* IANA */