resolve merge conflicts and update for proper build; including:

o print-fr.c returned to code on vendor branch
o remove pmap_prot.h include from print-sunrprc.c
o remove gcc/i386-specific ntoh* write-arounds from tcpdump-stdinc.h

Reviewed by:	bms

1 files changed, 432 insertions, 247 deletions

diff --git a/contrib/tcpdump/print-fr.c b/contrib/tcpdump/print-fr.c
index 4e568b1..bfe048a 100644
--- a/contrib/tcpdump/print-fr.c
+++ b/contrib/tcpdump/print-fr.c
@@ -22,103 +22,110 @@
  */
 
 #ifndef lint
-static  char rcsid[] =
-	"@(#)$Header: /home/ncvs/src/contrib/tcpdump/print-fr.c,v 1.1 1997/12/31 21:50:31 pst Exp $ (LBL)";
+static const char rcsid[] _U_ =
+	"@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.32 2005/04/06 21:32:39 mcr Exp $ (LBL)";
 #endif
 
-#ifdef PPP
-#include <sys/param.h>
-#include <sys/time.h>
-#include <sys/socket.h>
-#include <sys/file.h>
-#include <sys/ioctl.h>
-
-#if __STDC__
-struct mbuf;
-struct rtentry;
+#ifdef HAVE_CONFIG_H
+#include "config.h"
 #endif
-#include <net/if.h>
-#include <net/if_var.h>
 
-#include <netinet/in.h>
-#include <netinet/in_systm.h>
-#include <netinet/ip.h>
+#include <tcpdump-stdinc.h>
 
-#include <ctype.h>
-#include <netdb.h>
-#include <pcap.h>
-#include <signal.h>
 #include <stdio.h>
+#include <string.h>
+#include <pcap.h>
 
-#include <netinet/if_ether.h>
+#include "addrtoname.h"
+#include "interface.h"
 #include "ethertype.h"
+#include "nlpid.h"
+#include "extract.h"
+#include "oui.h"
 
-#include <net/ppp_defs.h>
-#include "interface.h"
-#include "addrtoname.h"
+static void frf15_print(const u_char *, u_int);
+
+/*
+ * the frame relay header has a variable length
+ *
+ * the EA bit determines if there is another byte
+ * in the header
+ *
+ * minimum header length is 2 bytes
+ * maximum header length is 4 bytes
+ *
+ *      7    6    5    4    3    2    1    0
+ *    +----+----+----+----+----+----+----+----+
+ *    |        DLCI (6 bits)        | CR | EA |
+ *    +----+----+----+----+----+----+----+----+
+ *    |   DLCI (4 bits)   |FECN|BECN| DE | EA |
+ *    +----+----+----+----+----+----+----+----+
+ *    |           DLCI (7 bits)          | EA |
+ *    +----+----+----+----+----+----+----+----+
+ *    |        DLCI (6 bits)        |SDLC| EA |
+ *    +----+----+----+----+----+----+----+----+
+ */
 
+#define FR_EA_BIT	0x01
 
-void q933_print();
+#define FR_CR_BIT       0x02000000
+#define FR_DE_BIT	0x00020000
+#define FR_BECN_BIT	0x00040000
+#define FR_FECN_BIT	0x00080000
+#define FR_SDLC_BIT	0x00000002
 
-#define FR_EA_BIT(p) ((p)&0x1)
-#define FR_DLCI(b0,b1) ((((b0)&0xFC)<<2)+(((b1)&0xF0)>>4))
 
