diff options
Diffstat (limited to 'epan/dissectors/packet-disp.c')
| -rw-r--r-- | epan/dissectors/packet-disp.c | 20 |
1 files changed, 7 insertions, 13 deletions
diff --git a/epan/dissectors/packet-disp.c b/epan/dissectors/packet-disp.c index 378fc29223..517cb5adc6 100644 --- a/epan/dissectors/packet-disp.c +++ b/epan/dissectors/packet-disp.c @@ -1514,18 +1514,12 @@ dissect_disp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree, void* d const char *disp_op_name; asn1_ctx_t asn1_ctx; - asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); - - /* do we have operation information from the ROS dissector? */ - if( data == NULL ){ - if(parent_tree){ - proto_tree_add_text(parent_tree, tvb, offset, -1, - "Internal error: can't get operation information from ROS dissector."); - } + /* do we have operation information from the ROS dissector */ + if (data == NULL) return 0; - } + session = (struct SESSION_DATA_STRUCTURE*)data; - session = ((struct SESSION_DATA_STRUCTURE*)data); + asn1_ctx_init(&asn1_ctx, ASN1_ENC_BER, TRUE, pinfo); asn1_ctx.private_data = session; @@ -2061,7 +2055,7 @@ void proto_register_disp(void) { "ShadowErrorData", HFILL }}, /*--- End of included file: packet-disp-hfarr.c ---*/ -#line 205 "../../asn1/disp/packet-disp-template.c" +#line 199 "../../asn1/disp/packet-disp-template.c" }; /* List of subtrees */ @@ -2126,7 +2120,7 @@ void proto_register_disp(void) { &ett_disp_T_signedShadowError, /*--- End of included file: packet-disp-ettarr.c ---*/ -#line 211 "../../asn1/disp/packet-disp-template.c" +#line 205 "../../asn1/disp/packet-disp-template.c" }; module_t *disp_module; @@ -2165,7 +2159,7 @@ void proto_reg_handoff_disp(void) { /*--- End of included file: packet-disp-dis-tab.c ---*/ -#line 239 "../../asn1/disp/packet-disp-template.c" +#line 233 "../../asn1/disp/packet-disp-template.c" /* APPLICATION CONTEXT */ |