X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/40ae3ad744d9f71079b410a810acbc33ef39f8ba..383670e8f3f5b51d1017d8c1a678aa7eaf1f2b4d:/print-sunatm.c diff --git a/print-sunatm.c b/print-sunatm.c index e1686d83..0fe5eee8 100644 --- a/print-sunatm.c +++ b/print-sunatm.c @@ -38,6 +38,7 @@ #include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" @@ -59,7 +60,7 @@ * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -u_int +void sunatm_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { @@ -69,17 +70,13 @@ sunatm_if_print(netdissect_options *ndo, u_char vpi; u_int traftype; - ndo->ndo_protocol = "sunatm_if"; - if (caplen < PKT_BEGIN_POS) { - nd_print_trunc(ndo); - return (caplen); - } + ndo->ndo_protocol = "sunatm"; if (ndo->ndo_eflag) { - ND_PRINT(EXTRACT_U_1(p + DIR_POS) & 0x80 ? "Tx: " : "Rx: "); + ND_PRINT(GET_U_1(p + DIR_POS) & 0x80 ? "Tx: " : "Rx: "); } - switch (EXTRACT_U_1(p + DIR_POS) & 0x0f) { + switch (GET_U_1(p + DIR_POS) & 0x0f) { case PT_LANE: traftype = ATM_LANE; @@ -94,13 +91,12 @@ sunatm_if_print(netdissect_options *ndo, break; } - vci = EXTRACT_BE_U_2(p + VCI_POS); - vpi = EXTRACT_U_1(p + VPI_POS); + vpi = GET_U_1(p + VPI_POS); + vci = GET_BE_U_2(p + VCI_POS); p += PKT_BEGIN_POS; caplen -= PKT_BEGIN_POS; length -= PKT_BEGIN_POS; + ndo->ndo_ll_hdr_len += PKT_BEGIN_POS; atm_print(ndo, vpi, vci, traftype, p, length, caplen); - - return (PKT_BEGIN_POS); }