The third argument to linkaddr_string is one of the LINKADDR_ enums.

[tcpdump] / print-chdlc.c

diff --git a/print-chdlc.c b/print-chdlc.c
index 73e4909bf2d2cbd99df489e308091779d69b8dfd..bc431774537fcb24f347d6e77d3c5514b484182c 100644 (file)
--- a/print-chdlc.c
+++ b/print-chdlc.c
@@ -22,7 +22,7 @@
 /* \summary: Cisco HDLC printer */
 
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 
 #include "netdissect-stdinc.h"
@@ -47,6 +47,7 @@ static const struct tok chdlc_cast_values[] = {
 u_int
 chdlc_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p)
 {
+       ndo->ndo_protocol = "chdlc_if";
        return chdlc_print(ndo, p, h->len);
 }
 
@@ -56,13 +57,14 @@ chdlc_print(netdissect_options *ndo, const u_char *p, u_int length)
        u_int proto;
        const u_char *bp = p;
 
+       ndo->ndo_protocol = "chdlc";
        if (length < CHDLC_HDRLEN)
                goto trunc;
        ND_TCHECK_LEN(p, CHDLC_HDRLEN);
-       proto = EXTRACT_BE_U_2(p + 2);
+       proto = GET_BE_U_2(p + 2);
        if (ndo->ndo_eflag) {
                 ND_PRINT("%s, ethertype %s (0x%04x), length %u: ",
-                       tok2str(chdlc_cast_values, "0x%02x", EXTRACT_U_1(p)),
+                       tok2str(chdlc_cast_values, "0x%02x", GET_U_1(p)),
                        tok2str(ethertype_values, "Unknown", proto),
                        proto,
                        length);
@@ -95,9 +97,9 @@ chdlc_print(netdissect_options *ndo, const u_char *p, u_int length)
                 if (length < 2)
                     goto trunc;
                 ND_TCHECK_2(p);
-                if (EXTRACT_U_1(p + 1) == NLPID_CLNP ||
-                    EXTRACT_U_1(p + 1) == NLPID_ESIS ||
-                    EXTRACT_U_1(p + 1) == NLPID_ISIS)
+                if (GET_U_1(p + 1) == NLPID_CLNP ||
+                    GET_U_1(p + 1) == NLPID_ESIS ||
+                    GET_U_1(p + 1) == NLPID_ISIS)
                     isoclns_print(ndo, p + 1, length - 1);
                 else
                     isoclns_print(ndo, p, length);
@@ -111,8 +113,8 @@ chdlc_print(netdissect_options *ndo, const u_char *p, u_int length)
        return (CHDLC_HDRLEN);
 
 trunc:
-       ND_PRINT("[|chdlc]");
-       return ndo->ndo_snapend - bp;
+       nd_print_trunc(ndo);
+       return (ND_BYTES_AVAILABLE_AFTER(bp));
 }
 
 /*
@@ -145,13 +147,14 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
        const struct cisco_slarp *slarp;
         u_int sec,min,hrs,days;
 
+       ndo->ndo_protocol = "chdlc_slarp";
        ND_PRINT("SLARP (length: %u), ",length);
        if (length < SLARP_MIN_LEN)
                goto trunc;
 
        slarp = (const struct cisco_slarp *)cp;
        ND_TCHECK_LEN(slarp, SLARP_MIN_LEN);
-       switch (EXTRACT_BE_U_4(slarp->code)) {
+       switch (GET_BE_U_4(slarp->code)) {
        case SLARP_REQUEST:
                ND_PRINT("request");
                /*
@@ -166,19 +169,19 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
                break;
        case SLARP_REPLY:
                ND_PRINT("reply %s/%s",
-                       ipaddr_string(ndo, &slarp->un.addr.addr),
-                       ipaddr_string(ndo, &slarp->un.addr.mask));
+                       ipaddr_string(ndo, slarp->un.addr.addr),
+                       ipaddr_string(ndo, slarp->un.addr.mask));
                break;
        case SLARP_KEEPALIVE:
                ND_PRINT("keepalive: mineseen=0x%08x, yourseen=0x%08x, reliability=0x%04x",
-                       EXTRACT_BE_U_4(slarp->un.keep.myseq),
-                       EXTRACT_BE_U_4(slarp->un.keep.yourseq),
-                       EXTRACT_BE_U_2(slarp->un.keep.rel));
+                       GET_BE_U_4(slarp->un.keep.myseq),
+                       GET_BE_U_4(slarp->un.keep.yourseq),
+                       GET_BE_U_2(slarp->un.keep.rel));
 
                 if (length >= SLARP_MAX_LEN) { /* uptime-stamp is optional */
                         cp += SLARP_MIN_LEN;
                         ND_TCHECK_4(cp);
-                        sec = EXTRACT_BE_U_4(cp) / 1000;
+                        sec = GET_BE_U_4(cp) / 1000;
                         min = sec / 60; sec -= min * 60;
                         hrs = min / 60; min -= hrs * 60;
                         days = hrs / 24; hrs -= days * 24;
@@ -186,7 +189,7 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
                 }
                break;
        default:
-               ND_PRINT("0x%02x unknown", EXTRACT_BE_U_4(slarp->code));
+               ND_PRINT("0x%02x unknown", GET_BE_U_4(slarp->code));
                 if (ndo->ndo_vflag <= 1)
                     print_unknown_data(ndo,cp+4,"\n\t",length-4);
                break;
@@ -199,13 +202,5 @@ chdlc_slarp_print(netdissect_options *ndo, const u_char *cp, u_int length)
        return;
 
 trunc:
-       ND_PRINT("[|slarp]");
+       nd_print_trunc(ndo);
 }
-
-
-/*
- * Local Variables:
- * c-style: whitesmith
- * c-basic-offset: 8
- * End:
- */