X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/570cdb3f162ad9b62ebb02f86ef8ab9618e9ffcd..b54ff914a1ea5c40da3687b52a508748ecb801b0:/print-atm.c

diff --git a/print-atm.c b/print-atm.c
index 70c9ef78..110d3881 100644
--- 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.39 2005-05-18 20:24:04 hannes Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -54,20 +54,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,
@@ -280,7 +294,7 @@ oam_print (const u_char *p, u_int length) {
 
     cell_header = EXTRACT_32BITS(p);
     cell_type = ((*(p+4))>>4) & 0x0f;
-    func_type = *(p) & 0x0f;
+    func_type = *(p+4) & 0x0f;
 
     vpi = (cell_header>>20)&0xff;
     vci = (cell_header>>4)&0xffff;