Add program_name field in the netdissect_options structure

[tcpdump] / print-rrcp.c

diff --git a/print-rrcp.c b/print-rrcp.c
index 961fb87309c6f6350c5c11557cd2285a927b45f1..c4d437574bfc6aa50af9a923bf82577f4c7957d2 100644 (file)
--- a/print-rrcp.c
+++ b/print-rrcp.c
@@ -21,29 +21,17 @@
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 
  * and Realtek Echo Protocol (RRCP-REP) packets.
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-rrcp.c,v 1.2 2008-04-11 17:21:34 gianluca Exp $";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #include <tcpdump-stdinc.h>
 

-#include <stdio.h>
-#include <string.h>
-

 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"
 
 #include "netdissect.h"
 #include "addrtoname.h"
 #include "extract.h"
 #include "ether.h"
 

-#ifndef ETH_ALEN 
-#define ETH_ALEN 6
-#endif
-

 #define RRCP_OPCODE_MASK       0x7F    /* 0x00 = hello, 0x01 = get, 0x02 = set */
 #define RRCP_ISREPLY           0x80    /* 0 = request to switch, 0x80 = reply from switch */
 
 #define RRCP_OPCODE_MASK       0x7F    /* 0x00 = hello, 0x01 = get, 0x02 = set */
 #define RRCP_ISREPLY           0x80    /* 0 = request to switch, 0x80 = reply from switch */
 


@@ -86,11 +74,9 @@ rrcp_print(netdissect_options *ndo,
          u_int length _U_)
 {
        const u_char *rrcp;
          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;
        register const struct ether_header *ep;

-       char proto_str[16];
-       char opcode_str[32];

 
        ep = (const struct ether_header *)cp;
        rrcp = cp + ETHER_HDRLEN;
 
        ep = (const struct ether_header *)cp;
        rrcp = cp + ETHER_HDRLEN;


@@ -100,19 +86,19 @@ 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",
        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%02d",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",
                ((*(rrcp + RRCP_OPCODE_ISREPLY_OFFSET)) & RRCP_ISREPLY) ? "reply" : "query"));
        if (rrcp_proto==1){
            ND_PRINT((ndo, ": %s",

-                    tok2strbuf(opcode_values,"unknown opcode (0x%02d)",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);
            ND_PRINT((ndo, " addr=0x%04x, data=0x%08x",
        }
        if (rrcp_opcode==1 || rrcp_opcode==2){
            ND_TCHECK2(*(rrcp + RRCP_REG_ADDR_OFFSET), 6);
            ND_PRINT((ndo, " addr=0x%04x, data=0x%08x",

-                    EXTRACT_16BITS(rrcp + RRCP_REG_ADDR_OFFSET),
-                    EXTRACT_32BITS(rrcp + RRCP_REG_DATA_OFFSET)));
+                     EXTRACT_LE_16BITS(rrcp + RRCP_REG_ADDR_OFFSET),
+                     EXTRACT_LE_32BITS(rrcp + RRCP_REG_DATA_OFFSET)));

        }
        if (rrcp_proto==1){
            ND_TCHECK2(*(rrcp + RRCP_AUTHKEY_OFFSET), 2);
        }
        if (rrcp_proto==1){
            ND_TCHECK2(*(rrcp + RRCP_AUTHKEY_OFFSET), 2);


@@ -125,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),
            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){
                     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){


@@ -134,8 +120,6 @@ rrcp_print(netdissect_options *ndo,
                    EXTRACT_32BITS(rrcp + RRCP_COOKIE2_OFFSET),
                    EXTRACT_32BITS(rrcp + RRCP_COOKIE1_OFFSET)));
        }
                    EXTRACT_32BITS(rrcp + RRCP_COOKIE2_OFFSET),
                    EXTRACT_32BITS(rrcp + RRCP_COOKIE1_OFFSET)));
        }

-        if (!ndo->ndo_vflag)
-            return;

        return;
 
 trunc:
        return;
 
 trunc: