X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/3976533f2cdbf4373a9ea71197aead3e5699aef0..5ef0bcb5edd748de9d9af13c40da0395dfdd94e8:/print-atm.c diff --git a/print-atm.c b/print-atm.c index 3bc135d7..434d901c 100644 --- a/print-atm.c +++ b/print-atm.c @@ -243,7 +243,7 @@ atm_llc_print(netdissect_options *ndo, * 'h->len' is the length of the packet off the wire, and 'h->caplen' * is the number of bytes actually captured. */ -u_int +void atm_if_print(netdissect_options *ndo, const struct pcap_pkthdr *h, const u_char *p) { @@ -252,18 +252,20 @@ atm_if_print(netdissect_options *ndo, uint32_t llchdr; u_int hdrlen = 0; - ndo->ndo_protocol = "atm_if"; + ndo->ndo_protocol = "atm"; if (caplen < 1) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } /* Cisco Style NLPID ? */ - if (EXTRACT_U_1(p) == LLC_UI) { + if (GET_U_1(p) == LLC_UI) { if (ndo->ndo_eflag) ND_PRINT("CNLPID "); isoclns_print(ndo, p + 1, length - 1); - return hdrlen; + ndo->ndo_ll_hdr_len += hdrlen; + return; } /* @@ -272,7 +274,8 @@ atm_if_print(netdissect_options *ndo, */ if (caplen < 3) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } /* @@ -282,7 +285,7 @@ atm_if_print(netdissect_options *ndo, * packet nor an RFC 2684 routed NLPID-formatted PDU nor * an 802.2-but-no-SNAP IP packet. */ - llchdr = EXTRACT_BE_U_3(p); + llchdr = GET_BE_U_3(p); if (llchdr != LLC_UI_HDR(LLCSAP_SNAP) && llchdr != LLC_UI_HDR(LLCSAP_ISONS) && llchdr != LLC_UI_HDR(LLCSAP_IP)) { @@ -304,21 +307,22 @@ atm_if_print(netdissect_options *ndo, */ if (caplen < 20) { nd_print_trunc(ndo); - return (caplen); + ndo->ndo_ll_hdr_len += caplen; + return; } if (ndo->ndo_eflag) ND_PRINT("%08x%08x %08x%08x ", - EXTRACT_BE_U_4(p), - EXTRACT_BE_U_4(p + 4), - EXTRACT_BE_U_4(p + 8), - EXTRACT_BE_U_4(p + 12)); + GET_BE_U_4(p), + GET_BE_U_4(p + 4), + GET_BE_U_4(p + 8), + GET_BE_U_4(p + 12)); p += 20; length -= 20; caplen -= 20; hdrlen += 20; } hdrlen += atm_llc_print(ndo, p, length, caplen); - return (hdrlen); + ndo->ndo_ll_hdr_len += hdrlen; } /* @@ -349,16 +353,14 @@ sig_print(netdissect_options *ndo, { uint32_t call_ref; - ND_TCHECK_1(p + PROTO_POS); - if (EXTRACT_U_1(p + PROTO_POS) == Q2931) { + if (GET_U_1(p + PROTO_POS) == Q2931) { /* * protocol:Q.2931 for User to Network Interface * (UNI 3.1) signalling */ ND_PRINT("Q.2931"); - ND_TCHECK_1(p + MSG_TYPE_POS); ND_PRINT(":%s ", - tok2str(msgtype2str, "msgtype#%u", EXTRACT_U_1(p + MSG_TYPE_POS))); + tok2str(msgtype2str, "msgtype#%u", GET_U_1(p + MSG_TYPE_POS))); /* * The call reference comes before the message type, @@ -366,16 +368,12 @@ sig_print(netdissect_options *ndo, * do from the caplen test above, we also know we have * the call reference. */ - call_ref = EXTRACT_BE_U_3(p + CALL_REF_POS); + call_ref = GET_BE_U_3(p + CALL_REF_POS); ND_PRINT("CALL_REF:0x%06x", call_ref); } else { /* SSCOP with some unknown protocol atop it */ - ND_PRINT("SSCOP, proto %u ", EXTRACT_U_1(p + PROTO_POS)); + ND_PRINT("SSCOP, proto %u ", GET_U_1(p + PROTO_POS)); } - return; - -trunc: - nd_print_trunc(ndo); } /* @@ -461,10 +459,9 @@ oam_print(netdissect_options *ndo, } oam_ptr; ndo->ndo_protocol = "oam"; - ND_TCHECK_1(p + ATM_HDR_LEN_NOHEC + hec); - cell_header = EXTRACT_BE_U_4(p + hec); - cell_type = (EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) >> 4) & 0x0f; - func_type = EXTRACT_U_1((p + ATM_HDR_LEN_NOHEC + hec)) & 0x0f; + cell_header = GET_BE_U_4(p + hec); + cell_type = (GET_U_1((p + ATM_HDR_LEN_NOHEC + hec)) >> 4) & 0x0f; + func_type = GET_U_1((p + ATM_HDR_LEN_NOHEC + hec)) & 0x0f; vpi = (cell_header>>20)&0xff; vci = (cell_header>>4)&0xffff; @@ -501,18 +498,20 @@ oam_print(netdissect_options *ndo, ND_PRINT("\n\tLoopback-Indicator %s, Correlation-Tag 0x%08x", tok2str(oam_fm_loopback_indicator_values, "Unknown", - EXTRACT_U_1(oam_ptr.oam_fm_loopback->loopback_indicator) & OAM_FM_LOOPBACK_INDICATOR_MASK), - EXTRACT_BE_U_4(oam_ptr.oam_fm_loopback->correlation_tag)); + GET_U_1(oam_ptr.oam_fm_loopback->loopback_indicator) & OAM_FM_LOOPBACK_INDICATOR_MASK), + GET_BE_U_4(oam_ptr.oam_fm_loopback->correlation_tag)); ND_PRINT("\n\tLocation-ID "); for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->loopback_id); idx++) { if (idx % 2) { - ND_PRINT("%04x ", EXTRACT_BE_U_2(&oam_ptr.oam_fm_loopback->loopback_id[idx])); + ND_PRINT("%04x ", + GET_BE_U_2(&oam_ptr.oam_fm_loopback->loopback_id[idx])); } } ND_PRINT("\n\tSource-ID "); for (idx = 0; idx < sizeof(oam_ptr.oam_fm_loopback->source_id); idx++) { if (idx % 2) { - ND_PRINT("%04x ", EXTRACT_BE_U_2(&oam_ptr.oam_fm_loopback->source_id[idx])); + ND_PRINT("%04x ", + GET_BE_U_2(&oam_ptr.oam_fm_loopback->source_id[idx])); } } break; @@ -521,11 +520,13 @@ oam_print(netdissect_options *ndo, case (OAM_CELLTYPE_FM << 4 | OAM_FM_FUNCTYPE_RDI): oam_ptr.oam_fm_ais_rdi = (const struct oam_fm_ais_rdi_t *)(p + OAM_CELLTYPE_FUNCTYPE_LEN); ND_TCHECK_SIZE(oam_ptr.oam_fm_ais_rdi); - ND_PRINT("\n\tFailure-type 0x%02x", EXTRACT_U_1(oam_ptr.oam_fm_ais_rdi->failure_type)); + ND_PRINT("\n\tFailure-type 0x%02x", + GET_U_1(oam_ptr.oam_fm_ais_rdi->failure_type)); ND_PRINT("\n\tLocation-ID "); for (idx = 0; idx < sizeof(oam_ptr.oam_fm_ais_rdi->failure_location); idx++) { if (idx % 2) { - ND_PRINT("%04x ", EXTRACT_BE_U_2(&oam_ptr.oam_fm_ais_rdi->failure_location[idx])); + ND_PRINT("%04x ", + GET_BE_U_2(&oam_ptr.oam_fm_ais_rdi->failure_location[idx])); } } break; @@ -539,8 +540,7 @@ oam_print(netdissect_options *ndo, } /* crc10 checksum verification */ - ND_TCHECK_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN); - cksum = EXTRACT_BE_U_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN) + cksum = GET_BE_U_2(p + OAM_CELLTYPE_FUNCTYPE_LEN + OAM_FUNCTION_SPECIFIC_LEN) & OAM_CRC10_MASK; cksum_shouldbe = verify_crc10_cksum(0, p, OAM_PAYLOAD_LEN);