]> The Tcpdump Group git mirrors - tcpdump/blobdiff - print-fr.c
Address Michael's comments.
[tcpdump] / print-fr.c
index 13dc8f9b7022d8a2b70a4ce8b09c49c3ffc4f9ed..51263066a77efeac3b08a17630d6e07b6dd96b5e 100644 (file)
@@ -20,8 +20,8 @@
  */
 
 #ifndef lint
-static const char rcsid[] =
-       "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.8 2002-12-11 07:14:00 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+       "@(#)$Header: /tcpdump/master/tcpdump/print-fr.c,v 1.51 2006-06-23 22:20:32 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -30,81 +30,128 @@ static const char rcsid[] =
 
 #include <tcpdump-stdinc.h>
 
-struct mbuf;
-struct rtentry;
-
 #include <stdio.h>
 #include <string.h>
 #include <pcap.h>
 
-#include "interface.h"
 #include "addrtoname.h"
+#include "interface.h"
 #include "ethertype.h"
+#include "nlpid.h"
 #include "extract.h"
+#include "oui.h"
 
-static void q933_print(const u_char *, int);
+static void frf15_print(const u_char *, u_int);
 
-#define FR_CR_BIT      0x02
-#define FR_EA_BIT(p)   ((p)&0x01)
-#define FR_FECN                0x08
-#define FR_BECN                0x04
-#define FR_DE          0x02
-#define FR_DLCI(b0, b1)        ((((b0)&0xFC)<<2)+(((b1)&0xF0)>>4))
+/*
+ * 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 |
+ *    +----+----+----+----+----+----+----+----+
+ */
 
-/* find out how many bytes are there in a frame */
-static u_int
-fr_addr_len(const u_char *p)
-{
-       u_int i=0;
-       
-       while (!FR_EA_BIT(p[i]) && i++ && !FR_EA_BIT(p[i+1])) i++;
-       return (i+1);
-}
+#define FR_EA_BIT      0x01
 
-/* the following is for framerelay */
-#define NLPID_LEN      1       /* NLPID is one byte long */
-#define NLPID_Q933      0x08
-#define NLPID_LMI       0x09
-#define NLPID_SNAP      0x80
-#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
+#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
 
 
-static const char *fr_nlpids[256];
+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 }
+};
 
-static void
-init_fr_nlpids(void)
+/* 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 *addr_len, u_int8_t *flags)
 {
-       int i;
-       static int fr_nlpid_flag = 0;
-
-       if (!fr_nlpid_flag) {
-               for (i=0; i < 256; i++)
-                       fr_nlpids[i] = NULL;
-               fr_nlpids[NLPID_Q933] = "Q.933";
-               fr_nlpids[NLPID_LMI] = "LMI";
-               fr_nlpids[NLPID_SNAP] = "SNAP";
-               fr_nlpids[NLPID_CLNP] = "CLNP";
-               fr_nlpids[NLPID_ESIS] = "ESIS";
-               fr_nlpids[NLPID_ISIS] = "ISIS";
-               fr_nlpids[NLPID_CONS] = "CONS";
-               fr_nlpids[NLPID_IDRP] = "IDRP";
-               fr_nlpids[NLPID_X25_ESIS] = "X25_ESIS";
-               fr_nlpids[NLPID_IP] = "IP";
+       if ((p[0] & FR_EA_BIT))
+               return -1;
+
+       *addr_len = 2;
+       *dlci = ((p[0] & 0xFC) << 2) | ((p[1] & 0xF0) >> 4);
+
+        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 */
+
+       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;
+
+        *dlci = (*dlci << 6) | (p[0] >> 2);
+
+       return 0;
 }
 
-/* Framerelay packet structure */
+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
 
