Fix spaces

[tcpdump] / print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 0885f64657c8ca30be51dbf403a98197d69ee228..1d76613d471bfae58e5d0e81da86fd59839420cd 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -41,10 +41,10 @@
  */
 
 #ifdef HAVE_CONFIG_H
  */
 
 #ifdef HAVE_CONFIG_H

-#include "config.h"
+#include <config.h>

 #endif
 
 #endif
 

-#include <netdissect-stdinc.h>
+#include "netdissect-stdinc.h"

 
 #include "netdissect.h"
 #include "addrtoname.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"


@@ -96,50 +96,51 @@ rrcp_print(netdissect_options *ndo,
        uint8_t rrcp_proto;
        uint8_t rrcp_opcode;
 
        uint8_t rrcp_proto;
        uint8_t rrcp_opcode;
 

+       ndo->ndo_protocol = "rrcp";

        ND_TCHECK_1(cp + RRCP_PROTO_OFFSET);
        rrcp_proto = EXTRACT_U_1(cp + RRCP_PROTO_OFFSET);
        ND_TCHECK_1(cp + RRCP_OPCODE_ISREPLY_OFFSET);
        rrcp_opcode = EXTRACT_U_1((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
        if (src != NULL && dst != NULL) {
        ND_TCHECK_1(cp + RRCP_PROTO_OFFSET);
        rrcp_proto = EXTRACT_U_1(cp + RRCP_PROTO_OFFSET);
        ND_TCHECK_1(cp + RRCP_OPCODE_ISREPLY_OFFSET);
        rrcp_opcode = EXTRACT_U_1((cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
        if (src != NULL && dst != NULL) {

-               ND_PRINT((ndo, "%s > %s, ",
+               ND_PRINT("%s > %s, ",

                        (src->addr_string)(ndo, src->addr),
                        (src->addr_string)(ndo, src->addr),

-                       (dst->addr_string)(ndo, dst->addr)));
+                       (dst->addr_string)(ndo, dst->addr));

        }
        }

-       ND_PRINT((ndo, "%s %s",
+       ND_PRINT("%s %s",

                tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
                tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),

-               ((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
+               ((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query");

        if (rrcp_proto==1){
        if (rrcp_proto==1){

-           ND_PRINT((ndo, ": %s",
-                    tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode)));
+           ND_PRINT(": %s",
+                    tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode));

        }
        if (rrcp_opcode==1 || rrcp_opcode==2){
            ND_TCHECK_6(cp + RRCP_REG_ADDR_OFFSET);
        }
        if (rrcp_opcode==1 || rrcp_opcode==2){
            ND_TCHECK_6(cp + RRCP_REG_ADDR_OFFSET);

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

                     EXTRACT_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),
                     EXTRACT_LE_U_2(cp + RRCP_REG_ADDR_OFFSET),

-                    EXTRACT_LE_U_4(cp + RRCP_REG_DATA_OFFSET)));
+                    EXTRACT_LE_U_4(cp + RRCP_REG_DATA_OFFSET));

        }
        if (rrcp_proto==1){
            ND_TCHECK_2(cp + RRCP_AUTHKEY_OFFSET);
        }
        if (rrcp_proto==1){
            ND_TCHECK_2(cp + RRCP_AUTHKEY_OFFSET);

-           ND_PRINT((ndo, ", auth=0x%04x",
-                 EXTRACT_BE_U_2(cp + RRCP_AUTHKEY_OFFSET)));
+           ND_PRINT(", auth=0x%04x",
+                 EXTRACT_BE_U_2(cp + RRCP_AUTHKEY_OFFSET));

        }
        if (rrcp_proto==1 && rrcp_opcode==0 &&
             ((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
            ND_TCHECK_4(cp + RRCP_VENDOR_ID_OFFSET);
        }
        if (rrcp_proto==1 && rrcp_opcode==0 &&
             ((EXTRACT_U_1(cp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY)){
            ND_TCHECK_4(cp + RRCP_VENDOR_ID_OFFSET);

-           ND_PRINT((ndo, " downlink_port=%d, uplink_port=%d, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
+           ND_PRINT(" downlink_port=%u, uplink_port=%u, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",

                     EXTRACT_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET),
                     EXTRACT_U_1(cp + RRCP_UPLINK_PORT_OFFSET),
                     etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET),
                     EXTRACT_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET),
                     EXTRACT_U_1(cp + RRCP_DOWNLINK_PORT_OFFSET),
                     EXTRACT_U_1(cp + RRCP_UPLINK_PORT_OFFSET),
                     etheraddr_string(ndo, cp + RRCP_UPLINK_MAC_OFFSET),
                     EXTRACT_BE_U_4(cp + RRCP_VENDOR_ID_OFFSET),

-                    EXTRACT_BE_U_2(cp + RRCP_CHIP_ID_OFFSET)));
+                    EXTRACT_BE_U_2(cp + RRCP_CHIP_ID_OFFSET));

        }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){
            ND_TCHECK_4(cp + RRCP_COOKIE2_OFFSET);
        }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){
            ND_TCHECK_4(cp + RRCP_COOKIE2_OFFSET);

-           ND_PRINT((ndo, ", cookie=0x%08x%08x ",
+           ND_PRINT(", cookie=0x%08x%08x ",

                    EXTRACT_BE_U_4(cp + RRCP_COOKIE2_OFFSET),
                    EXTRACT_BE_U_4(cp + RRCP_COOKIE2_OFFSET),

-                   EXTRACT_BE_U_4(cp + RRCP_COOKIE1_OFFSET)));
+                   EXTRACT_BE_U_4(cp + RRCP_COOKIE1_OFFSET));

        }
        return;
 
 trunc:
        }
        return;
 
 trunc:

-       ND_PRINT((ndo, "[|rrcp]"));
+       nd_print_trunc(ndo);

 }
 }