-struct fr_nlpids {
-	u_short id;
-	char *name;
+struct tok fr_header_flag_values[] = {
+    { FR_CR_BIT, "C!" },
+    { FR_DE_BIT, "DE" },
+    { FR_BECN_BIT, "BECN" },
+    { FR_FECN_BIT, "FECN" },
+    { FR_SDLC_BIT, "sdlcore" },
+    { 0, NULL }
 };
 
-/* find out how many bytes are there in a frame */
-int
-fr_addr_len(const u_char *p)
-{
-	int i=0;
-	
-	while (!FR_EA_BIT(p[i]) && i++ && !FR_EA_BIT(p[i+1])) i++;
-	return (i+1);
-}
 
-/* the following is for framerelay */
-#define NLPID_LEN	1	/* NLPID is one byte long */
-#define NLPID_Q933      0x08
-#define NLPID_CLNP      0x81
-#define NLPID_ESIS      0x82
-#define NLPID_ISIS      0x83
-#define NLPID_CONS      0x84
-#define NLPID_IDRP      0x85
-#define NLPID_X25_ESIS  0x8a
-#define NLPID_IP        0xcc
+/* 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,
+                           u_int *addr_len, u_int8_t *flags)
+{
+	if ((p[0] & FR_EA_BIT))
+		return -1;
 
+	*addr_len = 2;
+	*dlci = ((p[0] & 0xFC) << 2) | ((p[1] & 0xF0) >> 4);
 
-static struct fr_nlpids fr_nlpids[256];
-static fr_nlpid_flag =0;
+        flags[0] = p[0] & 0x02; /* populate the first flag fields */
+        flags[1] = p[1] & 0x0c;
 
-void init_fr_nlpids()
-{
-	int i;
+	if (p[1] & FR_EA_BIT)
+		return 0;	/* 2-byte Q.922 address */
 
-	if (!fr_nlpid_flag) {
-		for (i=0; i < 256; i++) {
-			fr_nlpids[i].id = 0;
-			fr_nlpids[i].name = "Not Specified";
-		}
-		fr_nlpids[NLPID_Q933].name = "Q.933";
-		fr_nlpids[NLPID_CLNP].name = "CLNP";
-		fr_nlpids[NLPID_ESIS].name = "ESIS";
-		fr_nlpids[NLPID_ISIS].name = "ISIS";
-		fr_nlpids[NLPID_CONS].name = "CONS";
-		fr_nlpids[NLPID_IDRP].name = "IDRP";
-		fr_nlpids[NLPID_X25_ESIS].name = "X25_ESIS";
-		fr_nlpids[NLPID_IP].name = "IP";
+	p += 2;
+	(*addr_len)++;		/* 3- or 4-byte Q.922 address */
+	if ((p[0] & FR_EA_BIT) == 0) {
+		*dlci = (*dlci << 7) | (p[0] >> 1);
+		(*addr_len)++;	/* 4-byte Q.922 address */
+		p++;
 	}
-	fr_nlpid_flag = 1;
+
+	if ((p[0] & FR_EA_BIT) == 0)
+		return -1; /* more than 4 bytes of Q.922 address? */
+
+        flags[3] = p[0] & 0x02;
+
+	if (p[0] & 0x02)
+                *sdlcore =  p[0] >> 2;
+	else
+		*dlci = (*dlci << 6) | (p[0] >> 2);
+
+	return 0;
 }
 
-/* Framerelay packet structure */
+/* Frame Relay packet structure, with flags and CRC removed
 
-/*
-                  +---------------------------+
-                  |    flag (7E hexadecimal)  |
                   +---------------------------+
                   |       Q.922 Address*      |
                   +--                       --+
@@ -137,136 +144,221 @@ void init_fr_nlpids()
                   |             .             |
                   |             .             |
                   +---------------------------+
-                  |   Frame Check Sequence    |
-                  +--           .           --+
-                  |       (two octets)        |
-                  +---------------------------+
-                  |   flag (7E hexadecimal)   |
-                  +---------------------------+
 
            * Q.922 addresses, as presently defined, are two octets and
              contain a 10-bit DLCI.  In some networks Q.922 addresses
              may optionally be increased to three or four octets.
-
 */
 
-#define FR_PROTOCOL(p) fr_protocol((p))
-
-int
-fr_hdrlen(const u_char *p)
+static u_int
+fr_hdrlen(const u_char *p, u_int addr_len, u_int caplen)
 {
-	int hlen;
-	hlen = fr_addr_len(p)+1;  /* addr_len + 0x03 + padding */
-	if( p[hlen] ) 
-		return hlen;
-	else
-		return hlen+1;
-}
-
-#define LAYER2_LEN(p) (fr_hdrlen((p))+NLPID_LEN)
-
-int
-fr_protocol(const u_char *p)
-{
-	int hlen;
-	
-	hlen = fr_addr_len(p) + 1;
-	if (p[hlen])  /* check for padding */
-		return p[hlen];
+	if ((caplen > addr_len + 1 /* UI */ + 1 /* pad */) &&
+	    !p[addr_len + 1] /* pad exist */)
+		return addr_len + 1 /* UI */ + 1 /* pad */ + 1 /* NLPID */;
 	else 
-		return p[hlen+1];
+		return addr_len + 1 /* UI */ + 1 /* NLPID */;
 }
 
-void
-fr_hdlc_print(const u_char *p, int length)
+static void
+fr_hdr_print(int length, u_int addr_len, u_int dlci, u_int8_t *flags, u_int16_t nlpid)
 {
-	int proto;
-	int i;
-	int hlen;
-
-	proto = FR_PROTOCOL(p);
-
-	init_fr_nlpids();
-	/* this is kinda kludge since it assumed that DLCI is two bytes. */
-	printf("%4d %02x%02x=DLCI(%d) ", length, p[0], p[1], FR_DLCI(p[0],p[1]));
-	printf("%02x %6s: ", proto, fr_nlpids[proto].name);
+    if (qflag) {
+        (void)printf("Q.922, DLCI %u, length %u: ",
+                     dlci,
+                     length);
+    } else {
+        if (nlpid <= 0xff) /* if its smaller than 256 then its a NLPID */
+            (void)printf("Q.922, hdr-len %u, DLCI %u, Flags [%s], NLPID %s (0x%02x), length %u: ",
+                         addr_len,
+                         dlci,
+                         bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),
+                         tok2str(nlpid_values,"unknown", nlpid),
+                         nlpid,
+                         length);
+        else /* must be an ethertype */
+            (void)printf("Q.922, hdr-len %u, DLCI %u, Flags [%s], cisco-ethertype %s (0x%04x), length %u: ",
+                         addr_len,
+                         dlci,
+                         bittok2str(fr_header_flag_values, "none", EXTRACT_32BITS(flags)),
+                         tok2str(ethertype_values, "unknown", nlpid),
+                         nlpid,
+                         length);        
+    }
 }
 
-
-
-void
-fr_if_print(u_char *user, const struct pcap_pkthdr *h,
-	     register const u_char *p)
+u_int
+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;
-	int frame_relay = 0,
-	  proto = FR_PROTOCOL(p);
+	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)) {
+		printf("Q.922, invalid address");
+		return caplen;
+	}
 
