osmith
/
wireshark
forked from osmocom/wireshark
1
0
Fork 0
Code Pull Requests Releases Wiki Activity

LPP: upgrade dissector to v17.1.0

This commit is contained in:
Pascal Quantin 2022-08-10 14:16:18 +02:00
parent dc03586983
commit f1140dbc9c
7 changed files with 9943 additions and 347 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
epan/dissectors/asn1/lpp/LPP-Broadcast-Definitions.asn
View File

@ -1,4 +1,4 @@
-- 3GPP TS 37.355 V16.8.0 (2022-03)
-- 3GPP TS 37.355 V17.1.0 (2022-06)
LPP-Broadcast-Definitions

1329
epan/dissectors/asn1/lpp/LPP-PDU-Definitions.asn
View File

File diff suppressed because it is too large Load Diff

20
epan/dissectors/asn1/lpp/lpp.cnf
View File

@ -66,6 +66,8 @@ GNSS-Almanac
GNSS-DataBitAssistance
GNSS-DifferentialCorrections
GNSS-EarthOrientationParameters
GNSS-Integrity-ServiceAlert-r17
GNSS-Integrity-ServiceParameters-r17
GNSS-IonosphericModel
GNSS-NavigationModel
GNSS-RealTimeIntegrity
@ -98,6 +100,9 @@ LPP-Message
NavIC-DifferentialCorrections-r16
NavIC-GridModelParameter-r16
NR-DL-PRS-AssistanceData-r16
NR-DL-PRS-TRP-TEG-Info-r17
NR-On-Demand-DL-PRS-Configurations-r17
NR-TRP-BeamAntennaInfo-r17
NR-UEB-TRP-LocationData-r16
NR-UEB-TRP-RTD-Info-r16
OTDOA-UE-Assisted-r15
@ -1833,6 +1838,12 @@ BT-MeasurementElement-r13/rssi-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&un
case LPP_POS_SIB_TYPE_1_8:
dissect_GNSS_SSR_CorrectionPoints_r16_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
case LPP_POS_SIB_TYPE_1_9:
dissect_GNSS_Integrity_ServiceParameters_r17_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
case LPP_POS_SIB_TYPE_1_10:
dissect_GNSS_Integrity_ServiceAlert_r17_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
case LPP_POS_SIB_TYPE_2_1:
dissect_GNSS_TimeModelList_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
@ -1926,6 +1937,15 @@ BT-MeasurementElement-r13/rssi-r13 DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&un
case LPP_POS_SIB_TYPE_6_3:
dissect_NR_UEB_TRP_RTD_Info_r16_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
case LPP_POS_SIB_TYPE_6_4:
dissect_NR_TRP_BeamAntennaInfo_r17_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
case LPP_POS_SIB_TYPE_6_5:
dissect_NR_DL_PRS_TRP_TEG_Info_r17_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
case LPP_POS_SIB_TYPE_6_6:
dissect_NR_On_Demand_DL_PRS_Configurations_r17_PDU(assist_data_sib_elem_tvb, actx->pinfo, subtree, NULL);
break;
default:
break;
}

7
epan/dissectors/asn1/lpp/packet-lpp-template.c
View File

@ -8,7 +8,7 @@
*
* SPDX-License-Identifier: GPL-2.0-or-later
*
* Ref 3GPP TS 37.355 version 16.8.0 Release 16
* Ref 3GPP TS 37.355 version 17.1.0 Release 17
* http://www.3gpp.org
*/
@ -93,6 +93,8 @@ static int dissect_GNSS_RTK_ReferenceStationInfo_r15_PDU(tvbuff_t *tvb _U_, pack
static int dissect_GNSS_RTK_CommonObservationInfo_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_RTK_AuxiliaryStationData_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_SSR_CorrectionPoints_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_Integrity_ServiceParameters_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_Integrity_ServiceAlert_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_TimeModelList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_DifferentialCorrections_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_GNSS_NavigationModel_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
@ -124,6 +126,9 @@ static int dissect_TBS_AssistanceDataList_r14_PDU(tvbuff_t *tvb _U_, packet_info
static int dissect_NR_DL_PRS_AssistanceData_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_NR_UEB_TRP_LocationData_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_NR_UEB_TRP_RTD_Info_r16_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_NR_TRP_BeamAntennaInfo_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_NR_DL_PRS_TRP_TEG_Info_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static int dissect_NR_On_Demand_DL_PRS_Configurations_r17_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
static void
lpp_degreesLatitude_fmt(gchar *s, guint32 v)

5
epan/dissectors/asn1/lpp/packet-lpp-template.h
View File

@ -23,6 +23,8 @@ typedef enum {
LPP_POS_SIB_TYPE_1_6,
LPP_POS_SIB_TYPE_1_7,
LPP_POS_SIB_TYPE_1_8,
LPP_POS_SIB_TYPE_1_9,
LPP_POS_SIB_TYPE_1_10,
LPP_POS_SIB_TYPE_2_1,
LPP_POS_SIB_TYPE_2_2,
LPP_POS_SIB_TYPE_2_3,
@ -54,6 +56,9 @@ typedef enum {
LPP_POS_SIB_TYPE_6_1,
LPP_POS_SIB_TYPE_6_2,
LPP_POS_SIB_TYPE_6_3,
LPP_POS_SIB_TYPE_6_4,
LPP_POS_SIB_TYPE_6_5,
LPP_POS_SIB_TYPE_6_6,
} lpp_pos_sib_type_t;
int dissect_lpp_AssistanceDataSIBelement_r15_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, lpp_pos_sib_type_t pos_sib_type);

8922
epan/dissectors/packet-lpp.c
View File

File diff suppressed because it is too large Load Diff

5
epan/dissectors/packet-lpp.h
View File

@ -64,6 +64,9 @@ typedef enum {
LPP_POS_SIB_TYPE_6_1,
LPP_POS_SIB_TYPE_6_2,
LPP_POS_SIB_TYPE_6_3,
LPP_POS_SIB_TYPE_6_4,
LPP_POS_SIB_TYPE_6_5,
LPP_POS_SIB_TYPE_6_6,
} lpp_pos_sib_type_t;
int dissect_lpp_AssistanceDataSIBelement_r15_PDU(tvbuff_t *tvb, packet_info *pinfo, proto_tree *tree, lpp_pos_sib_type_t pos_sib_type);
@ -110,6 +113,6 @@ int dissect_lpp_Sensor_MotionInformation_r15_PDU(tvbuff_t *tvb _U_, packet_info
int dissect_lpp_DisplacementTimeStamp_r15_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_);
/*--- End of included file: packet-lpp-exp.h ---*/
#line 62 "./asn1/lpp/packet-lpp-template.h"
#line 67 "./asn1/lpp/packet-lpp-template.h"
#endif /* PACKET_LPP_H */