diff options
Diffstat (limited to 'asn1')
-rw-r--r-- | asn1/ldap/ldap.cnf | 22 | ||||
-rw-r--r-- | asn1/ldap/packet-ldap-template.c | 40 | ||||
-rw-r--r-- | asn1/pkcs12/packet-pkcs12-template.c | 8 | ||||
-rw-r--r-- | asn1/snmp/packet-snmp-template.c | 32 | ||||
-rw-r--r-- | asn1/t125/packet-t125-template.c | 12 | ||||
-rw-r--r-- | asn1/tcap/packet-tcap-template.c | 16 | ||||
-rw-r--r-- | asn1/tcap/tcap.cnf | 4 | ||||
-rw-r--r-- | asn1/tetra/packet-tetra-template.h | 1 |
8 files changed, 68 insertions, 67 deletions
diff --git a/asn1/ldap/ldap.cnf b/asn1/ldap/ldap.cnf index 2955f5b133..fce9fb7aa7 100644 --- a/asn1/ldap/ldap.cnf +++ b/asn1/ldap/ldap.cnf @@ -214,7 +214,7 @@ char *mechanism = NULL; tvbuff_t *parameter_tvb; ldap_conv_info_t *ldap_info; -gint8 class; +gint8 ber_class; gboolean pc; gint32 tag; @@ -224,10 +224,10 @@ gint32 tag; return offset; ldap_info = actx->pinfo->private_data; - get_ber_identifier(parameter_tvb, 0, &class, &pc, &tag); + get_ber_identifier(parameter_tvb, 0, &ber_class, &pc, &tag); - /*if ((ldap_info->auth_mech != NULL) && (strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) && (class==BER_CLASS_CON)) {*/ - if ((ldap_info->auth_mech != NULL) && (class==BER_CLASS_CON)) { + /*if ((ldap_info->auth_mech != NULL) && (strcmp(ldap_info->auth_mech, "GSS-SPNEGO") == 0) && (ber_class==BER_CLASS_CON)) {*/ + if ((ldap_info->auth_mech != NULL) && (ber_class==BER_CLASS_CON)) { /* * This is a GSS-API token ancapsulated within GSS-SPNEGO. * We need to check the first byte to check whether the blob @@ -238,8 +238,8 @@ gint32 tag; if (parameter_tvb && (tvb_length(parameter_tvb) > 0)) call_dissector(spnego_handle, parameter_tvb, actx->pinfo, tree); } - /*if ((ldap_info->auth_mech != NULL) && ((strcmp(ldap_info->auth_mech, "GSSAPI") == 0) || (class==BER_CLASS_APP))) {*/ - if ((ldap_info->auth_mech != NULL) && (class==BER_CLASS_APP)) { + /*if ((ldap_info->auth_mech != NULL) && ((strcmp(ldap_info->auth_mech, "GSSAPI") == 0) || (ber_class==BER_CLASS_APP))) {*/ + if ((ldap_info->auth_mech != NULL) && (ber_class==BER_CLASS_APP)) { /* * This is a raw GSS-API token. */ @@ -258,7 +258,7 @@ ldap_conv_info_t *ldap_info; %(DEFAULT_BODY)s if (!parameter_tvb) return offset; - ldap_info = actx->pinfo->private_data; + ldap_info = (ldap_conv_info_t *)actx->pinfo->private_data; switch (ldap_info->auth_type) { /* For Kerberos V4, dissect it as a ticket. */ @@ -732,14 +732,14 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v return offset; #.FN_BODY Control/controlValue - gint8 class; + gint8 ber_class; gboolean pc, ind; gint32 tag; guint32 len; if((object_identifier_id != NULL) && oid_has_dissector(object_identifier_id)) { /* remove the OCTET STRING encoding */ - offset=dissect_ber_identifier(actx->pinfo, NULL, tvb, offset, &class, &pc, &tag); + offset=dissect_ber_identifier(actx->pinfo, NULL, tvb, offset, &ber_class, &pc, &tag); offset=dissect_ber_length(actx->pinfo, NULL, tvb, offset, &len, &ind); call_ber_oid_callback(object_identifier_id, tvb, offset, actx->pinfo, tree); @@ -776,7 +776,7 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v } #.FN_BODY DirSyncFlags - gint8 class; + gint8 ber_class; gboolean pc; gint32 tag; guint32 len; @@ -785,7 +785,7 @@ offset = dissect_ber_boolean(implicit_tag, actx, tree, tvb, offset, hf_index, &v int otheroffset = offset; if(!implicit_tag){ - otheroffset=dissect_ber_identifier(actx->pinfo, tree, tvb, otheroffset, &class, &pc, &tag); + otheroffset=dissect_ber_identifier(actx->pinfo, tree, tvb, otheroffset, &ber_class, &pc, &tag); otheroffset=dissect_ber_length(actx->pinfo, tree, tvb, offset, &len, NULL); } else { gint32 remaining=tvb_length_remaining(tvb, offset); diff --git a/asn1/ldap/packet-ldap-template.c b/asn1/ldap/packet-ldap-template.c index dda3d153b9..63b06789cb 100644 --- a/asn1/ldap/packet-ldap-template.c +++ b/asn1/ldap/packet-ldap-template.c @@ -301,7 +301,7 @@ static ldap_conv_info_t *ldap_info_items; static guint ldap_info_hash_matched(gconstpointer k) { - const ldap_call_response_t *key = k; + const ldap_call_response_t *key = (const ldap_call_response_t *)k; return key->messageId; } @@ -309,8 +309,8 @@ ldap_info_hash_matched(gconstpointer k) static gint ldap_info_equal_matched(gconstpointer k1, gconstpointer k2) { - const ldap_call_response_t *key1 = k1; - const ldap_call_response_t *key2 = k2; + const ldap_call_response_t *key1 = (const ldap_call_response_t*)k1; + const ldap_call_response_t *key2 = (const ldap_call_response_t*)k2; if( key1->req_frame && key2->req_frame && (key1->req_frame!=key2->req_frame) ){ return 0; @@ -327,7 +327,7 @@ ldap_info_equal_matched(gconstpointer k1, gconstpointer k2) static guint ldap_info_hash_unmatched(gconstpointer k) { - const ldap_call_response_t *key = k; + const ldap_call_response_t *key = (const ldap_call_response_t*)k; return key->messageId; } @@ -335,8 +335,8 @@ ldap_info_hash_unmatched(gconstpointer k) static gint ldap_info_equal_unmatched(gconstpointer k1, gconstpointer k2) { - const ldap_call_response_t *key1 = k1; - const ldap_call_response_t *key2 = k2; + const ldap_call_response_t *key1 = (const ldap_call_response_t*)k1; + const ldap_call_response_t *key2 = (const ldap_call_response_t*)k2; return key1->messageId==key2->messageId; } @@ -454,14 +454,14 @@ static char *ldapvalue_string=NULL; static int dissect_ldap_AssertionValue(gboolean implicit_tag, tvbuff_t *tvb, int offset, asn1_ctx_t *actx _U_, proto_tree *tree, int hf_index) { - gint8 class; + gint8 ber_class; gboolean pc, ind, is_ascii; gint32 tag; guint32 len, i; const guchar *str; if(!implicit_tag){ - offset=get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset=get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); offset=get_ber_length(tvb, offset, &len, &ind); } else { len=tvb_length_remaining(tvb,offset); @@ -646,7 +646,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu lcr.rep_frame=pinfo->fd->num; break; } - lcrp=g_hash_table_lookup(ldap_info->matched, &lcr); + lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->matched, &lcr); if(lcrp){ @@ -672,7 +672,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu unmatched list and if so remove it */ lcr.messageId=messageId; - lcrp=g_hash_table_lookup(ldap_info->unmatched, &lcr); + lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->unmatched, &lcr); if(lcrp){ g_hash_table_remove(ldap_info->unmatched, lcrp); } @@ -704,7 +704,7 @@ ldap_match_call_response(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gu /* this is a result - it should be in our unmatched list */ lcr.messageId=messageId; - lcrp=g_hash_table_lookup(ldap_info->unmatched, &lcr); + lcrp=(ldap_call_response_t *)g_hash_table_lookup(ldap_info->unmatched, &lcr); if(lcrp){ @@ -755,7 +755,7 @@ dissect_ldap_payload(tvbuff_t *tvb, packet_info *pinfo, guint headerLength = 0; guint length = 0; tvbuff_t *msg_tvb = NULL; - gint8 class; + gint8 ber_class; gboolean pc, ind = 0; gint32 ber_tag; @@ -772,13 +772,13 @@ one_more_pdu: * OK, try to read the "Sequence Of" header; this gets the total * length of the LDAP message. */ - messageOffset = get_ber_identifier(tvb, offset, &class, &pc, &ber_tag); + messageOffset = get_ber_identifier(tvb, offset, &ber_class, &pc, &ber_tag); messageOffset = get_ber_length(tvb, messageOffset, &msg_len, &ind); /* sanity check */ if((msg_len<4) || (msg_len>10000000)) return; - if ( (class==BER_CLASS_UNI) && (ber_tag==BER_UNI_TAG_SEQUENCE) ) { + if ( (ber_class==BER_CLASS_UNI) && (ber_tag==BER_UNI_TAG_SEQUENCE) ) { /* * Add the length of the "Sequence Of" header to the message * length. @@ -868,7 +868,7 @@ dissect_ldap_pdu(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gboolean i /* * Do we already have a type and mechanism? */ - ldap_info = conversation_get_proto_data(conversation, proto_ldap); + ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap); if (ldap_info == NULL) { /* No. Attach that information to the conversation, and add * it to the list of information structures. @@ -1647,7 +1647,7 @@ dissect_ldap_tcp(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) pinfo->ptype, pinfo->srcport, pinfo->destport, 0); if(conversation){ - ldap_info = conversation_get_proto_data(conversation, proto_ldap); + ldap_info = (ldap_conv_info_t *)conversation_get_proto_data(conversation, proto_ldap); } ldm_tree = NULL; @@ -1801,18 +1801,18 @@ ldap_reinit(void) } void -register_ldap_name_dissector_handle(const char *attr_type, dissector_handle_t dissector) +register_ldap_name_dissector_handle(const char *attr_type_p, dissector_handle_t dissector) { - dissector_add_string("ldap.name", attr_type, dissector); + dissector_add_string("ldap.name", attr_type_p, dissector); } void -register_ldap_name_dissector(const char *attr_type, dissector_t dissector, int proto) +register_ldap_name_dissector(const char *attr_type_p, dissector_t dissector, int proto) { dissector_handle_t dissector_handle; dissector_handle=create_dissector_handle(dissector, proto); - register_ldap_name_dissector_handle(attr_type, dissector_handle); + register_ldap_name_dissector_handle(attr_type_p, dissector_handle); } diff --git a/asn1/pkcs12/packet-pkcs12-template.c b/asn1/pkcs12/packet-pkcs12-template.c index 9b320690bf..2be750a8f5 100644 --- a/asn1/pkcs12/packet-pkcs12-template.c +++ b/asn1/pkcs12/packet-pkcs12-template.c @@ -90,7 +90,7 @@ static void append_oid(proto_tree *tree, const char *oid) #ifdef HAVE_LIBGCRYPT -int +static int generate_key_or_iv(unsigned int id, tvbuff_t *salt_tvb, unsigned int iter, const char *pw, unsigned int req_keylen, char * keybuf) { @@ -383,7 +383,7 @@ int PBE_decrypt_data(const char *object_identifier_id _U_, tvbuff_t *encrypted_t static int strip_octet_string(tvbuff_t *tvb) { - gint8 class; + gint8 ber_class; gboolean pc, ind; gint32 tag; guint32 len; @@ -393,10 +393,10 @@ static int strip_octet_string(tvbuff_t *tvb) /* if we use CMS (rather than PKCS#7) - which we are - we need to strip the OCTET STRING tag */ /* before proceeding */ - offset = get_ber_identifier(tvb, 0, &class, &pc, &tag); + offset = get_ber_identifier(tvb, 0, &ber_class, &pc, &tag); offset = get_ber_length(tvb, offset, &len, &ind); - if((class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_OCTETSTRING)) + if((ber_class == BER_CLASS_UNI) && (tag == BER_UNI_TAG_OCTETSTRING)) return offset; return 0; diff --git a/asn1/snmp/packet-snmp-template.c b/asn1/snmp/packet-snmp-template.c index 959724e69f..6aad3ff278 100644 --- a/asn1/snmp/packet-snmp-template.c +++ b/asn1/snmp/packet-snmp-template.c @@ -1501,17 +1501,17 @@ gboolean check_ScopedPdu(tvbuff_t* tvb) { int offset; - gint8 class; + gint8 ber_class; gboolean pc; gint32 tag; int hoffset, eoffset; guint32 len; - offset = get_ber_identifier(tvb, 0, &class, &pc, &tag); + offset = get_ber_identifier(tvb, 0, &ber_class, &pc, &tag); offset = get_ber_length(tvb, offset, NULL, NULL); - if ( ! (((class!=BER_CLASS_APP) && (class!=BER_CLASS_PRI) ) - && ( (!pc) || (class!=BER_CLASS_UNI) || (tag!=BER_UNI_TAG_ENUMERATED) ) + if ( ! (((ber_class!=BER_CLASS_APP) && (ber_class!=BER_CLASS_PRI) ) + && ( (!pc) || (ber_class!=BER_CLASS_UNI) || (tag!=BER_UNI_TAG_ENUMERATED) ) )) return FALSE; if((tvb_get_guint8(tvb, offset)==0)&&(tvb_get_guint8(tvb, offset+1)==0)) @@ -1519,14 +1519,14 @@ check_ScopedPdu(tvbuff_t* tvb) hoffset = offset; - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); offset = get_ber_length(tvb, offset, &len, NULL); eoffset = offset + len; if (eoffset <= hoffset) return FALSE; - if ((class!=BER_CLASS_APP)&&(class!=BER_CLASS_PRI)) - if( (class!=BER_CLASS_UNI) + if ((ber_class!=BER_CLASS_APP)&&(ber_class!=BER_CLASS_PRI)) + if( (ber_class!=BER_CLASS_UNI) ||((tag<BER_UNI_TAG_NumericString)&&(tag!=BER_UNI_TAG_OCTETSTRING)&&(tag!=BER_UNI_TAG_UTF8String)) ) return FALSE; @@ -1543,7 +1543,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, { guint length_remaining; - gint8 class; + gint8 ber_class; gboolean pc, ind = 0; gint32 tag; guint32 len; @@ -1628,7 +1628,7 @@ dissect_snmp_pdu(tvbuff_t *tvb, int offset, packet_info *pinfo, * length of the SNMP message. */ /* Set tree to 0 to not display internal BER fields if option used.*/ - offset = dissect_ber_identifier(pinfo, 0, tvb, offset, &class, &pc, &tag); + offset = dissect_ber_identifier(pinfo, 0, tvb, offset, &ber_class, &pc, &tag); /*Get the total octet length of the SNMP data*/ offset = dissect_ber_length(pinfo, 0, tvb, offset, &len, &ind); message_length = len + 2; @@ -1940,8 +1940,8 @@ process_prefs(void) static void* snmp_users_copy_cb(void* dest, const void* orig, size_t len _U_) { - const snmp_ue_assoc_t* o = orig; - snmp_ue_assoc_t* d = dest; + const snmp_ue_assoc_t* o = (const snmp_ue_assoc_t*)orig; + snmp_ue_assoc_t* d = (snmp_ue_assoc_t*)dest; d->auth_model = o->auth_model; d->user.authModel = auth_models[o->auth_model]; @@ -1975,7 +1975,7 @@ snmp_users_copy_cb(void* dest, const void* orig, size_t len _U_) static void snmp_users_free_cb(void* p) { - snmp_ue_assoc_t* ue = p; + snmp_ue_assoc_t* ue = (snmp_ue_assoc_t*)p; g_free(ue->user.userName.data); g_free(ue->user.authPassword.data); g_free(ue->user.privPassword.data); @@ -1987,7 +1987,7 @@ snmp_users_free_cb(void* p) static void snmp_users_update_cb(void* p _U_, const char** err) { - snmp_ue_assoc_t* ue = p; + snmp_ue_assoc_t* ue = (snmp_ue_assoc_t*)p; GString* es = g_string_new(""); unsigned i; @@ -2048,8 +2048,8 @@ UAT_VS_DEF(snmp_users,priv_proto,snmp_ue_assoc_t,0,"DES") static void * snmp_specific_trap_copy_cb(void *dest, const void *orig, size_t len _U_) { - snmp_st_assoc_t *u = dest; - const snmp_st_assoc_t *o = orig; + snmp_st_assoc_t *u = (snmp_st_assoc_t *)dest; + const snmp_st_assoc_t *o = (const snmp_st_assoc_t *)orig; u->enterprise = g_strdup(o->enterprise); u->trap = o->trap; @@ -2061,7 +2061,7 @@ snmp_specific_trap_copy_cb(void *dest, const void *orig, size_t len _U_) static void snmp_specific_trap_free_cb(void *r) { - snmp_st_assoc_t *u = r; + snmp_st_assoc_t *u = (snmp_st_assoc_t *)r; g_free(u->enterprise); g_free(u->desc); diff --git a/asn1/t125/packet-t125-template.c b/asn1/t125/packet-t125-template.c index c2ab2f7e90..b9da7642ce 100644 --- a/asn1/t125/packet-t125-template.c +++ b/asn1/t125/packet-t125-template.c @@ -64,7 +64,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { proto_item *item = NULL; proto_tree *tree = NULL; - gint8 class; + gint8 ber_class; gboolean pc; gint32 tag; @@ -76,9 +76,9 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) item = proto_tree_add_item(parent_tree, proto_t125, tvb, 0, tvb_length(tvb), ENC_NA); tree = proto_item_add_subtree(item, ett_t125); - get_ber_identifier(tvb, 0, &class, &pc, &tag); + get_ber_identifier(tvb, 0, &ber_class, &pc, &tag); - if ( (class==BER_CLASS_APP) && (tag>=101) && (tag<=104) ){ + if ( (ber_class==BER_CLASS_APP) && (tag>=101) && (tag<=104) ){ dissect_ConnectMCSPDU_PDU(tvb, pinfo, tree); } else { t124_set_top_tree(top_tree); @@ -91,7 +91,7 @@ dissect_t125(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) static gboolean dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree) { - gint8 class; + gint8 ber_class; gboolean pc; gint32 tag; guint32 choice_index = 100; @@ -100,14 +100,14 @@ dissect_t125_heur(tvbuff_t *tvb, packet_info *pinfo _U_, proto_tree *parent_tree asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo); /* could be BER */ - get_ber_identifier(tvb, 0, &class, &pc, &tag); + get_ber_identifier(tvb, 0, &ber_class, &pc, &tag); /* or PER */ dissect_per_constrained_integer(tvb, 0, &asn1_ctx, NULL, hf_t125_heur, 0, 42, &choice_index, FALSE); /* is this strong enough ? */ - if ( ((class==BER_CLASS_APP) && ((tag>=101) && (tag<=104))) || + if ( ((ber_class==BER_CLASS_APP) && ((tag>=101) && (tag<=104))) || (choice_index <=42)) { dissect_t125(tvb, pinfo, parent_tree); diff --git a/asn1/tcap/packet-tcap-template.c b/asn1/tcap/packet-tcap-template.c index be3dbf431d..aa61ab9731 100644 --- a/asn1/tcap/packet-tcap-template.c +++ b/asn1/tcap/packet-tcap-template.c @@ -129,11 +129,11 @@ extern void delete_itu_tcap_subdissector(guint32 ssn, dissector_handle_t dissect } dissector_handle_t get_ansi_tcap_subdissector(guint32 ssn) { - return g_hash_table_lookup(ansi_sub_dissectors,GUINT_TO_POINTER(ssn)); + return (dissector_handle_t)g_hash_table_lookup(ansi_sub_dissectors,GUINT_TO_POINTER(ssn)); } dissector_handle_t get_itu_tcap_subdissector(guint32 ssn) { - return g_hash_table_lookup(itu_sub_dissectors,GUINT_TO_POINTER(ssn)); + return (dissector_handle_t)g_hash_table_lookup(itu_sub_dissectors,GUINT_TO_POINTER(ssn)); } @@ -160,7 +160,7 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) struct tcaphash_context_t * p_tcap_context; dissector_handle_t subdissector_handle; asn1_ctx_t asn1_ctx; - gint8 class; + gint8 ber_class; gboolean pc; gint tag; @@ -176,9 +176,9 @@ dissect_tcap(tvbuff_t *tvb, packet_info *pinfo, proto_tree *parent_tree) * * */ - get_ber_identifier(tvb, 0, &class, &pc, &tag); + get_ber_identifier(tvb, 0, &ber_class, &pc, &tag); - if(class == BER_CLASS_PRI){ + if(ber_class == BER_CLASS_PRI){ switch(tag){ case 1: case 2: @@ -431,7 +431,7 @@ dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset tvbuff_t *next_tvb; proto_tree *subtree; proto_item *pi; - gint8 class; + gint8 ber_class; gboolean pc; gint32 tag; guint32 len; @@ -443,7 +443,7 @@ dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset { saved_offset = offset; - offset = get_ber_identifier(tvb, offset, &class, &pc, &tag); + offset = get_ber_identifier(tvb, offset, &ber_class, &pc, &tag); tag_offset = offset; offset = get_ber_length(tvb, offset, &len, &ind_field); len_offset = offset; @@ -461,7 +461,7 @@ dissect_tcap_param(asn1_ctx_t *actx, proto_tree *tree, tvbuff_t *tvb, int offset saved_offset, tag_length, tag, "CONSTRUCTOR Tag"); proto_tree_add_uint(subtree, hf_tcap_tag, tvb, saved_offset, - tag_length, class); + tag_length, ber_class); proto_tree_add_uint(subtree, hf_tcap_length, tvb, tag_offset, len_length, len); diff --git a/asn1/tcap/tcap.cnf b/asn1/tcap/tcap.cnf index 731d7e25af..675eb26b99 100644 --- a/asn1/tcap/tcap.cnf +++ b/asn1/tcap/tcap.cnf @@ -77,13 +77,13 @@ ABRT-apdu/_untag/user-information abrt_user_information #---------------------------------------------------------------------------------------- #.FN_BODY Component tvbuff_t *next_tvb; -gint8 class; +gint8 ber_class; gboolean pc; gint tag; guint32 len, comp_offset; gint ind_field; -comp_offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &class, &pc, &tag); +comp_offset = dissect_ber_identifier(actx->pinfo, tree, tvb, offset, &ber_class, &pc, &tag); comp_offset = dissect_ber_length(actx->pinfo, tree, tvb, comp_offset, &len, &ind_field); /* we can believe the length now */ next_tvb = tvb_new_subset(tvb, offset, len+comp_offset-offset, len+comp_offset-offset); diff --git a/asn1/tetra/packet-tetra-template.h b/asn1/tetra/packet-tetra-template.h index 5654b5063b..425ba83774 100644 --- a/asn1/tetra/packet-tetra-template.h +++ b/asn1/tetra/packet-tetra-template.h @@ -51,4 +51,5 @@ enum { void tetra_dissect_pdu(int channel_type, int dir, tvbuff_t *pdu, proto_tree *head, packet_info *pinfo); +#include "packet-tetra-exp.h" #endif /* PACKET_TETRA_H */ |