E1AP: upgrade dissector to v17.6.0

9 files changed, 326 insertions, 207 deletions

diff --git a/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn b/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn
index 76fa949074..0e088408bd 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-CommonDataTypes.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V17.6.0 (2023-09)
 -- **************************************************************
 --
 -- Common definitions
diff --git a/epan/dissectors/asn1/e1ap/E1AP-Constants.asn b/epan/dissectors/asn1/e1ap/E1AP-Constants.asn
index ed364b2404..9b23ae7b4c 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-Constants.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-Constants.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V17.6.0 (2023-09)
 -- **************************************************************
 --
 -- Constant definitions
@@ -298,6 +298,10 @@ id-MCForwardingResourceReleaseIndication						ProtocolIE-ID ::= 183
 id-PDCP-COUNT-Reset												ProtocolIE-ID ::= 184
 id-MBSSessionAssociatedInfoNonSupportToSupport					ProtocolIE-ID ::= 185
 id-VersionID													ProtocolIE-ID ::= 186
+id-InactivityInformationRequest									ProtocolIE-ID ::= 187
+id-UEInactivityInformation										ProtocolIE-ID ::= 188
+id-MBSAreaSessionID												ProtocolIE-ID ::= 189
+id-Secondary-PDU-Session-Data-Forwarding-Information			ProtocolIE-ID ::= 190
 
 
 END
diff --git a/epan/dissectors/asn1/e1ap/E1AP-Containers.asn b/epan/dissectors/asn1/e1ap/E1AP-Containers.asn
index d7d1392d51..b2966f9190 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-Containers.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-Containers.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V17.6.0 (2023-09)
 -- **************************************************************
 --
 -- Container definitions
diff --git a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn
index 536691e6bf..d9b51a9f41 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-IEs.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-IEs.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V17.6.0 (2023-09)
 -- **************************************************************
 --
 -- Information Element Definitions
@@ -76,6 +76,8 @@ IMPORTS
 	id-PDCP-COUNT-Reset,
 	id-MBSSessionAssociatedInfoNonSupportToSupport,
 	id-VersionID,
+	id-MBSAreaSessionID,
+	id-Secondary-PDU-Session-Data-Forwarding-Information,
 	maxnoofMBSAreaSessionIDs,
 	maxnoofSharedNG-UTerminations,
 	maxnoofMRBs,
@@ -1700,6 +1702,9 @@ IAB-donor-CU-UPPSKInfoItemExtIEs 	E1AP-PROTOCOL-EXTENSION ::= {
 }
 IAB-donor-CU-UPPSK	::= OCTET STRING
 
+InactivityInformationRequest ::= ENUMERATED {true, ...}
+
+
 -- J
 
 -- K
@@ -1857,7 +1862,7 @@ MBSSessionAssociatedInfoNonSupportToSupport-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 
 MBSSessionAssociatedInformation ::= SEQUENCE {
 	mbsSessionAssociatedInformationList		MBSSessionAssociatedInformationList,
-	mbsSessionForwardingAddress				TransportLayerAddress,
+	mbsSessionForwardingAddress				UP-TNL-Information,
 	iE-Extensions		ProtocolExtensionContainer { {MBSSessionAssociatedInformation-ExtIEs} }	OPTIONAL,
 	...
 }
@@ -1914,7 +1919,8 @@ MCBearerContextToSetup ::= SEQUENCE {
 }
 
 MCBearerContextToSetup-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
-	{ID id-MBSSessionAssociatedInfoNonSupportToSupport	CRITICALITY ignore	EXTENSION MBSSessionAssociatedInfoNonSupportToSupport	PRESENCE optional},
+	{ID id-MBSSessionAssociatedInfoNonSupportToSupport	CRITICALITY ignore	EXTENSION MBSSessionAssociatedInfoNonSupportToSupport	PRESENCE optional}|
+	{ID id-MBSAreaSessionID	CRITICALITY ignore	EXTENSION MBSAreaSessionID	PRESENCE optional},
 	...
 }
 
@@ -2863,7 +2869,8 @@ PDU-Session-Resource-To-Modify-Item-ExtIEs		E1AP-PROTOCOL-EXTENSION ::= {
 	{ID id-redundant-nG-UL-UP-TNL-Information			CRITICALITY ignore	EXTENSION 	UP-TNL-Information								PRESENCE optional	}|
 	{ID id-RedundantCommonNetworkInstance				CRITICALITY ignore	EXTENSION 	CommonNetworkInstance							PRESENCE optional	}|
 	{ID id-DataForwardingtoE-UTRANInformationList		CRITICALITY ignore	EXTENSION 	DataForwardingtoE-UTRANInformationList	PRESENCE optional	}|
-	{ID id-SecurityIndicationModify						CRITICALITY ignore	EXTENSION 	SecurityIndication								PRESENCE optional	},
+	{ID id-SecurityIndicationModify						CRITICALITY ignore	EXTENSION 	SecurityIndication								PRESENCE optional	}|
+	{ID id-Secondary-PDU-Session-Data-Forwarding-Information	CRITICALITY ignore	EXTENSION 	Data-Forwarding-Information		PRESENCE optional	},
 	...
 }
 
@@ -3570,6 +3577,8 @@ UplinkOnlyROHC-ExtIEs E1AP-PROTOCOL-EXTENSION ::= {
 
 URIaddress ::= VisibleString
 
+UEInactivityInformation ::= INTEGER (1..7200, ...)
+
 -- V
 
 -- W
diff --git a/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn b/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn
index 33514e0e36..4437c2d347 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-PDU-Contents.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V17.6.0 (2023-09)
 -- **************************************************************
 --
 -- PDU definitions for E1AP
@@ -139,7 +139,10 @@ IMPORTS
 	MBSMulticastF1UContextDescriptor,
 	GNB-CU-UP-MBS-Support-Info,
 	SDTContinueROHC,
-	MDTPLMNModificationList
+	MDTPLMNModificationList,
+	InactivityInformationRequest,
+	UEInactivityInformation
+
 
 FROM E1AP-IEs
 
@@ -281,7 +284,8 @@ FROM E1AP-Containers
 	id-gNB-CU-UP-MBS-Support-Info,
 	id-SDTContinueROHC,
 	id-ManagementBasedMDTPLMNModificationList,
-
+	id-InactivityInformationRequest,
+	id-UEInactivityInformation,
 	maxnoofErrors,
 	maxnoofSPLMNs,
 	maxnoofDRBs,
@@ -891,7 +895,8 @@ BearerContextModificationRequestIEs E1AP-PROTOCOL-IES ::= {
 	{ ID id-UESliceMaximumBitRateList					CRITICALITY ignore	TYPE UESliceMaximumBitRateList				      PRESENCE optional }|
 	{ ID id-SCGActivationStatus							CRITICALITY ignore	TYPE SCGActivationStatus					PRESENCE optional }|
 	{ ID id-SDTContinueROHC								CRITICALITY reject	TYPE SDTContinueROHC										PRESENCE optional }|
-	{ ID id-ManagementBasedMDTPLMNModificationList			CRITICALITY	ignore	TYPE MDTPLMNModificationList 							PRESENCE optional},
+	{ ID id-ManagementBasedMDTPLMNModificationList			CRITICALITY	ignore	TYPE MDTPLMNModificationList 							PRESENCE optional}|
+	{ ID id-InactivityInformationRequest			CRITICALITY ignore	TYPE InactivityInformationRequest						PRESENCE optional},
 	...
 }
 
@@ -938,7 +943,8 @@ BearerContextModificationResponseIEs E1AP-PROTOCOL-IES ::= {
 	{ ID id-gNB-CU-CP-UE-E1AP-ID						CRITICALITY reject	TYPE GNB-CU-CP-UE-E1AP-ID								PRESENCE mandatory }|
 	{ ID id-gNB-CU-UP-UE-E1AP-ID						CRITICALITY reject	TYPE GNB-CU-UP-UE-E1AP-ID								PRESENCE mandatory }|
 	{ ID id-System-BearerContextModificationResponse	CRITICALITY ignore	TYPE System-BearerContextModificationResponse		PRESENCE optional  }|
-	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics								PRESENCE optional  },
+	{ ID id-CriticalityDiagnostics						CRITICALITY ignore	TYPE CriticalityDiagnostics								PRESENCE optional  }|
+	{ ID id-UEInactivityInformation						CRITICALITY ignore	TYPE UEInactivityInformation			PRESENCE optional},
 	...
 }
 