-	ts_print(&h->ts);
+	hdr_len = fr_hdrlen(p, addr_len, caplen);
 
-	if (caplen < fr_hdrlen(p)) {
+	if (caplen < hdr_len) {
 		printf("[|fr]");
-		goto out;
+		return caplen;
 	}
 
-	/*
-	 * Some printers want to get back at the link level addresses,
-	 * and/or check that they're not walking off the end of the packet.
-	 * Rather than pass them all the way down, we set these globals.
-	 */
-	packetp = p;
-	snapend = p + caplen;
+	if (p[addr_len] != 0x03 && dlci != 0) {
 
-	if (eflag)
-		fr_hdlc_print(p, length);
+                /* lets figure out if we have cisco style encapsulation: */
+                extracted_ethertype = EXTRACT_16BITS(p+addr_len);
+
+                if (eflag)
+                    fr_hdr_print(length, addr_len, dlci, flags, extracted_ethertype);
 
-	length = length - (fr_hdrlen(p) + NLPID_LEN);
+                if (ether_encap_print(extracted_ethertype,
+                                      p+addr_len+ETHERTYPE_LEN,
+                                      length-addr_len-ETHERTYPE_LEN,
+                                      caplen-addr_len-ETHERTYPE_LEN,
+                                      &extracted_ethertype) == 0)
+                    /* ether_type not known, probably it wasn't one */
+                    printf("UI %02x! ", p[addr_len]);
+                else
+                    return hdr_len;
+        }
 
+	if (!p[addr_len + 1]) {	/* pad byte should be used with 3-byte Q.922 */
+		if (addr_len != 3)
+			printf("Pad! ");
+	} else if (addr_len == 3)
+		printf("No pad! ");
 
-	switch(FR_PROTOCOL(p)) {
+	nlpid = p[hdr_len - 1];
+
+	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:
-	case ETHERTYPE_IP:
-		ip_print((const u_char *)(p + LAYER2_LEN(p)), length);
+	        ip_print(gndo, p, length);
 		break;
+
+#ifdef INET6
+	case NLPID_IP6:
+		ip6_print(p, length);
+		break;
+#endif
 	case NLPID_CLNP:
 	case NLPID_ESIS:
 	case NLPID_ISIS:
-		isoclns_print((const u_char *)(p + LAYER2_LEN(p)), length, 
-			      caplen, "000000", "000000");
+                isoclns_print(p-1, length+1, caplen+1); /* OSI printers need the NLPID field */
 		break;
-	case NLPID_Q933:
-		q933_print((const u_char *)(p + LAYER2_LEN(p)), length);
+
+	case NLPID_SNAP:
+		orgcode = EXTRACT_24BITS(p);
+		et = EXTRACT_16BITS(p + 3);
+
+                if (eflag)
+                    (void)printf("SNAP, oui %s (0x%06x), ethertype %s (0x%04x): ",
+                                 tok2str(oui_values,"Unknown",orgcode),
+                                 orgcode,
+                                 tok2str(ethertype_values,"Unknown", et),
+                                 et);
+
+		if (snap_print((const u_char *)(p + 5), length - 5,
+			   caplen - 5, &extracted_ethertype, orgcode, et,
+			   0) == 0) {
+			/* ether_type not known, print raw packet */
+                        if (!eflag)
+                            fr_hdr_print(length + hdr_len, hdr_len,
+                                         dlci, flags, nlpid);
+			if (!xflag && !qflag)
+                            default_print(p - hdr_len, caplen + hdr_len);
+		}
+		break;
+
+        case NLPID_Q933:
+		q933_print(p, length);
 		break;
+
+        case NLPID_MFR:
+                frf15_print(p, length);
+                break;
+
 	default:
-		if(!eflag)
-			fr_hdlc_print(p, length);
-		if(!xflag)
-			default_print((const u_char *)(p + LAYER2_LEN(p)),
-					caplen - LAYER2_LEN(p));
+		if (!eflag)
+                    fr_hdr_print(length + hdr_len, addr_len,
+				     dlci, flags, nlpid);
+		if (!xflag)
+			default_print(p, caplen);
 	}
 
-	if (xflag)
-		default_print((const u_char *)(p + LAYER2_LEN(p)),
-				caplen - LAYER2_LEN(p));
-out:
-	putchar('\n');
+	return hdr_len;
 }
