diff options
author | Anders Broman <anders.broman@ericsson.com> | 2006-10-08 20:57:20 +0000 |
---|---|---|
committer | Anders Broman <anders.broman@ericsson.com> | 2006-10-08 20:57:20 +0000 |
commit | ed0cf1e0bb1f9b5bd617547e0381b1b11f482d1c (patch) | |
tree | aa7e6b350f0a68167a2c0af44f7112fced04ae29 | |
parent | daed1f10cdf4d289568204ce5d3066f94e91444f (diff) |
H248:
Lost a line in last commit.
ISUP Export a value string.
svn path=/trunk/; revision=19454
-rw-r--r-- | asn1/h248/packet-h248-template.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-h248.c | 8 | ||||
-rw-r--r-- | epan/dissectors/packet-isup.c | 2 | ||||
-rw-r--r-- | epan/dissectors/packet-isup.h | 7 |
4 files changed, 14 insertions, 5 deletions
diff --git a/asn1/h248/packet-h248-template.c b/asn1/h248/packet-h248-template.c index 3b6b86ca91..c945024204 100644 --- a/asn1/h248/packet-h248-template.c +++ b/asn1/h248/packet-h248-template.c @@ -749,6 +749,8 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse if (! pkg ) pkg = &no_package; + hf_param = *(pkg->hfid_params); + if (hf_param > 0) /* TODO: Will this ever happen now??*/ proto_tree_add_uint(package_tree, hf_param, tvb, offset-2, 2, name_minor); diff --git a/epan/dissectors/packet-h248.c b/epan/dissectors/packet-h248.c index 32b2c1dcd5..a7e2e25742 100644 --- a/epan/dissectors/packet-h248.c +++ b/epan/dissectors/packet-h248.c @@ -1161,6 +1161,8 @@ static int dissect_h248_PkgdName(gboolean implicit_tag, tvbuff_t *tvb, int offse if (! pkg ) pkg = &no_package; + hf_param = *(pkg->hfid_params); + if (hf_param > 0) /* TODO: Will this ever happen now??*/ proto_tree_add_uint(package_tree, hf_param, tvb, offset-2, 2, name_minor); @@ -5869,7 +5871,7 @@ dissect_h248_MegacoMessage(gboolean implicit_tag _U_, tvbuff_t *tvb, int offset, /*--- End of included file: packet-h248-fn.c ---*/ -#line 1758 "packet-h248-template.c" +#line 1760 "packet-h248-template.c" static void dissect_h248(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree) @@ -7060,7 +7062,7 @@ void proto_register_h248(void) { "", HFILL }}, /*--- End of included file: packet-h248-hfarr.c ---*/ -#line 1892 "packet-h248-template.c" +#line 1894 "packet-h248-template.c" { &hf_h248_ctx, { "Context", "h248.ctx", FT_UINT32, BASE_HEX, NULL, 0, "", HFILL }}, { &hf_h248_ctx_term, { "Termination", "h248.ctx.term", FT_STRING, BASE_NONE, NULL, 0, "", HFILL }}, @@ -7220,7 +7222,7 @@ void proto_register_h248(void) { &ett_h248_Value, /*--- End of included file: packet-h248-ettarr.c ---*/ -#line 1917 "packet-h248-template.c" +#line 1919 "packet-h248-template.c" }; module_t *h248_module; diff --git a/epan/dissectors/packet-isup.c b/epan/dissectors/packet-isup.c index 904ca94165..e9c1f47c6c 100644 --- a/epan/dissectors/packet-isup.c +++ b/epan/dissectors/packet-isup.c @@ -2775,7 +2775,7 @@ static const value_string optimisation_mode_vals[] = { { 0, NULL } }; -static const value_string bearer_network_connection_characteristics_vals[] = { +const value_string bearer_network_connection_characteristics_vals[] = { { 0x00, "no indication"}, { 0x01, "AAL type 1"}, diff --git a/epan/dissectors/packet-isup.h b/epan/dissectors/packet-isup.h index 1ce597d5c3..4e9688039e 100644 --- a/epan/dissectors/packet-isup.h +++ b/epan/dissectors/packet-isup.h @@ -24,6 +24,9 @@ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. */ +#ifndef PACKET_ISUP_H +#define PACKET_ISUP_H + #define ISUP_MAX_NUM_MESSAGE_TYPES 256 typedef struct _isup_tap_rec_t { @@ -155,7 +158,7 @@ WS_VAR_IMPORT const value_string q850_cause_code_vals[]; extern const value_string isup_parameter_type_value[]; extern const value_string isup_transmission_medium_requirement_value[]; extern const value_string isup_calling_partys_category_value[]; - +extern const value_string bearer_network_connection_characteristics_vals[]; /* * Export dissection of some parameters */ @@ -168,3 +171,5 @@ void dissect_isup_original_called_number_parameter(tvbuff_t *parameter_tvb, prot void dissect_isup_redirecting_number_parameter(tvbuff_t *parameter_tvb, proto_tree *parameter_tree, proto_item *parameter_item); extern int dissect_codec_mode(proto_tree *tree, tvbuff_t *tvb, int offset, int len); + +#endif /* PACKET_ISUP_H */
\ No newline at end of file |