diff --git a/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn b/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn
index ce104d1e19..64e99f4b7d 100644
--- a/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn
+++ b/epan/dissectors/asn1/e1ap/E1AP-PDU-Descriptions.asn
@@ -1,4 +1,4 @@
--- 3GPP TS 37.483 V17.5.0 (2023-06)
+-- 3GPP TS 37.483 V17.6.0 (2023-09)
 -- **************************************************************
 --
 -- Elementary Procedure definitions
diff --git a/epan/dissectors/asn1/e1ap/e1ap.cnf b/epan/dissectors/asn1/e1ap/e1ap.cnf
index 3517db2c30..3610dfadc4 100644
--- a/epan/dissectors/asn1/e1ap/e1ap.cnf
+++ b/epan/dissectors/asn1/e1ap/e1ap.cnf
@@ -160,193 +160,197 @@ id-MCBearerContextRelease                 ProcedureCode
 id-MCBearerContextReleaseRequest          ProcedureCode
 
 # ProtocolIE-ID
-id-Cause                                        ProtocolIE-ID
-id-CriticalityDiagnostics                       ProtocolIE-ID
-id-gNB-CU-CP-UE-E1AP-ID                         ProtocolIE-ID
-id-gNB-CU-UP-UE-E1AP-ID                         ProtocolIE-ID
-id-ResetType                                    ProtocolIE-ID
-id-UE-associatedLogicalE1-ConnectionItem        ProtocolIE-ID
-id-UE-associatedLogicalE1-ConnectionListResAck  ProtocolIE-ID
-id-gNB-CU-UP-ID                                 ProtocolIE-ID
-id-gNB-CU-UP-Name                               ProtocolIE-ID
-id-gNB-CU-CP-Name                               ProtocolIE-ID
-id-CNSupport                                    ProtocolIE-ID
-id-SupportedPLMNs                               ProtocolIE-ID
-id-TimeToWait                                   ProtocolIE-ID
-id-SecurityInformation                          ProtocolIE-ID
-id-UEDLAggregateMaximumBitRate                  ProtocolIE-ID
-id-System-BearerContextSetupRequest             ProtocolIE-ID
-id-System-BearerContextSetupResponse            ProtocolIE-ID
-id-BearerContextStatusChange                    ProtocolIE-ID
-id-System-BearerContextModificationRequest      ProtocolIE-ID
-id-System-BearerContextModificationResponse     ProtocolIE-ID
-id-System-BearerContextModificationConfirm      ProtocolIE-ID
-id-System-BearerContextModificationRequired     ProtocolIE-ID
-id-DRB-Status-List                              ProtocolIE-ID
-id-ActivityNotificationLevel                    ProtocolIE-ID
-id-ActivityInformation                          ProtocolIE-ID
-id-Data-Usage-Report-List                       ProtocolIE-ID
-id-New-UL-TNL-Information-Required              ProtocolIE-ID
-id-GNB-CU-CP-TNLA-To-Add-List                   ProtocolIE-ID
-id-GNB-CU-CP-TNLA-To-Remove-List                ProtocolIE-ID
-id-GNB-CU-CP-TNLA-To-Update-List                ProtocolIE-ID
-id-GNB-CU-CP-TNLA-Setup-List                    ProtocolIE-ID
-id-GNB-CU-CP-TNLA-Failed-To-Setup-List          ProtocolIE-ID
-id-DRB-To-Setup-List-EUTRAN                     ProtocolIE-ID
-id-DRB-To-Modify-List-EUTRAN                    ProtocolIE-ID
-id-DRB-To-Remove-List-EUTRAN                    ProtocolIE-ID
-id-DRB-Required-To-Modify-List-EUTRAN           ProtocolIE-ID
-id-DRB-Required-To-Remove-List-EUTRAN           ProtocolIE-ID
-id-DRB-Setup-List-EUTRAN                        ProtocolIE-ID
-id-DRB-Failed-List-EUTRAN                       ProtocolIE-ID
-id-DRB-Modified-List-EUTRAN                     ProtocolIE-ID
-id-DRB-Failed-To-Modify-List-EUTRAN             ProtocolIE-ID
-id-DRB-Confirm-Modified-List-EUTRAN             ProtocolIE-ID
-id-PDU-Session-Resource-To-Setup-List           ProtocolIE-ID
-id-PDU-Session-Resource-To-Modify-List          ProtocolIE-ID
-id-PDU-Session-Resource-To-Remove-List          ProtocolIE-ID
-id-PDU-Session-Resource-Required-To-Modify-List ProtocolIE-ID
-id-PDU-Session-Resource-Setup-List              ProtocolIE-ID
-id-PDU-Session-Resource-Failed-List             ProtocolIE-ID
-id-PDU-Session-Resource-Modified-List           ProtocolIE-ID
-id-PDU-Session-Resource-Failed-To-Modify-List   ProtocolIE-ID
-id-PDU-Session-Resource-Confirm-Modified-List   ProtocolIE-ID
-id-DRB-To-Setup-Mod-List-EUTRAN                 ProtocolIE-ID
-id-DRB-Setup-Mod-List-EUTRAN                    ProtocolIE-ID
-id-DRB-Failed-Mod-List-EUTRAN                   ProtocolIE-ID
-id-PDU-Session-Resource-Setup-Mod-List          ProtocolIE-ID
-id-PDU-Session-Resource-Failed-Mod-List         ProtocolIE-ID
-id-PDU-Session-Resource-To-Setup-Mod-List       ProtocolIE-ID
-id-TransactionID                                ProtocolIE-ID
-id-Serving-PLMN                                 ProtocolIE-ID
-id-UE-Inactivity-Timer                          ProtocolIE-ID
-id-System-GNB-CU-UP-CounterCheckRequest         ProtocolIE-ID
-id-DRBs-Subject-To-Counter-Check-List-EUTRAN    ProtocolIE-ID
-id-DRBs-Subject-To-Counter-Check-List-NG-RAN    ProtocolIE-ID
-id-PPI                                          ProtocolIE-ID
-id-gNB-CU-UP-Capacity                           ProtocolIE-ID
-id-GNB-CU-UP-OverloadInformation                ProtocolIE-ID
-id-UEDLMaximumIntegrityProtectedDataRate        ProtocolIE-ID
-id-PDU-Session-To-Notify-List                   ProtocolIE-ID
-id-PDU-Session-Resource-Data-Usage-List         ProtocolIE-ID
-id-SNSSAI                                       ProtocolIE-ID
-id-DataDiscardRequired                          ProtocolIE-ID
-id-OldQoSFlowMap-ULendmarkerexpected            ProtocolIE-ID
-id-DRB-QoS                                      ProtocolIE-ID
-id-GNB-CU-UP-TNLA-To-Remove-List                ProtocolIE-ID
-id-endpoint-IP-Address-and-Port                 ProtocolIE-ID
-id-TNLAssociationTransportLayerAddressgNBCUUP   ProtocolIE-ID
-id-RANUEID                                      ProtocolIE-ID
-id-GNB-DU-ID                                    ProtocolIE-ID
-id-CommonNetworkInstance                        ProtocolIE-ID
-id-NetworkInstance                              ProtocolIE-ID
-id-QoSFlowMappingIndication                     ProtocolIE-ID
-id-TraceActivation                              ProtocolIE-ID
-id-TraceID                                      ProtocolIE-ID
-id-SubscriberProfileIDforRFP                    ProtocolIE-ID
-id-AdditionalRRMPriorityIndex                   ProtocolIE-ID
-id-RetainabilityMeasurementsInfo                ProtocolIE-ID
-id-Transport-Layer-Address-Info                 ProtocolIE-ID
-id-QoSMonitoringRequest                         ProtocolIE-ID
-id-PDCP-StatusReportIndication                  ProtocolIE-ID
-id-gNB-CU-CP-Measurement-ID                     ProtocolIE-ID
-id-gNB-CU-UP-Measurement-ID                     ProtocolIE-ID
-id-RegistrationRequest                          ProtocolIE-ID
-id-ReportCharacteristics                        ProtocolIE-ID
-id-ReportingPeriodicity                         ProtocolIE-ID
-id-TNL-AvailableCapacityIndicator               ProtocolIE-ID
-id-HW-CapacityIndicator                         ProtocolIE-ID
-id-RedundantCommonNetworkInstance               ProtocolIE-ID
-id-redundant-nG-UL-UP-TNL-Information           ProtocolIE-ID
-id-redundant-nG-DL-UP-TNL-Information           ProtocolIE-ID
-id-RedundantQosFlowIndicator                    ProtocolIE-ID
-id-TSCTrafficCharacteristics                    ProtocolIE-ID
-id-CNPacketDelayBudgetDownlink                  ProtocolIE-ID
-id-CNPacketDelayBudgetUplink                    ProtocolIE-ID
-id-ExtendedPacketDelayBudget                    ProtocolIE-ID
-id-AdditionalPDCPduplicationInformation         ProtocolIE-ID
-id-RedundantPDUSessionInformation               ProtocolIE-ID
-id-RedundantPDUSessionInformation-used          ProtocolIE-ID
-id-QoS-Mapping-Information                      ProtocolIE-ID
-id-DLUPTNLAddressToUpdateList                   ProtocolIE-ID
-id-ULUPTNLAddressToUpdateList                   ProtocolIE-ID
-id-NPNSupportInfo                               ProtocolIE-ID
-id-NPNContextInfo                               ProtocolIE-ID
-id-MDTConfiguration                             ProtocolIE-ID
-id-ManagementBasedMDTPLMNList                   ProtocolIE-ID
-id-TraceCollectionEntityIPAddress               ProtocolIE-ID
-id-PrivacyIndicator                             ProtocolIE-ID
-id-TraceCollectionEntityURI                     ProtocolIE-ID
-id-URIaddress                                   ProtocolIE-ID
-id-EHC-Parameters                               ProtocolIE-ID
-id-DRBs-Subject-To-Early-Forwarding-List        ProtocolIE-ID
-id-DAPSRequestInfo                              ProtocolIE-ID
-id-CHOInitiation                                ProtocolIE-ID
-id-EarlyForwardingCOUNTReq                      ProtocolIE-ID
-id-EarlyForwardingCOUNTInfo                     ProtocolIE-ID
-id-AlternativeQoSParaSetList                    ProtocolIE-ID
-id-ExtendedSliceSupportList                     ProtocolIE-ID
-id-MCG-OfferedGBRQoSFlowInfo                    ProtocolIE-ID
-id-Number-of-tunnels                            ProtocolIE-ID
-id-DRB-Measurement-Results-Information-List     ProtocolIE-ID
-id-Extended-GNB-CU-CP-Name                      ProtocolIE-ID
-id-Extended-GNB-CU-UP-Name                      ProtocolIE-ID
-id-DataForwardingtoE-UTRANInformationList       ProtocolIE-ID
-id-QosMonitoringReportingFrequency              ProtocolIE-ID
-id-QoSMonitoringDisabled                        ProtocolIE-ID
-id-AdditionalHandoverInfo                       ProtocolIE-ID
-id-Extended-NR-CGI-Support-List                 ProtocolIE-ID
-id-DataForwardingtoNG-RANQoSFlowInformationList ProtocolIE-ID
-id-MaxCIDEHCDL                                  ProtocolIE-ID
-id-ignoreMappingRuleIndication                  ProtocolIE-ID
-id-DirectForwardingPathAvailability             ProtocolIE-ID
-id-EarlyDataForwardingIndicator                 ProtocolIE-ID
-id-QoSFlowsDRBRemapping                         ProtocolIE-ID
-id-DataForwardingSourceIPAddress                ProtocolIE-ID
-id-SecurityIndicationModify                     ProtocolIE-ID
-id-IAB-Donor-CU-UPPSKInfo                       ProtocolIE-ID
-id-ECGI-Support-List                            ProtocolIE-ID
-id-MDTPollutedMeasurementIndicator              ProtocolIE-ID
-id-M4ReportAmount                               ProtocolIE-ID
-id-M6ReportAmount                               ProtocolIE-ID
-id-M7ReportAmount                               ProtocolIE-ID
-id-UESliceMaximumBitRateList                    ProtocolIE-ID
-id-PDUSession-PairID                            ProtocolIE-ID
-id-SurvivalTime                                 ProtocolIE-ID
-id-UDC-Parameters                               ProtocolIE-ID
-id-SCGActivationStatus                          ProtocolIE-ID
-id-GNB-CU-CP-MBS-E1AP-ID                        ProtocolIE-ID
-id-GNB-CU-UP-MBS-E1AP-ID                        ProtocolIE-ID
-id-GlobalMBSSessionID                           ProtocolIE-ID
-id-BCBearerContextToSetup                       ProtocolIE-ID
-id-BCBearerContextToSetupResponse               ProtocolIE-ID
-id-BCBearerContextToModify                      ProtocolIE-ID
-id-BCBearerContextToModifyResponse              ProtocolIE-ID
-id-BCBearerContextToModifyRequired              ProtocolIE-ID
-id-BCBearerContextToModifyConfirm               ProtocolIE-ID
-id-MCBearerContextToSetup                       ProtocolIE-ID
-id-MCBearerContextToSetupResponse               ProtocolIE-ID
-id-MCBearerContextToModify                      ProtocolIE-ID
-id-MCBearerContextToModifyResponse              ProtocolIE-ID
-id-MCBearerContextToModifyRequired              ProtocolIE-ID
-id-MCBearerContextToModifyConfirm               ProtocolIE-ID
-id-MBSMulticastF1UContextDescriptor             ProtocolIE-ID
-id-gNB-CU-UP-MBS-Support-Info                   ProtocolIE-ID
-id-SecurityIndication                           ProtocolIE-ID
-id-SecurityResult                               ProtocolIE-ID
-id-SDTContinueROHC                              ProtocolIE-ID
-id-SDTindicatorSetup                            ProtocolIE-ID
-id-SDTindicatorMod                              ProtocolIE-ID
-id-DiscardTimerExtended                         ProtocolIE-ID
-id-ManagementBasedMDTPLMNModificationList       ProtocolIE-ID
-id-MCForwardingResourceRequest                  ProtocolIE-ID
-id-MCForwardingResourceIndication               ProtocolIE-ID
-id-MCForwardingResourceResponse                 ProtocolIE-ID
-id-MCForwardingResourceRelease                  ProtocolIE-ID
-id-MCForwardingResourceReleaseIndication        ProtocolIE-ID
-id-PDCP-COUNT-Reset                             ProtocolIE-ID
-id-MBSSessionAssociatedInfoNonSupportToSupport  ProtocolIE-ID
-id-VersionID                                    ProtocolIE-ID
+id-Cause                                             ProtocolIE-ID
+id-CriticalityDiagnostics                            ProtocolIE-ID
+id-gNB-CU-CP-UE-E1AP-ID                              ProtocolIE-ID
+id-gNB-CU-UP-UE-E1AP-ID                              ProtocolIE-ID
+id-ResetType                                         ProtocolIE-ID
+id-UE-associatedLogicalE1-ConnectionItem             ProtocolIE-ID
+id-UE-associatedLogicalE1-ConnectionListResAck       ProtocolIE-ID
+id-gNB-CU-UP-ID                                      ProtocolIE-ID
+id-gNB-CU-UP-Name                                    ProtocolIE-ID
+id-gNB-CU-CP-Name                                    ProtocolIE-ID
+id-CNSupport                                         ProtocolIE-ID
+id-SupportedPLMNs                                    ProtocolIE-ID
+id-TimeToWait                                        ProtocolIE-ID
+id-SecurityInformation                               ProtocolIE-ID
+id-UEDLAggregateMaximumBitRate                       ProtocolIE-ID
+id-System-BearerContextSetupRequest                  ProtocolIE-ID
+id-System-BearerContextSetupResponse                 ProtocolIE-ID
+id-BearerContextStatusChange                         ProtocolIE-ID
+id-System-BearerContextModificationRequest           ProtocolIE-ID
+id-System-BearerContextModificationResponse          ProtocolIE-ID
+id-System-BearerContextModificationConfirm           ProtocolIE-ID
+id-System-BearerContextModificationRequired          ProtocolIE-ID
+id-DRB-Status-List                                   ProtocolIE-ID
+id-ActivityNotificationLevel                         ProtocolIE-ID
+id-ActivityInformation                               ProtocolIE-ID
+id-Data-Usage-Report-List                            ProtocolIE-ID
+id-New-UL-TNL-Information-Required                   ProtocolIE-ID
+id-GNB-CU-CP-TNLA-To-Add-List                        ProtocolIE-ID
+id-GNB-CU-CP-TNLA-To-Remove-List                     ProtocolIE-ID
+id-GNB-CU-CP-TNLA-To-Update-List                     ProtocolIE-ID
+id-GNB-CU-CP-TNLA-Setup-List                         ProtocolIE-ID
+id-GNB-CU-CP-TNLA-Failed-To-Setup-List               ProtocolIE-ID
+id-DRB-To-Setup-List-EUTRAN                          ProtocolIE-ID
+id-DRB-To-Modify-List-EUTRAN                         ProtocolIE-ID
+id-DRB-To-Remove-List-EUTRAN                         ProtocolIE-ID
+id-DRB-Required-To-Modify-List-EUTRAN                ProtocolIE-ID
+id-DRB-Required-To-Remove-List-EUTRAN                ProtocolIE-ID
+id-DRB-Setup-List-EUTRAN                             ProtocolIE-ID
+id-DRB-Failed-List-EUTRAN                            ProtocolIE-ID
+id-DRB-Modified-List-EUTRAN                          ProtocolIE-ID
+id-DRB-Failed-To-Modify-List-EUTRAN                  ProtocolIE-ID
+id-DRB-Confirm-Modified-List-EUTRAN                  ProtocolIE-ID
+id-PDU-Session-Resource-To-Setup-List                ProtocolIE-ID
+id-PDU-Session-Resource-To-Modify-List               ProtocolIE-ID
+id-PDU-Session-Resource-To-Remove-List               ProtocolIE-ID
+id-PDU-Session-Resource-Required-To-Modify-List      ProtocolIE-ID
+id-PDU-Session-Resource-Setup-List                   ProtocolIE-ID
+id-PDU-Session-Resource-Failed-List                  ProtocolIE-ID
+id-PDU-Session-Resource-Modified-List                ProtocolIE-ID
+id-PDU-Session-Resource-Failed-To-Modify-List        ProtocolIE-ID
+id-PDU-Session-Resource-Confirm-Modified-List        ProtocolIE-ID
+id-DRB-To-Setup-Mod-List-EUTRAN                      ProtocolIE-ID
+id-DRB-Setup-Mod-List-EUTRAN                         ProtocolIE-ID
+id-DRB-Failed-Mod-List-EUTRAN                        ProtocolIE-ID
+id-PDU-Session-Resource-Setup-Mod-List               ProtocolIE-ID
+id-PDU-Session-Resource-Failed-Mod-List              ProtocolIE-ID
+id-PDU-Session-Resource-To-Setup-Mod-List            ProtocolIE-ID
+id-TransactionID                                     ProtocolIE-ID
+id-Serving-PLMN                                      ProtocolIE-ID
+id-UE-Inactivity-Timer                               ProtocolIE-ID
+id-System-GNB-CU-UP-CounterCheckRequest              ProtocolIE-ID
+id-DRBs-Subject-To-Counter-Check-List-EUTRAN         ProtocolIE-ID
+id-DRBs-Subject-To-Counter-Check-List-NG-RAN         ProtocolIE-ID
+id-PPI                                               ProtocolIE-ID
+id-gNB-CU-UP-Capacity                                ProtocolIE-ID
+id-GNB-CU-UP-OverloadInformation                     ProtocolIE-ID
+id-UEDLMaximumIntegrityProtectedDataRate             ProtocolIE-ID
+id-PDU-Session-To-Notify-List                        ProtocolIE-ID
+id-PDU-Session-Resource-Data-Usage-List              ProtocolIE-ID
+id-SNSSAI                                            ProtocolIE-ID
+id-DataDiscardRequired                               ProtocolIE-ID
+id-OldQoSFlowMap-ULendmarkerexpected                 ProtocolIE-ID
+id-DRB-QoS                                           ProtocolIE-ID
+id-GNB-CU-UP-TNLA-To-Remove-List                     ProtocolIE-ID
+id-endpoint-IP-Address-and-Port                      ProtocolIE-ID
+id-TNLAssociationTransportLayerAddressgNBCUUP        ProtocolIE-ID
+id-RANUEID                                           ProtocolIE-ID
+id-GNB-DU-ID                                         ProtocolIE-ID
+id-CommonNetworkInstance                             ProtocolIE-ID
+id-NetworkInstance                                   ProtocolIE-ID
+id-QoSFlowMappingIndication                          ProtocolIE-ID
+id-TraceActivation                                   ProtocolIE-ID
+id-TraceID                                           ProtocolIE-ID
+id-SubscriberProfileIDforRFP                         ProtocolIE-ID
+id-AdditionalRRMPriorityIndex                        ProtocolIE-ID
+id-RetainabilityMeasurementsInfo                     ProtocolIE-ID
+id-Transport-Layer-Address-Info                      ProtocolIE-ID
+id-QoSMonitoringRequest                              ProtocolIE-ID
+id-PDCP-StatusReportIndication                       ProtocolIE-ID
+id-gNB-CU-CP-Measurement-ID                          ProtocolIE-ID
+id-gNB-CU-UP-Measurement-ID                          ProtocolIE-ID
+id-RegistrationRequest                               ProtocolIE-ID
+id-ReportCharacteristics                             ProtocolIE-ID
+id-ReportingPeriodicity                              ProtocolIE-ID
+id-TNL-AvailableCapacityIndicator                    ProtocolIE-ID
+id-HW-CapacityIndicator                              ProtocolIE-ID
+id-RedundantCommonNetworkInstance                    ProtocolIE-ID
+id-redundant-nG-UL-UP-TNL-Information                ProtocolIE-ID
+id-redundant-nG-DL-UP-TNL-Information                ProtocolIE-ID
+id-RedundantQosFlowIndicator                         ProtocolIE-ID
+id-TSCTrafficCharacteristics                         ProtocolIE-ID
+id-CNPacketDelayBudgetDownlink                       ProtocolIE-ID
+id-CNPacketDelayBudgetUplink                         ProtocolIE-ID
+id-ExtendedPacketDelayBudget                         ProtocolIE-ID
+id-AdditionalPDCPduplicationInformation              ProtocolIE-ID
+id-RedundantPDUSessionInformation                    ProtocolIE-ID
+id-RedundantPDUSessionInformation-used               ProtocolIE-ID
+id-QoS-Mapping-Information                           ProtocolIE-ID
+id-DLUPTNLAddressToUpdateList                        ProtocolIE-ID
+id-ULUPTNLAddressToUpdateList                        ProtocolIE-ID
+id-NPNSupportInfo                                    ProtocolIE-ID
+id-NPNContextInfo                                    ProtocolIE-ID
+id-MDTConfiguration                                  ProtocolIE-ID
+id-ManagementBasedMDTPLMNList                        ProtocolIE-ID
+id-TraceCollectionEntityIPAddress                    ProtocolIE-ID
+id-PrivacyIndicator                                  ProtocolIE-ID
+id-TraceCollectionEntityURI                          ProtocolIE-ID
+id-URIaddress                                        ProtocolIE-ID
+id-EHC-Parameters                                    ProtocolIE-ID
+id-DRBs-Subject-To-Early-Forwarding-List             ProtocolIE-ID
+id-DAPSRequestInfo                                   ProtocolIE-ID
+id-CHOInitiation                                     ProtocolIE-ID
+id-EarlyForwardingCOUNTReq                           ProtocolIE-ID
+id-EarlyForwardingCOUNTInfo                          ProtocolIE-ID
+id-AlternativeQoSParaSetList                         ProtocolIE-ID
+id-ExtendedSliceSupportList                          ProtocolIE-ID
+id-MCG-OfferedGBRQoSFlowInfo                         ProtocolIE-ID
+id-Number-of-tunnels                                 ProtocolIE-ID
+id-DRB-Measurement-Results-Information-List          ProtocolIE-ID
+id-Extended-GNB-CU-CP-Name                           ProtocolIE-ID
+id-Extended-GNB-CU-UP-Name                           ProtocolIE-ID
+id-DataForwardingtoE-UTRANInformationList            ProtocolIE-ID
+id-QosMonitoringReportingFrequency                   ProtocolIE-ID
+id-QoSMonitoringDisabled                             ProtocolIE-ID
+id-AdditionalHandoverInfo                            ProtocolIE-ID
+id-Extended-NR-CGI-Support-List                      ProtocolIE-ID
+id-DataForwardingtoNG-RANQoSFlowInformationList      ProtocolIE-ID
+id-MaxCIDEHCDL                                       ProtocolIE-ID
+id-ignoreMappingRuleIndication                       ProtocolIE-ID
+id-DirectForwardingPathAvailability                  ProtocolIE-ID
+id-EarlyDataForwardingIndicator                      ProtocolIE-ID
+id-QoSFlowsDRBRemapping                              ProtocolIE-ID
+id-DataForwardingSourceIPAddress                     ProtocolIE-ID
+id-SecurityIndicationModify                          ProtocolIE-ID
+id-IAB-Donor-CU-UPPSKInfo                            ProtocolIE-ID
+id-ECGI-Support-List                                 ProtocolIE-ID
+id-MDTPollutedMeasurementIndicator                   ProtocolIE-ID
+id-M4ReportAmount                                    ProtocolIE-ID
+id-M6ReportAmount                                    ProtocolIE-ID
+id-M7ReportAmount                                    ProtocolIE-ID
+id-UESliceMaximumBitRateList                         ProtocolIE-ID
+id-PDUSession-PairID                                 ProtocolIE-ID
+id-SurvivalTime                                      ProtocolIE-ID
+id-UDC-Parameters                                    ProtocolIE-ID
+id-SCGActivationStatus                               ProtocolIE-ID
+id-GNB-CU-CP-MBS-E1AP-ID                             ProtocolIE-ID
+id-GNB-CU-UP-MBS-E1AP-ID                             ProtocolIE-ID
+id-GlobalMBSSessionID                                ProtocolIE-ID
+id-BCBearerContextToSetup                            ProtocolIE-ID
+id-BCBearerContextToSetupResponse                    ProtocolIE-ID
+id-BCBearerContextToModify                           ProtocolIE-ID
+id-BCBearerContextToModifyResponse                   ProtocolIE-ID
+id-BCBearerContextToModifyRequired                   ProtocolIE-ID
+id-BCBearerContextToModifyConfirm                    ProtocolIE-ID
+id-MCBearerContextToSetup                            ProtocolIE-ID
+id-MCBearerContextToSetupResponse                    ProtocolIE-ID
+id-MCBearerContextToModify                           ProtocolIE-ID
+id-MCBearerContextToModifyResponse                   ProtocolIE-ID
+id-MCBearerContextToModifyRequired                   ProtocolIE-ID
+id-MCBearerContextToModifyConfirm                    ProtocolIE-ID
+id-MBSMulticastF1UContextDescriptor                  ProtocolIE-ID
+id-gNB-CU-UP-MBS-Support-Info                        ProtocolIE-ID
+id-SecurityIndication                                ProtocolIE-ID
+id-SecurityResult                                    ProtocolIE-ID
+id-SDTContinueROHC                                   ProtocolIE-ID
+id-SDTindicatorSetup                                 ProtocolIE-ID
+id-SDTindicatorMod                                   ProtocolIE-ID
+id-DiscardTimerExtended                              ProtocolIE-ID
+id-ManagementBasedMDTPLMNModificationList            ProtocolIE-ID
+id-MCForwardingResourceRequest                       ProtocolIE-ID
+id-MCForwardingResourceIndication                    ProtocolIE-ID
+id-MCForwardingResourceResponse                      ProtocolIE-ID
+id-MCForwardingResourceRelease                       ProtocolIE-ID
+id-MCForwardingResourceReleaseIndication             ProtocolIE-ID
+id-PDCP-COUNT-Reset                                  ProtocolIE-ID
+id-MBSSessionAssociatedInfoNonSupportToSupport       ProtocolIE-ID
+id-VersionID                                         ProtocolIE-ID
+id-InactivityInformationRequest                      ProtocolIE-ID ::= 187
+id-UEInactivityInformation                           ProtocolIE-ID ::= 188
+id-MBSAreaSessionID                                  ProtocolIE-ID ::= 189
+id-Secondary-PDU-Session-Data-Forwarding-Information ProtocolIE-ID ::= 190
 
 #.END
 