-/*
-                  +---------------------------+
-                  |    flag (7E hexadecimal)  |
                   +---------------------------+
                   |       Q.922 Address*      |
                   +--                       --+
@@ -123,175 +170,413 @@ init_fr_nlpids(void)
                   |             .             |
                   |             .             |
                   +---------------------------+
-                  |   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))
-
 static u_int
-fr_hdrlen(const u_char *p)
+fr_hdrlen(const u_char *p, u_int addr_len)
 {
-       u_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)
-
-static 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 (!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 */;
 }
 
-static char *
-fr_flags(const u_char *p)
+static void
+fr_hdr_print(int length, u_int addr_len, u_int dlci, u_int8_t *flags, u_int16_t nlpid)
 {
-       static char flags[1+1+4+1+4+1+2+1];
-
-       if (p[0] & FR_CR_BIT)
-               strcpy(flags, "C");
-       else
-               strcpy(flags, "R");
-       if (p[1] & FR_FECN)
-               strcat(flags, ",FECN");
-       if (p[1] & FR_BECN)
-               strcat(flags, ",BECN");
-       if (p[1] & FR_DE)
-               strcat(flags, ",DE");
-       return flags;
+    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);        
+    }
 }
 
-static const char *
-fr_protostring(u_int8_t proto)
+u_int
+fr_if_print(const struct pcap_pkthdr *h, register const u_char *p)
 {
-       static char buf[5+1+2+1];
+       register u_int length = h->len;
+       register u_int caplen = h->caplen;
 
-       if (nflag || fr_nlpids[proto] == NULL) {
-               sprintf(buf, "proto-%02x", proto);
-               return buf;
-       }
-       return fr_nlpids[proto];
-}
+        TCHECK2(*p, 4); /* minimum frame header length */
 
-static void
-fr_hdr_print(const u_char *p, int length)
-{
-       u_int8_t proto;
-
-       proto = FR_PROTOCOL(p);
-
-       init_fr_nlpids();
-       /* this is kinda kludge since it assumed that DLCI is two bytes. */
-       if (qflag)
-               (void)printf("DLCI-%u-%s %d: ",
-                            FR_DLCI(p[0], p[1]), fr_flags(p), length);
-       else
-               (void)printf("DLCI-%u-%s %s %d: ",
-                            FR_DLCI(p[0], p[1]), fr_flags(p),
-                            fr_protostring(proto), length);
+        if ((length = fr_print(p, length)) == 0)
+            return (0);
+        else
+            return length;
+ trunc:
+        printf("[|fr]");
+        return caplen;
 }
 
