Fix for bug 752:

IEEE802.3ah-2004 (OAM) Errored Frame Seconds Summary Event TLV is not being
decoded properly.  Per IEEE802.3ah-2004 section 57.5.3.4, item g, the Error
Running Total field should be 4-octets however Ethereal is trying to decode this
field as 8-octets which results in incorrect value reported for "Error Running
Total" and "Event Running Total".

git-svn-id: http://anonsvn.wireshark.org/wireshark/trunk@17351 f5534014-38df-0310-8fa8-9805f1628bb7

diff --git a/epan/dissectors/packet-slowprotocols.c b/epan/dissectors/packet-slowprotocols.c
index fc59f05d173c353f71d256ffbffe21cc4a140a04..ca2bc6a30367bb431ceabe286447091334de13dc 100644 (file)
--- a/epan/dissectors/packet-slowprotocols.c
+++ b/epan/dissectors/packet-slowprotocols.c
@@ -184,7 +184,7 @@
 #define OAMPDU_EFSSE_WINDOW_SZ          2
 #define OAMPDU_EFSSE_THRESHOLD_SZ       2
 #define OAMPDU_EFSSE_ERRORS_SZ          2
-#define OAMPDU_EFSSE_ERR_TOTAL_SZ       8
+#define OAMPDU_EFSSE_ERR_TOTAL_SZ       4
 #define OAMPDU_EFSSE_TOTAL_SZ           4
 
 /* Variable Branch Type */
@@ -2038,9 +2038,9 @@ dissect_oampdu_event_notification(tvbuff_t *tvb, proto_tree *tree)
 
                 offset += OAMPDU_EFSSE_ERRORS_SZ;
 
-                big = tvb_get_ntoh64(tvb, offset);
-                proto_tree_add_uint64(event_tree, hf_oampdu_event_efsseTotalErrors,
-                        tvb, offset, 8, big);
+                dword = tvb_get_ntohl(tvb, offset);
+                proto_tree_add_uint(event_tree, hf_oampdu_event_efsseTotalErrors,
+                        tvb, offset, 4, dword);
 
                 offset += OAMPDU_EFSSE_ERR_TOTAL_SZ;
 
@@ -2871,7 +2871,7 @@ proto_register_slow_protocols(void)
 
     { &hf_oampdu_event_efsseTotalErrors,
       { "Error Running Total",    "oam.event.efsseTotalErrors",
-        FT_UINT64,    BASE_DEC,    NULL,    0x0,
+        FT_UINT32,    BASE_DEC,    NULL,    0x0,
         "Number of frames in error since reset of the sublayer", HFILL }},
 
     { &hf_oampdu_event_efsseTotalEvents,