@@ -477,6 +481,8 @@ MBSMulticastF1UContextDescriptor             N e1ap.ies id-MBSMulticastF1UContex
 GNB-CU-UP-MBS-Support-Info                   N e1ap.ies id-gNB-CU-UP-MBS-Support-Info
 SDTContinueROHC                              N e1ap.ies id-SDTContinueROHC
 MDTPLMNModificationList                      N e1ap.ies id-ManagementBasedMDTPLMNModificationList
+InactivityInformationRequest                 N e1ap.ies id-InactivityInformationRequest
+UEInactivityInformation                      N e1ap.ies id-UEInactivityInformation
 
 #E1AP-PROTOCOL-EXTENSION
 SNSSAI                                       N e1ap.extension id-SNSSAI
@@ -542,6 +548,8 @@ MCForwardingResourceReleaseIndication        N e1ap.extension id-MCForwardingRes
 PDCP-COUNT-Reset                             N e1ap.extension id-PDCP-COUNT-Reset
 MBSSessionAssociatedInfoNonSupportToSupport  N e1ap.extension id-MBSSessionAssociatedInfoNonSupportToSupport
 VersionID                                    N e1ap.extension id-VersionID
+MBSAreaSessionID                             N e1ap.extension id-MBSAreaSessionID
+Data-Forwarding-Information                  N e1ap.extension id-Secondary-PDU-Session-Data-Forwarding-Information
 
 #E1AP-ELEMENTARY-PROCEDURE
 Reset                                    N e1ap.proc.imsg id-reset
