X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/546558eabd81cfc36a81a4df728fdfea0d83b41a..HEAD:/print-atm.c diff --git a/print-atm.c b/print-atm.c index 22acd73f..2dee4e65 100644 --- a/print-atm.c +++ b/print-atm.c @@ -21,12 +21,11 @@ /* \summary: Asynchronous Transfer Mode (ATM) printer */ -#ifdef HAVE_CONFIG_H #include -#endif #include "netdissect-stdinc.h" +#define ND_LONGJMP_FROM_TCHECK #include "netdissect.h" #include "extract.h" #include "addrtoname.h" @@ -105,7 +104,7 @@ #define B_BEARER 0x5e /* broadband bearer capability */ #define B_LOWER 0x5f /* broadband lower information */ #define CALLING_PARTY 0x6c /* calling party number */ -#define CALLED_PARTY 0x70 /* called party nmber */ +#define CALLED_PARTY 0x70 /* called party number */ #define Q2931 0x09 @@ -113,17 +112,18 @@ #define PROTO_POS 0 /* offset of protocol discriminator */ #define CALL_REF_POS 2 /* offset of call reference value */ #define MSG_TYPE_POS 5 /* offset of message type */ -#define MSG_LEN_POS 7 /* offset of mesage length */ +#if 0 +#define MSG_LEN_POS 7 /* offset of message length */ #define IE_BEGIN_POS 9 /* offset of first information element */ /* format of signalling messages */ #define TYPE_POS 0 #define LEN_POS 2 #define FIELD_BEGIN_POS 4 +#endif /* end of the original atmuni31.h */ -static const char tstr[] = "[|atm]"; #define OAM_CRC10_MASK 0x3ff #define OAM_PAYLOAD_LEN 48 @@ -194,23 +194,11 @@ static const struct tok oam_fm_loopback_indicator_values[] = { { 0, NULL } }; -static const struct tok *oam_functype_values[16] = { - NULL, - oam_fm_functype_values, /* 1 */ - oam_pm_functype_values, /* 2 */ - NULL, - NULL, - NULL, - NULL, - NULL, - oam_ad_functype_values, /* 8 */ - NULL, - NULL, - NULL, - NULL, - NULL, - NULL, - NULL +static const struct uint_tokary oam_celltype2tokary[] = { + { OAM_CELLTYPE_FM, oam_fm_functype_values }, + { OAM_CELLTYPE_PM, oam_pm_functype_values }, + { OAM_CELLTYPE_AD, oam_ad_functype_values }, + /* uint2tokary() does not use array termination. */ }; /* @@ -244,7 +232,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) { @@ -253,28 +241,21 @@ atm_if_print(netdissect_options *ndo, uint32_t llchdr; u_int hdrlen = 0; - ndo->ndo_protocol = "atm_if"; - if (caplen < 1 || length < 1) { - ND_PRINT("%s", tstr); - return (caplen); - } + ndo->ndo_protocol = "atm"; /* Cisco Style NLPID ? */ - if (EXTRACT_U_1(p) == LLC_UI) { + if (GET_U_1(p) == LLC_UI) { if (ndo->ndo_eflag) ND_PRINT("CNLPID "); + ndo->ndo_ll_hdr_len += 1; isoclns_print(ndo, p + 1, length - 1); - return hdrlen; + return; } /* * Must have at least a DSAP, an SSAP, and the first byte of the * control field. */ - if (caplen < 3 || length < 3) { - ND_PRINT("%s", tstr); - return (caplen); - } /* * Extract the presumed LLC header into a variable, for quick @@ -283,7 +264,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)) { @@ -303,23 +284,21 @@ atm_if_print(netdissect_options *ndo, * packets? If so, could it be changed to use a * new DLT_IEEE802_6 value if we added it? */ - if (caplen < 20 || length < 20) { - ND_PRINT("%s", tstr); - return (caplen); - } 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)); + /* Always cover the full header. */ + ND_TCHECK_LEN(p, 20); p += 20; length -= 20; caplen -= 20; hdrlen += 20; } - hdrlen += atm_llc_print(ndo, p, length, caplen); - return (hdrlen); + ndo->ndo_ll_hdr_len += hdrlen; + ndo->ndo_ll_hdr_len += atm_llc_print(ndo, p, length, caplen); } /* @@ -350,16 +329,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, @@ -367,16 +344,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(" %s", tstr); } /* @@ -449,12 +422,13 @@ struct oam_fm_ais_rdi_t { }; void -oam_print (netdissect_options *ndo, - const u_char *p, u_int length, u_int hec) +oam_print(netdissect_options *ndo, + const u_char *p, u_int length, u_int hec) { uint32_t cell_header; uint16_t vpi, vci, cksum, cksum_shouldbe, idx; uint8_t cell_type, func_type, payload, clp; + const struct tok *oam_functype_str; union { const struct oam_fm_loopback_t *oam_fm_loopback; @@ -462,10 +436,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; @@ -486,11 +459,12 @@ oam_print (netdissect_options *ndo, tok2str(oam_celltype_values, "unknown", cell_type), cell_type); - if (oam_functype_values[cell_type] == NULL) + oam_functype_str = uint2tokary(oam_celltype2tokary, cell_type); + if (oam_functype_str == NULL) ND_PRINT(", func-type unknown (%u)", func_type); else ND_PRINT(", func-type %s (%u)", - tok2str(oam_functype_values[cell_type],"none",func_type), + tok2str(oam_functype_str, "none", func_type), func_type); p += ATM_HDR_LEN_NOHEC + hec; @@ -502,18 +476,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; @@ -522,11 +498,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; @@ -540,18 +518,11 @@ 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); ND_PRINT("\n\tcksum 0x%03x (%scorrect)", cksum, cksum_shouldbe == 0 ? "" : "in"); - - return; - -trunc: - ND_PRINT("[|oam]"); - return; }