diff options
Diffstat (limited to 'asn1/h225/packet-h225-template.c')
| -rw-r--r-- | asn1/h225/packet-h225-template.c | 16 |
1 files changed, 9 insertions, 7 deletions
diff --git a/asn1/h225/packet-h225-template.c b/asn1/h225/packet-h225-template.c index 0a34bd9a0a..edf47f6b81 100644 --- a/asn1/h225/packet-h225-template.c +++ b/asn1/h225/packet-h225-template.c @@ -44,13 +44,13 @@ #include <string.h> #include <epan/prefs.h> +#include <epan/oid_resolv.h> #include "tap.h" #include "packet-tpkt.h" #include "packet-per.h" #include "packet-h225.h" #include <epan/t35.h> #include <epan/h225-persistentdata.h> -#include "packet-ber.h" #include "packet-h235.h" #include "packet-h245.h" #include "packet-q931.h" @@ -203,6 +203,7 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * proto_item *it; proto_tree *tr; int offset = 0; + asn_ctx_t asn_ctx; pi_current++; if(pi_current==5){ @@ -227,8 +228,8 @@ dissect_h225_H323UserInformation(tvbuff_t *tvb, packet_info *pinfo, proto_tree * it=proto_tree_add_protocol_format(tree, proto_h225, tvb, 0, tvb_length(tvb), PSNAME" CS"); tr=proto_item_add_subtree(it, ett_h225); - per_aligment_type_callback(TRUE); - offset = dissect_h225_H323_UserInformation(tvb, offset,pinfo, tr, hf_h225_H323_UserInformation); + asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo); + offset = dissect_h225_H323_UserInformation(tvb, offset, &asn_ctx, tr, hf_h225_H323_UserInformation); if (h245_list.count && check_col(pinfo->cinfo, COL_PROTOCOL)){ col_append_str(pinfo->cinfo, COL_PROTOCOL, "/"); @@ -247,6 +248,7 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree proto_item *it; proto_tree *tr; guint32 offset=0; + asn_ctx_t asn_ctx; pi_current++; if(pi_current==5){ @@ -265,8 +267,8 @@ dissect_h225_h225_RasMessage(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree it=proto_tree_add_protocol_format(tree, proto_h225, tvb, offset, tvb_length(tvb), PSNAME" RAS"); tr=proto_item_add_subtree(it, ett_h225); - per_aligment_type_callback(TRUE); - offset = dissect_h225_RasMessage(tvb, 0, pinfo,tr, hf_h225_RasMessage ); + asn_ctx_init(&asn_ctx, ASN_ENC_PER, TRUE, pinfo); + offset = dissect_h225_RasMessage(tvb, 0, &asn_ctx, tr, hf_h225_RasMessage ); ras_call_matching(tvb, pinfo, tr, h225_pi); @@ -345,8 +347,8 @@ void proto_register_h225(void) { register_init_routine(&h225_init_routine); h225_tap = register_tap("h225"); - register_ber_oid_name("0.0.8.2250.0.2","itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 2"); - register_ber_oid_name("0.0.8.2250.0.4","itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 4"); + add_oid_str_name("0.0.8.2250.0.2","itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 2"); + add_oid_str_name("0.0.8.2250.0.4","itu-t(0) recommendation(0) h(8) h225-0(2250) version(0) 4"); } |