@@ -845,6 +853,9 @@ QosMonitoringReportingFrequency DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units
 #.TYPE_ATTR
 SurvivalTime DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_microseconds
 
+#.TYPE_ATTR
+UEInactivityInformation DISPLAY=BASE_DEC|BASE_UNIT_STRING STRINGS=&units_seconds
+
 #.FN_HDR Reset
   col_append_sep_str(actx->pinfo->cinfo, COL_INFO, NULL, "Reset");
 #.FN_HDR ResetAcknowledge
diff --git a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c
index f51884a25f..0a3a0ff34e 100644
--- a/epan/dissectors/asn1/e1ap/packet-e1ap-template.c
+++ b/epan/dissectors/asn1/e1ap/packet-e1ap-template.c
@@ -8,7 +8,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * References: 3GPP TS 37.483 V17.5.0 (2023-06)
+ * References: 3GPP TS 37.483 V17.6.0 (2023-09)
  */
 
 #include "config.h"
diff --git a/epan/dissectors/packet-e1ap.c b/epan/dissectors/packet-e1ap.c
index 87b389d5ab..2c5472f075 100644
--- a/epan/dissectors/packet-e1ap.c
+++ b/epan/dissectors/packet-e1ap.c
@@ -13,7 +13,7 @@
  *
  * SPDX-License-Identifier: GPL-2.0-or-later
  *
