Fix spaces

diff --git a/CHANGES b/CHANGES
index be91e0fd301806394ff50097b46d08ff2ff4c1a2..5e0f19d7fdb83613594fe7edfc7ad11cb8820cb6 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -718,7 +718,7 @@ Tue.   March 30, 2004. [email protected]. Summary for 3.8.3 release
 Mon.   March 29, 2004. [email protected]. Summary for 3.8.2 release
 
        Fixes for print-isakmp.c      CVE:    CAN-2004-0183, CAN-2004-0184
 Mon.   March 29, 2004. [email protected]. Summary for 3.8.2 release
 
        Fixes for print-isakmp.c      CVE:    CAN-2004-0183, CAN-2004-0184

-                            http://www.rapid7.com/advisories/R7-0017.html
+                            http://www.rapid7.com/advisories/R7-0017.html

        IP-over-IEEE1394 printing.
        some MINGW32 changes.
        updates for autoconf 2.5
        IP-over-IEEE1394 printing.
        some MINGW32 changes.
        updates for autoconf 2.5

diff --git a/aclocal.m4 b/aclocal.m4
index 50b5673aa3cc88bbd6fe2488271b82142b812f58..4d31f29ca987d5fde1bc7f7ab0c26febbce0381c 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -169,7 +169,7 @@ AC_DEFUN(AC_LBL_C_INIT,
                    ;;
 
            osf*)
                    ;;
 
            osf*)

-                   #
+                   #

                    # Presumed to be DEC OSF/1, Digital UNIX, or
                    # Tru64 UNIX.
                    #
                    # Presumed to be DEC OSF/1, Digital UNIX, or
                    # Tru64 UNIX.
                    #


@@ -1072,9 +1072,9 @@ AC_DEFUN(AC_LBL_SSLEAY,
        # Or should we just look for "libcrypto.*"?
        #
        if test -d "$1/$tmplib" -a \( -f "$1/$tmplib/libcrypto.a" -o \
        # Or should we just look for "libcrypto.*"?
        #
        if test -d "$1/$tmplib" -a \( -f "$1/$tmplib/libcrypto.a" -o \

-                                   -f "$1/$tmplib/libcrypto.so" -o \
-                                   -f "$1/$tmplib/libcrypto.sl" -o \
-                                   -f "$1/$tmplib/libcrypto.dylib" \); then
+                                   -f "$1/$tmplib/libcrypto.so" -o \
+                                   -f "$1/$tmplib/libcrypto.sl" -o \
+                                   -f "$1/$tmplib/libcrypto.dylib" \); then

                ac_cv_ssleay_path="$1"
        fi
 
                ac_cv_ssleay_path="$1"
        fi
 

diff --git a/addrtoname.c b/addrtoname.c
index 011d3d717521a254b2e00410f6c9430d89f5c4d9..b6b49aa48c80ca9ab8d5bad05e73e977dfa9d5c8 100644 (file)
--- a/addrtoname.c
+++ b/addrtoname.c
@@ -702,7 +702,7 @@ isonsap_string(netdissect_options *ndo, const uint8_t *nsap,
                *cp++ = hex[*nsap++ & 0xf];
                if (((nsap_idx & 1) == 0) &&
                     (nsap_idx + 1 < nsap_length)) {
                *cp++ = hex[*nsap++ & 0xf];
                if (((nsap_idx & 1) == 0) &&
                     (nsap_idx + 1 < nsap_length)) {

-                       *cp++ = '.';
+                       *cp++ = '.';

                }
        }
        *cp = '\0';
                }
        }
        *cp = '\0';

diff --git a/configure b/configure
index fec27712c32e5701603abde1dceb80373db08818..990363f21130e8209057a0ea8af92cc64f95092d 100755 (executable)
--- a/configure
+++ b/configure
@@ -3510,7 +3510,7 @@ rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
                    ;;
 
            osf*)
                    ;;
 
            osf*)

-                   #
+                   #

                    # Presumed to be DEC OSF/1, Digital UNIX, or
                    # Tru64 UNIX.
                    #
                    # Presumed to be DEC OSF/1, Digital UNIX, or
                    # Tru64 UNIX.
                    #