-void
-fr_if_print(u_char *user _U_, const struct pcap_pkthdr *h,
-            register const u_char *p)
+u_int
+fr_print(register const u_char *p, u_int length)
 {
-       register u_int length = h->len;
-       register u_int caplen = h->caplen;
-       u_char protocol;
-       int layer2_len;
-       u_short extracted_ethertype;
-       u_int32_t orgcode;
-       register u_short et;
+       u_int16_t extracted_ethertype;
+       u_int dlci;
+       u_int addr_len;
+       u_int16_t nlpid;
+       u_int hdr_len;
+       u_int8_t flags[4];
+
+       if (parse_q922_addr(p, &dlci, &addr_len, flags)) {
+               printf("Q.922, invalid address");
+               return 0;
+       }
 
-       ts_print(&h->ts);
+        TCHECK2(*p,addr_len+1+1);
+       hdr_len = fr_hdrlen(p, addr_len);
+        TCHECK2(*p,hdr_len);
 
-       if (caplen < fr_hdrlen(p)) {
-               printf("[|fr]");
-               goto out;
-       }
+       if (p[addr_len] != 0x03 && dlci != 0) {
 
-       /*
-        * 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;
+                /* lets figure out if we have cisco style encapsulation: */
+                extracted_ethertype = EXTRACT_16BITS(p+addr_len);
 
-       if (eflag)
-               fr_hdr_print(p, length);
+                if (eflag)
+                    fr_hdr_print(length, addr_len, dlci, flags, extracted_ethertype);
 
-       protocol = FR_PROTOCOL(p);
-       layer2_len = LAYER2_LEN(p);
-       p += layer2_len;
-       length -= layer2_len;
-       caplen -= layer2_len;
+                if (ethertype_print(gndo, extracted_ethertype,
+                                      p+addr_len+ETHERTYPE_LEN,
+                                      length-addr_len-ETHERTYPE_LEN,
+                                      length-addr_len-ETHERTYPE_LEN) == 0)
+                    /* ether_type not known, probably it wasn't one */
+                    printf("UI %02x! ", p[addr_len]);
+                else
+                    return hdr_len;
+        }
 
-       switch (protocol) {
+       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! ");
 
+       nlpid = p[hdr_len - 1];
+
+       if (eflag)
+               fr_hdr_print(length, addr_len, dlci, flags, nlpid);
+       p += hdr_len;
+       length -= hdr_len;
+
+       switch (nlpid) {
        case NLPID_IP:
-               ip_print(p, length);
+               ip_print(gndo, p, length);
                break;
 
+#ifdef INET6
+       case NLPID_IP6:
+               ip6_print(gndo, p, length);
+               break;
+#endif
        case NLPID_CLNP:
        case NLPID_ESIS:
        case NLPID_ISIS:
-               isoclns_print(p, length, caplen, NULL, NULL);
+                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, 0) == 0) {
                        /* ether_type not known, print raw packet */
-                       if (!eflag)
-                               fr_hdr_print(p - layer2_len, length + layer2_len);
-                       if (extracted_ethertype) {
-                               printf("(SNAP %s) ",
-                              etherproto_string(htons(extracted_ethertype)));
-                       }
-                       if (!xflag && !qflag)
-                               default_print(p - layer2_len, caplen + layer2_len);
+                        if (!eflag)
+                            fr_hdr_print(length + hdr_len, hdr_len,
+                                         dlci, flags, nlpid);
+                       if (!suppress_default_print)
+                            default_print(p - hdr_len, length + hdr_len);
                }
                break;
 
-       case NLPID_Q933:
+        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(p - layer2_len, length + layer2_len);
+                    fr_hdr_print(length + hdr_len, addr_len,
+                                    dlci, flags, nlpid);
                if (!xflag)
-                       default_print(p, caplen);
+                       default_print(p, length);
        }
 
-       if (xflag)
-               default_print(p, caplen);
-out:
-       putchar('\n');
+       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
+ */
+
 }
 
 /*
@@ -341,104 +626,258 @@ out:
 #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_int8_t call_ref;  /* usually is 0 for framerelay PVC */
-    u_int8_t 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_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
 };
 
-#define FULL_STATUS 0
-#define LINK_VERIFY 1
-#define ASYNC_PVC   2
+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
+};
 
-static void
-q933_print(const u_char *p, int length)
+void
+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_len;
-       const char *decode_str;
-       char temp_str[255];
-       struct common_ie_header *ie_p;
+       struct ie_tlv_header_t  *ie_p;
+        int olen;
+       int is_ansi = 0;
+        u_int codeset;
+        u_int ie_is_known = 0;
+
+       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, codeset %u", is_ansi ? "ANSI" : "CCITT", codeset);
+
+       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]));
        }
-       printf(" %s\n", decode_str);
 
-       length = length - 3;
-       ptemp = ptemp + 3;
+        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 */
-               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";
+       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);
                    }
-                   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";               
+                    return;
+               }
+
+                /* lets do the full IE parsing only in verbose mode
+                 * however some IEs (DLCI Status, Link Verify)
+                 * 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);
+               }
+
+                /* sanity check */
+                if (ie_p->ie_type == 0 || ie_p->ie_len == 0) {
+                    return;
                }
-               printf("\t\tIE: %02X Len: %d, %s\n",
-                      ie_p->ie_id, ie_p->ie_len, decode_str);
+
+                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 && 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) {
+            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;
 }