- * References: 3GPP TS 37.483 V17.5.0 (2023-06)
+ * References: 3GPP TS 37.483 V17.6.0 (2023-09)
  */
 
 #include "config.h"
@@ -302,7 +302,11 @@ typedef enum _ProtocolIE_ID_enum {
   id_MCForwardingResourceReleaseIndication = 183,
   id_PDCP_COUNT_Reset = 184,
   id_MBSSessionAssociatedInfoNonSupportToSupport = 185,
-  id_VersionID = 186
+  id_VersionID = 186,
+  id_InactivityInformationRequest = 187,
+  id_UEInactivityInformation = 188,
+  id_MBSAreaSessionID = 189,
+  id_Secondary_PDU_Session_Data_Forwarding_Information = 190
 } ProtocolIE_ID_enum;
 
 /* Initialize the protocol and registered fields */
@@ -347,6 +351,7 @@ static int hf_e1ap_CommonNetworkInstance_PDU = -1;  /* CommonNetworkInstance */
 static int hf_e1ap_CP_TNL_Information_PDU = -1;   /* CP_TNL_Information */
 static int hf_e1ap_CriticalityDiagnostics_PDU = -1;  /* CriticalityDiagnostics */
 static int hf_e1ap_DAPSRequestInfo_PDU = -1;      /* DAPSRequestInfo */
