diff options
| author | AndersBroman <anders.broman@ericsson.com> | 2014-08-19 16:02:40 +0200 |
|---|---|---|
| committer | Anders Broman <a.broman58@gmail.com> | 2014-08-19 14:07:06 +0000 |
| commit | 93da6170e32e3840abb0fe8a95ad99cc97590ebe (patch) | |
| tree | 6a894548f26f4594e7b6769a6dda66cae92ce0cd /asn1 | |
| parent | 50413192e378ae7a7e05aa69a0da8226ff80e235 (diff) | |
| download | wireshark-93da6170e32e3840abb0fe8a95ad99cc97590ebe.tar.gz wireshark-93da6170e32e3840abb0fe8a95ad99cc97590ebe.tar.bz2 wireshark-93da6170e32e3840abb0fe8a95ad99cc97590ebe.zip | |
Remove unused hf and deprecated API
Change-Id: I5196f2be4b15704517ff1dc8bfacc6f9b52ecd71
Reviewed-on: https://code.wireshark.org/review/3720
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'asn1')
| -rw-r--r-- | asn1/gsm_map/gsm_map.cnf | 4 | ||||
| -rw-r--r-- | asn1/ranap/packet-ranap-template.c | 5 | ||||
| -rw-r--r-- | asn1/ranap/ranap.cnf | 4 |
3 files changed, 4 insertions, 9 deletions
diff --git a/asn1/gsm_map/gsm_map.cnf b/asn1/gsm_map/gsm_map.cnf index f4fb63751a..3a88b4e150 100644 --- a/asn1/gsm_map/gsm_map.cnf +++ b/asn1/gsm_map/gsm_map.cnf @@ -264,8 +264,8 @@ MAP-DialoguePDU B "0.4.0.0.1.1.1.1" "map-DialogueAS" if(tvb_reported_length(parameter_tvb)==0) return offset; - /* Hide the octet string dfault printout */ - PROTO_ITEM_SET_HIDDEN(actx->created_item); + /* Hide the octet string default printout */ + PROTO_ITEM_SET_HIDDEN(actx->created_item); dissect_e212_imsi(parameter_tvb, actx->pinfo, tree, 0, tvb_reported_length(parameter_tvb), FALSE); diff --git a/asn1/ranap/packet-ranap-template.c b/asn1/ranap/packet-ranap-template.c index a01444142b..233f5bdf6e 100644 --- a/asn1/ranap/packet-ranap-template.c +++ b/asn1/ranap/packet-ranap-template.c @@ -69,7 +69,6 @@ static dissector_handle_t rrc_s_to_trnc_handle = NULL; static dissector_handle_t rrc_t_to_srnc_handle = NULL; static dissector_handle_t rrc_ho_to_utran_cmd = NULL; -static int hf_ranap_imsi_digits = -1; static int hf_ranap_transportLayerAddress_ipv4 = -1; static int hf_ranap_transportLayerAddress_ipv6 = -1; static int hf_ranap_transportLayerAddress_nsap = -1; @@ -303,10 +302,6 @@ void proto_register_ranap(void) { /* List of fields */ static hf_register_info hf[] = { - { &hf_ranap_imsi_digits, - { "IMSI digits", "ranap.imsi_digits", - FT_STRING, BASE_NONE, NULL, 0, - NULL, HFILL }}, { &hf_ranap_transportLayerAddress_ipv4, { "transportLayerAddress IPv4", "ranap.transportLayerAddress_ipv4", FT_IPv4, BASE_NONE, NULL, 0, diff --git a/asn1/ranap/ranap.cnf b/asn1/ranap/ranap.cnf index 938819cdea..452d7cd7a7 100644 --- a/asn1/ranap/ranap.cnf +++ b/asn1/ranap/ranap.cnf @@ -222,7 +222,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") %(DEFAULT_BODY)s - if ((rrc_message_tvb)&&(tvb_length(rrc_message_tvb)!=0)&&(glbl_dissect_container)){ + if ((rrc_message_tvb)&&(tvb_reported_length(rrc_message_tvb)!=0)&&(glbl_dissect_container)){ switch(ProtocolIE_ID){ case id_Source_ToTarget_TransparentContainer: /* INTEGER ::= 61 */ /* 9.2.1.30a Source to Target Transparent Container @@ -310,7 +310,7 @@ MAX_VAL = asn1_param_get_integer(%(ACTX)s,"upperBound") # TransportLayerAddress ::= BIT STRING (SIZE (1..160, ...)) # Asume 4 bytes used in case of IPv4 /* Get the length */ - tvb_len = tvb_length(parameter_tvb); + tvb_len = tvb_reported_length(parameter_tvb); subtree = proto_item_add_subtree(actx->created_item, ett_ranap_TransportLayerAddress); if (tvb_len==4){ /* IPv4 */ |