From Julián Lastiri via bug 3656:

ClassifierID should be before Priority field in the Extended Classifier of
PacketCable Multimedia Protocol. Also the reference to PacketCable Multimedia
document PKT-SP-MM-I02-040930 is wrong because there is no definition about
Extended Classifier. My fix is based on PacketCable Multimedia
PKT-SP-MM-I04-080522 document.

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

diff --git a/epan/dissectors/packet-cops.c b/epan/dissectors/packet-cops.c
index 5fae3b919ce09d03364996a41d660e04c0a1e427..4041a9168c6428ba0cbca9778a0a016fe4aed7c9 100644 (file)
--- a/epan/dissectors/packet-cops.c
+++ b/epan/dissectors/packet-cops.c
@@ -14,7 +14,7 @@
  *    Based on PKT-SP-DQOS-I09-040402 (April 2, 2004)
  *
  *    PacketCable Multimedia Specification
- *    Based on PKT-SP-MM-I02-040930
+ *    Based on PKT-SP-MM-I04-080522
  *
  *    www.packetcable.com
  *
@@ -3230,15 +3230,17 @@ cops_classifier(tvbuff_t *tvb, proto_tree *st, guint n, guint32 offset, gboolean
        offset += 2;
     }
 
-    /* Priority */
-    info_to_display(tvb,stt,offset,1,"Priority",NULL,FMT_HEX,&hf_cops_pcmm_classifier_priority);
-    offset += 1;
-
     if (extended) {
        /* ClassifierID */
        info_to_display(tvb,stt,offset,2,"ClassifierID",NULL,FMT_HEX,&hf_cops_pcmm_classifier_classifier_id);
        offset += 2;
+    }
+    
+    /* Priority */
+    info_to_display(tvb,stt,offset,1,"Priority",NULL,FMT_HEX,&hf_cops_pcmm_classifier_priority);
+    offset += 1;
 
+    if (extended) {
        /* Activation State */
        info_to_display(tvb,stt,offset,1,"Activation State",NULL,FMT_HEX,&hf_cops_pcmm_classifier_activation_state);
        offset += 1;