finalize the tokenlists of supported OAM messages

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index 77977b256c19a27eb635ae5489c63793567b15f7..136b99fc787a65e8bb9d489be78b87f3de0aa588 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -19,8 +19,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 #ifndef lint

-static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.31 2002-12-18 08:53:19 guy Exp $ (LBL)";
+static const char rcsid[] _U_ =
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38 2005-01-19 16:46:27 hannes Exp $ (LBL)";

 #endif
 
 #ifdef HAVE_CONFIG_H
 #endif
 
 #ifdef HAVE_CONFIG_H


@@ -43,6 +43,54 @@ static const char rcsid[] =
 
 #include "ether.h"
 
 
 #include "ether.h"
 

+struct tok oam_celltype_values[] = {
+    { 0x1, "Fault Management" },
+    { 0x2, "Performance Management" },
+    { 0x8, "activate/deactivate" },
+    { 0xf, "System Management" },
+    { 0, NULL }
+};
+
+struct tok oam_fm_functype_values[] = {
+    { 0x0, "AIS" },
+    { 0x1, "RDI" },
+    { 0x4, "Continuity Check" },
+    { 0x8, "Loopback" },
+    { 0, NULL }
+};
+
+struct tok oam_pm_functype_values[] = {
+    { 0x0, "Forward Monitoring" },
+    { 0x1, "Backward Reporting" },
+    { 0x2, "Monitoring and Reporting" },
+    { 0, NULL }
+};
+
+struct tok oam_ad_functype_values[] = {
+    { 0x0, "Performance Monitoring" },
+    { 0x1, "Continuity Check" },
+    { 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
+};
+

 /*
  * Print an RFC 1483 LLC-encapsulated ATM frame.
  */
 /*
  * Print an RFC 1483 LLC-encapsulated ATM frame.
  */


@@ -72,31 +120,22 @@ atm_llc_print(const u_char *p, int length, int caplen)
 /*
  * This is the top level routine of the printer.  'p' points
  * to the LLC/SNAP header of the packet, 'h->ts' is the timestamp,
 /*
  * This is the top level routine of the printer.  'p' points
  * to the LLC/SNAP header of the packet, 'h->ts' is the timestamp,

- * 'h->length' is the length of the packet off the wire, and 'h->caplen'
+ * 'h->len' is the length of the packet off the wire, and 'h->caplen'

  * is the number of bytes actually captured.
  */
  * is the number of bytes actually captured.
  */

-void
-atm_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
+u_int
+atm_if_print(const struct pcap_pkthdr *h, const u_char *p)

 {
        u_int caplen = h->caplen;
        u_int length = h->len;
        u_int32_t llchdr;
 {
        u_int caplen = h->caplen;
        u_int length = h->len;
        u_int32_t llchdr;

-
-       ++infodelay;
-       ts_print(&h->ts);
+       u_int hdrlen = 0;

 
        if (caplen < 8) {
                printf("[|atm]");
 
        if (caplen < 8) {
                printf("[|atm]");

-               goto out;
+               return (caplen);

        }
 
        }
 

-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-

        /*
         * Extract the presumed LLC header into a variable, for quick
         * testing.
        /*
         * Extract the presumed LLC header into a variable, for quick
         * testing.


@@ -133,12 +172,10 @@ atm_if_print(u_char *user _U_, const struct pcap_pkthdr *h, const u_char *p)
                p += 20;
                length -= 20;
                caplen -= 20;
                p += 20;
                length -= 20;
                caplen -= 20;

+               hdrlen += 20;

        }
        atm_llc_print(p, length, caplen);
        }
        atm_llc_print(p, length, caplen);

-       if (xflag)
-               default_print(p, caplen);
- out:
-       putchar('\n');
+       return (hdrlen);

 }
 
 /*
 }
 
 /*


@@ -207,40 +244,30 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
        if (eflag)
                printf("VPI:%u VCI:%u ", vpi, vci);
 
        if (eflag)
                printf("VPI:%u VCI:%u ", vpi, vci);
 

-       /*
-        * Some printers want to check that they're not walking off the
-        * end of the packet.
-        * Rather than pass it all the way down, we set this global.
-        */
-       snapend = p + caplen;
-

        if (vpi == 0) {
                switch (vci) {
 
                case PPC:
                        sig_print(p, caplen);
        if (vpi == 0) {
                switch (vci) {
 
                case PPC:
                        sig_print(p, caplen);

-                       goto out;
+                       return;

 
                case BCC:
                        printf("broadcast sig: ");
 
                case BCC:
                        printf("broadcast sig: ");

-                       goto out;
-
-               case OAMF4SC:
-                       printf("oamF4(segment): ");
-                       goto out;
+                       return;

 
 

+               case OAMF4SC: /* fall through */

                case OAMF4EC:
                case OAMF4EC:

-                       printf("oamF4(end): ");
-                       goto out;
+                        oam_print(p, length);
+                       return;

 
                case METAC:
                        printf("meta: ");
 
                case METAC:
                        printf("meta: ");

-                       goto out;
+                       return;

 
                case ILMIC:
                        printf("ilmi: ");
                        snmp_print(p, length);
 
                case ILMIC:
                        printf("ilmi: ");
                        snmp_print(p, length);

-                       goto out;
+                       return;

                }
        }
 
                }
        }
 


@@ -258,8 +285,48 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
                lane_print(p, length, caplen);
                break;
        }
                lane_print(p, length, caplen);
                break;
        }

+}
+
+int 
+oam_print (const u_char *p, u_int length) {
+
+    u_int16_t cell_header, cell_type, func_type,vpi,vci,payload,clp;
+
+    cell_header = EXTRACT_32BITS(p);
+    cell_type = ((*(p+4))>>4) & 0x0f;
+    func_type = *(p) & 0x0f;
+
+    vpi = (cell_header>>20)&0xff;
+    vci = (cell_header>>4)&0xffff;
+    payload = (cell_header>>1)&0x7;
+    clp = cell_header&0x1;
+
+    switch (vci) {
+    case OAMF4SC:
+        printf("OAM F4 (segment), ");
+            break;
+    case OAMF4EC:
+        printf("OAM F4 (end), ");
+        break;
+    default:
+        printf("OAM F5, ");
+        break;
+    }
+
+    if (eflag)
+        printf("vpi %u, vci %u, payload %u, clp %u, ",vpi,vci,payload,clp);
+
+    printf("cell-type %s (%u)",
+           tok2str(oam_celltype_values, "unknown", cell_type),
+           cell_type);
+
+    if (oam_functype_values[cell_type] == NULL)
+        printf(", func-type unknown (%u)", func_type);
+    else
+        printf(", func-type %s (%u)",
+               bittok2str(oam_functype_values[cell_type],"none",func_type),
+               func_type);

 
 

-out:
-       if (xflag)
-               default_print(p, caplen);
+    printf(", length %u",length);
+    return 1;

 }
 }