+static int hf_e1ap_Data_Forwarding_Information_PDU = -1;  /* Data_Forwarding_Information */
 static int hf_e1ap_DataForwardingtoE_UTRANInformationList_PDU = -1;  /* DataForwardingtoE_UTRANInformationList */
 static int hf_e1ap_Data_Usage_Report_List_PDU = -1;  /* Data_Usage_Report_List */
 static int hf_e1ap_DirectForwardingPathAvailability_PDU = -1;  /* DirectForwardingPathAvailability */
@@ -395,7 +400,9 @@ static int hf_e1ap_GNB_DU_ID_PDU = -1;            /* GNB_DU_ID */
 static int hf_e1ap_HW_CapacityIndicator_PDU = -1;  /* HW_CapacityIndicator */
 static int hf_e1ap_IgnoreMappingRuleIndication_PDU = -1;  /* IgnoreMappingRuleIndication */
 static int hf_e1ap_Inactivity_Timer_PDU = -1;     /* Inactivity_Timer */
+static int hf_e1ap_InactivityInformationRequest_PDU = -1;  /* InactivityInformationRequest */
 static int hf_e1ap_MaxCIDEHCDL_PDU = -1;          /* MaxCIDEHCDL */
+static int hf_e1ap_MBSAreaSessionID_PDU = -1;     /* MBSAreaSessionID */
 static int hf_e1ap_MBSSessionAssociatedInfoNonSupportToSupport_PDU = -1;  /* MBSSessionAssociatedInfoNonSupportToSupport */
 static int hf_e1ap_MCBearerContextToSetup_PDU = -1;  /* MCBearerContextToSetup */
 static int hf_e1ap_MCBearerContextToSetupResponse_PDU = -1;  /* MCBearerContextToSetupResponse */