diff --git a/print-802_11.c b/print-802_11.c
index 8a4b3bdb56338eb4fc073e2b017a778fb14b0e08..548893f551d5bf2f65fae36449eb32d024233c1c 100644 (file)
--- a/print-802_11.c
+++ b/print-802_11.c
@@ -245,10 +245,10 @@ struct tim_t {
 
 #define        E_SSID          0
 #define        E_RATES         1
 
 #define        E_SSID          0
 #define        E_RATES         1

-#define        E_FH            2
+#define        E_FH            2

 #define        E_DS            3
 #define        E_DS            3

-#define        E_CF            4
-#define        E_TIM           5
+#define        E_CF            4
+#define        E_TIM           5

 #define        E_IBSS          6
 /* reserved            7 */
 /* reserved            8 */
 #define        E_IBSS          6
 /* reserved            7 */
 /* reserved            8 */


@@ -840,7 +840,7 @@ static const char *status_text[] = {
        "Reserved",                                             /*  8 */
        "Reserved",                                             /*  9 */
        "Cannot Support all requested capabilities in the Capability "
        "Reserved",                                             /*  8 */
        "Reserved",                                             /*  9 */
        "Cannot Support all requested capabilities in the Capability "

-         "Information field",                                  /* 10 */
+         "Information field",                                  /* 10 */

        "Reassociation denied due to inability to confirm that association "
          "exists",                                             /* 11 */
        "Association denied due to reason outside the scope of the "
        "Reassociation denied due to inability to confirm that association "
          "exists",                                             /* 11 */
        "Association denied due to reason outside the scope of the "


@@ -851,9 +851,9 @@ static const char *status_text[] = {
          "sequence number out of expected sequence",           /* 14 */
        "Authentication rejected because of challenge failure", /* 15 */
        "Authentication rejected due to timeout waiting for next frame in "
          "sequence number out of expected sequence",           /* 14 */
        "Authentication rejected because of challenge failure", /* 15 */
        "Authentication rejected due to timeout waiting for next frame in "

-         "sequence",                                           /* 16 */
+         "sequence",                                           /* 16 */

        "Association denied because AP is unable to handle additional"
        "Association denied because AP is unable to handle additional"

-         "associated stations",                                /* 17 */
+         "associated stations",                                /* 17 */

        "Association denied due to requesting station not supporting all of "
          "the data rates in BSSBasicRateSet parameter",        /* 18 */
        "Association denied due to requesting station not supporting "
        "Association denied due to requesting station not supporting all of "
          "the data rates in BSSBasicRateSet parameter",        /* 18 */
        "Association denied due to requesting station not supporting "

diff --git a/print-icmp6.c b/print-icmp6.c
index 85a919d131e2c93e61cf06ab58f243760ba4fb3a..52f58a0e50ae63dbc1277fc5f5d2dc75bd079230 100644 (file)
--- a/print-icmp6.c
+++ b/print-icmp6.c
@@ -139,7 +139,7 @@ struct icmp6_hdr {
 #define ICMP6_MAXTYPE                  201
 
 #define ICMP6_DST_UNREACH_NOROUTE      0       /* no route to destination */
 #define ICMP6_MAXTYPE                  201
 
 #define ICMP6_DST_UNREACH_NOROUTE      0       /* no route to destination */

-#define ICMP6_DST_UNREACH_ADMIN                1       /* administratively prohibited */
+#define ICMP6_DST_UNREACH_ADMIN                1       /* administratively prohibited */

 #define ICMP6_DST_UNREACH_NOTNEIGHBOR  2       /* not a neighbor(obsolete) */
 #define ICMP6_DST_UNREACH_BEYONDSCOPE  2       /* beyond scope of source address */
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */
 #define ICMP6_DST_UNREACH_NOTNEIGHBOR  2       /* not a neighbor(obsolete) */
 #define ICMP6_DST_UNREACH_BEYONDSCOPE  2       /* beyond scope of source address */
 #define ICMP6_DST_UNREACH_ADDR         3       /* address unreachable */


@@ -148,7 +148,7 @@ struct icmp6_hdr {
 #define ICMP6_TIME_EXCEED_TRANSIT      0       /* ttl==0 in transit */
 #define ICMP6_TIME_EXCEED_REASSEMBLY   1       /* ttl==0 in reass */
 
 #define ICMP6_TIME_EXCEED_TRANSIT      0       /* ttl==0 in transit */
 #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_NEXTHEADER     1       /* unrecognized next header */
 #define ICMP6_PARAMPROB_OPTION         2       /* unrecognized option */
 


@@ -320,7 +320,7 @@ struct nd_opt_rdnss {               /* RDNSS RFC 6106 5.1 */
        nd_uint8_t      nd_opt_rdnss_len;
        nd_uint16_t     nd_opt_rdnss_reserved;
        nd_uint32_t     nd_opt_rdnss_lifetime;
        nd_uint8_t      nd_opt_rdnss_len;
        nd_uint16_t     nd_opt_rdnss_reserved;
        nd_uint32_t     nd_opt_rdnss_lifetime;

-       nd_ipv6         nd_opt_rdnss_addr[1];   /* variable-length */
+       nd_ipv6         nd_opt_rdnss_addr[1];   /* variable-length */

 };
 
 struct nd_opt_dnssl {          /* DNSSL RFC 6106 5.2 */
 };
 
 struct nd_opt_dnssl {          /* DNSSL RFC 6106 5.2 */


@@ -883,7 +883,7 @@ rpl_dao_print(netdissect_options *ndo,
 
         ND_TCHECK_SIZE(dao);
         if (length < ND_RPL_DAO_MIN_LEN)
 
         ND_TCHECK_SIZE(dao);
         if (length < ND_RPL_DAO_MIN_LEN)

-               goto tooshort;
+               goto tooshort;

 
         bp += ND_RPL_DAO_MIN_LEN;
         length -= ND_RPL_DAO_MIN_LEN;
 
         bp += ND_RPL_DAO_MIN_LEN;
         length -= ND_RPL_DAO_MIN_LEN;


@@ -928,7 +928,7 @@ rpl_daoack_print(netdissect_options *ndo,
 
         ND_TCHECK_LEN(daoack, ND_RPL_DAOACK_MIN_LEN);
         if (length < ND_RPL_DAOACK_MIN_LEN)
 
         ND_TCHECK_LEN(daoack, ND_RPL_DAOACK_MIN_LEN);
         if (length < ND_RPL_DAOACK_MIN_LEN)

-               goto tooshort;
+               goto tooshort;

 
         bp += ND_RPL_DAOACK_MIN_LEN;
         length -= ND_RPL_DAOACK_MIN_LEN;
 
         bp += ND_RPL_DAOACK_MIN_LEN;
         length -= ND_RPL_DAOACK_MIN_LEN;

diff --git a/print-isakmp.c b/print-isakmp.c
index 8c3c0806db27196cc6a6a705827b58d36b20a4ae..ba2a4dd1af51b07b481b8cff081bb06b3640585b 100644 (file)
--- a/print-isakmp.c
+++ b/print-isakmp.c
@@ -1188,7 +1188,7 @@ static const struct attrmap encr_t_map[] = {
 static const struct attrmap oakley_t_map[] = {
        { NULL, 0, { NULL } },
        { "enc", 8,     { NULL, "1des", "idea", "blowfish", "rc5",
 static const struct attrmap oakley_t_map[] = {
        { NULL, 0, { NULL } },
        { "enc", 8,     { NULL, "1des", "idea", "blowfish", "rc5",

-                         "3des", "cast", "aes", }, },
+                         "3des", "cast", "aes", }, },

        { "hash", 7,    { NULL, "md5", "sha1", "tiger",
                          "sha2-256", "sha2-384", "sha2-512", }, },
        { "auth", 6,    { NULL, "preshared", "dss", "rsa sig", "rsa enc",
        { "hash", 7,    { NULL, "md5", "sha1", "tiger",
                          "sha2-256", "sha2-384", "sha2-512", }, },
        { "auth", 6,    { NULL, "preshared", "dss", "rsa sig", "rsa enc",

diff --git a/print-lldp.c b/print-lldp.c
index 90bde666247c07c28fb02f1a80a2ff9d88a70f54..c2ba6c63e9b21c7fd35b3e2b2351d8edb3b56237 100644 (file)
--- a/print-lldp.c
+++ b/print-lldp.c
@@ -714,7 +714,7 @@ lldp_private_8021_print(netdissect_options *ndo,
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION_LENGTH){
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CONGESTION_NOTIFICATION_LENGTH){

-               return hexdump;
+               return hexdump;

         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Pre-Priority CNPV Indicator");
         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Pre-Priority CNPV Indicator");


@@ -736,7 +736,7 @@ lldp_private_8021_print(netdissect_options *ndo,
         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Willing:%u, CBS:%u, RES:%u, Max TCs:%u",
         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Willing:%u, CBS:%u, RES:%u, Max TCs:%u",

-               tval >> 7, (tval >> 6) & 0x02, (tval >> 3) & 0x07, tval & 0x07);
+               tval >> 7, (tval >> 6) & 0x02, (tval >> 3) & 0x07, tval & 0x07);

 
         /*Print Priority Assignment Table*/
         print_ets_priority_assignment_table(ndo, tptr + 5);
 
         /*Print Priority Assignment Table*/
         print_ets_priority_assignment_table(ndo, tptr + 5);


@@ -751,7 +751,7 @@ lldp_private_8021_print(netdissect_options *ndo,
 
     case LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION_LENGTH) {
 
     case LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_ETS_RECOMMENDATION_LENGTH) {

-               return hexdump;
+               return hexdump;

         }
         ND_PRINT("\n\t    RES: %u", EXTRACT_U_1(tptr + 4));
         /*Print Priority Assignment Table */
         }
         ND_PRINT("\n\t    RES: %u", EXTRACT_U_1(tptr + 4));
         /*Print Priority Assignment Table */


@@ -768,7 +768,7 @@ lldp_private_8021_print(netdissect_options *ndo,
         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Willing: %u, MBC: %u, RES: %u, PFC cap:%u ",
         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Willing: %u, MBC: %u, RES: %u, PFC cap:%u ",

-               tval >> 7, (tval >> 6) & 0x01, (tval >> 4) & 0x03, (tval & 0x0f));
+               tval >> 7, (tval >> 6) & 0x01, (tval >> 4) & 0x03, (tval & 0x0f));

         ND_PRINT("\n\t    PFC Enable");
         tval=EXTRACT_U_1(tptr + 5);
         ND_PRINT("\n\t     Priority : 0  1  2  3  4  5  6  7");
         ND_PRINT("\n\t    PFC Enable");
         tval=EXTRACT_U_1(tptr + 5);
         ND_PRINT("\n\t     Priority : 0  1  2  3  4  5  6  7");


@@ -783,40 +783,40 @@ lldp_private_8021_print(netdissect_options *ndo,
         }
         ND_PRINT("\n\t    RES: %u", EXTRACT_U_1(tptr + 4));
         if(tlv_len<=LLDP_PRIVATE_8021_SUBTYPE_APPLICATION_PRIORITY_MIN_LENGTH){
         }
         ND_PRINT("\n\t    RES: %u", EXTRACT_U_1(tptr + 4));
         if(tlv_len<=LLDP_PRIVATE_8021_SUBTYPE_APPLICATION_PRIORITY_MIN_LENGTH){

-               return hexdump;
+               return hexdump;

         }
         /*  Length of Application Priority Table */
         sublen=tlv_len-5;
         if(sublen%3!=0){
         }
         /*  Length of Application Priority Table */
         sublen=tlv_len-5;
         if(sublen%3!=0){

-               return hexdump;
+               return hexdump;

         }
         i=0;
         ND_PRINT("\n\t    Application Priority Table");
         while(i<sublen) {
         }
         i=0;
         ND_PRINT("\n\t    Application Priority Table");
         while(i<sublen) {

-               tval=EXTRACT_U_1(tptr + i + 5);
-               ND_PRINT("\n\t      Priority: %u, RES: %u, Sel: %u, Protocol ID: %u",
-                        tval >> 5, (tval >> 3) & 0x03, (tval & 0x07),
+               tval=EXTRACT_U_1(tptr + i + 5);
+               ND_PRINT("\n\t      Priority: %u, RES: %u, Sel: %u, Protocol ID: %u",
+                        tval >> 5, (tval >> 3) & 0x03, (tval & 0x07),

                         EXTRACT_BE_U_2(tptr + i + 5));
                         EXTRACT_BE_U_2(tptr + i + 5));

-               i=i+3;
+               i=i+3;

         }
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_EVB:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_EVB_LENGTH){
         }
         break;
     case LLDP_PRIVATE_8021_SUBTYPE_EVB:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_EVB_LENGTH){

-               return hexdump;
+               return hexdump;

         }
         ND_PRINT("\n\t    EVB Bridge Status");
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t      RES: %u, BGID: %u, RRCAP: %u, RRCTR: %u",
         }
         ND_PRINT("\n\t    EVB Bridge Status");
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t      RES: %u, BGID: %u, RRCAP: %u, RRCTR: %u",

-               tval >> 3, (tval >> 2) & 0x01, (tval >> 1) & 0x01, tval & 0x01);
+               tval >> 3, (tval >> 2) & 0x01, (tval >> 1) & 0x01, tval & 0x01);

         ND_PRINT("\n\t    EVB Station Status");
         tval=EXTRACT_U_1(tptr + 5);
         ND_PRINT("\n\t      RES: %u, SGID: %u, RRREQ: %u,RRSTAT: %u",
         ND_PRINT("\n\t    EVB Station Status");
         tval=EXTRACT_U_1(tptr + 5);
         ND_PRINT("\n\t      RES: %u, SGID: %u, RRREQ: %u,RRSTAT: %u",

-               tval >> 4, (tval >> 3) & 0x01, (tval >> 2) & 0x01, tval & 0x03);
+               tval >> 4, (tval >> 3) & 0x01, (tval >> 2) & 0x01, tval & 0x03);

         tval=EXTRACT_U_1(tptr + 6);
         ND_PRINT("\n\t    R: %u, RTE: %u, ",tval >> 5, tval & 0x1f);
         tval=EXTRACT_U_1(tptr + 7);
         ND_PRINT("EVB Mode: %s [%u]",
         tval=EXTRACT_U_1(tptr + 6);
         ND_PRINT("\n\t    R: %u, RTE: %u, ",tval >> 5, tval & 0x1f);
         tval=EXTRACT_U_1(tptr + 7);
         ND_PRINT("EVB Mode: %s [%u]",

-               tok2str(lldp_evb_mode_values, "unknown", tval >> 6), tval >> 6);
+               tok2str(lldp_evb_mode_values, "unknown", tval >> 6), tval >> 6);

         ND_PRINT("\n\t    ROL: %u, RWD: %u, ", (tval >> 5) & 0x01, tval & 0x1f);
         tval=EXTRACT_U_1(tptr + 8);
         ND_PRINT("RES: %u, ROL: %u, RKA: %u", tval >> 6, (tval >> 5) & 0x01, tval & 0x1f);
         ND_PRINT("\n\t    ROL: %u, RWD: %u, ", (tval >> 5) & 0x01, tval & 0x1f);
         tval=EXTRACT_U_1(tptr + 8);
         ND_PRINT("RES: %u, ROL: %u, RKA: %u", tval >> 6, (tval >> 5) & 0x01, tval & 0x1f);


@@ -824,22 +824,22 @@ lldp_private_8021_print(netdissect_options *ndo,
 
     case LLDP_PRIVATE_8021_SUBTYPE_CDCP:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CDCP_MIN_LENGTH){
 
     case LLDP_PRIVATE_8021_SUBTYPE_CDCP:
         if(tlv_len<LLDP_PRIVATE_8021_SUBTYPE_CDCP_MIN_LENGTH){

-               return hexdump;
+               return hexdump;

         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Role: %u, RES: %u, Scomp: %u ",
         }
         tval=EXTRACT_U_1(tptr + 4);
         ND_PRINT("\n\t    Role: %u, RES: %u, Scomp: %u ",

-               tval >> 7, (tval >> 4) & 0x07, (tval >> 3) & 0x01);
+               tval >> 7, (tval >> 4) & 0x07, (tval >> 3) & 0x01);

         ND_PRINT("ChnCap: %u", EXTRACT_BE_U_2(tptr + 6) & 0x0fff);
         sublen=tlv_len-8;
         if(sublen%3!=0) {
         ND_PRINT("ChnCap: %u", EXTRACT_BE_U_2(tptr + 6) & 0x0fff);
         sublen=tlv_len-8;
         if(sublen%3!=0) {

-               return hexdump;
+               return hexdump;

         }
         i=0;
         while(i<sublen) {
                tval=EXTRACT_BE_U_3(tptr + i + 8);
         }
         i=0;
         while(i<sublen) {
                tval=EXTRACT_BE_U_3(tptr + i + 8);

-               ND_PRINT("\n\t    SCID: %u, SVID: %u",
-                       tval >> 12, tval & 0x000fff);
-               i=i+3;
+               ND_PRINT("\n\t    SCID: %u, SVID: %u",
+                       tval >> 12, tval & 0x000fff);
+               i=i+3;

         }
         break;
 
         }
         break;
 

diff --git a/print-lmp.c b/print-lmp.c
index 6b28544c8ff866b7c131711ffa8ede4438945cba..26f4ba7bc4996220072223920a9c8a2cf8e94b02 100644 (file)
--- a/print-lmp.c
+++ b/print-lmp.c
@@ -872,7 +872,7 @@ lmp_print(netdissect_options *ndo,
 
                        ND_PRINT("\n\t\t    Channel Status: %s (%u)",
                                        tok2str(lmp_obj_channel_status_values,
 
                        ND_PRINT("\n\t\t    Channel Status: %s (%u)",
                                        tok2str(lmp_obj_channel_status_values,

-                                       "Unknown",
+                                       "Unknown",

                                        EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
                                        EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
                        offset+=8;
                                        EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF),
                                        EXTRACT_BE_U_4(obj_tptr + offset + 4)&0x3FFFFFF);
                        offset+=8;

diff --git a/print-ntp.c b/print-ntp.c
index f695c8d09205339616064bc10d3e1cba1b930bf3..5c9b6dcf57030352242854d3b5714bf7cf895276 100644 (file)
--- a/print-ntp.c
+++ b/print-ntp.c
@@ -350,21 +350,21 @@ ntp_time_print(netdissect_options *ndo,
                ND_TCHECK_4(bp->key_id);
                ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
                ND_TCHECK_LEN(bp->message_digest, 16);
                ND_TCHECK_4(bp->key_id);
                ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
                ND_TCHECK_LEN(bp->message_digest, 16);

-                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
-                              EXTRACT_BE_U_4(bp->message_digest),
-                              EXTRACT_BE_U_4(bp->message_digest + 4),
-                              EXTRACT_BE_U_4(bp->message_digest + 8),
-                              EXTRACT_BE_U_4(bp->message_digest + 12));
+               ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x",
+                        EXTRACT_BE_U_4(bp->message_digest),
+                        EXTRACT_BE_U_4(bp->message_digest + 4),
+                        EXTRACT_BE_U_4(bp->message_digest + 8),
+                        EXTRACT_BE_U_4(bp->message_digest + 12));

        } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */
                ND_TCHECK_4(bp->key_id);
                ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
                ND_TCHECK_LEN(bp->message_digest, 20);
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",
        } else if (length == NTP_TIMEMSG_MINLEN + 4 + 20) {     /* Optional: key-id + 160-bit digest */
                ND_TCHECK_4(bp->key_id);
                ND_PRINT("\n\tKey id: %u", EXTRACT_BE_U_4(bp->key_id));
                ND_TCHECK_LEN(bp->message_digest, 20);
                ND_PRINT("\n\tAuthentication: %08x%08x%08x%08x%08x",

-                              EXTRACT_BE_U_4(bp->message_digest),
-                              EXTRACT_BE_U_4(bp->message_digest + 4),
-                              EXTRACT_BE_U_4(bp->message_digest + 8),
-                              EXTRACT_BE_U_4(bp->message_digest + 12),
-                              EXTRACT_BE_U_4(bp->message_digest + 16));
+                        EXTRACT_BE_U_4(bp->message_digest),
+                        EXTRACT_BE_U_4(bp->message_digest + 4),
+                        EXTRACT_BE_U_4(bp->message_digest + 8),
+                        EXTRACT_BE_U_4(bp->message_digest + 12),
+                        EXTRACT_BE_U_4(bp->message_digest + 16));

        } else if (length > NTP_TIMEMSG_MINLEN) {
                ND_PRINT("\n\t(%u more bytes after the header)", length - NTP_TIMEMSG_MINLEN);
        }
        } else if (length > NTP_TIMEMSG_MINLEN) {
                ND_PRINT("\n\t(%u more bytes after the header)", length - NTP_TIMEMSG_MINLEN);
        }


@@ -449,7 +449,7 @@ union ntpdata {
  */
 void
 ntp_print(netdissect_options *ndo,
  */
 void
 ntp_print(netdissect_options *ndo,

-          const u_char *cp, u_int length)
+         const u_char *cp, u_int length)

 {
        const union ntpdata *bp = (const union ntpdata *)cp;
        u_int mode, version, leapind;
 {
        const union ntpdata *bp = (const union ntpdata *)cp;
        u_int mode, version, leapind;


@@ -465,19 +465,19 @@ ntp_print(netdissect_options *ndo,
        mode = (status & MODEMASK) >> MODESHIFT;
        if (!ndo->ndo_vflag) {
                ND_PRINT(", %s, length %u",
        mode = (status & MODEMASK) >> MODESHIFT;
        if (!ndo->ndo_vflag) {
                ND_PRINT(", %s, length %u",

-                         tok2str(ntp_mode_values, "Unknown mode", mode),
-                         length);
+                        tok2str(ntp_mode_values, "Unknown mode", mode),
+                        length);

                return;
        }
 
        ND_PRINT(", %s, length %u\n",
                return;
        }
 
        ND_PRINT(", %s, length %u\n",

-                 tok2str(ntp_mode_values, "Unknown mode", mode), length);
+                 tok2str(ntp_mode_values, "Unknown mode", mode), length);

 
        /* leapind = (status & LEAPMASK) >> LEAPSHIFT; */
        leapind = (status & LEAPMASK);
        ND_PRINT("\tLeap indicator: %s (%u)",
 
        /* leapind = (status & LEAPMASK) >> LEAPSHIFT; */
        leapind = (status & LEAPMASK);
        ND_PRINT("\tLeap indicator: %s (%u)",

-                 tok2str(ntp_leapind_values, "Unknown", leapind),
-                 leapind);
+                tok2str(ntp_leapind_values, "Unknown", leapind),
+                leapind);

 
        switch (mode) {
 
 
        switch (mode) {
 


@@ -522,7 +522,7 @@ p_sfix(netdissect_options *ndo,
 
 static void
 p_ntp_time(netdissect_options *ndo,
 
 static void
 p_ntp_time(netdissect_options *ndo,

-           const struct l_fixedpt *lfp)
+          const struct l_fixedpt *lfp)

 {
        uint32_t i;
        uint32_t uf;
 {
        uint32_t i;
        uint32_t uf;


@@ -577,8 +577,8 @@ p_ntp_time(netdissect_options *ndo,
 /* Prints time difference between *lfp and *olfp */
 static void
 p_ntp_delta(netdissect_options *ndo,
 /* Prints time difference between *lfp and *olfp */
 static void
 p_ntp_delta(netdissect_options *ndo,

-            const struct l_fixedpt *olfp,
-            const struct l_fixedpt *lfp)
+           const struct l_fixedpt *olfp,
+           const struct l_fixedpt *lfp)

 {
        uint32_t u, uf;
        uint32_t ou, ouf;
 {
        uint32_t u, uf;
        uint32_t ou, ouf;

diff --git a/print-ospf6.c b/print-ospf6.c
index 0511435fe933ef199b3c53fae6bb4842517250e8..756d25e21a92e55577c7d79d400d8d63564dd9cc 100644 (file)
--- a/print-ospf6.c
+++ b/print-ospf6.c
@@ -482,7 +482,7 @@ ospf6_print_lsa(netdissect_options *ndo,
         * header.
         */
         if (length < sizeof(struct lsa6_hdr) || (const u_char *)lsap + length > dataend)
         * header.
         */
         if (length < sizeof(struct lsa6_hdr) || (const u_char *)lsap + length > dataend)

-               return (1);
+               return (1);

         lsa_length = length - sizeof(struct lsa6_hdr);
         tptr = (const uint8_t *)lsap+sizeof(struct lsa6_hdr);
 
         lsa_length = length - sizeof(struct lsa6_hdr);
         tptr = (const uint8_t *)lsap+sizeof(struct lsa6_hdr);
 

diff --git a/print-sll.c b/print-sll.c
index 56b9714d2114f12f07a87ac4937a80ac7c5b0c5d..3c25a9a556e1a90c6e98112ceeeeda6e64e51daf 100644 (file)
--- a/print-sll.c
+++ b/print-sll.c
@@ -298,7 +298,7 @@ recurse:
                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {
                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {

-                       uint16_t tag = EXTRACT_BE_U_2(p);
+                       uint16_t tag = EXTRACT_BE_U_2(p);

 
                        ND_PRINT("%s, ", ieee8021q_tci_string(tag));
                }
 
                        ND_PRINT("%s, ", ieee8021q_tci_string(tag));
                }


@@ -489,7 +489,7 @@ recurse:
                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {
                        return (hdrlen + length);
                }
                if (ndo->ndo_eflag) {

-                       uint16_t tag = EXTRACT_BE_U_2(p);
+                       uint16_t tag = EXTRACT_BE_U_2(p);

 
                        ND_PRINT("%s, ", ieee8021q_tci_string(tag));
                }
 
                        ND_PRINT("%s, ", ieee8021q_tci_string(tag));
                }

diff --git a/print-smb.c b/print-smb.c
index fa4081efdb663361126a138608a837b39f2c3b51..d8e66f13eb4a707a91d0bf5bec642a5a873bcdda 100644 (file)
--- a/print-smb.c
+++ b/print-smb.c
@@ -834,7 +834,7 @@ print_smb(netdissect_options *ndo,
     smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);
 
     if (nterrcodes) {
     smb_fdata(ndo, buf, fmt_smbheader, buf + 33, unicodestr);
 
     if (nterrcodes) {

-       nterror = EXTRACT_LE_U_4(buf + 5);
+       nterror = EXTRACT_LE_U_4(buf + 5);

        if (nterror)
            ND_PRINT("NTError = %s\n", nt_errstr(nterror));
     } else {
        if (nterror)
            ND_PRINT("NTError = %s\n", nt_errstr(nterror));
     } else {

diff --git a/print-snmp.c b/print-snmp.c
index 6607f0515c1da4291b98ae55b4fd5750657ac8df..87c7e9705e70b1d7f1107c531008d662a0062c94 100644 (file)
--- a/print-snmp.c
+++ b/print-snmp.c
@@ -932,7 +932,7 @@ smi_decode_oid(netdissect_options *ndo,
                 * (see X.690:1997 clause 8.19 for the details)
                 */
                if (first < 0) {
                 * (see X.690:1997 clause 8.19 for the details)
                 */
                if (first < 0) {

-                       first = 0;
+                       first = 0;

                        firstval = o / OIDMUX;
                        if (firstval > 2) firstval = 2;
                        o -= firstval * OIDMUX;
                        firstval = o / OIDMUX;
                        if (firstval > 2) firstval = 2;
                        o -= firstval * OIDMUX;

diff --git a/print-tcp.c b/print-tcp.c
index f69c56de83a160e0ea11381205b7d178811ad009..a7b60b8ee8057ce3feb6e82db95044e6cd98579b 100644 (file)
--- a/print-tcp.c
+++ b/print-tcp.c
@@ -188,7 +188,7 @@ tcp_print(netdissect_options *ndo,
                                      ip6addr_string(ndo, ip6->ip6_dst));
                } else {
                        ND_PRINT("%s > %s:",
                                      ip6addr_string(ndo, ip6->ip6_dst));
                } else {
                        ND_PRINT("%s > %s:",

-                                    ipaddr_string(ndo, ip->ip_src),
+                                    ipaddr_string(ndo, ip->ip_src),

                                     ipaddr_string(ndo, ip->ip_dst));
                 }
                 nd_print_trunc(ndo);
                                     ipaddr_string(ndo, ip->ip_dst));
                 }
                 nd_print_trunc(ndo);

diff --git a/print.c b/print.c
index c6e354309ea8a4fa175c9e4dac273e0a1681d294..5fe620bf56dfae5a6d1c2118fab40cc2267d669b 100644 (file)
--- a/print.c
+++ b/print.c
@@ -70,7 +70,7 @@ static const struct printer printers[] = {
        { nflog_if_print,       DLT_NFLOG},
 #endif
 #ifdef DLT_CIP
        { nflog_if_print,       DLT_NFLOG},
 #endif
 #ifdef DLT_CIP

-       { cip_if_print,         DLT_CIP },
+       { cip_if_print,         DLT_CIP },

 #endif
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },
 #endif
 #ifdef DLT_ATM_CLIP
        { cip_if_print,         DLT_ATM_CLIP },