July 2023 - gerrit-log - lists.osmocom.org

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Add RIM_RoutingAddress to RANInfoRelay templates
by pespin 24 Jul '23

24 Jul '23

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33894 ) Change subject: GTP_Templates: Add RIM_RoutingAddress to RANInfoRelay templates ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d497389226b12368cc0ed4e3d469cde8e812ba6 Gerrit-Change-Number: 33894 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 09:52:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTP-Templates: fix incorrect comment
by pespin 24 Jul '23

24 Jul '23

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33893 ) Change subject: GTP-Templates: fix incorrect comment ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81c518a8ce23e3e830b173e4af34b3a5414148af Gerrit-Change-Number: 33893 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 09:51:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: cosmetic: remove double space
by dexter 24 Jul '23

24 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33895 ) Change subject: GTP_Templates: cosmetic: remove double space ...................................................................... GTP_Templates: cosmetic: remove double space Related: OS#5760 Change-Id: I57ca17db216102043261806db16764a3eb211070 --- M library/GTP_Templates.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/95/33895/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index dbd2015..0d833a5 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1106,7 +1106,7 @@ template (value) PDU_BSSGP_RAN_INFORMATION_REQUEST_GTPC ts_GTPC_RAN_Information_Request(template (value) RIM_Routing_Information_GTPC dest, template (value) RIM_Routing_Information_GTPC src, - template (value) RAN_Information_Request_RIM_Container_GTPC cont) := { + template (value) RAN_Information_Request_RIM_Container_GTPC cont) := { bssgpPduType := '71'O, destination_Cell_Identifier := dest, source_Cell_Identifier := src, -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33895 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I57ca17db216102043261806db16764a3eb211070 Gerrit-Change-Number: 33895 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: Add RIM_RoutingAddress to RANInfoRelay templates
by dexter 24 Jul '23

24 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33894 ) Change subject: GTP_Templates: Add RIM_RoutingAddress to RANInfoRelay templates ...................................................................... GTP_Templates: Add RIM_RoutingAddress to RANInfoRelay templates The RIM_RoutingAddress tells a relaying RIM node (SGSN, MME) where to route a RIM RANTransparentContainer. The RANTransparentContainer also contains source and detination, but is not meant to be interpreted by a relaying node. That is why a RIM_RoutingAddress exists. Related: OS#5760 Change-Id: I4d497389226b12368cc0ed4e3d469cde8e812ba6 --- M library/GTP_Templates.ttcn 1 file changed, 24 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/94/33894/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 53dd2ea..dbd2015 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1226,11 +1226,13 @@ private_extension_gtpc := * } } - template (value) GTPC_PDUs ts_RANInfoRelay(template (value) RANTransparentContainer transparentContainer) := { + template (value) GTPC_PDUs ts_RANInfoRelay(template (value) RANTransparentContainer transparentContainer, + template (omit) RIM_RoutingAddress ra := omit, + template (omit) RIM_RoutingAddress_Discriminator ra_discr := omit) := { ranInformationRelay := { transparentContainer := transparentContainer, - rIM_RoutingAddress := omit, - rIM_RoutingAddress_Discriminator := omit, + rIM_RoutingAddress := ra, + rIM_RoutingAddress_Discriminator := ra_discr, private_extension_gtpc := omit } } @@ -1242,9 +1244,11 @@ } template (value) Gtp1cUnitdata ts_GTPC_RANInfoRelay(template (value) GtpPeer peer, - template (value) RANTransparentContainer transparentContainer) := { + template (value) RANTransparentContainer transparentContainer, + template (omit) RIM_RoutingAddress ra := omit, + template (omit) RIM_RoutingAddress_Discriminator ra_discr := omit) := { peer := peer, - gtpc := ts_GTP1C_PDU(rANInformationRelay, '00000000'O, valueof(ts_RANInfoRelay(transparentContainer)), 0) + gtpc := ts_GTP1C_PDU(rANInformationRelay, '00000000'O, valueof(ts_RANInfoRelay(transparentContainer, ra, ra_discr)), 0) } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33894 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4d497389226b12368cc0ed4e3d469cde8e812ba6 Gerrit-Change-Number: 33894 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTP-Templates: fix incorrect comment
by dexter 24 Jul '23

