aboutsummaryrefslogtreecommitdiffstats
path: root/epan/dissectors/packet-e212.c
diff options
context:
space:
mode:
authorHessam Jalali <hessam.jalali@gmail.com>2016-10-25 11:59:54 +0330
committerMichael Mann <mmann78@netscape.net>2016-10-25 17:22:46 +0000
commit346bda4238033fb146d6a7e7f21ecd714da396a2 (patch)
treec692ae636b36f001fbb5fc0adbbda6c672b66182 /epan/dissectors/packet-e212.c
parentc63f89515985a8db0aa8a500b1832474619090aa (diff)
e212: added 3 new filters (CGI, ECGI, TAI)
Added these new filters to enhance mcc/mnc filtering in GTP protocol. Change-Id: I595b5fde4fa358886fbe5c58f6ecab496d9ef08c Reviewed-on: https://code.wireshark.org/review/18444 Reviewed-by: Jaap Keuter <jaap.keuter@xs4all.nl> Petri-Dish: Jaap Keuter <jaap.keuter@xs4all.nl> Tested-by: Petri Dish Buildbot <buildbot-no-reply@wireshark.org> Reviewed-by: Alexis La Goutte <alexis.lagoutte@gmail.com> Reviewed-by: Michael Mann <mmann78@netscape.net>
Diffstat (limited to 'epan/dissectors/packet-e212.c')
-rw-r--r--epan/dissectors/packet-e212.c48
1 files changed, 48 insertions, 0 deletions
diff --git a/epan/dissectors/packet-e212.c b/epan/dissectors/packet-e212.c
index 5ea8dc6e7a..8cc31032bc 100644
--- a/epan/dissectors/packet-e212.c
+++ b/epan/dissectors/packet-e212.c
@@ -2724,10 +2724,16 @@ static int hf_E212_mcc = -1;
static int hf_E212_mcc_lai = -1;
static int hf_E212_mcc_sai = -1;
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_mnc = -1;
static int hf_E212_mnc_lai = -1;
static int hf_E212_mnc_sai = -1;
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 ett_e212_imsi = -1;
@@ -2817,6 +2823,18 @@ dissect_e212_mcc_mnc_wmem_packet_str(tvbuff_t *tvb, packet_info *pinfo, proto_tr
hf_E212_mcc_id = hf_E212_mcc_sai;
hf_E212_mnc_id = hf_E212_mnc_sai;
break;
+ case E212_CGI:
+ hf_E212_mcc_id = hf_E212_mcc_cgi;
+ hf_E212_mnc_id = hf_E212_mnc_cgi;
+ break;
+ case E212_ECGI:
+ hf_E212_mcc_id = hf_E212_mcc_ecgi;
+ hf_E212_mnc_id = hf_E212_mnc_ecgi;
+ break;
+ case E212_TAI:
+ hf_E212_mcc_id = hf_E212_mcc_tai;
+ hf_E212_mnc_id = hf_E212_mnc_tai;
+ break;
default:
hf_E212_mcc_id = hf_E212_mcc;
hf_E212_mnc_id = hf_E212_mnc;
@@ -3200,6 +3218,21 @@ proto_register_e212(void)
FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0,
"Mobile Country Code MCC", HFILL }
},
+ { &hf_E212_mcc_cgi,
+ { "Mobile Country Code (MCC)","e212.cgi.mcc",
+ FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0,
+ "Mobile Country Code MCC", HFILL }
+ },
+ { &hf_E212_mcc_ecgi,
+ { "Mobile Country Code (MCC)","e212.ecgi.mcc",
+ FT_UINT16, BASE_DEC|BASE_EXT_STRING, &E212_codes_ext, 0x0,
+ "Mobile Country Code MCC", HFILL }
+ },
+ { &hf_E212_mcc_tai,
+ { "Mobile Country Code (MCC)","e212.tai.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,
@@ -3220,6 +3253,21 @@ proto_register_e212(void)
FT_UINT16, BASE_DEC, NULL, 0x0,
"Mobile network code", HFILL }
},
+ { &hf_E212_mnc_cgi,
+ { "Mobile Network Code (MNC)","e212.cgi.mnc",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Mobile network code", HFILL }
+ },
+ { &hf_E212_mnc_ecgi,
+ { "Mobile Network Code (MNC)","e212.ecgi.mnc",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Mobile network code", HFILL }
+ },
+ { &hf_E212_mnc_tai,
+ { "Mobile Network Code (MNC)","e212.tai.mnc",
+ FT_UINT16, BASE_DEC, NULL, 0x0,
+ "Mobile network code", HFILL }
+ },
#if 0
{ &hf_E212_msin,
{ "Mobile Subscriber Identification Number (MSIN)", "e212.msin",