Fix to show all the internal tokens. when configured, when dissecting an unknown...

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

diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c
index 9aafe82d177b49b5e7c7221adab8b7c706c651ee..c0fe370d40edce373ff2483e7b5a1dbc48861d1e 100644 (file)
--- a/epan/dissectors/packet-ber.c
+++ b/epan/dissectors/packet-ber.c
@@ -244,8 +244,10 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
                   throwing an exception.
                 */
 
-               offset=dissect_ber_identifier(pinfo, tree, tvb, start_offset, &class, &pc, &tag);
-               offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
+               if(show_internal_ber_fields) {
+                 offset=dissect_ber_identifier(pinfo, tree, tvb, start_offset, &class, &pc, &tag);
+                 offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
+               }
                proto_tree_add_text(tree, tvb, offset, len, "BER: Error length:%u longer than tvb_length_ramaining:%d",len, tvb_length_remaining(tvb, offset));
                return tvb_length(tvb);
        }
@@ -317,6 +319,13 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
          case BER_CLASS_PRI:
          default:
            /* we can't dissect this directly as it is specific */
+
+           /* we dissect again if show_internal_ber_fields is set */
+           if(show_internal_ber_fields) {
+             offset=dissect_ber_identifier(pinfo, tree, tvb, start_offset, &class, &pc, &tag);
+             offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
+           }
+
            pi = proto_tree_add_text(tree, tvb, offset, len, "[%s %d] ", val_to_str(class,ber_class_codes,"Unknown"), tag);
            /* we may want to do better and show the bytes */
            is_printable = TRUE;
@@ -344,6 +353,12 @@ int dissect_unknown_ber(packet_info *pinfo, tvbuff_t *tvb, int offset, proto_tre
 
        case TRUE: /* this is constructed */
 
+         /* we dissect again if show_internal_ber_fields is set */
+         if(show_internal_ber_fields) {
+           offset=dissect_ber_identifier(pinfo, tree, tvb, start_offset, &class, &pc, &tag);
+           offset=dissect_ber_length(pinfo, tree, tvb, offset, &len, NULL);
+         }
+
          switch(class) {
          case BER_CLASS_UNI:
                    item=proto_tree_add_text(tree, tvb, offset, len, "%s", val_to_str(tag,ber_uni_tag_codes,"Unknown"));