diff options
| author | Anders Broman <anders.broman@ericsson.com> | 2005-03-30 19:09:48 +0000 |
|---|---|---|
| committer | Anders Broman <anders.broman@ericsson.com> | 2005-03-30 19:09:48 +0000 |
| commit | dfdff5a70c5764e2f7ab5ff8fccda3b4b1c326e7 (patch) | |
| tree | 8a70a60bcc0c8866aeeb29ce203daa3b1ee191f4 /epan | |
| parent | d238f2c65f450d93c98a13770180f3c647a7c211 (diff) | |
Improve some debug messages.
svn path=/trunk/; revision=13980
Diffstat (limited to 'epan')
| -rw-r--r-- | epan/dissectors/packet-ber.c | 15 |
1 files changed, 11 insertions, 4 deletions
diff --git a/epan/dissectors/packet-ber.c b/epan/dissectors/packet-ber.c index 111ff9d7a3..e21d257eba 100644 --- a/epan/dissectors/packet-ber.c +++ b/epan/dissectors/packet-ber.c @@ -697,7 +697,7 @@ printf("SEQUENCE dissect_ber_sequence(%s) entered\n",name); if ((!pc) ||(!implicit_tag&&((class!=BER_CLASS_UNI) ||(tag!=BER_UNI_TAG_SEQUENCE)))) { - proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: Sequence expected but Class:%d PC:%d Tag:%d was unexpected", class, pc, tag); + proto_tree_add_text(tree, tvb, offset-2, 2, "BER Error: Sequence expected but Class:%d(%s) PC:%d Tag:%d was unexpected", class,val_to_str(class,ber_class_codes,"Unknown"), pc, tag); return end_offset; } } else { @@ -765,8 +765,11 @@ ber_sequence_try_again: seq++; goto ber_sequence_try_again; } - - proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in SEQUENCE expected class:%d tag:%d but found class:%d tag:%d",seq->class,seq->tag,class,tag); + if ( seq->class == BER_CLASS_UNI){ + proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in SEQUENCE expected class:%d (%s) tag:%d but found class:%d tag:%d",seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),seq->tag,val_to_str(seq->tag,ber_uni_tag_codes,"Unknown"),class,tag); + }else{ + proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in SEQUENCE expected class:%d (%s) tag:%d(%s) but found class:%d tag:%d",seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),seq->tag,class,tag); + } seq++; offset=eoffset; continue; @@ -783,7 +786,11 @@ ber_sequence_try_again: goto ber_sequence_try_again; } - proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in sequence expected class:%d tag:%d but found class:%d tag:%d",seq->class,seq->tag,class,tag); + if ( seq->class == BER_CLASS_UNI){ + proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in sequence expected class:%d (%s) tag:%d(%s) but found class:%d(%s) tag:%d",seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),seq->tag,val_to_str(seq->tag,ber_uni_tag_codes,"Unknown"),class,val_to_str(class,ber_class_codes,"Unknown"),tag); + }else{ + proto_tree_add_text(tree, tvb, offset, len, "BER Error: Wrong field in sequence expected class:%d (%s) tag:%d but found class:%d(%s) tag:%d",seq->class,val_to_str(seq->class,ber_class_codes,"Unknown"),seq->tag,class,val_to_str(class,ber_class_codes,"Unknown"),tag); + } seq++; offset=eoffset; continue; |