@@ -481,6 +488,7 @@ static int hf_e1ap_UE_associatedLogicalE1_ConnectionItem_PDU = -1;  /* UE_associ
 static int hf_e1ap_UESliceMaximumBitRateList_PDU = -1;  /* UESliceMaximumBitRateList */
 static int hf_e1ap_UP_TNL_Information_PDU = -1;   /* UP_TNL_Information */
 static int hf_e1ap_URIaddress_PDU = -1;           /* URIaddress */
+static int hf_e1ap_UEInactivityInformation_PDU = -1;  /* UEInactivityInformation */
 static int hf_e1ap_Reset_PDU = -1;                /* Reset */
 static int hf_e1ap_ResetType_PDU = -1;            /* ResetType */
 static int hf_e1ap_ResetAcknowledge_PDU = -1;     /* ResetAcknowledge */
@@ -829,7 +837,7 @@ static int hf_e1ap_unicast = -1;                  /* UP_TNL_Information */
 static int hf_e1ap_ue_Reference_ID = -1;          /* GNB_CU_CP_UE_E1AP_ID */
 static int hf_e1ap_associatedQoSFlowInformationList = -1;  /* MBSSessionAssociatedInformationList */
 static int hf_e1ap_mbsSessionAssociatedInformationList = -1;  /* MBSSessionAssociatedInformationList */
-static int hf_e1ap_mbsSessionForwardingAddress = -1;  /* TransportLayerAddress */
+static int hf_e1ap_mbsSessionForwardingAddress = -1;  /* UP_TNL_Information */
 static int hf_e1ap_MBSSessionAssociatedInformationList_item = -1;  /* MBSSessionAssociatedInformation_Item */
 static int hf_e1ap_mbs_QoS_Flow_Identifier = -1;  /* QoS_Flow_Identifier */
 static int hf_e1ap_associated_unicast_QoS_Flow_Identifier = -1;  /* QoS_Flow_Identifier */
@@ -1897,6 +1905,10 @@ static const value_string e1ap_ProtocolIE_ID_vals[] = {
   { id_PDCP_COUNT_Reset, "id-PDCP-COUNT-Reset" },
   { id_MBSSessionAssociatedInfoNonSupportToSupport, "id-MBSSessionAssociatedInfoNonSupportToSupport" },
   { id_VersionID, "id-VersionID" },
+  { id_InactivityInformationRequest, "id-InactivityInformationRequest" },
+  { id_UEInactivityInformation, "id-UEInactivityInformation" },
+  { id_MBSAreaSessionID, "id-MBSAreaSessionID" },
+  { id_Secondary_PDU_Session_Data_Forwarding_Information, "id-Secondary-PDU-Session-Data-Forwarding-Information" },
   { 0, NULL }
 };
 
@@ -7401,6 +7413,21 @@ dissect_e1ap_IAB_Donor_CU_UPPSKInfo_Item(tvbuff_t *tvb _U_, int offset _U_, asn1
 }
 
 
