osmocom
/
wireshark
11
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

RADIUS: replace ULI decoder with version from GTPv2 

Reuse the DIAMETER dissector for 3GPP-ULI for RADIUS as well.

The DIAMETER dissector for 3GPP-ULI IE is more complete than the RADIUS
version. The format of the IE is the same in RADIUS and DIAMETER.
This commit is contained in:
Andreas Schultz 2021-07-08 09:42:45 +02:00 committed by Wireshark GitLab Utility
parent 831f6233ad
commit 9e29ec0940
2 changed files with 39 additions and 152 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

140
epan/dissectors/packet-gtp.c
View File

@ -220,8 +220,6 @@ static int hf_gtp_sai_sac = -1;
static int hf_gtp_rai_rac = -1;
static int hf_gtp_lac = -1;
static int hf_gtp_tac = -1;
static int hf_gtp_eci = -1;
static int hf_gtp_ncgi_nrci = -1;
static int hf_gtp_ranap_cause = -1;
static int hf_gtp_recovery = -1;
static int hf_gtp_reorder = -1;
@ -6637,133 +6635,6 @@ decode_gtp_rat_type(tvbuff_t * tvb, int offset, packet_info * pinfo, proto_tree
return 3 + length;
}
/* GPRS: ?
* UMTS: 29.060 v6.11.0, chapter 7.7.51
* User Location Information
* Type = 152 (Decimal)
*/
static const
gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo)
{
int offset = 0;
guint8 geo_loc_type;
guint16 length = tvb_reported_length(tvb);
proto_item* ti;
/* Geographic Location Type */
geo_loc_type = tvb_get_guint8(tvb, offset);
ti = proto_tree_add_uint(tree, hf_gtp_uli_geo_loc_type, tvb, offset, 1, geo_loc_type);
offset++;
switch(geo_loc_type) {
case 0:
/* Geographic Location field included and it holds the Cell Global
* Identification (CGI) of where the user currently is registered.
* CGI is defined in sub-clause 4.3.1 of 3GPP TS 23.003 [2].
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_CGI, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
offset+=2;
/* The CI is of fixed length with 2 octets and it can be coded using a full
* hexadecimal representation
*/
proto_tree_add_item(tree, hf_gtp_cgi_ci, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
case 1:
/* Geographic Location field included and it holds the Service
* Area Identity (SAI) of where the user currently is registered.
* SAI is defined in sub-clause 9.2.3.9 of 3GPP TS 25.413 [7].
*/
/* PLMN identity M 9.2.3.55
* 9.2.3.55 PLMN identity M OCTET STRING (SIZE (3))
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_SAI, TRUE);
offset+=3;
/* LAC M OCTET STRING (SIZE(2)) 0000 and FFFE not allowed.*/
proto_tree_add_item(tree, hf_gtp_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
offset+=2;
/* SAC M OCTET STRING (SIZE(2)) */
proto_tree_add_item(tree, hf_gtp_sai_sac, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
case 2:
/* Geographic Location field included and it holds the Routing
* Area Identification (RAI) of where the user currently is
* registered. RAI is defined in sub-clause 4.2 of 3GPP TS 23.003
* [2].
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_RAI, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_lac, tvb, offset, 2, ENC_BIG_ENDIAN);
offset+=2;
/* Routing Area Code (RAC) which is a fixed length code (of 1 octet)
* identifying a routing area within a location area.
*/
proto_tree_add_item(tree, hf_gtp_rai_rac, tvb, offset, 1, ENC_BIG_ENDIAN);
break;
case 128:
/* Geographic Location field included and it holds the Tracking
* Area Identity (TAI) of where the user currently is registered.
* TAI is defined in sub-clause 8.21.4 of 3GPP TS 29.274.
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_TAI, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_tac, tvb, offset, 2, ENC_BIG_ENDIAN);
break;
case 129:
/* Geographic Location field included and it holds the E-UTRAN Cell
* Global Identifier (ECGI) of where the user currently is registered.
* ECGI is defined in sub-clause 8.21.5 of 3GPP TS 29.274.
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_ECGI, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_eci, tvb, offset, 4, ENC_BIG_ENDIAN);
break;
case 130:
/* Geographic Location field included and it holds the Tracking
* Area Identity (TAI) and E-UTRAN CellGlobal Identifier (ECGI)
* of where the user currently is registered.
* TAI is defined in sub-clause 8.21.4 of 3GPP TS 29.274.
* ECGI is defined in sub-clause 8.21.5 of 3GPP TS 29.274.
*/
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_TAI, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_tac, tvb, offset, 2, ENC_BIG_ENDIAN);
offset += 2;
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_ECGI, TRUE);
offset+=3;
proto_tree_add_item(tree, hf_gtp_eci, tvb, offset, 4, ENC_BIG_ENDIAN);
break;
case 135:
/* NCGI */
{
proto_tree_add_item(tree, hf_gtp_ncgi_nrci, tvb, offset, 5, ENC_BIG_ENDIAN);
}
break;
case 136:
/* 5GS TAI */
{
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_TAI, TRUE);
}
break;
case 137:
/* 5GS TAI and NCGI */
{
dissect_e212_mcc_mnc(tvb, pinfo, tree, offset, E212_TAI, TRUE);
offset += 3;
proto_tree_add_item(tree, hf_gtp_ncgi_nrci, tvb, offset, 5, ENC_BIG_ENDIAN);
}
break;
default:
expert_add_info(pinfo, ti, &ei_gtp_ext_geo_loc_type);
break;
}
return tvb_bytes_to_str(wmem_packet_scope(), tvb, 0, length);
}
/*
* 7.7.51 User Location Information
*/
@ -10776,16 +10647,6 @@ proto_register_gtp(void)
FT_UINT16, BASE_DEC, NULL, 0,
NULL, HFILL}
},
{ &hf_gtp_eci,
{"ECI", "gtp.eci",
FT_UINT32, BASE_DEC, NULL, 0x0FFFFFFF,
"E-UTRAN Cell Identifier", HFILL}
},
{&hf_gtp_ncgi_nrci,
{"NR Cell Identifier", "gtp.ncgi_nrci",
FT_UINT40, BASE_HEX, NULL, 0xfffffffff0,
NULL, HFILL}
},
{&hf_gtp_ranap_cause,
{ "RANAP cause", "gtp.ranap_cause",
FT_UINT8, BASE_DEC|BASE_EXT_STRING, &ranap_cause_type_ext, 0,
@ -11870,7 +11731,6 @@ proto_reg_handoff_gtp(void)
radius_register_avp_dissector(VENDOR_THE3GPP, 5, dissect_radius_qos_umts);
radius_register_avp_dissector(VENDOR_THE3GPP, 12, dissect_radius_selection_mode);
radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc);

51
epan/dissectors/packet-gtpv2.c
View File

@ -20,6 +20,7 @@
#include <epan/to_str.h>
#include <epan/asn1.h>
#include <epan/expert.h>
#include <epan/sminmpec.h>
#include <epan/addr_resolv.h>
#include "packet-gsm_a_common.h"
@ -31,6 +32,7 @@
#include "packet-bssgp.h"
#include "packet-ntp.h"
#include "packet-gtpv2.h"
#include "packet-radius.h"
#include "packet-diameter.h"
#include "packet-diameter_3gpp.h"
#include "packet-ip.h"
@ -3123,16 +3125,19 @@ static const value_string geographic_location_type_vals[] = {
{0, NULL}
};
int
dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
static int
dissect_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, gchar **avp_str)
{
diam_sub_dis_t *diam_sub_dis = (diam_sub_dis_t*)data;
int offset = 0;
guint length;
guint flags;
guint32 flags_3gpp;
gchar *str_buf = NULL;
length = tvb_reported_length(tvb);
if (!avp_str)
avp_str = &str_buf;
proto_tree_add_item_ret_uint(tree, hf_gtpv2_glt, tvb, offset, 1, ENC_BIG_ENDIAN, &flags_3gpp);
offset++;
@ -3190,9 +3195,9 @@ dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
mcc_mnc_str = dissect_e212_mcc_mnc_wmem_packet_str(tvb, pinfo, subtree, offset, E212_NRCGI, TRUE);
offset += 3;
proto_tree_add_item_ret_uint64(subtree, hf_gtpv2_ncgi_nrci, tvb, offset, 5, ENC_BIG_ENDIAN, &nr_cell_id);
diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(),
"%s, NR Cell Id 0x%" G_GINT64_MODIFIER "x",
mcc_mnc_str, nr_cell_id);
*avp_str = wmem_strdup_printf(wmem_packet_scope(),
"%s, NR Cell Id 0x%" G_GINT64_MODIFIER "x",
mcc_mnc_str, nr_cell_id);
}
return length;
case 136:
@ -3202,7 +3207,7 @@ dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
subtree = proto_tree_add_subtree(tree, tvb, offset, 5, ett_gtpv2_uli_field, NULL,
"Tracking Area Identity (TAI)");
diam_sub_dis->avp_str = dissect_gtpv2_tai(tvb, pinfo, subtree, &offset);
*avp_str = dissect_gtpv2_tai(tvb, pinfo, subtree, &offset);
}
return length;
case 137:
@ -3214,15 +3219,15 @@ dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
subtree = proto_tree_add_subtree(tree, tvb, offset, 5, ett_gtpv2_uli_field, NULL,
"Tracking Area Identity (TAI)");
diam_sub_dis->avp_str = dissect_gtpv2_tai(tvb, pinfo, subtree, &offset);
*avp_str = dissect_gtpv2_tai(tvb, pinfo, subtree, &offset);
subtree = proto_tree_add_subtree(tree, tvb, offset, 8, ett_gtpv2_uli_field, NULL,
"NR Cell Global Identifier (NCGI)");
mcc_mnc_str = dissect_e212_mcc_mnc_wmem_packet_str(tvb, pinfo, subtree, offset, E212_NRCGI, TRUE);
offset += 3;
proto_tree_add_item_ret_uint64(subtree, hf_gtpv2_ncgi_nrci, tvb, offset, 5, ENC_BIG_ENDIAN, &nr_cell_id);
diam_sub_dis->avp_str = wmem_strdup_printf(wmem_packet_scope(),
"%s, %s, NR Cell Id 0x%" G_GINT64_MODIFIER "x",
diam_sub_dis->avp_str, mcc_mnc_str, nr_cell_id);
*avp_str = wmem_strdup_printf(wmem_packet_scope(),
"%s, %s, NR Cell Id 0x%" G_GINT64_MODIFIER "x",
*avp_str, mcc_mnc_str, nr_cell_id);
}
return length;
default:
@ -3230,10 +3235,28 @@ dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, v
return length;
}
diam_sub_dis->avp_str = decode_gtpv2_uli(tvb, pinfo, tree, NULL, length, 0, flags);
*avp_str = decode_gtpv2_uli(tvb, pinfo, tree, NULL, length, 0, flags);
return length;
}
static const
gchar *dissect_radius_user_loc(proto_tree * tree, tvbuff_t * tvb, packet_info* pinfo)
{
guint16 length;
length = dissect_3gpp_uli(tvb, pinfo, tree, NULL);
return tvb_bytes_to_str(wmem_packet_scope(), tvb, 0, length);
}
int
dissect_diameter_3gpp_uli(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, void *data)
{
diam_sub_dis_t *diam_sub_dis = (diam_sub_dis_t*)data;
return dissect_3gpp_uli(tvb, pinfo, tree, &diam_sub_dis->avp_str);
}
/*
* 8.22 Fully Qualified TEID (F-TEID)
*/
@ -12265,7 +12288,11 @@ void proto_register_gtpv2(void)
void
proto_reg_handoff_gtpv2(void)
{
//static gboolean Initialized = FALSE;
nas_eps_handle = find_dissector_add_dependency("nas-eps", proto_gtpv2);
radius_register_avp_dissector(VENDOR_THE3GPP, 22, dissect_radius_user_loc);
}
/*