-#else
-#include <sys/types.h>
-#include <sys/time.h>
 
-#include <stdio.h>
+/* 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)         |
+ *    +----+----+----+----+----+----+----+----+
+ */
+
+struct tok frf15_flag_values[] = {
+    { 0x80, "Begin" },
+    { 0x40, "End" },
+    { 0x20, "Control" },
+    { 0, NULL }
+};
+
+#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]&0xe0;
+    sequence_num = (p[0]&0x1e)<<7 | p[1];
+
+    printf("FRF.15, seq 0x%03x, Flags [%s],%s Fragmentation, length %u",
+           sequence_num,
+           bittok2str(frf15_flag_values,"none",flags),
+           flags&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
+ */
 
-#include "interface.h"
-u_int
-fr_if_print(const struct pcap_pkthdr *h, const u_char *p)
-{
-	error("not configured for ppp");
-	/* NOTREACHED */
 }
-#endif
 
 /*
  * Q.933 decoding portion for framerelay specific.
@@ -315,112 +407,205 @@ fr_if_print(const struct pcap_pkthdr *h, const u_char *p)
 #define MSG_TYPE_STATUS           0x7D
 #define MSG_TYPE_STATUS_ENQ       0x75
 
-#define ONE_BYTE_IE_MASK 0xF0
+struct tok fr_q933_msg_values[] = {
+    { MSG_TYPE_ESC_TO_NATIONAL, "ESC to National" },
+    { MSG_TYPE_ALERT, "Alert" },
+    { MSG_TYPE_CALL_PROCEEDING, "Call proceeding" },
+    { MSG_TYPE_CONNECT, "Connect" },
+    { MSG_TYPE_CONNECT_ACK, "Connect ACK" },
+    { MSG_TYPE_PROGRESS, "Progress" },
+    { MSG_TYPE_SETUP, "Setup" },
+    { MSG_TYPE_DISCONNECT, "Disconnect" },
+    { MSG_TYPE_RELEASE, "Release" },
+    { MSG_TYPE_RELEASE_COMPLETE, "Release Complete" },
+    { MSG_TYPE_RESTART, "Restart" },
+    { MSG_TYPE_RESTART_ACK, "Restart ACK" },
+    { MSG_TYPE_STATUS, "Status Reply" },
+    { MSG_TYPE_STATUS_ENQ, "Status Enquiry" },
+    { 0, NULL }
+};
 
-/* See L2 protocol ID picture above */
-struct q933_header {
-    u_char call_ref;  /* usually is 0 for framerelay PVC */
-    u_char msg_type;  
+#define MSG_ANSI_LOCKING_SHIFT	0x95
+
+#define FR_LMI_ANSI_REPORT_TYPE_IE	0x01
+#define FR_LMI_ANSI_LINK_VERIFY_IE_91	0x19 /* details? */
+#define FR_LMI_ANSI_LINK_VERIFY_IE	0x03
+#define FR_LMI_ANSI_PVC_STATUS_IE	0x07
+
+#define FR_LMI_CCITT_REPORT_TYPE_IE	0x51
+#define FR_LMI_CCITT_LINK_VERIFY_IE	0x53
+#define FR_LMI_CCITT_PVC_STATUS_IE	0x57
+
+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" },
+    { FR_LMI_ANSI_PVC_STATUS_IE, "ANSI PVC Status" },
+    { FR_LMI_CCITT_REPORT_TYPE_IE, "CCITT Report Type" },
+    { FR_LMI_CCITT_LINK_VERIFY_IE, "CCITT Link Verify" },
+    { FR_LMI_CCITT_PVC_STATUS_IE, "CCITT PVC Status" },
+    { 0, NULL }
 };
 
-#define REPORT_TYPE_IE    0x01
-#define LINK_VERIFY_IE_91 0x19
-#define LINK_VERIFY_IE_94 0x03
-#define PVC_STATUS_IE     0x07
+#define FR_LMI_REPORT_TYPE_IE_FULL_STATUS 0
+#define FR_LMI_REPORT_TYPE_IE_LINK_VERIFY 1
+#define FR_LMI_REPORT_TYPE_IE_ASYNC_PVC   2
 
-#define MAX_IE_SIZE
+struct tok fr_lmi_report_type_ie_values[] = {
+    { FR_LMI_REPORT_TYPE_IE_FULL_STATUS, "Full Status" },
+    { FR_LMI_REPORT_TYPE_IE_LINK_VERIFY, "Link verify" },
+    { FR_LMI_REPORT_TYPE_IE_ASYNC_PVC, "Async PVC Status" },
+    { 0, NULL }
+};
 
-struct common_ie_header {
-    u_char ie_id;
-    u_char ie_len;
+/* array of 16 codepages - currently we only support codepage 5 */
+static struct tok *fr_q933_ie_codesets[] = {
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    fr_q933_ie_values_codeset5,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL,
+    NULL
 };
 
-#define FULL_STATUS 0
-#define LINK_VERIFY 1
-#define ASYNC_PVC   2
 
+struct common_ie_header {
+    u_int8_t ie_id;
+    u_int8_t ie_len;
+};
 
 void
-q933_print(const u_char *p, int length)
+q933_print(const u_char *p, u_int length)
 {
-	struct q933_header *header = (struct q933_header *)(p+1);
 	const u_char *ptemp = p;
-	int ie_type, ie_len;
-	char *decode_str, temp_str[255];
 	struct common_ie_header *ie_p;
+        int olen;
+	int is_ansi = 0;
+        u_int dlci,codeset;
+
+	if (length < 9) {	/* shortest: Q.933a LINK VERIFY */
+		printf("[|q.933]");
+		return;
+	}
+
+        codeset = p[2]&0x0f;   /* extract the codeset */
+
+	if (p[2] == MSG_ANSI_LOCKING_SHIFT)
+		is_ansi = 1;
     
+        printf("%s", eflag ? "" : "Q.933, ");
 
 	/* printing out header part */
-	printf("Call Ref: %02x, MSG Type: %02x", 
-	       header->call_ref, header->msg_type);
-	switch(header->msg_type) {
-	case MSG_TYPE_STATUS:
-	    decode_str = "STATUS REPLY";
-	    break;
-	case MSG_TYPE_STATUS_ENQ:
-	    decode_str = "STATUS ENQUIRY";
-	    break;
-	default:
-	    decode_str = "UNKNOWN MSG Type";
-	}
-	printf(" %s\n", decode_str);
+	printf(is_ansi ? "ANSI" : "CCITT ");
+
+	if (p[0])
+		printf(", Call Ref: 0x%02x", p[0]);
 
-	length = length - 3;
-	ptemp = ptemp + 3;
+        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("[|q.933]");
+		return;
+	}
+	length -= 2 - is_ansi;
+	ptemp += 2 + is_ansi;
 	
 	/* Loop through the rest of IE */
-	while( length > 0 ) {
-	    if( ptemp[0] & ONE_BYTE_IE_MASK ) {
-		ie_len = 1;
-		printf("\t\tOne byte IE: %02x, Content %02x\n", 
-		       (*ptemp & 0x70)>>4, (*ptemp & 0x0F));
-		length--;
-		ptemp++;
-	    }
-	    else {  /* Multi-byte IE */
+	while (length > sizeof(struct common_ie_header)) {
 		ie_p = (struct common_ie_header *)ptemp;
-		switch (ie_p->ie_id) {
-		case REPORT_TYPE_IE:
-		    switch(ptemp[2]) {
-		    case FULL_STATUS:
-			decode_str = "FULL STATUS";
-			break;
-		    case LINK_VERIFY:
-			decode_str = "LINK VERIFY";
-			break;
-		    case ASYNC_PVC:
-			decode_str = "Async PVC Status";
-			break;
-		    default:
-			decode_str = "Reserved Value";
-		    }
-		    break;
-		case LINK_VERIFY_IE_91:
-		case LINK_VERIFY_IE_94:
-		    snprintf(temp_str, sizeof(temp_str), "TX Seq: %3d, RX Seq: %3d",
-			    ptemp[2], ptemp[3]);
-		    decode_str = temp_str;
-		    break;
-		case PVC_STATUS_IE:
-		    snprintf(temp_str,sizeof(temp_str), "DLCI %d: status %s %s",
-			    ((ptemp[2]&0x3f)<<4)+ ((ptemp[3]&0x78)>>3), 
-			    ptemp[4] & 0x8 ?"new,":" ",
-			    ptemp[4] & 0x2 ?"Active":"Inactive");
-		    break;
-		default:
-		    decode_str = "Non-decoded Value";		    
+		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[|q.933]");
+                    else
+                        printf(", length %u",olen);
+                    return;
 		}
-		printf("\t\tIE: %02X Len: %d, %s\n",
-		       ie_p->ie_id, ie_p->ie_len, decode_str);
+
+                /* 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_q933_ie_codesets[codeset],"unknown",ie_p->ie_id),
+                           ie_p->ie_id,
+                           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;
+                }
+
+                /* do we want to see a hexdump of the IE ? */
+                if (vflag> 1)
+                    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)
+            printf(", length %u",olen);
 }
-
-
-
-
-
-