aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-e212.c
diff options
context:
space:
mode:
authorPascal Quantin <pascal.quantin@gmail.com>2018-08-09 16:43:48 +0200
committerPascal Quantin <pascal.quantin@gmail.com>2018-08-09 18:55:06 +0000
commitbc6e462c23d0dbf089f2b785c442597c56d7b21d (patch)
tree9f2554fcc3743c81caf5e70182e3e94c7c5bda5c /epan/dissectors/packet-e212.c
parent0720dedeff69536a721bc7c331c190290c8fb1ee (diff)
GTPv2: add dissection of newer geographic location types
Bug: 15050 Change-Id: I3ecf9715fa5950262b68caff61e55abf943cebca Reviewed-on: https://code.wireshark.org/review/29045 Petri-Dish: Pascal Quantin <pascal.quantin@gmail.com> Tested-by: Petri Dish Buildbot Reviewed-by: Pascal Quantin <pascal.quantin@gmail.com>
Diffstat (limited to 'epan/dissectors/packet-e212.c')
-rw-r--r--epan/dissectors/packet-e212.c16
1 files changed, 16 insertions, 0 deletions
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index 6cdde5db4e..7e67d4efdc 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -2880,6 +2880,7 @@ static int hf_E212_mcc_rai = -1;
static int hf_E212_mcc_cgi = -1;
static int hf_E212_mcc_ecgi = -1;
static int hf_E212_mcc_tai = -1;
+static int hf_E212_mcc_nrcgi = -1;
static int hf_E212_mnc = -1;
static int hf_E212_mnc_lai = -1;
static int hf_E212_mnc_sai = -1;
@@ -2887,6 +2888,7 @@ static int hf_E212_mnc_rai = -1;
static int hf_E212_mnc_cgi = -1;
static int hf_E212_mnc_ecgi = -1;
static int hf_E212_mnc_tai = -1;
+static int hf_E212_mnc_nrcgi = -1;
static int ett_e212_imsi = -1;
@@ -2988,6 +2990,10 @@ dissect_e212_mcc_mnc_wmem_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tr
hf_E212_mcc_id = hf_E212_mcc_tai;
hf_E212_mnc_id = hf_E212_mnc_tai;
break;
+ case E212_NRCGI:
+ hf_E212_mcc_id = hf_E212_mcc_nrcgi;
+ hf_E212_mnc_id = hf_E212_mnc_nrcgi;
+ break;
default:
hf_E212_mcc_id = hf_E212_mcc;
hf_E212_mnc_id = hf_E212_mnc;
@@ -3412,6 +3418,11 @@ proto_register_e212(void)
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0,
"Mobile Country Code MCC", HFILL }
},
+ { &hf_E212_mcc_nrcgi,
+ { "Mobile Country Code (MCC)","e212.nrcgi.mcc",
+ FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0,
+ "Mobile Country Code MCC", HFILL }
+ },
{ &hf_E212_mnc,
{ "Mobile Network Code (MNC)","e212.mnc",
FT_UINT16, BASE_DEC, NULL, 0x0,
@@ -3447,6 +3458,11 @@ proto_register_e212(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
"Mobile network code", HFILL }
},
+ { &hf_E212_mnc_nrcgi,
+ { "Mobile Network Code (MNC)","e212.nrcgi.mnc",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Mobile network code", HFILL }
+ },
#if 0
{ &hf_E212_msin,
{ "Mobile Subscriber Identification Number (MSIN)", "e212.msin",