diff options
author | AndersBroman <anders.broman@ericsson.com> | 2015-01-14 13:47:08 +0100 |
---|---|---|
committer | Anders Broman <a.broman58@gmail.com> | 2015-01-14 13:37:14 +0000 |
commit | 20e2c05d9b380158bfa27dcb94dd23ba7cad3ec6 (patch) | |
tree | e509621172bdceb10291db72d92ed6cac6d75384 /epan/dissectors/packet-nas_eps.c | |
parent | 36aca292fb9ee3ce47203958ebc879665db3027a (diff) |
[E212]Modify dissect_e212_mcc_mnc() to take E212 number type as an
argument. While at it remove deprecated APIs
Change-Id: Ib1a7e9d7aeba6379fb4492816a0ac602e67493c6
Reviewed-on: https://code.wireshark.org/review/6534
Reviewed-by: Anders Broman <a.broman58@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-nas_eps.c')
-rw-r--r-- | epan/dissectors/packet-nas_eps.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/epan/dissectors/packet-nas_eps.c b/epan/dissectors/packet-nas_eps.c index 0a3c7e1a51..41fc482911 100644 --- a/epan/dissectors/packet-nas_eps.c +++ b/epan/dissectors/packet-nas_eps.c @@ -1057,7 +1057,7 @@ de_emm_eps_mid(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, case 6: /* GUTI */ curr_offset++; - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_NONE, TRUE); /* MME Group ID octet 7 - 8 */ proto_tree_add_item(tree, hf_nas_eps_emm_mme_grp_id, tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset+=2; @@ -1562,7 +1562,7 @@ de_emm_trac_area_id(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, curr_offset = offset; - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_NONE, TRUE); proto_tree_add_item(tree, hf_nas_eps_emm_tai_tac, tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset+=2; @@ -1616,7 +1616,7 @@ de_emm_trac_area_id_lst(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * MNC digit 3 MCC digit 3 octet 3 * MNC digit 2 MNC digit 1 octet 4 */ - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_NONE, TRUE); /* type of list = "000" */ /* TAC 1 octet 5 * TAC 1 (continued) octet 6 @@ -1639,7 +1639,7 @@ de_emm_trac_area_id_lst(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * MNC digit 3 MCC digit 3 octet 3 * MNC digit 2 MNC digit 1 octet 4 */ - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_NONE, TRUE); proto_tree_add_item(tree, hf_nas_eps_emm_tai_tac, tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset+=2; break; @@ -1655,7 +1655,7 @@ de_emm_trac_area_id_lst(tvbuff_t *tvb, proto_tree *tree, packet_info *pinfo, * MNC digit 3 MCC digit 3 octet 3 * MNC digit 2 MNC digit 1 octet 4 */ - curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, TRUE); + curr_offset = dissect_e212_mcc_mnc(tvb, pinfo, tree, curr_offset, E212_NONE, TRUE); proto_tree_add_item(tree, hf_nas_eps_emm_tai_tac, tvb, curr_offset, 2, ENC_BIG_ENDIAN); curr_offset+=2; } |