+static const value_string e1ap_InactivityInformationRequest_vals[] = {
+  {   0, "true" },
+  { 0, NULL }
+};
+
+
+static int
+dissect_e1ap_InactivityInformationRequest(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_enumerated(tvb, offset, actx, tree, hf_index,
+                                     1, NULL, TRUE, 0, NULL);
+
+  return offset;
+}
+
+
 static const value_string e1ap_MaxIPrate_vals[] = {
   {   0, "bitrate64kbs" },
   {   1, "max-UErate" },
@@ -7491,7 +7518,7 @@ dissect_e1ap_MBSSessionAssociatedInfoNonSupportToSupport(tvbuff_t *tvb _U_, int
 
 static const per_sequence_t MBSSessionAssociatedInformation_sequence[] = {
   { &hf_e1ap_mbsSessionAssociatedInformationList, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_e1ap_MBSSessionAssociatedInformationList },
-  { &hf_e1ap_mbsSessionForwardingAddress, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_e1ap_TransportLayerAddress },
+  { &hf_e1ap_mbsSessionForwardingAddress, ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_e1ap_UP_TNL_Information },
   { &hf_e1ap_iE_Extensions  , ASN1_EXTENSION_ROOT    , ASN1_OPTIONAL    , dissect_e1ap_ProtocolExtensionContainer },
   { NULL, 0, 0, NULL }
 };
@@ -10053,6 +10080,16 @@ dissect_e1ap_URIaddress(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_,
 }
 
 
+
+static int
+dissect_e1ap_UEInactivityInformation(tvbuff_t *tvb _U_, int offset _U_, asn1_ctx_t *actx _U_, proto_tree *tree _U_, int hf_index _U_) {
+  offset = dissect_per_constrained_integer(tvb, offset, actx, tree, hf_index,
+                                                            1U, 7200U, NULL, TRUE);
+
+  return offset;
+}
+
+
 static const per_sequence_t Reset_sequence[] = {
   { &hf_e1ap_protocolIEs    , ASN1_EXTENSION_ROOT    , ASN1_NOT_OPTIONAL, dissect_e1ap_ProtocolIE_Container },
   { NULL, 0, 0, NULL }
@@ -11817,6 +11854,14 @@ static int dissect_DAPSRequestInfo_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_Data_Forwarding_Information_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_e1ap_Data_Forwarding_Information(tvb, offset, &asn1_ctx, tree, hf_e1ap_Data_Forwarding_Information_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_DataForwardingtoE_UTRANInformationList_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -12201,6 +12246,14 @@ static int dissect_Inactivity_Timer_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_InactivityInformationRequest_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_e1ap_InactivityInformationRequest(tvb, offset, &asn1_ctx, tree, hf_e1ap_InactivityInformationRequest_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_MaxCIDEHCDL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -12209,6 +12262,14 @@ static int dissect_MaxCIDEHCDL_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pr
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_MBSAreaSessionID_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_e1ap_MBSAreaSessionID(tvb, offset, &asn1_ctx, tree, hf_e1ap_MBSAreaSessionID_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_MBSSessionAssociatedInfoNonSupportToSupport_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -12889,6 +12950,14 @@ static int dissect_URIaddress_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, pro
   offset += 7; offset >>= 3;
   return offset;
 }
+static int dissect_UEInactivityInformation_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
+  int offset = 0;
+  asn1_ctx_t asn1_ctx;
+  asn1_ctx_init(&asn1_ctx, ASN1_ENC_PER, TRUE, pinfo);
+  offset = dissect_e1ap_UEInactivityInformation(tvb, offset, &asn1_ctx, tree, hf_e1ap_UEInactivityInformation_PDU);
+  offset += 7; offset >>= 3;
+  return offset;
+}
 static int dissect_Reset_PDU(tvbuff_t *tvb _U_, packet_info *pinfo _U_, proto_tree *tree _U_, void *data _U_) {
   int offset = 0;
   asn1_ctx_t asn1_ctx;
@@ -13886,6 +13955,10 @@ void proto_register_e1ap(void) {
       { "DAPSRequestInfo", "e1ap.DAPSRequestInfo_element",
         FT_NONE, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_e1ap_Data_Forwarding_Information_PDU,
+      { "Data-Forwarding-Information", "e1ap.Data_Forwarding_Information_element",
+        FT_NONE, BASE_NONE, NULL, 0,
+        NULL, HFILL }},
     { &hf_e1ap_DataForwardingtoE_UTRANInformationList_PDU,
       { "DataForwardingtoE-UTRANInformationList", "e1ap.DataForwardingtoE_UTRANInformationList",
         FT_UINT32, BASE_DEC, NULL, 0,
@@ -14078,10 +14151,18 @@ void proto_register_e1ap(void) {
       { "Inactivity-Timer", "e1ap.Inactivity_Timer",
         FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
         NULL, HFILL }},
+    { &hf_e1ap_InactivityInformationRequest_PDU,
+      { "InactivityInformationRequest", "e1ap.InactivityInformationRequest",
+        FT_UINT32, BASE_DEC, VALS(e1ap_InactivityInformationRequest_vals), 0,
+        NULL, HFILL }},
     { &hf_e1ap_MaxCIDEHCDL_PDU,
       { "MaxCIDEHCDL", "e1ap.MaxCIDEHCDL",
         FT_UINT32, BASE_DEC, NULL, 0,
         NULL, HFILL }},
+    { &hf_e1ap_MBSAreaSessionID_PDU,
+      { "MBSAreaSessionID", "e1ap.MBSAreaSessionID",
+        FT_UINT32, BASE_DEC, NULL, 0,
+        NULL, HFILL }},
     { &hf_e1ap_MBSSessionAssociatedInfoNonSupportToSupport_PDU,
       { "MBSSessionAssociatedInfoNonSupportToSupport", "e1ap.MBSSessionAssociatedInfoNonSupportToSupport_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -14422,6 +14503,10 @@ void proto_register_e1ap(void) {
       { "URIaddress", "e1ap.URIaddress",
         FT_STRING, BASE_NONE, NULL, 0,
         NULL, HFILL }},
+    { &hf_e1ap_UEInactivityInformation_PDU,
+      { "UEInactivityInformation", "e1ap.UEInactivityInformation",
+        FT_UINT32, BASE_DEC|BASE_UNIT_STRING, &units_seconds, 0,
+        NULL, HFILL }},
     { &hf_e1ap_Reset_PDU,
       { "Reset", "e1ap.Reset_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -15816,8 +15901,8 @@ void proto_register_e1ap(void) {
         NULL, HFILL }},
     { &hf_e1ap_mbsSessionForwardingAddress,
       { "mbsSessionForwardingAddress", "e1ap.mbsSessionForwardingAddress",
-        FT_BYTES, BASE_NONE, NULL, 0,
-        "TransportLayerAddress", HFILL }},
+        FT_UINT32, BASE_DEC, VALS(e1ap_UP_TNL_Information_vals), 0,
+        "UP_TNL_Information", HFILL }},
     { &hf_e1ap_MBSSessionAssociatedInformationList_item,
       { "MBSSessionAssociatedInformation-Item", "e1ap.MBSSessionAssociatedInformation_Item_element",
         FT_NONE, BASE_NONE, NULL, 0,
@@ -17450,6 +17535,8 @@ proto_reg_handoff_e1ap(void)
   dissector_add_uint("e1ap.ies", id_gNB_CU_UP_MBS_Support_Info, create_dissector_handle(dissect_GNB_CU_UP_MBS_Support_Info_PDU, proto_e1ap));
   dissector_add_uint("e1ap.ies", id_SDTContinueROHC, create_dissector_handle(dissect_SDTContinueROHC_PDU, proto_e1ap));
   dissector_add_uint("e1ap.ies", id_ManagementBasedMDTPLMNModificationList, create_dissector_handle(dissect_MDTPLMNModificationList_PDU, proto_e1ap));
+  dissector_add_uint("e1ap.ies", id_InactivityInformationRequest, create_dissector_handle(dissect_InactivityInformationRequest_PDU, proto_e1ap));
+  dissector_add_uint("e1ap.ies", id_UEInactivityInformation, create_dissector_handle(dissect_UEInactivityInformation_PDU, proto_e1ap));
   dissector_add_uint("e1ap.extension", id_SNSSAI, create_dissector_handle(dissect_SNSSAI_PDU, proto_e1ap));
   dissector_add_uint("e1ap.extension", id_OldQoSFlowMap_ULendmarkerexpected, create_dissector_handle(dissect_QoS_Flow_List_PDU, proto_e1ap));
   dissector_add_uint("e1ap.extension", id_DRB_QoS, create_dissector_handle(dissect_QoSFlowLevelQoSParameters_PDU, proto_e1ap));
@@ -17513,6 +17600,8 @@ proto_reg_handoff_e1ap(void)
   dissector_add_uint("e1ap.extension", id_PDCP_COUNT_Reset, create_dissector_handle(dissect_PDCP_COUNT_Reset_PDU, proto_e1ap));
   dissector_add_uint("e1ap.extension", id_MBSSessionAssociatedInfoNonSupportToSupport, create_dissector_handle(dissect_MBSSessionAssociatedInfoNonSupportToSupport_PDU, proto_e1ap));
   dissector_add_uint("e1ap.extension", id_VersionID, create_dissector_handle(dissect_VersionID_PDU, proto_e1ap));
+  dissector_add_uint("e1ap.extension", id_MBSAreaSessionID, create_dissector_handle(dissect_MBSAreaSessionID_PDU, proto_e1ap));
+  dissector_add_uint("e1ap.extension", id_Secondary_PDU_Session_Data_Forwarding_Information, create_dissector_handle(dissect_Data_Forwarding_Information_PDU, proto_e1ap));
   dissector_add_uint("e1ap.proc.imsg", id_reset, create_dissector_handle(dissect_Reset_PDU, proto_e1ap));
   dissector_add_uint("e1ap.proc.sout", id_reset, create_dissector_handle(dissect_ResetAcknowledge_PDU, proto_e1ap));
   dissector_add_uint("e1ap.proc.imsg", id_errorIndication, create_dissector_handle(dissect_ErrorIndication_PDU, proto_e1ap));