From 080a286b5f7bb94bbbbacc6c7a28771b977c6904 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 28 Sep 2021 21:41:47 +0200 Subject: [PATCH 1/7] Addition of PGW-C+SMF Parameters --- 33128/r17/TS33128Payloads.asn | 56 +++++++++++++++++++++++++++++++---- 1 file changed, 51 insertions(+), 5 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 30891ca..263dc83 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1247,7 +1247,8 @@ SMFPDUSessionEstablishment ::= SEQUENCE accessType [16] AccessType OPTIONAL, rATType [17] RATType OPTIONAL, sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, - uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL + uEEPSPDNConnection [19] UEEPSPDNConnection OPTIONAL, + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL } -- See clause 6.2.3.2.3 for details of this structure @@ -1263,7 +1264,8 @@ SMFPDUSessionModification ::= SEQUENCE requestType [8] FiveGSMRequestType, accessType [9] AccessType OPTIONAL, rATType [10] RATType OPTIONAL, - pDUSessionID [11] PDUSessionID OPTIONAL + pDUSessionID [11] PDUSessionID OPTIONAL, + ePS5GSComboInfo [12] EPS5GSComboInfo OPTIONAL } -- See clause 6.2.3.2.4 for details of this structure @@ -1278,7 +1280,8 @@ SMFPDUSessionRelease ::= SEQUENCE uplinkVolume [7] INTEGER OPTIONAL, downlinkVolume [8] INTEGER OPTIONAL, location [9] Location OPTIONAL, - cause [10] SMFErrorCodes OPTIONAL + cause [10] SMFErrorCodes OPTIONAL, + ePS5GSComboInfo [11] EPS5GSComboInfo OPTIONAL } -- See clause 6.2.3.2.5 for details of this structure @@ -1302,7 +1305,8 @@ SMFStartOfInterceptionWithEstablishedPDUSession ::= SEQUENCE accessType [16] AccessType OPTIONAL, rATType [17] RATType OPTIONAL, sMPDUDNRequest [18] SMPDUDNRequest OPTIONAL, - timeOfSessionEstablishment [19] Timestamp OPTIONAL + timeOfSessionEstablishment [19] Timestamp OPTIONAL, + ePS5GSComboInfo [20] EPS5GSComboInfo OPTIONAL } -- See clause 6.2.3.2.6 for details of this structure @@ -1522,6 +1526,48 @@ RequestIndication ::= ENUMERATED rELDUETO5GANREQUEST(7) } +-- ================== +-- PGW-C + SMF Parameters +-- ================== + +EPS5GSComboInfo ::= SEQUENCE{ + ePSInterworkingIndication [1] EPSInterworkingIndication, + ePSSubscriberIDs [2] EPSSubscriberIDs, + ePSPDNCnxInfo [3] EPSPDNCnxInfo, + ePSBearerInfo [4] EPSBearerInfo +} + +EPSInterworkingIndication ::= ENUMERATED +{ + none(1), + withN26(2), + withoutN26(3), + iwkNon3GPP(4) +} + +EPSSubscriberIDs ::= SEQUENCE +{ + iMSI [1] IMSI OPTIONAL, + mSISDN [2] MSISDN OPTIONAL, + iMEI [3] IMEI OPTIONAL +} + +EPSPDNCnxInfo ::= SEQUENCE +{ + pGWS8ControlPlaneFTEID [1] FTEID, + linkedBearerID [2] EPSBearerID OPTIONAL +} + +EPSBearerInfo ::= SEQUENCE Of EPSBearers + +EPSBearers ::= SEQUENCE +{ + ePSBearerID [1] EPSBearerID, + pGWS8UserPlaneFTEID [2] FTEID, + qCI [3] QCI +} + +QCI = INTEGER (0..80) -- ================== -- 5G UPF definitions -- ================== @@ -4013,4 +4059,4 @@ OGCURN ::= UTF8String -- TS 29.572 [24], clause 6.1.6.2.15 MethodCode ::= INTEGER (16..31) -END \ No newline at end of file +END -- GitLab From dc0e4c426fb46b3d8d43e74cfb57fea565923d37 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 28 Sep 2021 21:47:08 +0200 Subject: [PATCH 2/7] Correction of capitalisation in PGW-C+SMF ASN.1 --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 263dc83..c7e2808 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1558,7 +1558,7 @@ EPSPDNCnxInfo ::= SEQUENCE linkedBearerID [2] EPSBearerID OPTIONAL } -EPSBearerInfo ::= SEQUENCE Of EPSBearers +EPSBearerInfo ::= SEQUENCE OF EPSBearers EPSBearers ::= SEQUENCE { -- GitLab From 4b2a89cce2fc44d6b9682b7f2f100e01e051a357 Mon Sep 17 00:00:00 2001 From: grahamj Date: Tue, 28 Sep 2021 21:49:16 +0200 Subject: [PATCH 3/7] Typo correction --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index c7e2808..bb2f02d 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1567,7 +1567,7 @@ EPSBearers ::= SEQUENCE qCI [3] QCI } -QCI = INTEGER (0..80) +QCI ::= INTEGER (0..80) -- ================== -- 5G UPF definitions -- ================== -- GitLab From 723af2696c7a6dc41531d5e85dd9a89f7aab5ba6 Mon Sep 17 00:00:00 2001 From: grahamj Date: Wed, 29 Sep 2021 13:56:52 +0200 Subject: [PATCH 4/7] Added missing carriage return --- 33128/r17/TS33128Payloads.asn | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index bb2f02d..3bfa9f7 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1530,7 +1530,8 @@ RequestIndication ::= ENUMERATED -- PGW-C + SMF Parameters -- ================== -EPS5GSComboInfo ::= SEQUENCE{ +EPS5GSComboInfo ::= SEQUENCE +{ ePSInterworkingIndication [1] EPSInterworkingIndication, ePSSubscriberIDs [2] EPSSubscriberIDs, ePSPDNCnxInfo [3] EPSPDNCnxInfo, -- GitLab From 4faaa9addb85a6fba700ad193a3c6b8189a1a1eb Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 4 Oct 2021 14:39:56 +0200 Subject: [PATCH 5/7] fixes drafting rule mismatch --- 33128/r17/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 3bfa9f7..bbb320e 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1526,9 +1526,9 @@ RequestIndication ::= ENUMERATED rELDUETO5GANREQUEST(7) } --- ================== +-- ====================== -- PGW-C + SMF Parameters --- ================== +-- ====================== EPS5GSComboInfo ::= SEQUENCE { -- GitLab From 97d4736d27375961ba00b53e42d6d7768f65dddf Mon Sep 17 00:00:00 2001 From: hawbaker Date: Mon, 4 Oct 2021 14:58:14 +0200 Subject: [PATCH 6/7] Made correction to conditional attributes (CnxInfo, Bearer) --- 33128/r17/TS33128Payloads.asn | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index bbb320e..131ea02 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1534,8 +1534,8 @@ EPS5GSComboInfo ::= SEQUENCE { ePSInterworkingIndication [1] EPSInterworkingIndication, ePSSubscriberIDs [2] EPSSubscriberIDs, - ePSPDNCnxInfo [3] EPSPDNCnxInfo, - ePSBearerInfo [4] EPSBearerInfo + ePSPDNCnxInfo [3] EPSPDNCnxInfo OPTIONAL, + ePSBearerInfo [4] EPSBearerInfo OPTIONAL } EPSInterworkingIndication ::= ENUMERATED -- GitLab From 8d4ffb286d3891e569e51327689e1be38bf45439 Mon Sep 17 00:00:00 2001 From: grahamj Date: Mon, 4 Oct 2021 16:02:42 +0200 Subject: [PATCH 7/7] Update 33128/r17/TS33128Payloads.asn --- 33128/r17/TS33128Payloads.asn | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/33128/r17/TS33128Payloads.asn b/33128/r17/TS33128Payloads.asn index 131ea02..76fa560 100644 --- a/33128/r17/TS33128Payloads.asn +++ b/33128/r17/TS33128Payloads.asn @@ -1568,7 +1568,7 @@ EPSBearers ::= SEQUENCE qCI [3] QCI } -QCI ::= INTEGER (0..80) +QCI ::= INTEGER (0..255) -- ================== -- 5G UPF definitions -- ================== -- GitLab