bugfix from Aaron Campbel <[email protected]>:

[tcpdump] / print-atm.c

diff --git a/print-atm.c b/print-atm.c
index 70c9ef78f87473ef0a700fcfb9b0a0a048eac24e..c6e5d704790b52c3a0cf87caa1af54c02c106a28 100644 (file)
--- a/print-atm.c
+++ b/print-atm.c
@@ -20,7 +20,7 @@
  */
 #ifndef lint
 static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.37 2004-10-18 16:26:20 hannes Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-atm.c,v 1.38.2.6 2006-01-25 13:27:24 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -43,6 +43,12 @@ static const char rcsid[] _U_ =
 
 #include "ether.h"
 
+struct tok oam_f_values[] = {
+    { OAMF4SC, "OAM F4 (segment)" },
+    { OAMF4EC, "OAM F4 (end)" },
+    { 0, NULL }
+};
+
 struct tok oam_celltype_values[] = {
     { 0x1, "Fault Management" },
     { 0x2, "Performance Management" },
@@ -54,20 +60,34 @@ struct tok oam_celltype_values[] = {
 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,
-    NULL,
-    NULL,
+    oam_fm_functype_values, /* 1 */
+    oam_pm_functype_values, /* 2 */
     NULL,
     NULL,
     NULL,
     NULL,
     NULL,
+    oam_ad_functype_values, /* 8 */
     NULL,
     NULL,
     NULL,
@@ -92,7 +112,7 @@ atm_llc_print(const u_char *p, int length, int caplen)
                        printf("(LLC %s) ",
                etherproto_string(htons(extracted_ethertype)));
                }
-               if (!xflag && !qflag)
+               if (!suppress_default_print)
                        default_print(p, caplen);
        }
 }
@@ -122,6 +142,14 @@ atm_if_print(const struct pcap_pkthdr *h, const u_char *p)
                return (caplen);
        }
 
+        /* Cisco Style NLPID ? */
+        if (*p == LLC_UI) {
+            if (eflag)
+                printf("CNLPID ");
+            isoclns_print(p+1, length-1, caplen-1);
+            return hdrlen;
+        }
+
        /*
         * Extract the presumed LLC header into a variable, for quick
         * testing.
@@ -243,7 +271,7 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
 
                case OAMF4SC: /* fall through */
                case OAMF4EC:
-                        oam_print(p, length);
+                        oam_print(p, length, ATM_OAM_HEC);
                        return;
 
                case METAC:
@@ -274,33 +302,23 @@ atm_print(u_int vpi, u_int vci, u_int traftype, const u_char *p, u_int length,
 }
 
 int 
-oam_print (const u_char *p, u_int length) {
+oam_print (const u_char *p, u_int length, u_int hec) {
 
-    u_int16_t cell_header, cell_type, func_type,vpi,vci,payload,clp;
+    u_int32_t cell_header;
+    u_int16_t cell_type, func_type,vpi,vci,payload,clp;
 
-    cell_header = EXTRACT_32BITS(p);
-    cell_type = ((*(p+4))>>4) & 0x0f;
-    func_type = *(p) & 0x0f;
+    cell_header = EXTRACT_32BITS(p+hec);
+    cell_type = ((*(p+4+hec))>>4) & 0x0f;
+    func_type = *(p+4+hec) & 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("%s, vpi %u, vci %u, payload %u, clp %u, ",
+           tok2str(oam_f_values, "OAM F5", vci),
+           vpi, vci, payload, clp);
 
     printf("cell-type %s (%u)",
            tok2str(oam_celltype_values, "unknown", cell_type),