24 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33893 ) Change subject: GTP-Templates: fix incorrect comment ...................................................................... GTP-Templates: fix incorrect comment Change-Id: I81c518a8ce23e3e830b173e4af34b3a5414148af Related: OS#5760 --- M library/GTP_Templates.ttcn 1 file changed, 11 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/93/33893/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index c7d7824..53dd2ea 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -194,7 +194,7 @@ } - /* template matching reception of GTP-C echo-request */ + /* template matching reception of GTP-C unit-data */ template Gtp1cUnitdata tr_GTPC_MsgType(template GtpPeer peer, template OCT1 msg_type, template OCT4 teid, template GTPC_PDUs pdus := ?) := { peer := peer, gtpc := tr_GTP1C_PDU(msg_type, teid, pdus) -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33893 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I81c518a8ce23e3e830b173e4af34b3a5414148af Gerrit-Change-Number: 33893 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: GTP_Templates: add template tr_GTPC_RAN_Information_Request
by dexter 24 Jul '23

24 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33896 ) Change subject: GTP_Templates: add template tr_GTPC_RAN_Information_Request ...................................................................... GTP_Templates: add template tr_GTPC_RAN_Information_Request We have a template ts_GTPC_RAN_Information_Request not no tr_GTPC_RAN_Information_Request yet. Related: OS#5760 Change-Id: Ibf737ddc7a9867f0a73646bc0d86550fea6f6dbd --- M library/GTP_Templates.ttcn 1 file changed, 23 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/96/33896/1 diff --git a/library/GTP_Templates.ttcn b/library/GTP_Templates.ttcn index 0d833a5..198a3b8 100644 --- a/library/GTP_Templates.ttcn +++ b/library/GTP_Templates.ttcn @@ -1112,6 +1112,16 @@ source_Cell_Identifier := src, rIM_Container := cont } + template PDU_BSSGP_RAN_INFORMATION_REQUEST_GTPC + tr_GTPC_RAN_Information_Request(template RIM_Routing_Information_GTPC dest := ?, + template RIM_Routing_Information_GTPC src := ?, + template RAN_Information_Request_RIM_Container_GTPC cont := ?) := { + bssgpPduType := '71'O, + destination_Cell_Identifier := dest, + source_Cell_Identifier := src, + rIM_Container := cont + } + template (value) RANTransparentContainer ts_RANTransparentContainer_RAN_INFO_REQ(template (value) PDU_BSSGP_RAN_INFORMATION_REQUEST_GTPC pdu) := { type_gtpc := '90'O, lengthf := 0, /* FIXME */ -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Ibf737ddc7a9867f0a73646bc0d86550fea6f6dbd Gerrit-Change-Number: 33896 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: S1AP_Templates: Add templates for MMEDirectInformationTransfer
by dexter 24 Jul '23

24 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33897 ) Change subject: S1AP_Templates: Add templates for MMEDirectInformationTransfer ...................................................................... S1AP_Templates: Add templates for MMEDirectInformationTransfer We do not have S1AP_Templates for MMEDirectInformationTransfer yet. Related: OS#5760 Change-Id: Iebad3ab1f6a3bdf24dc2aead29652f98f3a92d75 --- M library/s1ap/S1AP_Templates.ttcn 1 file changed, 51 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/97/33897/1 diff --git a/library/s1ap/S1AP_Templates.ttcn b/library/s1ap/S1AP_Templates.ttcn index 69e3f8b..46ec779 100644 --- a/library/s1ap/S1AP_Templates.ttcn +++ b/library/s1ap/S1AP_Templates.ttcn @@ -895,13 +895,50 @@ } } +/* 9.1.14 eNB DIRECT INFORMATION TRANSFER */ +template (value) S1AP_PDU +ts_S1AP_eNBDirectInfTrans(template (value) Inter_SystemInformationTransferType inf) := { + initiatingMessage := { + procedureCode := id_eNBDirectInformationTransfer, + criticality := reject, + value_ := { + eNBDirectInformationTransfer := { + protocolIEs := { + { + id := S1AP_Constants.id_Inter_SystemInformationTransferTypeEDT, + criticality := ignore, + value_ := {Inter_SystemInformationTransferType := inf} + } + } + } + } + } +} +/* 9.1.15 MME DIRECT INFORMATION TRANSFER */ +template (present) S1AP_PDU +tr_S1AP_MMEDirectInfTrans(template (present) Inter_SystemInformationTransferType inf := ?) := { + initiatingMessage := { + procedureCode := id_MMEDirectInformationTransfer, + criticality := ignore, + value_ := { + MMEDirectInformationTransfer := { + protocolIEs := { + { + id := S1AP_Constants.id_Inter_SystemInformationTransferTypeMDT, + criticality := reject, + value_ := {Inter_SystemInformationTransferType := inf} + }, * + } + } + } + } +} /* all non-UE-related S1AP messages */ template (present) S1AP_PDU tr_S1AP_nonUErelated := (tr_S1AP_SetupReq, tr_S1AP_SetupResp, tr_S1AP_SetupFail, - tr_S1AP_Reset, tr_S1AP_ResetAck + tr_S1AP_Reset, tr_S1AP_ResetAck, tr_S1AP_MMEDirectInfTrans ); - } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: Iebad3ab1f6a3bdf24dc2aead29652f98f3a92d75 Gerrit-Change-Number: 33897 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: S1AP_Emulation: improve accessibility of unit-data
by dexter 24 Jul '23

