Default to first interface from pcap_findalldevs()

[tcpdump] / print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index d2cbc5c181db284261ce6e676d00c63b13e689d7..315514752624fc75635c86aaa7edddce1246f685 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -25,10 +25,7 @@
 #include "config.h"
 #endif
 
-#include <tcpdump-stdinc.h>
-
-#include <stdio.h>
-#include <string.h>
+#include <netdissect-stdinc.h>
 
 #include "netdissect.h"
 #include "addrtoname.h"
@@ -77,11 +74,9 @@ rrcp_print(netdissect_options *ndo,
          u_int length _U_)
 {
        const u_char *rrcp;
-       u_int8_t rrcp_proto;
-       u_int8_t rrcp_opcode;
+       uint8_t rrcp_proto;
+       uint8_t rrcp_opcode;
        register const struct ether_header *ep;
-       char proto_str[16];
-       char opcode_str[32];
 
        ep = (const struct ether_header *)cp;
        rrcp = cp + ETHER_HDRLEN;
@@ -91,13 +86,13 @@ rrcp_print(netdissect_options *ndo,
        ND_TCHECK(*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET));
        rrcp_opcode = (*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_OPCODE_MASK;
         ND_PRINT((ndo, "%s > %s, %s %s",
-               etheraddr_string(ESRC(ep)),
-               etheraddr_string(EDST(ep)),
-               tok2strbuf(proto_values,"RRCP-0x%02x",rrcp_proto,proto_str,sizeof(proto_str)),
+               etheraddr_string(ndo, ESRC(ep)),
+               etheraddr_string(ndo, EDST(ep)),
+               tok2str(proto_values,"RRCP-0x%02x",rrcp_proto),
                ((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
        if (rrcp_proto==1){
            ND_PRINT((ndo, ": %s",
-                    tok2strbuf(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode,opcode_str,sizeof(opcode_str))));
+                    tok2str(opcode_values,"unknown opcode (0x%02x)",rrcp_opcode)));
        }
        if (rrcp_opcode==1 || rrcp_opcode==2){
            ND_TCHECK2(*(rrcp + RRCP_REG_ADDR_OFFSET), 6);
@@ -116,7 +111,7 @@ rrcp_print(netdissect_options *ndo,
            ND_PRINT((ndo, " downlink_port=%d, uplink_port=%d, uplink_mac=%s, vendor_id=%08x ,chip_id=%04x ",
                     *(rrcp + RRCP_DOWNLINK_PORT_OFFSET),
                     *(rrcp + RRCP_UPLINK_PORT_OFFSET),
-                    etheraddr_string(rrcp + RRCP_UPLINK_MAC_OFFSET),
+                    etheraddr_string(ndo, rrcp + RRCP_UPLINK_MAC_OFFSET),
                     EXTRACT_32BITS(rrcp + RRCP_VENDOR_ID_OFFSET),
                     EXTRACT_16BITS(rrcp + RRCP_CHIP_ID_OFFSET)));
        }else if (rrcp_opcode==1 || rrcp_opcode==2 || rrcp_proto==2){
@@ -125,8 +120,6 @@ rrcp_print(netdissect_options *ndo,
                    EXTRACT_32BITS(rrcp + RRCP_COOKIE2_OFFSET),
                    EXTRACT_32BITS(rrcp + RRCP_COOKIE1_OFFSET)));
        }
-        if (!ndo->ndo_vflag)
-            return;
        return;
 
 trunc: