X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/b17c37fdb52b3f4ee15eccb923576495b49dccae..refs/heads/tcpdump-4.0:/print-fr.c diff --git a/print-fr.c b/print-fr.c index b5330f9c..f71aee66 100644 --- a/print-fr.c +++ b/print-fr.c @@ -21,7 +21,7 @@ #ifndef lint static const char rcsid[] _U_ = - "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.25 2004-10-09 17:55:26 hannes Exp $ (LBL)"; + "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.51 2006-06-23 22:20:32 hannes Exp $ (LBL)"; #endif #ifdef HAVE_CONFIG_H @@ -39,8 +39,9 @@ static const char rcsid[] _U_ = #include "ethertype.h" #include "nlpid.h" #include "extract.h" +#include "oui.h" -static void lmi_print(const u_char *, u_int); +static void frf15_print(const u_char *, u_int); /* * the frame relay header has a variable length @@ -61,7 +62,6 @@ static void lmi_print(const u_char *, u_int); * +----+----+----+----+----+----+----+----+ * | DLCI (6 bits) |SDLC| EA | * +----+----+----+----+----+----+----+----+ - */ #define FR_EA_BIT 0x01 @@ -82,11 +82,25 @@ struct tok fr_header_flag_values[] = { { 0, NULL } }; +/* FRF.15 / FRF.16 */ +#define MFR_B_BIT 0x80 +#define MFR_E_BIT 0x40 +#define MFR_C_BIT 0x20 +#define MFR_BEC_MASK (MFR_B_BIT | MFR_E_BIT | MFR_C_BIT) +#define MFR_CTRL_FRAME (MFR_B_BIT | MFR_E_BIT | MFR_C_BIT) +#define MFR_FRAG_FRAME (MFR_B_BIT | MFR_E_BIT ) + +struct tok frf_flag_values[] = { + { MFR_B_BIT, "Begin" }, + { MFR_E_BIT, "End" }, + { MFR_C_BIT, "Control" }, + { 0, NULL } +}; /* Finds out Q.922 address length, DLCI and flags. Returns 0 on success * save the flags dep. on address length */ -static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore, +static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *addr_len, u_int8_t *flags) { if ((p[0] & FR_EA_BIT)) @@ -95,8 +109,10 @@ static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore, *addr_len = 2; *dlci = ((p[0] & 0xFC) << 2) | ((p[1] & 0xF0) >> 4); - flags[0] = p[0] & 0x02; /* populate the frist flag fields */ + flags[0] = p[0] & 0x02; /* populate the first flag fields */ flags[1] = p[1] & 0x0c; + flags[2] = 0; /* clear the rest of the flags */ + flags[3] = 0; if (p[1] & FR_EA_BIT) return 0; /* 2-byte Q.922 address */ @@ -114,14 +130,26 @@ static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore, flags[3] = p[0] & 0x02; - if (p[0] & 0x02) - *sdlcore = p[0] >> 2; - else - *dlci = (*dlci << 6) | (p[0] >> 2); + *dlci = (*dlci << 6) | (p[0] >> 2); return 0; } +char *q922_string(const u_char *p) { + + static u_int dlci, addr_len; + static u_int8_t flags[4]; + static char buffer[sizeof("DLCI xxxxxxxxxx")]; + memset(buffer, 0, sizeof(buffer)); + + if (parse_q922_addr(p, &dlci, &addr_len, flags) == 0){ + snprintf(buffer, sizeof(buffer), "DLCI %u", dlci); + } + + return buffer; +} + + /* Frame Relay packet structure, with flags and CRC removed +---------------------------+ @@ -149,10 +177,9 @@ static int parse_q922_addr(const u_char *p, u_int *dlci, u_int *sdlcore, */ static u_int -fr_hdrlen(const u_char *p, u_int addr_len, u_int caplen) +fr_hdrlen(const u_char *p, u_int addr_len) { - if ((caplen > addr_len + 1 /* UI */ + 1 /* pad */) && - !p[addr_len + 1] /* pad exist */) + if (!p[addr_len + 1] /* pad exist */) return addr_len + 1 /* UI */ + 1 /* pad */ + 1 /* NLPID */; else return addr_len + 1 /* UI */ + 1 /* NLPID */; @@ -190,34 +217,38 @@ fr_if_print(const struct pcap_pkthdr *h, register const u_char *p) { register u_int length = h->len; register u_int caplen = h->caplen; + + TCHECK2(*p, 4); /* minimum frame header length */ + + if ((length = fr_print(p, length)) == 0) + return (0); + else + return length; + trunc: + printf("[|fr]"); + return caplen; +} + +u_int +fr_print(register const u_char *p, u_int length) +{ u_int16_t extracted_ethertype; - u_int32_t orgcode; - register u_short et; u_int dlci; - u_int sdlcore; u_int addr_len; u_int16_t nlpid; u_int hdr_len; u_int8_t flags[4]; - if (caplen < 4) { /* minimum frame header length */ - printf("[|fr]"); - return caplen; - } - - if (parse_q922_addr(p, &dlci, &sdlcore, &addr_len, flags)) { + if (parse_q922_addr(p, &dlci, &addr_len, flags)) { printf("Q.922, invalid address"); - return caplen; + return 0; } - hdr_len = fr_hdrlen(p, addr_len, caplen); - - if (caplen < hdr_len) { - printf("[|fr]"); - return caplen; - } + TCHECK2(*p,addr_len+1+1); + hdr_len = fr_hdrlen(p, addr_len); + TCHECK2(*p,hdr_len); - if (p[addr_len] != 0x03) { + if (p[addr_len] != 0x03 && dlci != 0) { /* lets figure out if we have cisco style encapsulation: */ extracted_ethertype = EXTRACT_16BITS(p+addr_len); @@ -228,7 +259,7 @@ fr_if_print(const struct pcap_pkthdr *h, register const u_char *p) if (ether_encap_print(extracted_ethertype, p+addr_len+ETHERTYPE_LEN, length-addr_len-ETHERTYPE_LEN, - caplen-addr_len-ETHERTYPE_LEN, + length-addr_len-ETHERTYPE_LEN, &extracted_ethertype) == 0) /* ether_type not known, probably it wasn't one */ printf("UI %02x! ", p[addr_len]); @@ -246,14 +277,12 @@ fr_if_print(const struct pcap_pkthdr *h, register const u_char *p) if (eflag) fr_hdr_print(length, addr_len, dlci, flags, nlpid); - p += hdr_len; length -= hdr_len; - caplen -= hdr_len; switch (nlpid) { case NLPID_IP: - ip_print(p, length); + ip_print(gndo, p, length); break; #ifdef INET6 @@ -264,41 +293,291 @@ fr_if_print(const struct pcap_pkthdr *h, register const u_char *p) case NLPID_CLNP: case NLPID_ESIS: case NLPID_ISIS: - isoclns_print(p, length, caplen); + isoclns_print(p-1, length+1, length+1); /* OSI printers need the NLPID field */ break; case NLPID_SNAP: - orgcode = EXTRACT_24BITS(p); - et = EXTRACT_16BITS(p + 3); - if (snap_print((const u_char *)(p + 5), length - 5, - caplen - 5, &extracted_ethertype, orgcode, et, - 0) == 0) { + if (snap_print(p, length, length, &extracted_ethertype, 0) == 0) { /* ether_type not known, print raw packet */ - if (!eflag) + if (!eflag) fr_hdr_print(length + hdr_len, hdr_len, - dlci, flags, nlpid); - if (extracted_ethertype) { - printf("(SNAP %s) ", - etherproto_string(htons(extracted_ethertype))); - } - if (!xflag && !qflag) - default_print(p - hdr_len, caplen + hdr_len); + dlci, flags, nlpid); + if (!suppress_default_print) + default_print(p - hdr_len, length + hdr_len); } break; - case NLPID_LMI: - lmi_print(p, length); + case NLPID_Q933: + q933_print(p, length); break; + case NLPID_MFR: + frf15_print(p, length); + break; + + case NLPID_PPP: + ppp_print(p, length); + break; + default: if (!eflag) fr_hdr_print(length + hdr_len, addr_len, dlci, flags, nlpid); if (!xflag) - default_print(p, caplen); + default_print(p, length); } return hdr_len; + + trunc: + printf("[|fr]"); + return 0; + +} + +u_int +mfr_if_print(const struct pcap_pkthdr *h, register const u_char *p) +{ + register u_int length = h->len; + register u_int caplen = h->caplen; + + TCHECK2(*p, 2); /* minimum frame header length */ + + if ((length = mfr_print(p, length)) == 0) + return (0); + else + return length; + trunc: + printf("[|mfr]"); + return caplen; +} + + +#define MFR_CTRL_MSG_ADD_LINK 1 +#define MFR_CTRL_MSG_ADD_LINK_ACK 2 +#define MFR_CTRL_MSG_ADD_LINK_REJ 3 +#define MFR_CTRL_MSG_HELLO 4 +#define MFR_CTRL_MSG_HELLO_ACK 5 +#define MFR_CTRL_MSG_REMOVE_LINK 6 +#define MFR_CTRL_MSG_REMOVE_LINK_ACK 7 + +struct tok mfr_ctrl_msg_values[] = { + { MFR_CTRL_MSG_ADD_LINK, "Add Link" }, + { MFR_CTRL_MSG_ADD_LINK_ACK, "Add Link ACK" }, + { MFR_CTRL_MSG_ADD_LINK_REJ, "Add Link Reject" }, + { MFR_CTRL_MSG_HELLO, "Hello" }, + { MFR_CTRL_MSG_HELLO_ACK, "Hello ACK" }, + { MFR_CTRL_MSG_REMOVE_LINK, "Remove Link" }, + { MFR_CTRL_MSG_REMOVE_LINK_ACK, "Remove Link ACK" }, + { 0, NULL } +}; + +#define MFR_CTRL_IE_BUNDLE_ID 1 +#define MFR_CTRL_IE_LINK_ID 2 +#define MFR_CTRL_IE_MAGIC_NUM 3 +#define MFR_CTRL_IE_TIMESTAMP 5 +#define MFR_CTRL_IE_VENDOR_EXT 6 +#define MFR_CTRL_IE_CAUSE 7 + +struct tok mfr_ctrl_ie_values[] = { + { MFR_CTRL_IE_BUNDLE_ID, "Bundle ID"}, + { MFR_CTRL_IE_LINK_ID, "Link ID"}, + { MFR_CTRL_IE_MAGIC_NUM, "Magic Number"}, + { MFR_CTRL_IE_TIMESTAMP, "Timestamp"}, + { MFR_CTRL_IE_VENDOR_EXT, "Vendor Extension"}, + { MFR_CTRL_IE_CAUSE, "Cause"}, + { 0, NULL } +}; + +#define MFR_ID_STRING_MAXLEN 50 + +struct ie_tlv_header_t { + u_int8_t ie_type; + u_int8_t ie_len; +}; + +u_int +mfr_print(register const u_char *p, u_int length) +{ + u_int tlen,idx,hdr_len = 0; + u_int16_t sequence_num; + u_int8_t ie_type,ie_len; + const u_int8_t *tptr; + + +/* + * FRF.16 Link Integrity Control Frame + * + * 7 6 5 4 3 2 1 0 + * +----+----+----+----+----+----+----+----+ + * | B | E | C=1| 0 0 0 0 | EA | + * +----+----+----+----+----+----+----+----+ + * | 0 0 0 0 0 0 0 0 | + * +----+----+----+----+----+----+----+----+ + * | message type | + * +----+----+----+----+----+----+----+----+ + */ + + TCHECK2(*p, 4); /* minimum frame header length */ + + if ((p[0] & MFR_BEC_MASK) == MFR_CTRL_FRAME && p[1] == 0) { + printf("FRF.16 Control, Flags [%s], %s, length %u", + bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK)), + tok2str(mfr_ctrl_msg_values,"Unknown Message (0x%02x)",p[2]), + length); + tptr = p + 3; + tlen = length -3; + hdr_len = 3; + + if (!vflag) + return hdr_len; + + while (tlen>sizeof(struct ie_tlv_header_t)) { + TCHECK2(*tptr, sizeof(struct ie_tlv_header_t)); + ie_type=tptr[0]; + ie_len=tptr[1]; + + printf("\n\tIE %s (%u), length %u: ", + tok2str(mfr_ctrl_ie_values,"Unknown",ie_type), + ie_type, + ie_len); + + /* infinite loop check */ + if (ie_type == 0 || ie_len <= sizeof(struct ie_tlv_header_t)) + return hdr_len; + + TCHECK2(*tptr,ie_len); + tptr+=sizeof(struct ie_tlv_header_t); + /* tlv len includes header */ + ie_len-=sizeof(struct ie_tlv_header_t); + tlen-=sizeof(struct ie_tlv_header_t); + + switch (ie_type) { + + case MFR_CTRL_IE_MAGIC_NUM: + printf("0x%08x",EXTRACT_32BITS(tptr)); + break; + + case MFR_CTRL_IE_BUNDLE_ID: /* same message format */ + case MFR_CTRL_IE_LINK_ID: + for (idx = 0; idx < ie_len && idx < MFR_ID_STRING_MAXLEN; idx++) { + if (*(tptr+idx) != 0) /* don't print null termination */ + safeputchar(*(tptr+idx)); + else + break; + } + break; + + case MFR_CTRL_IE_TIMESTAMP: + if (ie_len == sizeof(struct timeval)) { + ts_print((const struct timeval *)tptr); + break; + } + /* fall through and hexdump if no unix timestamp */ + + /* + * FIXME those are the defined IEs that lack a decoder + * you are welcome to contribute code ;-) + */ + + case MFR_CTRL_IE_VENDOR_EXT: + case MFR_CTRL_IE_CAUSE: + + default: + if (vflag <= 1) + print_unknown_data(tptr,"\n\t ",ie_len); + break; + } + + /* do we want to see a hexdump of the IE ? */ + if (vflag > 1 ) + print_unknown_data(tptr,"\n\t ",ie_len); + + tlen-=ie_len; + tptr+=ie_len; + } + return hdr_len; + } +/* + * FRF.16 Fragmentation Frame + * + * 7 6 5 4 3 2 1 0 + * +----+----+----+----+----+----+----+----+ + * | B | E | C=0|seq. (high 4 bits) | EA | + * +----+----+----+----+----+----+----+----+ + * | sequence (low 8 bits) | + * +----+----+----+----+----+----+----+----+ + * | DLCI (6 bits) | CR | EA | + * +----+----+----+----+----+----+----+----+ + * | DLCI (4 bits) |FECN|BECN| DE | EA | + * +----+----+----+----+----+----+----+----+ + */ + + sequence_num = (p[0]&0x1e)<<7 | p[1]; + /* whole packet or first fragment ? */ + if ((p[0] & MFR_BEC_MASK) == MFR_FRAG_FRAME || + (p[0] & MFR_BEC_MASK) == MFR_B_BIT) { + printf("FRF.16 Frag, seq %u, Flags [%s], ", + sequence_num, + bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK))); + hdr_len = 2; + fr_print(p+hdr_len,length-hdr_len); + return hdr_len; + } + + /* must be a middle or the last fragment */ + printf("FRF.16 Frag, seq %u, Flags [%s]", + sequence_num, + bittok2str(frf_flag_values,"none",(p[0] & MFR_BEC_MASK))); + print_unknown_data(p,"\n\t",length); + + return hdr_len; + + trunc: + printf("[|mfr]"); + return length; +} + +/* an NLPID of 0xb1 indicates a 2-byte + * FRF.15 header + * + * 7 6 5 4 3 2 1 0 + * +----+----+----+----+----+----+----+----+ + * ~ Q.922 header ~ + * +----+----+----+----+----+----+----+----+ + * | NLPID (8 bits) | NLPID=0xb1 + * +----+----+----+----+----+----+----+----+ + * | B | E | C |seq. (high 4 bits) | R | + * +----+----+----+----+----+----+----+----+ + * | sequence (low 8 bits) | + * +----+----+----+----+----+----+----+----+ + */ + +#define FR_FRF15_FRAGTYPE 0x01 + +static void +frf15_print (const u_char *p, u_int length) { + + u_int16_t sequence_num, flags; + + flags = p[0]&MFR_BEC_MASK; + sequence_num = (p[0]&0x1e)<<7 | p[1]; + + printf("FRF.15, seq 0x%03x, Flags [%s],%s Fragmentation, length %u", + sequence_num, + bittok2str(frf_flag_values,"none",flags), + p[0]&FR_FRF15_FRAGTYPE ? "Interface" : "End-to-End", + length); + +/* TODO: + * depending on all permutations of the B, E and C bit + * dig as deep as we can - e.g. on the first (B) fragment + * there is enough payload to print the IP header + * on non (B) fragments it depends if the fragmentation + * model is end-to-end or interface based wether we want to print + * another Q.922 header + */ + } /* @@ -348,7 +627,7 @@ fr_if_print(const struct pcap_pkthdr *h, register const u_char *p) #define MSG_TYPE_STATUS 0x7D #define MSG_TYPE_STATUS_ENQ 0x75 -struct tok fr_lmi_msg_values[] = { +struct tok fr_q933_msg_values[] = { { MSG_TYPE_ESC_TO_NATIONAL, "ESC to National" }, { MSG_TYPE_ALERT, "Alert" }, { MSG_TYPE_CALL_PROCEEDING, "Call proceeding" }, @@ -377,7 +656,7 @@ struct tok fr_lmi_msg_values[] = { #define FR_LMI_CCITT_LINK_VERIFY_IE 0x53 #define FR_LMI_CCITT_PVC_STATUS_IE 0x57 -struct tok fr_lmi_ie_values[] = { +struct tok fr_q933_ie_values_codeset5[] = { { FR_LMI_ANSI_REPORT_TYPE_IE, "ANSI Report Type" }, { FR_LMI_ANSI_LINK_VERIFY_IE_91, "ANSI Link Verify" }, { FR_LMI_ANSI_LINK_VERIFY_IE, "ANSI Link Verify" }, @@ -399,132 +678,207 @@ struct tok fr_lmi_report_type_ie_values[] = { { 0, NULL } }; -struct common_ie_header { - u_int8_t ie_id; - u_int8_t ie_len; +/* array of 16 codepages - currently we only support codepage 1,5 */ +static struct tok *fr_q933_ie_codesets[] = { + NULL, + fr_q933_ie_values_codeset5, + NULL, + NULL, + NULL, + fr_q933_ie_values_codeset5, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL }; -static void -lmi_print(const u_char *p, u_int length) +static int fr_q933_print_ie_codeset5(const struct ie_tlv_header_t *ie_p, + const u_char *p); + +typedef int (*codeset_pr_func_t)(const struct ie_tlv_header_t *ie_p, + const u_char *p); + +/* array of 16 codepages - currently we only support codepage 1,5 */ +static codeset_pr_func_t fr_q933_print_ie_codeset[] = { + NULL, + fr_q933_print_ie_codeset5, + NULL, + NULL, + NULL, + fr_q933_print_ie_codeset5, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL, + NULL +}; + +void +q933_print(const u_char *p, u_int length) { const u_char *ptemp = p; - struct common_ie_header *ie_p; + struct ie_tlv_header_t *ie_p; int olen; int is_ansi = 0; - u_int dlci; + u_int codeset; + u_int ie_is_known = 0; if (length < 9) { /* shortest: Q.933a LINK VERIFY */ - printf("[|lmi]"); + printf("[|q.933]"); return; } - if (p[2] == MSG_ANSI_LOCKING_SHIFT) - is_ansi = 1; + codeset = p[2]&0x0f; /* extract the codeset */ + + if (p[2] == MSG_ANSI_LOCKING_SHIFT) { + is_ansi = 1; + } - if (!eflag) - printf("Q.933 LMI, "); + printf("%s", eflag ? "" : "Q.933, "); /* printing out header part */ - printf(is_ansi ? "ANSI" : "CCITT "); - - if (p[0]) - printf(", Call Ref: 0x%02x", p[0]); + printf("%s, codeset %u", is_ansi ? "ANSI" : "CCITT", codeset); - if (vflag) - printf(", %s (0x%02x), length %u", - tok2str(fr_lmi_msg_values,"unknown message",p[1]), - p[1], - length); - else - printf(", %s", - tok2str(fr_lmi_msg_values,"unknown message 0x%02x",p[1])); + if (p[0]) { + printf(", Call Ref: 0x%02x", p[0]); + } + if (vflag) { + printf(", %s (0x%02x), length %u", + tok2str(fr_q933_msg_values, + "unknown message", p[1]), + p[1], + length); + } else { + printf(", %s", + tok2str(fr_q933_msg_values, + "unknown message 0x%02x", p[1])); + } olen = length; /* preserve the original length for non verbose mode */ if (length < (u_int)(2 - is_ansi)) { - printf("[|lmi]"); + printf("[|q.933]"); return; } - length -= 2 - is_ansi; + length -= 2 + is_ansi; ptemp += 2 + is_ansi; /* Loop through the rest of IE */ - while (length > 0) { - ie_p = (struct common_ie_header *)ptemp; - if (length < sizeof(struct common_ie_header) || - length < sizeof(struct common_ie_header) + ie_p->ie_len) { - if (vflag) /* not bark if there is just a trailer */ - printf("\n[|lmi]"); - else + while (length > sizeof(struct ie_tlv_header_t)) { + ie_p = (struct ie_tlv_header_t *)ptemp; + if (length < sizeof(struct ie_tlv_header_t) || + length < sizeof(struct ie_tlv_header_t) + ie_p->ie_len) { + if (vflag) { /* not bark if there is just a trailer */ + printf("\n[|q.933]"); + } else { printf(", length %u",olen); + } return; } /* lets do the full IE parsing only in verbose mode * however some IEs (DLCI Status, Link Verify) - * are also intereststing in non-verbose mode */ - if (vflag) - printf("\n\t%s IE (%u), length %u: ", - tok2str(fr_lmi_ie_values,"unknown",ie_p->ie_id), - ie_p->ie_id, + * are also interestting in non-verbose mode */ + if (vflag) { + printf("\n\t%s IE (0x%02x), length %u: ", + tok2str(fr_q933_ie_codesets[codeset], + "unknown", ie_p->ie_type), + ie_p->ie_type, ie_p->ie_len); - - switch (ie_p->ie_id) { - - case FR_LMI_ANSI_REPORT_TYPE_IE: /* fall through */ - case FR_LMI_CCITT_REPORT_TYPE_IE: - if (vflag) - printf("%s (%u)", - tok2str(fr_lmi_report_type_ie_values,"unknown",ptemp[2]), - ptemp[2]); - break; + } - case FR_LMI_ANSI_LINK_VERIFY_IE: /* fall through */ - case FR_LMI_CCITT_LINK_VERIFY_IE: - case FR_LMI_ANSI_LINK_VERIFY_IE_91: - if (!vflag) - printf(", "); - printf("TX Seq: %3d, RX Seq: %3d", ptemp[2], ptemp[3]); - break; - case FR_LMI_ANSI_PVC_STATUS_IE: /* fall through */ - case FR_LMI_CCITT_PVC_STATUS_IE: - if (!vflag) - printf(", "); - /* now parse the DLCI information element. */ - if ((ie_p->ie_len < 3) || - (ptemp[2] & 0x80) || - ((ie_p->ie_len == 3) && !(ptemp[3] & 0x80)) || - ((ie_p->ie_len == 4) && ((ptemp[3] & 0x80) || !(ptemp[4] & 0x80))) || - ((ie_p->ie_len == 5) && ((ptemp[3] & 0x80) || (ptemp[4] & 0x80) || - !(ptemp[5] & 0x80))) || - (ie_p->ie_len > 5) || - !(ptemp[ie_p->ie_len + 1] & 0x80)) - printf("Invalid DLCI IE"); - - dlci = ((ptemp[2] & 0x3F) << 4) | ((ptemp[3] & 0x78) >> 3); - if (ie_p->ie_len == 4) - dlci = (dlci << 6) | ((ptemp[4] & 0x7E) >> 1); - else if (ie_p->ie_len == 5) - dlci = (dlci << 13) | (ptemp[4] & 0x7F) | ((ptemp[5] & 0x7E) >> 1); - - printf("DLCI %u: status %s%s", dlci, - ptemp[ie_p->ie_len + 1] & 0x8 ? "New, " : "", - ptemp[ie_p->ie_len + 1] & 0x2 ? "Active" : "Inactive"); - break; - - default: - if (vflag <= 1) - print_unknown_data(ptemp+2,"\n\t",ie_p->ie_len); - break; - } + /* sanity check */ + if (ie_p->ie_type == 0 || ie_p->ie_len == 0) { + return; + } + + if (fr_q933_print_ie_codeset[codeset] != NULL) { + ie_is_known = fr_q933_print_ie_codeset[codeset](ie_p, ptemp); + } + + if (vflag >= 1 && !ie_is_known) { + print_unknown_data(ptemp+2,"\n\t",ie_p->ie_len); + } /* do we want to see a hexdump of the IE ? */ - if (vflag> 1) + if (vflag> 1 && ie_is_known) { print_unknown_data(ptemp+2,"\n\t ",ie_p->ie_len); + } length = length - ie_p->ie_len - 2; ptemp = ptemp + ie_p->ie_len + 2; } - if (!vflag) + if (!vflag) { printf(", length %u",olen); + } +} + +static int +fr_q933_print_ie_codeset5(const struct ie_tlv_header_t *ie_p, const u_char *p) +{ + u_int dlci; + + switch (ie_p->ie_type) { + + case FR_LMI_ANSI_REPORT_TYPE_IE: /* fall through */ + case FR_LMI_CCITT_REPORT_TYPE_IE: + if (vflag) { + printf("%s (%u)", + tok2str(fr_lmi_report_type_ie_values,"unknown",p[2]), + p[2]); + } + return 1; + + case FR_LMI_ANSI_LINK_VERIFY_IE: /* fall through */ + case FR_LMI_CCITT_LINK_VERIFY_IE: + case FR_LMI_ANSI_LINK_VERIFY_IE_91: + if (!vflag) { + printf(", "); + } + printf("TX Seq: %3d, RX Seq: %3d", p[2], p[3]); + return 1; + + case FR_LMI_ANSI_PVC_STATUS_IE: /* fall through */ + case FR_LMI_CCITT_PVC_STATUS_IE: + if (!vflag) { + printf(", "); + } + /* now parse the DLCI information element. */ + if ((ie_p->ie_len < 3) || + (p[2] & 0x80) || + ((ie_p->ie_len == 3) && !(p[3] & 0x80)) || + ((ie_p->ie_len == 4) && ((p[3] & 0x80) || !(p[4] & 0x80))) || + ((ie_p->ie_len == 5) && ((p[3] & 0x80) || (p[4] & 0x80) || + !(p[5] & 0x80))) || + (ie_p->ie_len > 5) || + !(p[ie_p->ie_len + 1] & 0x80)) { + printf("Invalid DLCI IE"); + } + + dlci = ((p[2] & 0x3F) << 4) | ((p[3] & 0x78) >> 3); + if (ie_p->ie_len == 4) { + dlci = (dlci << 6) | ((p[4] & 0x7E) >> 1); + } + else if (ie_p->ie_len == 5) { + dlci = (dlci << 13) | (p[4] & 0x7F) | ((p[5] & 0x7E) >> 1); + } + + printf("DLCI %u: status %s%s", dlci, + p[ie_p->ie_len + 1] & 0x8 ? "New, " : "", + p[ie_p->ie_len + 1] & 0x2 ? "Active" : "Inactive"); + return 1; + } + + return 0; }