24 Jul '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33898 ) Change subject: S1AP_Emulation: improve accessibility of unit-data ...................................................................... S1AP_Emulation: improve accessibility of unit-data When S1AP unit-data is passed around, there is always the problem that it is routed to the MTC_CT. The reason for this is that S1AP_Emulation cannot determine a specific receiver component because unit-data does not contain any addressing fields that would identifiy a specific eNB or UE. Unfortunately it can be a huge problem when developing test fixtures that use unit-data from inside a ConnHdlr component. It is no problem to send unit-data using S1AP.send(), but it is impossible to receive unit-data through the same path. The solution that is proposed in this patch uses a mechanism that sends unit-data to all ConnHdlr components that it knows from previous activities. Related: OS#5760 Change-Id: I041b45b247e365b0d4ee8645c07dc5f26007af82 --- M library/S1AP_Emulation.ttcn 1 file changed, 70 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/98/33898/1 diff --git a/library/S1AP_Emulation.ttcn b/library/S1AP_Emulation.ttcn index a907483..a1cc443 100644 --- a/library/S1AP_Emulation.ttcn +++ b/library/S1AP_Emulation.ttcn @@ -96,6 +96,12 @@ NAS_UE_State nus }; +/* represents a single S1AP UnitData Association. This association basically represents a table with components that + * are subscribed to receive UnitData traffic. */ +type record AssociationDataUnitdata { + S1AP_ConnHdlr comp_ref /* component handling this UE connection */ +}; + type component S1AP_Emulation_CT { /* Port facing to the UDP SUT */ port S1AP_CODEC_PT S1AP; @@ -105,7 +111,8 @@ port S1AP_Conn_PT S1AP_CLIENT; /* currently tracked connections */ var AssociationData S1apAssociationTable[16]; - /* pending expected CRCX */ + var AssociationDataUnitdata S1apAssociationUnitdataTable[16]; + /* pending expected S1AP Association (UE oriented) */ var ExpectData S1apExpectTable[8]; /* procedure based port to register for incoming connections */ port S1APEM_PROC_PT S1AP_PROC; @@ -249,6 +256,29 @@ return -1; } +private function f_s1ap_id_table_unitdata_add(S1AP_ConnHdlr comp_ref) +runs on S1AP_Emulation_CT return integer { + var integer i; + + /* Make sure a component reference is not added twice */ + for (i := 0; i < sizeof(S1apAssociationUnitdataTable); i := i+1) { + if (S1apAssociationUnitdataTable[i].comp_ref == comp_ref) { + return i; + } + } + + for (i := 0; i < sizeof(S1apAssociationUnitdataTable); i := i+1) { + if (S1apAssociationUnitdataTable[i].comp_ref == null) { + S1apAssociationUnitdataTable[i].comp_ref := comp_ref; + return i; + } + } + + testcase.stop("S1AP Unitdata Association Table full!"); + return -1; +} + + private function f_s1ap_id_table_del(S1AP_ConnHdlr comp_ref, ENB_UE_S1AP_ID enb_id) runs on S1AP_Emulation_CT { var integer i; @@ -274,6 +304,11 @@ S1apAssociationTable[i].cgi := omit; S1apAssociationTable[i].tai := omit; S1apAssociationTable[i].nus := valueof(t_NAS_UE_State(g_pars.role)); + S1apAssociationTable[i].comp_ref := null; + } + + for (var integer i := 0; i < sizeof(S1apAssociationUnitdataTable); i := i+1) { + S1apAssociationUnitdataTable[i].comp_ref := null; } } @@ -434,6 +469,7 @@ [] S1AP_CLIENT.receive(S1AP_PDU:?) -> value msg sender vc_conn { /* Pass message through */ /* FIXME: validate S1AP_IDs ? */ + f_s1ap_id_table_unitdata_add(vc_conn); S1AP.send(t_S1AP_Send(g_s1ap_conn_id, msg)); } @@ -446,7 +482,14 @@ /* S1AP received from peer (MME) */ [] S1AP.receive(tr_S1AP_RecvFrom_R(?)) -> value mrf { if (match(mrf.msg, tr_S1AP_nonUErelated)) { - /* non-UE-related S1AP message */ + /* non-UE-related S1AP message, send it to all subscribed components and to + * unitdata_cb. */ + for (var integer i := 0; i < sizeof(S1apAssociationUnitdataTable); i := i+1) { + if (S1apAssociationUnitdataTable[i].comp_ref != null) { + vc_conn := S1apAssociationUnitdataTable[i].comp_ref; + S1AP_CLIENT.send(mrf.msg) to vc_conn; + } + } var template S1AP_PDU resp := ops.unitdata_cb.apply(mrf.msg); if (isvalue(resp)) { S1AP.send(t_S1AP_Send(g_s1ap_conn_id, valueof(resp))); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I041b45b247e365b0d4ee8645c07dc5f26007af82 Gerrit-Change-Number: 33898 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-gprs[master]: rlcmac: Avoid discard packets when in Countdown procedure
by osmith 24 Jul '23

24 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33889 ) Change subject: rlcmac: Avoid discard packets when in Countdown procedure ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33889 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I311302b5282767dc806b1dfe053994f175390b69 Gerrit-Change-Number: 33889 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 09:26:46 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-gprs[master]: rlcmac: ul_tbf: Move logic selecting proper queue to helper function
by osmith 24 Jul '23

24 Jul '23

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33888 ) Change subject: rlcmac: ul_tbf: Move logic selecting proper queue to helper function ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/rlcmac/tbf_ul.c: https://gerrit.osmocom.org/c/libosmo-gprs/+/33888/comment/f259a18f_e7218cc3 PS1, Line 331: /* Returns the MS/GRE queue unless the UL TBF has entered Countdown Procedure. In that case, it returns the specific frozen queue. */ very long line -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icceaf53048e9662176385b2976e2bc8e3387df71 Gerrit-Change-Number: 33888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 24 Jul 2023 09:23:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0