May 2022 - gerrit-log - lists.osmocom.org

Change in osmo-ttcn3-hacks[master]: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 ) Change subject: mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered ...................................................................... mgw: Introduce test TC_two_crcx_mdcx_and_iuup{_rtp}_rfci_unordered Related: SYS#5969 Change-Id: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c --- M mgw/MGCP_Test.ttcn 1 file changed, 39 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/91/28191/1 diff --git a/mgw/MGCP_Test.ttcn b/mgw/MGCP_Test.ttcn index de00e9d..60f955f 100644 --- a/mgw/MGCP_Test.ttcn +++ b/mgw/MGCP_Test.ttcn @@ -19,6 +19,7 @@ import from RTP_CodecPort all; import from RTP_CodecPort_CtrlFunct all; import from RTP_Emulation all; + import from IuUP_Emulation all; import from OSMUX_Types all; import from OSMUX_CodecPort all; import from OSMUX_CodecPort_CtrlFunct all; @@ -2465,6 +2466,7 @@ /* create two local RTP+IuUP emulations and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; @@ -2483,6 +2485,7 @@ flow[0].rtp_cfg.tx_payload_type := flow[0].pt; flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2576,12 +2579,28 @@ setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup() runs on dummy_CT { - f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* Same as TC_two_crcx_mdcx_and_iuup, but passing unordered RFCI list (ID != position) */ + testcase TC_two_crcx_mdcx_and_iuup_rfci_unordered() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(1), + t_IuUP_RFC_AMR_SID(2), + t_IuUP_RFC_AMR_NO_DATA(0) + }; + f_tc_two_crcx_mdcx_and_iuup(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), mp_local_ipv4, mp_remote_ipv4); } /* create two local emulations (1 RTP, 1 RTP+IuUP) and pass data in both directions */ function f_tc_two_crcx_mdcx_and_iuup_rtp(charstring local_ip_a, charstring remote_ip_a, + IuUP_RabFlowCombinationList rfcl_a, charstring local_ip_b, charstring remote_ip_b) runs on dummy_CT { var RtpFlowData flow[2]; var RtpemStats stats[2]; @@ -2602,6 +2621,7 @@ flow[0].rtp_cfg.rx_fixed_payload := '08556d944c71a1a081e7ead204244480000ecd82b81118000097c4794e7740'O; /* flow[1].rtp_cfg.tx_fixed_payload converted AMR-BE-RTP->AMR-IUUP*/ flow[0].rtp_cfg.iuup_mode := true; flow[0].rtp_cfg.iuup_cfg.active_init := true; + flow[0].rtp_cfg.iuup_cfg.rab_flow_combs := rfcl_a; f_flow_create(RTPEM[0], ep, call_id, "recvonly", flow[0], true); f_rtpem_mode(RTPEM[0], RTPEM_MODE_RXONLY); @@ -2696,7 +2716,22 @@ setverdict(pass); } testcase TC_two_crcx_mdcx_and_iuup_rtp() runs on dummy_CT { - f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(0), + t_IuUP_RFC_AMR_SID(1), + t_IuUP_RFC_AMR_NO_DATA(2) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), + mp_local_ipv4, mp_remote_ipv4); + } + /* Same as TC_two_crcx_mdcTC_two_crcx_mdcx_and_iuup_rtpx_and_iuup, but passing unordered RFCI list (ID != position) */ + testcase TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered() runs on dummy_CT { + var template (value) IuUP_RabFlowCombinationList rfcl := { + t_IuUP_RFC_AMR_12_2(1), + t_IuUP_RFC_AMR_SID(2), + t_IuUP_RFC_AMR_NO_DATA(0) + }; + f_tc_two_crcx_mdcx_and_iuup_rtp(mp_local_ipv4, mp_remote_ipv4, valueof(rfcl), mp_local_ipv4, mp_remote_ipv4); } @@ -2775,7 +2810,9 @@ execute(TC_two_crcx_mdcx_and_rtp_osmux_ipv6_ipv4()); execute(TC_two_crcx_mdcx_and_iuup()); + execute(TC_two_crcx_mdcx_and_iuup_rfci_unordered()); execute(TC_two_crcx_mdcx_and_iuup_rtp()); + execute(TC_two_crcx_mdcx_and_iuup_rtp_rfci_unordered()); /* Note: This testcase will trigger an OSMO_ASSERT() bug in * older versions of osmo-mgw. This eventually leads into -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28191 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: I2523f18a0fdba87f4e13a2ce3c5da482c4af2e3c Gerrit-Change-Number: 28191 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: IuUP: Improve enc/dec of PDU Type 14

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 ) Change subject: IuUP: Improve enc/dec of PDU Type 14 ...................................................................... IuUP: Improve enc/dec of PDU Type 14 Change-Id: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce --- M library/IuUP_Emulation.ttcn M library/IuUP_Types.ttcn 2 files changed, 142 insertions(+), 47 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/88/28188/1 diff --git a/library/IuUP_Emulation.ttcn b/library/IuUP_Emulation.ttcn index 19c2c84..899ba50 100644 --- a/library/IuUP_Emulation.ttcn +++ b/library/IuUP_Emulation.ttcn @@ -100,7 +100,7 @@ } else { /* store an INIT_ACK to be transmitted later */ st.pending_tx_pdu := valueof(ts_IuUP_INIT_ACK(pdu.type_14.frame_nr, - pdu.type_14.iuup_version)); + pdu.type_14.u.proc.hdr.iuup_version)); } } else if (match(pdu, tr_IuUP_INIT_ACK)) { if (st.cfg.active_init == true) { @@ -127,7 +127,7 @@ if (st.cfg.active_init) { if (not isvalue(st.pending_tx_pdu)) { /* send INIT */ - pdu := valueof(ts_IuUP_INIT('160051673C01270000820000001710000100'O)); + pdu := valueof(ts_IuUP_INIT(ts_IuUP_PDU14_ProcSending_INIT)); st.pending_tx_pdu := pdu; } /* else: wait for INIT-ACK return ''O at the end */ diff --git a/library/IuUP_Types.ttcn b/library/IuUP_Types.ttcn index b822ddf..e99dfef 100644 --- a/library/IuUP_Types.ttcn +++ b/library/IuUP_Types.ttcn @@ -91,6 +91,8 @@ /* See TS 25.415 6.6.3.18 */ type uint8_t IuUP_TimeAlignment; +/* See TS 25.415 6.6.3.24 */ +type uint4_t IuUP_IPTI; /* See TS 25.415 6.6.2.1 */ type record IuUP_PDU_Type_0 { @@ -119,45 +121,57 @@ IuUP_PDU_Type pdu_type, IuUP_AckNack ack_nack, uint2_t frame_nr, + IuUP_PDU14_Union u +} with { variant (u) "CROSSTAG(proc, ack_nack=IuUP_ACKNACK_CTRL; + ack, ack_nack=IuUP_ACKNACK_ACK; + nack, ack_nack=IuUP_ACKNACK_NACK)" +}; + +type record IuUP_PDU_Type_14_Common_Hdr { uint4_t iuup_version, IuUP_ProcedureIndicator procedure_ind, uint6_t header_crc, - uint10_t payload_crc, - IuUP_PDU14_Union u -} with { variant (u) "CROSSTAG( proc_sending, ack_nack=IuUP_ACKNACK_CTRL; - ack, ack_nack=IuUP_ACKNACK_ACK; - nack, ack_nack=IuUP_ACKNACK_NACK)" + uint10_t payload_crc +}; + +type union IuUP_PDU14_Union { + IuUP_PDU14_ProcSending proc, + IuUP_PDU14_ACK ack, + IuUP_PDU14_NACK nack }; /* 6.6.2.3.1 Figure 21 */ type record IuUP_PDU14_ProcSending { - octetstring payload + IuUP_PDU_Type_14_Common_Hdr hdr, + IuUP_PDU14_ProcSendingUnion u +} with { + variant (u) "CROSSTAG(init, hdr.procedure_ind=IuUP_PRI_INITIALIZATION; + rate_ctrl, hdr.procedure_ind=IuUP_PRI_RATE_CONTROL; + time_alignment, hdr.procedure_ind=IuUP_PRI_TIME_ALIGNMENT; + error_event, hdr.procedure_ind=IuUP_PRI_ERROR_EVENT; + other, OTHERWISE)" }; /* 6.6.2.3.2 Figure 22 */ type record IuUP_PDU14_ACK { + IuUP_PDU_Type_14_Common_Hdr hdr, octetstring spare_ext optional }; /* 6.6.2.3.3 Figure 23 */ type record IuUP_PDU14_NACK { + IuUP_PDU_Type_14_Common_Hdr hdr, IuUP_ErrorCause err_cause, BIT2 spare, octetstring spare_ext optional }; -type union IuUP_PDU14_Union { - IuUP_PDU14_ProcSending proc_sending, - IuUP_PDU14_ACK ack, - IuUP_PDU14_NACK nack -}; - type union IuUP_PDU14_ProcSendingUnion { IuUP_PDU14_ProcSending_INIT init, IuUP_PDU14_ProcSending_RATE_CTRL rate_ctrl, - IuUP_PDU14_ProcSending_RATE_CTRL rate_ctrl_ack, IuUP_PDU14_ProcSending_TIME_ALIGNMENT time_alignment, - IuUP_PDU14_ProcSending_ERROR_EVENT error_event + IuUP_PDU14_ProcSending_ERROR_EVENT error_event, + octetstring other }; /* 6.6.2.3.4.1 Initialisation */ @@ -166,21 +180,35 @@ boolean ti, uint3_t subflows_per_rfci, boolean chain_ind, - - /* FIXME: Further decode */ - octetstring payload + IuUP_InitRfci rfci, + IuUP_IPTI_List IPTIs optional, + BIT16 versions_supported, + uint4_t data_pdu_type, + BIT4 spare2 +} with { + variant (IPTIs) "PRESENCE(ti=true)" + variant (versions_supported) "BITORDER(lsb)" + variant (versions_supported) "BYTEORDER(last)" }; type record IuUP_InitRfci { boolean lri, boolean li, - IuUP_RFCI rfci, + IuUP_RFCI rfci_id, RecOfU8 len8 optional, - RecOfU16 len16 optional -} with { variant (len8) "PRESENCE(li=false)"; - variant (len16) "PRESENCE(li=true)" + RecOfU16 len16 optional, + IuUP_InitRfci rfci optional +} with { + variant (len8) "PRESENCE(li=false)"; + variant (len16) "PRESENCE(li=true)" + variant (rfci) "PRESENCE(lri=false)" }; -type record of uint8_t RecOfU8; -type record of uint16_t RecOfU16; +type record of IuUP_IPTI IuUP_IPTI_List with { + variant "FIELDLENGTH(3)" + variant "PADDING(yes)" + }; +type record of uint8_t RecOfU8 with { variant "FIELDLENGTH(3)" }; +type record of uint16_t RecOfU16 with { variant "FIELDLENGTH(3)" }; +type record of IuUP_InitRfci IuUP_InitRfciList; /* 6.6.2.3.4.2.1 Rate Control procedure */ type record IuUP_PDU14_ProcSending_RATE_CTRL { @@ -226,12 +254,14 @@ pdu_type := 14, ack_nack := IuUP_ACKNACK_ACK, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := 0, - payload_crc := 0, u := { ack := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := 0, + payload_crc := 0 + }, spare_ext := omit } } @@ -243,48 +273,113 @@ pdu_type := 14, ack_nack := IuUP_ACKNACK_ACK, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := ?, - payload_crc := ?, u := { ack := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := ?, + payload_crc := ? + }, spare_ext := omit } } } }; -template IuUP_PDU ts_IuUP_INIT(octetstring payload, uint2_t frame_nr := 0, uint4_t version := 0) := { +template (value) IuUP_InitRfci ts_IuUP_InitRfci( + template (value) boolean lri, + template (value) boolean li, + template (value) IuUP_RFCI rfci_id, + template (omit) RecOfU8 len8, + template (omit) RecOfU16 len16, + template (omit) IuUP_InitRfci rfci := omit) := { + lri := lri, + li := li, + rfci_id := rfci_id, + len8 := len8, + len16 := len16, + rfci := rfci +} + +template (value) IuUP_PDU14_ProcSending_INIT ts_IuUP_PDU14_ProcSending_INIT( + template (value) boolean ti := true, + template (value) uint3_t subflows_per_rfci := 3, + template (value) boolean chain_ind := false, + template (value) IuUP_InitRfci rfci := ts_IuUP_InitRfci(false, false, 0, {81, 103, 60}, omit, + ts_IuUP_InitRfci(false, false, 1, {39, 0, 0}, omit, + ts_IuUP_InitRfci(true, false, 2, {0, 0, 0}, omit, omit))), + template (omit) IuUP_IPTI_List IPTIs := {1, 7, 1}, + template (value) BIT16 versions_supported := '0000000000000001'B, + template (value) uint4_t data_pdu_type := 0) := { + spare := '000'B, + ti := ti, + subflows_per_rfci := subflows_per_rfci, + chain_ind := chain_ind, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := versions_supported, + data_pdu_type := data_pdu_type, + spare2 := '0000'B +} + +template (present) IuUP_PDU14_ProcSending_INIT tr_IuUP_PDU14_ProcSending_INIT( + template (present) boolean ti := ?, + template (present) uint3_t subflows_per_rfci := ?, + template (present) boolean chain_ind := ?, + template (present) IuUP_InitRfci rfci := ?, + template IuUP_IPTI_List IPTIs := *, + template (present) BIT16 versions_supported := ?, + template (present) uint4_t data_pdu_type := ?) := { + spare := '000'B, + ti := ti, + subflows_per_rfci := subflows_per_rfci, + chain_ind := chain_ind, + rfci := rfci, + IPTIs := IPTIs, + versions_supported := versions_supported, + data_pdu_type := data_pdu_type, + spare2 := '0000'B +} + +template (value) IuUP_PDU ts_IuUP_INIT(template (value) IuUP_PDU14_ProcSending_INIT init, uint2_t frame_nr := 0, uint4_t version := 0) := { type_14 := { pdu_type := 14, ack_nack := IuUP_ACKNACK_CTRL, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := 0, - payload_crc := 0, u := { - proc_sending := { - payload := payload + proc := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := 0, + payload_crc := 0 + }, + u := { + init := init + } } } } }; -template IuUP_PDU tr_IuUP_INIT(template octetstring payload := ?, template uint2_t frame_nr := ?, +template IuUP_PDU tr_IuUP_INIT(template (present) IuUP_PDU14_ProcSending_INIT init := ?, template octetstring payload := ?, template uint2_t frame_nr := ?, template uint4_t version := ?) := { type_14 := { pdu_type := 14, ack_nack := IuUP_ACKNACK_CTRL, frame_nr := frame_nr, - iuup_version := version, - procedure_ind := IuUP_PRI_INITIALIZATION, - header_crc := ?, - payload_crc := ?, u := { - proc_sending := { - payload := payload + proc := { + hdr := { + iuup_version := version, + procedure_ind := IuUP_PRI_INITIALIZATION, + header_crc := ?, + payload_crc := ? + }, + u := { + init := init + } } } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28188 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: I33e8a82e654b5afef8bc468cf6b1fff8fa9637ce Gerrit-Change-Number: 28188 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-mgw[master]: iuup: Fix caps in logging message

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-mgw/+/28187 ) Change subject: iuup: Fix caps in logging message ...................................................................... iuup: Fix caps in logging message Change-Id: Icf836f770f22a9460378f91ef037997a73464faa --- M src/libosmo-mgcp/mgcp_iuup.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/87/28187/1 diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 1fea392..120b330 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -270,7 +270,7 @@ return ft; } msgb_pull_to_l3(msg); - LOGP(DLMGCP, LOGL_DEBUG, "Convert Iuup -> AMR: ft %d, len %d\n", ft, msgb_l3len(msg)); + LOGP(DLMGCP, LOGL_DEBUG, "Convert IuUP -> AMR: ft %d, len %d\n", ft, msgb_l3len(msg)); if (mgcp_codec_amr_is_octet_aligned(conn_rtp_dst->end.codec)) { amr_hdr = (struct amr_hdr *) msgb_push(msg, sizeof(struct amr_hdr)); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/28187 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: Icf836f770f22a9460378f91ef037997a73464faa Gerrit-Change-Number: 28187 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: skip upload if nothing new

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 ) Change subject: contrib/jenkins.sh: skip upload if nothing new ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f70d6149b29ec2ff7f185dfae8bc8d4a1953dc2 Gerrit-Change-Number: 28186 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 16:21:32 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-ccid-firmware[master]: contrib/jenkins.sh: skip upload if nothing new

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 ) Change subject: contrib/jenkins.sh: skip upload if nothing new ...................................................................... contrib/jenkins.sh: skip upload if nothing new The contrib/jenkins.sh script gets triggered daily. Do not upload new files unless a new commit was added (then the filename changes). Otherwise the binary and timestamp change on the server each day, which is confusing and potentially makes catching regressions harder. I've also considered disabling the daily trigger for this repository, but I think it's better to keep it so we notice without much delay if changes in libosmocore or the toolchain cause a build failure. Change-Id: I3f70d6149b29ec2ff7f185dfae8bc8d4a1953dc2 --- M contrib/jenkins.sh 1 file changed, 16 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ccid-firmware refs/changes/86/28186/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index 7877dcf..961acf1 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -71,14 +71,22 @@ [ftp.osmocom.org]:48 ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK8iivY70EiR5NiGChV39gRLjNpC8lvu1ZdHtdMw2zuX EOF SSH_COMMAND="ssh -o 'UserKnownHostsFile=/build/known_hosts' -p 48" - rsync --archive --copy-links --verbose --compress --delete --rsh "$SSH_COMMAND" \ - $TOPDIR/sysmoOCTSIM/gcc/sysmoOCTSIM.{bin,elf} \ - binaries@ftp.osmocom.org:web-files/osmo-ccid-firmware/latest/ - rsync --archive --verbose --compress --rsh "$SSH_COMMAND" \ - --exclude $TOPDIR/sysmoOCTSIM/gcc/sysmoOCTSIM.bin \ - --exclude $TOPDIR/sysmoOCTSIM/gcc/sysmoOCTSIM.elf \ - $TOPDIR/sysmoOCTSIM/gcc/*-*.{bin,elf} \ - binaries@ftp.osmocom.org:web-files/osmo-ccid-firmware/all/ + LATEST_BIN="$(cd "$TOPDIR"/sysmoOCTSIM/gcc/; ls -1 sysmoOCTSIM-*-*.bin)" + + echo "LATEST_BIN: $LATEST_BIN" + + if rsync --rsh "$SSH_COMMAND" binaries@ftp.osmocom.org:web-files/osmo-ccid-firmware/all/ | grep -q "$LATEST_BIN"; then + echo "Skipping upload, $LATEST_BIN has already been uploaded." + else + rsync --archive --copy-links --verbose --compress --delete --rsh "$SSH_COMMAND" \ + $TOPDIR/sysmoOCTSIM/gcc/sysmoOCTSIM.{bin,elf} \ + binaries@ftp.osmocom.org:web-files/osmo-ccid-firmware/latest/ + rsync --archive --verbose --compress --rsh "$SSH_COMMAND" \ + --exclude $TOPDIR/sysmoOCTSIM/gcc/sysmoOCTSIM.bin \ + --exclude $TOPDIR/sysmoOCTSIM/gcc/sysmoOCTSIM.elf \ + $TOPDIR/sysmoOCTSIM/gcc/*-*.{bin,elf} \ + binaries@ftp.osmocom.org:web-files/osmo-ccid-firmware/all/ + fi fi echo -- To view, visit https://gerrit.osmocom.org/c/osmo-ccid-firmware/+/28186 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ccid-firmware Gerrit-Branch: master Gerrit-Change-Id: I3f70d6149b29ec2ff7f185dfae8bc8d4a1953dc2 Gerrit-Change-Number: 28186 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: test Gy Volume-Quote-Threshold feature

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 ) Change subject: ggsn: test Gy Volume-Quote-Threshold feature ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 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: If10171589e915db8e78278d2d802e38c66b37687 Gerrit-Change-Number: 28179 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 14:20:06 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-mgw[master]: IuUP: Support RFCI ID != RFCI Index

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/28183 ) Change subject: IuUP: Support RFCI ID != RFCI Index ...................................................................... IuUP: Support RFCI ID != RFCI Index The initially merged IuUP API and implementation in libosmocore assumed that RFCI with ID was always in the position of its ID inside the list of RFCIs. This was the case for messages sent by ip.access nano3g as well as our own osmocom implementation. However it was noticed that other nodes from other vendors actually use other order, as allowed by the IuUP message format. Hence, we need to break the assumption and provide explicit ID information in the list. NOTICE: This commit implies an API change when using libosmogsm. However, the previous API was never available in any libosmogsm release, and only available in both libosmogsm and osmo-mgw master, so we are only breaking compatibility between different master versions, which is acceptable. Related: SYS#5969 Depends: libosmocore.git Change-Id Ib21cee2e30bf83dff4e167f79541796007af9845 Change-Id: I40ebf36ad37f5196751caf2297a340e538ad28bc --- M TODO-RELEASE M include/osmocom/mgcp/mgcp_conn.h M src/libosmo-mgcp/mgcp_iuup.c 3 files changed, 42 insertions(+), 25 deletions(-) Approvals: osmith: Looks good to me, but someone else must approve laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index c5a3b36..f4a57fc 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -24,3 +24,4 @@ # If any interfaces have been removed or changed since the last public release, a=0. # #library what description / commit summary line +libosmogsm >1.6.0 use of iuup.h (libosmocore.git Ib21cee2e30bf83dff4e167f79541796007af9845) diff --git a/include/osmocom/mgcp/mgcp_conn.h b/include/osmocom/mgcp/mgcp_conn.h index 5ba6836..7338027 100644 --- a/include/osmocom/mgcp/mgcp_conn.h +++ b/include/osmocom/mgcp/mgcp_conn.h @@ -98,7 +98,7 @@ struct { struct osmo_iuup_instance *iui; bool active_init; /* true: Send IuUP Init */ - int rfci_idx_no_data; /* Index for RFCI NO_DATA (-1 if not available) */ + int rfci_id_no_data; /* RFCI Id for RFCI NO_DATA (-1 if not available) */ bool configured; struct osmo_iuup_rnl_prim *init_ind; } iuup; diff --git a/src/libosmo-mgcp/mgcp_iuup.c b/src/libosmo-mgcp/mgcp_iuup.c index 5af481d..1fea392 100644 --- a/src/libosmo-mgcp/mgcp_iuup.c +++ b/src/libosmo-mgcp/mgcp_iuup.c @@ -64,19 +64,29 @@ static int _find_rfci_no_data(struct osmo_iuup_rnl_prim *irp) { int i; + uint8_t rfci_cnt = 0; /* Find RFCI containing NO_DATA: */ - for (i = 0; i < irp->u.status.u.initialization.num_rfci; i++) { + for (i = 0; i < ARRAY_SIZE(irp->u.status.u.initialization.rfci); i++) { + struct osmo_iuup_rfci *rfci = &irp->u.status.u.initialization.rfci[i]; int j; - bool is_no_data = true; + bool is_no_data; + if (!rfci->used) + continue; + rfci_cnt++; + + is_no_data = true; for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) { - if (irp->u.status.u.initialization.subflow_sizes[i][j]) { + if (rfci->subflow_sizes[j]) { is_no_data = false; break; } } - if (is_no_data) { - return i; - } + if (is_no_data) + return rfci->id; + + /* early loop termination: */ + if (rfci_cnt == irp->u.status.u.initialization.num_subflows) + break; } return -1; } @@ -85,20 +95,30 @@ static int8_t _conn_iuup_amr_ft_2_rfci(struct mgcp_conn_rtp *conn_rtp, uint8_t ft) { int8_t i; + uint8_t rfci_cnt = 0; unsigned match_bytes = (unsigned)osmo_amr_bytes(ft); struct osmo_iuup_rnl_prim *irp = conn_rtp->iuup.init_ind; OSMO_ASSERT(irp); /* TODO: cache this somehow */ - for (i = 0; i < irp->u.status.u.initialization.num_rfci; i++) { + for (i = 0; i < ARRAY_SIZE(irp->u.status.u.initialization.rfci); i++) { + struct osmo_iuup_rfci *rfci = &irp->u.status.u.initialization.rfci[i]; int j; - unsigned num_bits = 0; - for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) - num_bits += irp->u.status.u.initialization.subflow_sizes[i][j]; - if (match_bytes == (num_bits + 7)/8) - return i; - } + unsigned num_bits; + if (!rfci->used) + continue; + rfci_cnt++; + num_bits = 0; + for (j = 0; j < irp->u.status.u.initialization.num_subflows; j++) + num_bits += rfci->subflow_sizes[j]; + if (match_bytes == (num_bits + 7)/8) + return rfci->id; + + /* early loop termination: */ + if (rfci_cnt == irp->u.status.u.initialization.num_subflows) + break; + } return -1; } @@ -134,9 +154,9 @@ conn_rtp->iuup.active_init = true; /* Find RFCI containing NO_DATA: */ - conn_rtp->iuup.rfci_idx_no_data = _find_rfci_no_data(init_ind); + conn_rtp->iuup.rfci_id_no_data = _find_rfci_no_data(init_ind); - /* Copy over the rfci_idx_no_data, since we reuse the same subflow set: */ + /* Copy over the rfci_id_no_data, since we reuse the same subflow set: */ msg = msgb_copy_c(conn_rtp->conn, irp->oph.msg, "iuup-init-copy"); conn_rtp->iuup.init_ind = (struct osmo_iuup_rnl_prim *)msgb_data(msg); conn_rtp->iuup.init_ind->oph.msg = msg; @@ -149,12 +169,8 @@ irp2->u.config.supported_versions_mask = def_configure_req.supported_versions_mask; irp2->u.config.num_rfci = irp->u.status.u.initialization.num_rfci; irp2->u.config.num_subflows = irp->u.status.u.initialization.num_subflows; - memcpy(irp2->u.config.subflow_sizes, irp->u.status.u.initialization.subflow_sizes, - IUUP_MAX_RFCIS * IUUP_MAX_SUBFLOWS * sizeof(irp2->u.config.subflow_sizes[0][0])); irp2->u.config.IPTIs_present = irp->u.status.u.initialization.IPTIs_present; - if (irp->u.status.u.initialization.IPTIs_present) - memcpy(irp2->u.config.IPTIs, irp->u.status.u.initialization.IPTIs, - IUUP_MAX_RFCIS * sizeof(irp2->u.config.IPTIs[0])); + memcpy(irp2->u.config.rfci, irp->u.status.u.initialization.rfci, sizeof(irp2->u.config.rfci)); irp2->u.config.t_init = def_configure_req.t_init; irp2->u.config.t_ta = def_configure_req.t_ta; irp2->u.config.t_rc = def_configure_req.t_rc; @@ -350,7 +366,7 @@ struct msgb *msg; /* Find RFCI containing NO_DATA: */ - conn_rtp_src->iuup.rfci_idx_no_data = _find_rfci_no_data(irp); + conn_rtp_src->iuup.rfci_id_no_data = _find_rfci_no_data(irp); msg = msgb_copy_c(conn_rtp_src->conn, irp->oph.msg, "iuup-init-copy"); conn_rtp_src->iuup.init_ind = (struct osmo_iuup_rnl_prim *)msgb_data(msg); @@ -554,7 +570,7 @@ OSMO_ASSERT(conn_rtp->iuup.iui); osmo_iuup_instance_set_user_prim_cb(conn_rtp->iuup.iui, _conn_iuup_user_prim_cb, conn_rtp); osmo_iuup_instance_set_transport_prim_cb(conn_rtp->iuup.iui, _conn_iuup_transport_prim_cb, conn_rtp); - conn_rtp->iuup.rfci_idx_no_data = -1; + conn_rtp->iuup.rfci_id_no_data = -1; return 0; } @@ -701,7 +717,7 @@ struct osmo_iuup_rnl_prim *irp; int rc; - if (conn_rtp->iuup.rfci_idx_no_data == -1) { + if (conn_rtp->iuup.rfci_id_no_data == -1) { LOG_CONN_RTP(conn_rtp, LOGL_NOTICE, "No RFCI NO_DATA found, unable to send dummy packet\n"); return -ENOTSUP; } @@ -709,7 +725,7 @@ irp = osmo_iuup_rnl_prim_alloc(conn_rtp->conn, OSMO_IUUP_RNL_DATA, PRIM_OP_REQUEST, MGW_IUUP_MSGB_SIZE); irp->u.data.frame_nr = 0; irp->u.data.fqc = IUUP_FQC_FRAME_GOOD; - irp->u.data.rfci = conn_rtp->iuup.rfci_idx_no_data; + irp->u.data.rfci = conn_rtp->iuup.rfci_id_no_data; irp->oph.msg->l3h = irp->oph.msg->tail; if ((rc = osmo_iuup_rnl_prim_down(conn_rtp->iuup.iui, irp)) != 0) { LOG_CONN_RTP(conn_rtp, LOGL_ERROR, "Failed Tx RTP dummy payload down the IuUP layer\n"); -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/28183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I40ebf36ad37f5196751caf2297a340e538ad28bc Gerrit-Change-Number: 28183 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

Change in osmo-mgw[master]: IuUP: Support RFCI ID != RFCI Index

by pespin

Attention is currently required from: neels, fixeria, daniel, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/28183 ) Change subject: IuUP: Support RFCI ID != RFCI Index ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/28183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I40ebf36ad37f5196751caf2297a340e538ad28bc Gerrit-Change-Number: 28183 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 14:14:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn: test Gy Volume-Quote-Threshold feature

by pespin

Attention is currently required from: pespin, fixeria. Hello osmith, Jenkins Builder, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 to look at the new patch set (#2). Change subject: ggsn: test Gy Volume-Quote-Threshold feature ...................................................................... ggsn: test Gy Volume-Quote-Threshold feature Change-Id: If10171589e915db8e78278d2d802e38c66b37687 --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn 2 files changed, 106 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/79/28179/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 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: If10171589e915db8e78278d2d802e38c66b37687 Gerrit-Change-Number: 28179 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

3 years

1
0
0 0

Change in osmo-ttcn3-hacks[master]: ggsn/pgw: Fix Gy CCR Reporting-Reason expectancies

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28178 ) Change subject: ggsn/pgw: Fix Gy CCR Reporting-Reason expectancies ...................................................................... ggsn/pgw: Fix Gy CCR Reporting-Reason expectancies The Reporting-Reason can be in different places depending on its values. In the case of TERMINATION, we expect it to be FINAL so we know its location. Change-Id: Id33b9bb2f7b469e03a0761dc8807770cfdf77fcc --- M ggsn_tests/GGSN_Tests.ttcn M library/DIAMETER_Templates.ttcn M pgw/PGW_Tests.ttcn 3 files changed, 15 insertions(+), 6 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 4e6581c..875a9d6 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -576,7 +576,7 @@ tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_Reporting_Reason, + /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ tr_AVP_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), @@ -624,6 +624,7 @@ tr_AVP_Multiple_Services_Credit_Control(content := superset( /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason(FINAL), tr_AVP_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 4b17ac5..03fec7c 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1675,20 +1675,27 @@ { var AVP multi_services_cc, used_service_unit; var AVP_Grouped multi_services_cc_data, used_service_unit_data; + var template (omit) AVP repreason_tpl; var AVP repreason, cc_time, cc_in_oct, cc_out_oct; multi_services_cc := f_DIAMETER_get_avp_or_fail(rx_dia, c_AVP_Code_DCC_NONE_Multiple_Services_Credit_Control); multi_services_cc_data := valueof(multi_services_cc.avp_data.avp_DCC_NONE_Multiple_Services_Credit_Control); - repreason := f_AVP_Grouped_get_avp_or_fail(multi_services_cc_data, c_AVP_Code_DCA_3GPP_Reporting_Reason); + used_service_unit := f_AVP_Grouped_get_avp_or_fail(multi_services_cc_data, c_AVP_Code_DCC_NONE_Used_Service_Unit); + used_service_unit_data := valueof(used_service_unit.avp_data.avp_DCC_NONE_Used_Service_Unit); + + /* Reporting-Reason can be either inside Multiple-Services-Credit-Control or inside Used-Service-Unit */ + repreason_tpl := f_AVP_Grouped_get_avp(multi_services_cc_data, c_AVP_Code_DCA_3GPP_Reporting_Reason); + if (istemplatekind(repreason_tpl, "omit")) { + repreason := f_AVP_Grouped_get_avp_or_fail(used_service_unit_data, c_AVP_Code_DCA_3GPP_Reporting_Reason); + } else { + repreason := valueof(repreason_tpl); + } if (not match(repreason.avp_data.avp_DCA_3GPP_Reporting_Reason, repreason_exp)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, log2str("3GPP-Reporting-Reason mismatch ", repreason, " vs exp ", repreason_exp)); } - used_service_unit := f_AVP_Grouped_get_avp_or_fail(multi_services_cc_data, c_AVP_Code_DCC_NONE_Used_Service_Unit); - used_service_unit_data := valueof(used_service_unit.avp_data.avp_DCC_NONE_Used_Service_Unit); - cc_time := f_AVP_Grouped_get_avp_or_fail(used_service_unit_data, c_AVP_Code_DCC_NONE_CC_Time); if (not match(oct2int(cc_time.avp_data.avp_DCC_NONE_CC_Time), cc_time_exp)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, diff --git a/pgw/PGW_Tests.ttcn b/pgw/PGW_Tests.ttcn index d8ee60d..e1f49ab 100644 --- a/pgw/PGW_Tests.ttcn +++ b/pgw/PGW_Tests.ttcn @@ -409,7 +409,7 @@ tr_AVP_Multiple_Services_Credit_Control(content := superset( tr_AVP_Requested_Service_Unit, tr_AVP_Used_Service_Unit, - tr_AVP_3GPP_Reporting_Reason, + /* tr_AVP_3GPP_Reporting_Reason, can be sometimes inside UsedServiceUnit */ tr_AVP_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), @@ -459,6 +459,7 @@ tr_AVP_Multiple_Services_Credit_Control(content := superset( /* tr_AVP_Requested_Service_Unit, Only in INIT and UPDATE */ tr_AVP_Used_Service_Unit, + tr_AVP_3GPP_Reporting_Reason(FINAL), tr_AVP_3GPP_QoS_Information, tr_AVP_GI_3GPP_RatType(rat_type) )), -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28178 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: Id33b9bb2f7b469e03a0761dc8807770cfdf77fcc Gerrit-Change-Number: 28178 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

3 years

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2022