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

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

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

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28182 ) Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... iuup: Rework API to support RFCI IDs != RFCI index The initially merged IuUP API and implementation 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 breaks API and ABI compatibility with older versions of libosmogsm, but not with any previous release of libosmocore since the API is only available in master so far (it was added in 9fe1f9fb0b3197cdecaa55017d3afd7355e59c36). Similary, it's only user (osmo-mgw) only uses the API in master, so there's no API breakage with older releases. Related: SYS#5969 Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 --- M TODO-RELEASE M include/osmocom/gsm/iuup.h M src/gsm/iuup.c M tests/iuup/iuup_test.c 4 files changed, 76 insertions(+), 48 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ae28c0..9f9f9d9 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmogsm add struct member Add codec_list_bss_supported to gsm0808_handover_request_ack (more_items flag ensures ABI compat) libosmogb ABI BREAKAGE Add reset_ack_notification function pointer to struct bssgp_bvc_fsm_ops libosmogsm add API Add rach_tx_integer_raw2val() in gsm_utils.h +libosmogsm add API iuup.h diff --git a/include/osmocom/gsm/iuup.h b/include/osmocom/gsm/iuup.h index 1ea2b2e..db3d5e0 100644 --- a/include/osmocom/gsm/iuup.h +++ b/include/osmocom/gsm/iuup.h @@ -42,6 +42,14 @@ uint32_t t_ms; /* time in ms */ uint32_t n_max; /* max number of repetitions */ }; +struct osmo_iuup_rfci { + uint8_t used:1, + spare1:1, + id:6; + uint8_t spare2:4, + IPTI:4; /* values range 0-15, 4 bits */; + uint16_t subflow_sizes[IUUP_MAX_SUBFLOWS]; +}; struct osmo_iuup_rnl_config { /* transparent (true) or SMpSDU (false): */ bool transparent; @@ -56,9 +64,8 @@ uint16_t supported_versions_mask; uint8_t num_rfci; uint8_t num_subflows; - uint16_t subflow_sizes[IUUP_MAX_RFCIS][IUUP_MAX_SUBFLOWS]; bool IPTIs_present; - uint8_t IPTIs[IUUP_MAX_RFCIS]; /* values range 0-15, 4 bits */ + struct osmo_iuup_rfci rfci[IUUP_MAX_RFCIS]; /* TODO: Indication of delivery of erroneous SDUs*/ struct osmo_iuup_rnl_config_timer t_init; @@ -84,9 +91,8 @@ uint8_t data_pdu_type; uint8_t num_rfci; uint8_t num_subflows; - uint16_t subflow_sizes[IUUP_MAX_RFCIS][IUUP_MAX_SUBFLOWS]; bool IPTIs_present; - uint8_t IPTIs[IUUP_MAX_RFCIS]; /* values range 0-15, 4 bits */ + struct osmo_iuup_rfci rfci[IUUP_MAX_RFCIS]; } initialization; struct { } rate_control; diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index eb595ce..edcea3b 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -286,13 +286,10 @@ struct iuup_ctrl_init_rfci_hdr *ihdr_rfci; struct iuup_ctrl_init_tail *itail; unsigned int i, j; - uint8_t num_subflows, num_rfci; uint16_t payload_crc; + uint8_t rfci_cnt; struct msgb *msg; - num_subflows = iui->config.num_subflows; - num_rfci = iui->config.num_rfci; - itp = osmo_iuup_tnl_prim_alloc(iui, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_REQUEST, IUUP_MSGB_SIZE); msg = itp->oph.msg; @@ -307,42 +304,68 @@ ihdr = (struct iuup_ctrl_init_hdr *)msgb_put(msg, sizeof(*ihdr)); ihdr->chain_ind = 0; /* this frame is the last frame for the procedure. TODO: support several */ - ihdr->num_subflows_per_rfci = num_subflows; + ihdr->num_subflows_per_rfci = iui->config.num_subflows; ihdr->ti = iui->config.IPTIs_present ? 1 : 0; ihdr->spare = 0; /* RFCI + subflow size part: */ - for (i = 0; i < num_rfci; i++) { - bool last = (i+1 == num_rfci); - uint8_t len_size = 1; - for (j = 0; j < num_subflows; j++) { - if (iui->config.subflow_sizes[i][j] > UINT8_MAX) + rfci_cnt = 0; + for (i = 0; i < ARRAY_SIZE(iui->config.rfci); i++) { + bool last; + uint8_t len_size; + struct osmo_iuup_rfci *rfci = &iui->config.rfci[i]; + if (!rfci->used) + continue; + rfci_cnt++; + last = (rfci_cnt == iui->config.num_rfci); + + len_size = 1; + for (j = 0; j < iui->config.num_subflows; j++) { + if (rfci->subflow_sizes[j] > UINT8_MAX) len_size = 2; } - ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)msgb_put(msg, sizeof(*ihdr_rfci) + len_size * num_subflows); - ihdr_rfci->rfci = i; + + ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)msgb_put(msg, sizeof(*ihdr_rfci) + len_size * iui->config.num_subflows); + ihdr_rfci->rfci = rfci->id; ihdr_rfci->li = len_size - 1; ihdr_rfci->lri = last; if (len_size == 2) { uint16_t *buf = (uint16_t *)&ihdr_rfci->subflow_length[0]; - for (j = 0; j < num_subflows; j++) - osmo_store16be(iui->config.subflow_sizes[i][j], buf++); + for (j = 0; j < iui->config.num_subflows; j++) + osmo_store16be(rfci->subflow_sizes[j], buf++); } else { - for (j = 0; j < num_subflows; j++) - ihdr_rfci->subflow_length[j] = iui->config.subflow_sizes[i][j]; + for (j = 0; j < iui->config.num_subflows; j++) + ihdr_rfci->subflow_length[j] = rfci->subflow_sizes[j]; } + /* early loop termination: */ + if (last) + break; + } + /* Sanity check: */ + if (rfci_cnt != iui->config.num_rfci) { + LOGP(DLIUUP, LOGL_ERROR, "rfci_cnt %u != num_rfci %u\n", + rfci_cnt, iui->config.num_rfci); + msgb_free(msg); + return NULL; } if (iui->config.IPTIs_present) { - uint8_t num_bytes = (num_rfci + 1) / 2; + uint8_t num_bytes = (iui->config.num_rfci + 1) / 2; uint8_t *buf = msgb_put(msg, num_bytes); - for (i = 0; i < num_bytes - 1; i++) - buf[i] = iui->config.IPTIs[i*2] << 4 | - (iui->config.IPTIs[i*2 + 1] & 0x0f); - buf[i] = iui->config.IPTIs[i*2] << 4; - if (!(num_rfci & 0x01)) /* is even: */ - buf[i] |= (iui->config.IPTIs[i*2 + 1] & 0x0f); - + rfci_cnt = 0; + for (i = 0; i < ARRAY_SIZE(iui->config.rfci); i++) { + struct osmo_iuup_rfci *rfci = &iui->config.rfci[i]; + if (!rfci->used) + continue; + if (!(rfci_cnt & 0x01)) /* is even: */ + buf[rfci_cnt / 2] = (((uint8_t)rfci->IPTI) << 4); + else + buf[rfci_cnt / 2] |= (rfci->IPTI & 0x0F); + rfci_cnt++; + /* early loop termination: */ + if (rfci_cnt == iui->config.num_rfci) + break; + } } itail = (struct iuup_ctrl_init_tail *)msgb_put(msg, sizeof(*itail)); @@ -368,12 +391,8 @@ irp->u.status.u.initialization.data_pdu_type = iui->config.data_pdu_type; irp->u.status.u.initialization.num_subflows = iui->config.num_subflows; irp->u.status.u.initialization.num_rfci = iui->config.num_rfci; - memcpy(irp->u.status.u.initialization.subflow_sizes, iui->config.subflow_sizes, - IUUP_MAX_RFCIS * IUUP_MAX_SUBFLOWS * sizeof(iui->config.subflow_sizes[0][0])); irp->u.status.u.initialization.IPTIs_present = iui->config.IPTIs_present; - if (iui->config.IPTIs_present) - memcpy(irp->u.status.u.initialization.IPTIs, iui->config.IPTIs, - IUUP_MAX_RFCIS * sizeof(iui->config.IPTIs[0])); + memcpy(irp->u.status.u.initialization.rfci, iui->config.rfci, sizeof(iui->config.rfci)); return irp; } @@ -530,24 +549,27 @@ ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)ihdr->rfci_data; do { + struct osmo_iuup_rfci *rfci = &iui->config.rfci[num_rfci]; uint8_t l_size_bytes = ihdr_rfci->li + 1; is_last = ihdr_rfci->lri; - if (ihdr_rfci->rfci != num_rfci) { - LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Unexpected RFCI %u at position %u received\n", - ihdr_rfci->rfci, num_rfci); + if (num_rfci >= IUUP_MAX_RFCIS) { + LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Too many RFCIs received (%u)\n", + num_rfci); err_cause = IUUP_ERR_CAUSE_UNEXPECTED_RFCI; goto send_nack; } + rfci->used = 1; + rfci->id = ihdr_rfci->rfci; if (l_size_bytes == 2) { uint16_t *subflow_size = (uint16_t *)ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = osmo_load16be(subflow_size); + rfci->subflow_sizes[i] = osmo_load16be(subflow_size); subflow_size++; } } else { uint8_t *subflow_size = ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = *subflow_size; + rfci->subflow_sizes[i] = *subflow_size; subflow_size++; } } @@ -561,19 +583,18 @@ uint8_t num_bytes = (num_rfci + 1) / 2; iui->config.IPTIs_present = true; for (i = 0; i < num_bytes - 1; i++) { - iui->config.IPTIs[i*2] = *buf >> 4; - iui->config.IPTIs[i*2 + 1] = *buf & 0x0f; + iui->config.rfci[i*2].IPTI = *buf >> 4; + iui->config.rfci[i*2 + 1].IPTI = *buf & 0x0f; buf++; } - iui->config.IPTIs[i*2] = *buf >> 4; + iui->config.rfci[i*2].IPTI = *buf >> 4; if (!(num_rfci & 0x01)) /* is even: */ - iui->config.IPTIs[i*2 + 1] = *buf & 0x0f; + iui->config.rfci[i*2 + 1].IPTI = *buf & 0x0f; buf++; itail = (struct iuup_ctrl_init_tail *)buf; } else { itail = (struct iuup_ctrl_init_tail *)ihdr_rfci; } - if (itail->data_pdu_type > 1) { LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Unexpected Data PDU Type %u received\n", itail->data_pdu_type); err_cause = IUUP_ERR_CAUSE_UNEXPECTED_VALUE; diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index a58481d..6e3d8ca 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -19,14 +19,14 @@ .supported_versions_mask = 0x0001, .num_rfci = 3, .num_subflows = 3, - .subflow_sizes = { - {81, 103, 60}, - {39, 0, 0}, - {0, 0, 0}, + .IPTIs_present = true, + .rfci = { + {.used = 1, .id = 0, .IPTI = 1, .subflow_sizes = {81, 103, 60} }, + {.used = 1, .id = 1, .IPTI = 7, .subflow_sizes = {39, 0, 0} }, + {.used = 1, .id = 2, .IPTI = 1, .subflow_sizes = {0, 0, 0} }, }, /* .delivery_err_sdu = All set to 0 (YES) by default, */ .IPTIs_present = true, - .IPTIs = {1, 7, 1}, .t_init = { .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }, .t_ta = { .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }, .t_rc = { .t_ms = IUUP_TIMER_RC_T_DEFAULT, .n_max = IUUP_TIMER_RC_N_DEFAULT }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 4 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

2 years, 1 month

1
0
0 0

Change in pysim[master]: ts_102_221: fix SFI generation

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28184 ) Change subject: ts_102_221: fix SFI generation ...................................................................... ts_102_221: fix SFI generation The generation of the SFI does not work. The result is always a zero length TLV IE. Change-Id: Iaa38d2be4719f12c1d7b30a8befe278f1ed78ac1 --- M pySim/ts_102_221.py 1 file changed, 4 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/84/28184/1 diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index bf63f55..e7aff97 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -190,10 +190,11 @@ # of the TLV value field. In this case, bits b3 to b1 shall be set to 0 class Shift3RAdapter(Adapter): def _decode(self, obj, context, path): - return obj >> 3 + return int.from_bytes(obj, 'big') >> 3 def _encode(self, obj, context, path): - return obj << 3 - _construct = COptional(Shift3RAdapter(Byte)) + val = int(obj) << 3 + return val.to_bytes(1, 'big') + _construct = COptional(Shift3RAdapter(Bytes(1))) # ETSI TS 102 221 11.1.1.4.9 class LifeCycleStatusInteger(BER_TLV_IE, tag=0x8A): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28184 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iaa38d2be4719f12c1d7b30a8befe278f1ed78ac1 Gerrit-Change-Number: 28184 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in pysim[master]: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/pysim/+/28185 ) Change subject: ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length ...................................................................... ts_102_221: The BTLV IEs FILE SIZE and TOTAL FILE SIZE have a min length The TLV IEs FILE SIZE and TOTAL FILE SIZE have a minimum length of 2 byte. Even when the length is in the single digit range two bytes must be used. See also: ETSI TS 102 221, section 11.1.1.4.1 and 11.1.1.4.2 Change-Id: Ief113ce8fe3bcae2c9fb2ff4138df9ccf98d26ff --- M pySim/construct.py M pySim/ts_102_221.py 2 files changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/pysim refs/changes/85/28185/1 diff --git a/pySim/construct.py b/pySim/construct.py index fcbadd8..a43cd29 100644 --- a/pySim/construct.py +++ b/pySim/construct.py @@ -208,10 +208,11 @@ class GreedyInteger(Construct): """A variable-length integer implementation, think of combining GrredyBytes with BytesInteger.""" - def __init__(self, signed=False, swapped=False): + def __init__(self, signed=False, swapped=False, minlen=0): super().__init__() self.signed = signed self.swapped = swapped + self.minlen = minlen def _parse(self, stream, context, path): data = stream_read_entire(stream, path) @@ -239,6 +240,8 @@ if not isinstance(obj, integertypes): raise IntegerError(f"value {obj} is not an integer", path=path) length = self.__bytes_required(obj) + if length < self.minlen: + length = length + (self.minlen - length) try: data = integer2bytes(obj, length, self.signed) except ValueError as e: diff --git a/pySim/ts_102_221.py b/pySim/ts_102_221.py index e7aff97..08e836c 100644 --- a/pySim/ts_102_221.py +++ b/pySim/ts_102_221.py @@ -80,11 +80,11 @@ # ETSI TS 102 221 11.1.1.4.2 class FileSize(BER_TLV_IE, tag=0x80): - _construct = GreedyInteger() + _construct = GreedyInteger(minlen=2) # ETSI TS 102 221 11.1.1.4.2 class TotalFileSize(BER_TLV_IE, tag=0x81): - _construct = GreedyInteger() + _construct = GreedyInteger(minlen=2) # ETSI TS 102 221 11.1.1.4.3 class FileDescriptor(BER_TLV_IE, tag=0x82): -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28185 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ief113ce8fe3bcae2c9fb2ff4138df9ccf98d26ff Gerrit-Change-Number: 28185 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: do not reset codec ID on receipt of DTX frames

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28175 ) Change subject: coding: do not reset codec ID on receipt of DTX frames ...................................................................... coding: do not reset codec ID on receipt of DTX frames Parsing of CMI/CMC/CMR from AMR's special DTX frames is currently not implemented. It's better to keep the old stored value rather than resetting it to 0 every time we receive such a frame. Add TODO comments for each DTX frame type. Change-Id: Ic4edbb8ab873fe0bdd69a8710803628bc4f447d0 Related: OS#5570 --- M src/coding/gsm0503_coding.c 1 file changed, 28 insertions(+), 23 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index 715a361..2b59b7b 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2157,7 +2157,7 @@ { sbit_t iB[912], cB[456], h; ubit_t d[244], p[6], conv[250]; - int i, j, k, best = 0, rv, len, steal = 0, id = 0; + int i, j, k, best = 0, rv, len, steal = 0, id = -1; ubit_t cBd[456]; *n_errors = 0; *n_bits_total = 0; static ubit_t sid_first_dummy[64] = { 0 }; @@ -2202,6 +2202,7 @@ * (AFS_SID_UPDATE_CN). */ if (dtx_prev != AFS_SID_UPDATE) break; + /* TODO: parse CMI _and_ CMC/CMR (16 + 16 bit) */ *dtx = AFS_SID_UPDATE_CN; extract_afs_sid_update(sid_update_enc, cB); @@ -2217,19 +2218,19 @@ tch_amr_sid_update_append(conv, 1, (codec_mode_req) ? codec[*ft] - : codec[id]); + : codec[id > 0 ? id : 0]); tch_amr_reassemble(tch_data, conv, 39); len = 5; goto out; - case AFS_SID_FIRST: + case AFS_SID_FIRST: /* TODO: parse CMI or CMC/CMR (16 bit) */ tch_amr_sid_update_append(sid_first_dummy, 0, (codec_mode_req) ? codec[*ft] - : codec[id]); + : codec[id > 0 ? id : 0]); tch_amr_reassemble(tch_data, conv, 39); len = 5; goto out; - case AFS_SID_UPDATE: - case AFS_ONSET: + case AFS_SID_UPDATE: /* TODO: parse CMI _and_ CMC/CMR (16 + 16 bit) */ + case AFS_ONSET: /* TODO: parse CMI or CMC/CMR (N * 16 - M bit) */ len = 0; goto out; default: @@ -2399,10 +2400,12 @@ out: /* Change codec request / indication, if frame is valid */ - if (codec_mode_req) - *cmr = id; - else - *ft = id; + if (id != -1) { + if (codec_mode_req) + *cmr = id; + else + *ft = id; + } return len; } @@ -2621,7 +2624,7 @@ { sbit_t iB[912], cB[456], h; ubit_t d[244], p[6], conv[135]; - int i, j, k, best = 0, rv, len, steal = 0, id = 0; + int i, j, k, best = 0, rv, len, steal = 0, id = -1; ubit_t cBd[456]; static ubit_t sid_first_dummy[64] = { 0 }; @@ -2684,7 +2687,7 @@ /* TODO: detect and handle AHS_SID_UPDATE + AHS_SID_UPDATE_INH */ switch (*dtx) { - case AHS_SID_UPDATE: + case AHS_SID_UPDATE: /* TODO: parse CMI _and_ CMC/CMR (16 + 16 bit) */ /* cB[] contains 16 bits of coded in-band data and 212 bits containing * the identification marker. We need to unmap/deinterleave 114 odd * bits from the last two blocks, 114 even bits from the first two @@ -2717,21 +2720,21 @@ tch_amr_sid_update_append(conv, 1, (codec_mode_req) ? codec[*ft] - : codec[id]); + : codec[id > 0 ? id : 0]); tch_amr_reassemble(tch_data, conv, 39); len = 5; goto out; - case AHS_SID_FIRST_P2: + case AHS_SID_FIRST_P2: /* TODO: parse CMI or CMC/CMR (N * 16 - M bit) */ tch_amr_sid_update_append(sid_first_dummy, 0, (codec_mode_req) ? codec[*ft] - : codec[id]); + : codec[id > 0 ? id : 0]); tch_amr_reassemble(tch_data, sid_first_dummy, 39); len = 5; goto out; - case AHS_ONSET: - case AHS_SID_FIRST_INH: - case AHS_SID_UPDATE_INH: - case AHS_SID_FIRST_P1: + case AHS_ONSET: /* TODO: parse CMI or CMC/CMR (N * 16 - M bit) */ + case AHS_SID_FIRST_INH: /* TODO: parse CMI or CMC/CMR (16 bit) */ + case AHS_SID_UPDATE_INH: /* TODO: parse CMI or CMC/CMR (16 bit) */ + case AHS_SID_FIRST_P1: /* TODO: parse CMI or CMC/CMR (16 bit) */ len = 0; goto out; default: @@ -2885,10 +2888,12 @@ out: /* Change codec request / indication, if frame is valid */ - if (codec_mode_req) - *cmr = id; - else - *ft = id; + if (id != -1) { + if (codec_mode_req) + *cmr = id; + else + *ft = id; + } return len; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic4edbb8ab873fe0bdd69a8710803628bc4f447d0 Gerrit-Change-Number: 28175 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(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

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%)

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28166 ) Change subject: coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%) ...................................................................... coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%) As was demonstrated in [1], there is a TCH/AHS specific problem in libosmocoding causing unexpected BER ~50% in decoded AHS_SID_UPDATE frames. The reason is that A[H]S_SID_UPDATE employs quite tricky interleaving algorithm, which is different from the algorithm used by normal TCH/AHS speech frames or A[F]S_SID_UPDATE frames. An AHS_SID_UPDATE frame consists of two halves (228 bits each): +---------+--------------------|---------+--------------------+ | in-band | SID marker | in-band | coded data | +---------+--------------------|---------+--------------------+ | 16 bits | 212 bits | 16 bits | 212 bits | The first half contains coded in-band signalling data (16 bits) and the identification marker (212 bits), which allows to detect that it's an AHS_SID_UPDATE. This half is carried by even bits of the first two bursts and odd bits of the last two bursts. The other half also contains the in-band data (16 bits), while the remaining 212 bits contain encoded SID_UPDATE (212 bits). This half is carried by even bits of the last two bursts and odd bits of the first two bursts. Current implementation does not use odd bits of the first two bursts at all, so buffer cB[] in gsm0503_tch_ahs_decode_dtx() contains only 114 out of 228 bits. This patch changes the logic, so that gsm0503_tch_ahs_decode_dtx() would not split AHS_SID_UPDATE onto two frames anymore like its TCH/AFS equivalent does, but attempt to deinterleave the second half and attempt to decode the payload immediately. Change-Id: I8686d895e96fa0e606c1898b6574cc80a8f46983 Related: [1] I434157e2091a306c039123cea08d84bd8533c937 Related: SYS#5853 --- M src/coding/gsm0503_coding.c M tests/dtx/dtx_gsm0503_test.ok 2 files changed, 27 insertions(+), 15 deletions(-) Approvals: laforge: Looks good to me, approved osmith: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/coding/gsm0503_coding.c b/src/coding/gsm0503_coding.c index e81bf02..715a361 100644 --- a/src/coding/gsm0503_coding.c +++ b/src/coding/gsm0503_coding.c @@ -2676,25 +2676,38 @@ /* Determine the DTX frame type (SID_UPDATE, ONSET etc...) */ if (dtx) { - const enum gsm0503_amr_dtx_frames dtx_prev = *dtx; + int n_bits_total_sid; + int n_errors_sid; osmo_sbit2ubit(cBd, cB, 456); *dtx = gsm0503_detect_ahs_dtx_frame(n_errors, n_bits_total, cBd); + /* TODO: detect and handle AHS_SID_UPDATE + AHS_SID_UPDATE_INH */ switch (*dtx) { - case AMR_OTHER: - /* NOTE: The AHS_SID_UPDATE frame is splitted into - * two half rate frames. If the id marker frame - * (AHS_SID_UPDATE) is detected the following frame - * contains the actual comfort noised data part of - * (AHS_SID_UPDATE_CN). */ - if (dtx_prev != AHS_SID_UPDATE) - break; + case AHS_SID_UPDATE: + /* cB[] contains 16 bits of coded in-band data and 212 bits containing + * the identification marker. We need to unmap/deinterleave 114 odd + * bits from the last two blocks, 114 even bits from the first two + * blocks and combine them together. */ + gsm0503_tch_burst_unmap(&iB[0 * 114], &bursts[2 * 116], NULL, 0); + gsm0503_tch_burst_unmap(&iB[1 * 114], &bursts[3 * 116], NULL, 0); + gsm0503_tch_burst_unmap(&iB[2 * 114], &bursts[0 * 116], NULL, 1); + gsm0503_tch_burst_unmap(&iB[3 * 114], &bursts[1 * 116], NULL, 1); + gsm0503_tch_hr_deinterleave(cB, iB); + + /* cB[] is expected to contain 16 bits of coded in-band data and + * 212 bits containing the coded data (53 bits coded at 1/4 rate). */ *dtx = AHS_SID_UPDATE_CN; osmo_conv_decode_ber(&gsm0503_tch_axs_sid_update, - cB + 16, conv, n_errors, - n_bits_total); + cB + 16, conv, &n_errors_sid, + &n_bits_total_sid); + /* gsm0503_detect_ahs_dtx_frame() calculates BER for the marker, + * osmo_conv_decode_ber() calculates BER for the coded data. */ + if (n_errors != NULL) + *n_errors += n_errors_sid; + if (n_bits_total != NULL) + *n_bits_total += n_bits_total_sid; rv = osmo_crc16gen_check_bits(&gsm0503_amr_crc14, conv, 35, conv + 35); if (rv != 0) { @@ -2715,7 +2728,6 @@ tch_amr_reassemble(tch_data, sid_first_dummy, 39); len = 5; goto out; - case AHS_SID_UPDATE: case AHS_ONSET: case AHS_SID_FIRST_INH: case AHS_SID_UPDATE_INH: diff --git a/tests/dtx/dtx_gsm0503_test.ok b/tests/dtx/dtx_gsm0503_test.ok index 750b440..60f3884 100644 --- a/tests/dtx/dtx_gsm0503_test.ok +++ b/tests/dtx/dtx_gsm0503_test.ok @@ -17,10 +17,10 @@ Running test_gsm0503_tch_afhs_decode_dtx(at offset=0): testing detection/decoding of AHS_SID_UPDATE ==> gsm0503_tch_ahs_decode_dtx() yields 'AMR_OTHER (audio)' (rc=-1, BER 109/212) Running test_gsm0503_tch_afhs_decode_dtx(at offset=232): testing detection/decoding of AHS_SID_UPDATE - ==> gsm0503_tch_ahs_decode_dtx() yields 'AHS_SID_UPDATE (marker)' (rc=0, BER 0/212) -Running test_gsm0503_tch_afhs_decode_dtx(at offset=464): testing detection/decoding of AHS_SID_UPDATE - ==> gsm0503_tch_ahs_decode_dtx() yields 'AHS_SID_UPDATE_CN (audio)' (rc=5, BER 106/212) + ==> gsm0503_tch_ahs_decode_dtx() yields 'AHS_SID_UPDATE_CN (audio)' (rc=5, BER 0/424) ====> tch_data[] = { 6003ccb270 } +Running test_gsm0503_tch_afhs_decode_dtx(at offset=464): testing detection/decoding of AHS_SID_UPDATE + ==> gsm0503_tch_ahs_decode_dtx() yields 'AMR_OTHER (audio)' (rc=-1, BER 111/212) Running test_gsm0503_tch_afhs_decode_dtx(at offset=0): testing tagging of FACCH/F ==> gsm0503_tch_afs_decode_dtx() yields 'AMR_OTHER (audio)' (rc=-1, BER 456/456) Running test_gsm0503_tch_afhs_decode_dtx(at offset=0): testing tagging of FACCH/H -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8686d895e96fa0e606c1898b6574cc80a8f46983 Gerrit-Change-Number: 28166 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: reader: more meaningful null pointer check in get_sw

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28180 ) Change subject: reader: more meaningful null pointer check in get_sw ...................................................................... reader: more meaningful null pointer check in get_sw At the moment msgb_apdu_de(resp) is used to check if the msgb that is handed over to get_sw is properly populated with data. However, since msgb_apdu_de() is just adding an offset, which cannot be 0 to ->l2h the returned value also can never be NULL. This means that we cannot use msgb_apdu_de() to detect if resp contains a nullpointer. Lets check if ->l2h is not NULL instead. This will make sure that ->l2h is populated. Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Related: OS#5560 --- M src/sim/reader.c 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/sim/reader.c b/src/sim/reader.c index b41b730..982b2ee 100644 --- a/src/sim/reader.c +++ b/src/sim/reader.c @@ -40,7 +40,7 @@ { int ret; - if (!msgb_apdu_de(resp) || msgb_apdu_le(resp) < 2) + if (!resp->l2h || msgb_apdu_le(resp) < 2) return -EIO; ret = msgb_get_u16(resp); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Gerrit-Change-Number: 28180 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: reader: more meaningful null pointer check in get_sw

by laforge

Attention is currently required from: neels, daniel, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28180 ) Change subject: reader: more meaningful null pointer check in get_sw ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Gerrit-Change-Number: 28180 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:34:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: separate gsm0503_tch_a[fh]s_decode_inband()

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28177 ) Change subject: coding: separate gsm0503_tch_a[fh]s_decode_inband() ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0106de7a7f87517006e323299b2dc08457d1c6cf Gerrit-Change-Number: 28177 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:33:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: add gsm0503_detect_a[fh]s_dtx_frame2()

by laforge

Attention is currently required from: fixeria, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28176 ) Change subject: coding: add gsm0503_detect_a[fh]s_dtx_frame2() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcac395f800bb64150c97fcdaca3523ecfc5fcee Gerrit-Change-Number: 28176 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:33:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: do not reset codec ID on receipt of DTX frames

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28175 ) Change subject: coding: do not reset codec ID on receipt of DTX frames ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic4edbb8ab873fe0bdd69a8710803628bc4f447d0 Gerrit-Change-Number: 28175 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:32:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%)

by laforge

Attention is currently required from: osmith, fixeria, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28166 ) Change subject: coding: fix decoding of AHS_SID_UPDATE frames (BER ~50%) ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28166 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I8686d895e96fa0e606c1898b6574cc80a8f46983 Gerrit-Change-Number: 28166 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(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-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:31:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... stats: new trackers for lchan life duration (v2) This patch adds two stats which track cummulative lchan lifetime by type TCH and SDCCH. These new counters will accomplish two things: 1) Provide a glanceable way to see if lchan durations look healthy. When examining a site, short-lived (<5s) and long-lived (>30s) TCH lchans are difficult to tell apart. If we only see short-lived TCH lchans, there is most likely an RF or signaling problem to investigate. This new counter will expose channel ages in the VTY output 2) Provide a more accurate count for Erlangs per site. Currently, we are basing Erlangs on active TCH channel counts per stats period. This method skews high very quickly. Each active TCH in that period translates into the full 10s of activity. This counter should improve accuracy by two orders of magnitude. Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 --- M include/osmocom/bsc/bts.h M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bsc_init.c M src/osmo-bsc/bts.c M src/osmo-bsc/bts_trx_vty.c M src/osmo-bsc/bts_vty.c M src/osmo-bsc/gsm_data.c M src/osmo-bsc/lchan_fsm.c 8 files changed, 140 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h index 58ea39c..5a67791 100644 --- a/include/osmocom/bsc/bts.h +++ b/include/osmocom/bsc/bts.h @@ -60,6 +60,8 @@ BTS_CTR_CHAN_ACT_SDCCH, BTS_CTR_CHAN_ACT_TCH, BTS_CTR_CHAN_ACT_NACK, + BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL, + BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL, BTS_CTR_RSL_UNKNOWN, BTS_CTR_RSL_IPA_NACK, BTS_CTR_RSL_DELETE_IND, @@ -757,6 +759,9 @@ unsigned long long bts_uptime(const struct gsm_bts *bts); +#define BTS_STORE_LCHAN_DURATIONS_INTERVAL 1 /* in seconds */ +void bts_store_lchan_durations(struct gsm_bts *bts); + char *get_model_oml_status(const struct gsm_bts *bts); /* reset the state of all MO in the BTS */ void gsm_bts_mo_reset(struct gsm_bts *bts); diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index 6df7c61..6abe943 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -889,6 +889,9 @@ uint8_t interf_band; /* MS power control state */ struct lchan_power_ctrl_state ms_power_ctrl; + /* Timestamps and markers to track active state duration. */ + struct timespec active_start; + struct timespec active_stored; }; /* One Timeslot in a TRX */ @@ -1147,6 +1150,7 @@ char *gsm_ts_name(const struct gsm_bts_trx_ts *ts); char *gsm_ts_and_pchan_name(const struct gsm_bts_trx_ts *ts); void lchan_update_name(struct gsm_lchan *lchan); +uint64_t gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan); static inline char *gsm_lchan_name(const struct gsm_lchan *lchan) { @@ -1278,6 +1282,9 @@ /* Timer to write each BTS's uptime counter state to the stats system. */ struct osmo_timer_list bts_store_uptime_timer; + /* Timer to write each BTS's set of lchan duration counters' state to the stats system. */ + struct osmo_timer_list bts_store_lchan_durations_timer; + struct { /* Single MGCP client configuration under msc node (also required for * MGCP proxy when sccp-lite is used) */ diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c index 0412f6b..650a76b 100644 --- a/src/osmo-bsc/bsc_init.c +++ b/src/osmo-bsc/bsc_init.c @@ -88,6 +88,18 @@ osmo_timer_schedule(&net->bts_store_uptime_timer, BTS_STORE_UPTIME_INTERVAL, 0); } +static void bsc_store_bts_lchan_durations(void *data) +{ + struct gsm_network *net = data; + struct gsm_bts *bts; + + llist_for_each_entry(bts, &net->bts_list, list) + bts_store_lchan_durations(bts); + + /* Keep this timer ticking. */ + osmo_timer_schedule(&net->bts_store_lchan_durations_timer, BTS_STORE_LCHAN_DURATIONS_INTERVAL, 0); +} + static struct gsm_network *bsc_network_init(void *ctx) { struct gsm_network *net = gsm_network_init(ctx); @@ -180,6 +192,10 @@ osmo_timer_setup(&net->bts_store_uptime_timer, bsc_store_bts_uptime, net); osmo_timer_schedule(&net->bts_store_uptime_timer, BTS_STORE_UPTIME_INTERVAL, 0); + /* Init lchan duration tracking timer. */ + osmo_timer_setup(&net->bts_store_lchan_durations_timer, bsc_store_bts_lchan_durations, net); + osmo_timer_schedule(&net->bts_store_lchan_durations_timer, BTS_STORE_LCHAN_DURATIONS_INTERVAL, 0); + net->cbc->net = net; net->cbc->mode = BSC_CBC_LINK_MODE_DISABLED; net->cbc->server.local_addr = bsc_cbc_default_server_local_addr; diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c index c04a59e..ad46f54 100644 --- a/src/osmo-bsc/bts.c +++ b/src/osmo-bsc/bts.c @@ -741,6 +741,61 @@ osmo_stat_item_set(osmo_stat_item_group_get_item(bts->bts_statg, BTS_STAT_UPTIME_SECONDS), bts_uptime(bts)); } +void bts_store_lchan_durations(struct gsm_bts *bts) +{ + struct gsm_bts_trx *trx; + int i, j; + struct timespec now, elapsed; + uint64_t elapsed_ms; + uint64_t elapsed_tch_ms = 0; + uint64_t elapsed_sdcch_ms = 0; + + /* Ignore BTS that are not in operation. */ + if (!trx_is_usable(bts->c0)) + return; + + /* Grab storage time to be used for all lchans. */ + osmo_clock_gettime(CLOCK_MONOTONIC, &now); + + /* Iterate over all lchans. */ + llist_for_each_entry(trx, &bts->trx_list, list) { + for (i = 0; i < ARRAY_SIZE(trx->ts); i++) { + struct gsm_bts_trx_ts *ts = &trx->ts[i]; + for (j = 0; j < ARRAY_SIZE(ts->lchan); j++) { + struct gsm_lchan *lchan = &ts->lchan[j]; + + /* Ignore lchans whose activation timestamps are not yet set. */ + if (lchan->active_stored.tv_sec == 0 && lchan->active_stored.tv_nsec == 0) + continue; + + /* Calculate elapsed time since last storage. */ + timespecsub(&now, &lchan->active_stored, &elapsed); + elapsed_ms = elapsed.tv_sec * 1000 + elapsed.tv_nsec / 1000000; + + /* Assign elapsed time to appropriate bucket. */ + switch (lchan->type) { + case GSM_LCHAN_TCH_H: + case GSM_LCHAN_TCH_F: + elapsed_tch_ms += elapsed_ms; + break; + case GSM_LCHAN_SDCCH: + elapsed_sdcch_ms += elapsed_ms; + break; + default: + continue; + } + + /* Update storage time. */ + lchan->active_stored = now; + } + } + } + + /* Export to rate counters. */ + rate_ctr_add(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL), elapsed_tch_ms); + rate_ctr_add(rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL), elapsed_sdcch_ms); +} + unsigned long long bts_uptime(const struct gsm_bts *bts) { struct timespec tp; @@ -1099,6 +1154,12 @@ [BTS_CTR_CHAN_ACT_NACK] = \ { "chan_act:nack", "Number of Channel Activations that the BTS NACKed" }, + [BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL] = \ + { "chan_tch:active_milliseconds:total", + "Cumulative number of milliseconds of TCH channel activity" }, + [BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL] = \ + { "chan_sdcch:active_milliseconds:total", + "Cumulative number of milliseconds of SDCCH channel activity" }, [BTS_CTR_RSL_UNKNOWN] = \ { "rsl:unknown", "Number of unknown/unsupported RSL messages received from BTS" }, diff --git a/src/osmo-bsc/bts_trx_vty.c b/src/osmo-bsc/bts_trx_vty.c index a3d6033..9cf128e 100644 --- a/src/osmo-bsc/bts_trx_vty.c +++ b/src/osmo-bsc/bts_trx_vty.c @@ -569,6 +569,13 @@ vty_out(vty, "BTS %u, TRX %u, Timeslot %u, Lchan %u: Type %s%s", lchan->ts->trx->bts->nr, lchan->ts->trx->nr, lchan->ts->nr, lchan->nr, gsm_lchant_name(lchan->type), VTY_NEWLINE); + + if (lchan->activate.concluded) { + vty_out(vty, " Active for: %s seconds%s", + osmo_int_to_float_str_c(OTC_SELECT, gsm_lchan_active_duration_ms(lchan), 3), + VTY_NEWLINE); + } + vty_out_dyn_ts_details(vty, lchan->ts); vty_out(vty, " Connection: %u, State: %s%s%s%s", lchan->conn ? 1: 0, lchan_state_name(lchan), diff --git a/src/osmo-bsc/bts_vty.c b/src/osmo-bsc/bts_vty.c index 4e60cd8..ba4215a 100644 --- a/src/osmo-bsc/bts_vty.c +++ b/src/osmo-bsc/bts_vty.c @@ -3677,6 +3677,8 @@ struct gsm_bts_trx *trx; int ts_hopping_total; int ts_non_hopping_total; + const struct rate_ctr *activations_tch; + const struct rate_ctr *activations_sdcch; vty_out(vty, "BTS %u is of %s type in band %s, has CI %u LAC %u, " "BSIC %u (NCC=%u, BCC=%u) and %u TRX%s", @@ -3851,6 +3853,29 @@ rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_TOTAL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHREQ_NO_CHANNEL)->current, VTY_NEWLINE); + + vty_out(vty, " Channel Activations :%s", VTY_NEWLINE); + activations_tch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_TCH); + vty_out(vty, " TCH %"PRIu64"", activations_tch->current); + if (activations_tch->intv[RATE_CTR_INTV_HOUR].rate > 0) { + const struct rate_ctr *active_time_tch_ms = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_TCH_ACTIVE_MILLISECONDS_TOTAL); + vty_out(vty, " (avg lifespan %s seconds in last hour)", + osmo_int_to_float_str_c(OTC_SELECT, + active_time_tch_ms->intv[RATE_CTR_INTV_HOUR].rate + / activations_tch->intv[RATE_CTR_INTV_HOUR].rate, 3)); + } + vty_out(vty, "%s", VTY_NEWLINE); + activations_sdcch = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_ACT_SDCCH); + vty_out(vty, " SDCCH %"PRIu64"", activations_sdcch->current); + if (activations_sdcch->intv[RATE_CTR_INTV_HOUR].rate > 0) { + const struct rate_ctr *active_time_sdcch_ms = rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_SDCCH_ACTIVE_MILLISECONDS_TOTAL); + vty_out(vty, " (avg lifespan %s seconds in last hour)", + osmo_int_to_float_str_c(OTC_SELECT, + active_time_sdcch_ms->intv[RATE_CTR_INTV_HOUR].rate + / activations_sdcch->intv[RATE_CTR_INTV_HOUR].rate, 3)); + } + vty_out(vty, "%s", VTY_NEWLINE); + vty_out(vty, " Channel Failures : %"PRIu64" rf_failures, %"PRIu64" rll failures%s", rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RF_FAIL)->current, rate_ctr_group_get_ctr(bts->bts_ctrs, BTS_CTR_CHAN_RLL_ERR)->current, diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c index 22be92d..64c348f 100644 --- a/src/osmo-bsc/gsm_data.c +++ b/src/osmo-bsc/gsm_data.c @@ -342,6 +342,21 @@ lchan->nr - (lchan->vamos.is_secondary ? ts->max_primary_lchans : 0)); } +/* If the lchan is currently active, return the duration since activation in milliseconds. + * Otherwise return 0. */ +uint64_t gsm_lchan_active_duration_ms(const struct gsm_lchan *lchan) +{ + struct timespec now, elapsed; + + if (lchan->active_start.tv_sec == 0 && lchan->active_start.tv_nsec == 0) + return 0; + + osmo_clock_gettime(CLOCK_MONOTONIC, &now); + timespecsub(&now, &lchan->active_start, &elapsed); + + return elapsed.tv_sec * 1000 + elapsed.tv_nsec / 1000000; +} + /* obtain the MO structure for a given object instance */ static inline struct gsm_abis_mo * gsm_objclass2mo(struct gsm_bts *bts, uint8_t obj_class, diff --git a/src/osmo-bsc/lchan_fsm.c b/src/osmo-bsc/lchan_fsm.c index 5df6c57..1c85ff3 100644 --- a/src/osmo-bsc/lchan_fsm.c +++ b/src/osmo-bsc/lchan_fsm.c @@ -204,6 +204,10 @@ return; lchan->activate.concluded = true; + /* Set active state timekeeping markers. */ + osmo_clock_gettime(CLOCK_MONOTONIC, &lchan->active_start); + lchan->active_stored = lchan->active_start; + switch (lchan->activate.info.activ_for) { case ACTIVATE_FOR_MS_CHANNEL_REQUEST: /* No signalling to do here, MS is free to use the channel, and should go on to connect -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder 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

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by laforge

Attention is currently required from: iedemam, neels. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 4: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder 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: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:29:58 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by laforge

Attention is currently required from: neels, pespin, fixeria, daniel, dexter. laforge 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+1 -- 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(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 13:29:03 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by laforge

Attention is currently required from: neels, pespin, fixeria, daniel, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28182 ) Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 3 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-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(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 13:28:34 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: pySim-shell: more generic export options

by laforge

Attention is currently required from: pespin, daniel, Christian Amsüss, dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28159 ) Change subject: pySim-shell: more generic export options ...................................................................... Patch Set 1: Code-Review-1 (1 comment) Patchset: PS1: ok, please rework with **kwargs, marking as -1 until then. -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Ie860eec918e7cdb01651642f4bc2474c9fb1924f Gerrit-Change-Number: 28159 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: Christian Amsüss <chrysn(a)fsfe.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:22:53 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in pysim[master]: pySim-shell: extend walk() so that we can also have action of ADF or DF

by laforge

Attention is currently required from: dexter. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/28160 ) Change subject: pySim-shell: extend walk() so that we can also have action of ADF or DF ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/pysim/+/28160 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: Iabcd78552a14a2d3f8f31273dda7731e1f640cdb Gerrit-Change-Number: 28160 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:22:11 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by laforge

Attention is currently required from: pespin, fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28178 ) Change subject: ggsn/pgw: Fix Gy CCR Reporting-Reason expectancies ...................................................................... Patch Set 1: Code-Review+2 -- 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: 1 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 13:20:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

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 1: Code-Review+1 (2 comments) File ggsn_tests/GGSN_Tests.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179/comment/7859f4e9_c9fa… PS1, Line 144: . missing space https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179/comment/815c3d7a_0c8e… PS1, Line 2443: 10 seconds looks like it's 8 seconds -- 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: 1 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 12:48:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28178 ) Change subject: ggsn/pgw: Fix Gy CCR Reporting-Reason expectancies ...................................................................... Patch Set 1: Code-Review+1 -- 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: 1 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 12:43:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by osmith

Attention is currently required from: neels, pespin, fixeria, daniel, dexter. osmith 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+1 -- 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(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 12:38:54 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by osmith

Attention is currently required from: neels, pespin, fixeria, daniel, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28182 ) Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... Patch Set 3: Code-Review+1 (1 comment) File src/gsm/iuup.c: https://gerrit.osmocom.org/c/libosmocore/+/28182/comment/c158722d_b11f9d00 PS3, Line 348: msgb_free(msg); > the other code path does not free msg at the end. […] nvm, the msgb is created in osmo_iuup_tnl_prim_alloc so it makes sense. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 3 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(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 12:32:59 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by osmith

Attention is currently required from: neels, pespin, fixeria, daniel, dexter. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28182 ) Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... Patch Set 3: (2 comments) Patchset: PS3: not sure about the msgb_free, rest looks good! File src/gsm/iuup.c: https://gerrit.osmocom.org/c/libosmocore/+/28182/comment/a1c0f113_d633749f PS3, Line 348: msgb_free(msg); the other code path does not free msg at the end. should we really do it here? -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 3 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: pespin <pespin(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 12:28:30 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by iedemam

Attention is currently required from: neels. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: > I don't see any stats reporting in this patch anymore. This is only about VTY output? > The commit log says "stats". The function bts_store_lchan_durations() stores duration values in the stats system after summing across all lchans. I'm already using these values in production and comparing to our previous approach. They are tracking well. > IMHO it would be better to fix the performance problem in osmo_time_cc. > The way this patch avoids performance issues is to reduce the timer callback to 1/s, No, the biggest improvement is only using one timer per BSC instead of one timer per lchan. > Of course we can reconfigure osmo_time_cc to trigger timers only once per second. > It may be necessary to separate the granularity from the update timer period, > then we can get milliseconds precision while updating that value less often. > > Another fix is to have only one single timer callback that updates all active > osmo_time_cc. Like that we can have active lchan tracking in millisecond precision > for *any* number of lchans with only a single timer in select() for all of them. > This would reduce the select() load by a factor that is the number of active lchans, > in production environments this is more than factor 10 (as this patch does). I think we're just turning things inside out at this point then. Why add any timer logic at all to each lchan when they will all be externally controlled and triggered? The only thing each lchan needs to know about itself is a couple of timestamps. > osmo_time_cc made problems because it is fairly new code that tries to solve a > pretty complex problem in a generic way, and I built some problems into it. > IMHO it is worth it to make that work, so that iedemam's patch will perform well. If you were free to implement all of the above suggestions, I might vote this way as well. However, I don't think you have much free time on your hands given the delay in each response. This is not a criticism, just being practical in solving the problem at hand. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 12:02:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by neels

Attention is currently required from: iedemam. neels has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: I don't see any stats reporting in this patch anymore. This is only about VTY output? The commit log says "stats". IMHO it would be better to fix the performance problem in osmo_time_cc. The way this patch avoids performance issues is to reduce the timer callback to 1/s, the time_cc patch called timers 10/s * nr of active lchans, by granularity configuration. Of course we can reconfigure osmo_time_cc to trigger timers only once per second. It may be necessary to separate the granularity from the update timer period, then we can get milliseconds precision while updating that value less often. Another fix is to have only one single timer callback that updates all active osmo_time_cc. Like that we can have active lchan tracking in millisecond precision for *any* number of lchans with only a single timer in select() for all of them. This would reduce the select() load by a factor that is the number of active lchans, in production environments this is more than factor 10 (as this patch does). osmo_time_cc made problems because it is fairly new code that tries to solve a pretty complex problem in a generic way, and I built some problems into it. IMHO it is worth it to make that work, so that iedemam's patch will perform well. On the other hand I feel like i have caused substantial work with my review on this topic, and i am ok with an implementation that goes in the wrong direction from my point of view, if it does the right thing in everyone else's opinion. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Comment-Date: Wed, 25 May 2022 11:44:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by pespin

Attention is currently required from: osmith, neels, fixeria, daniel, dexter. Hello osmith, Jenkins Builder, neels, fixeria, daniel, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-mgw/+/28183 to look at the new patch set (#2). 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/28183/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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(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-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by pespin

Attention is currently required from: osmith, neels, fixeria, daniel, dexter. Hello osmith, Jenkins Builder, neels, fixeria, daniel, dexter, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/28182 to look at the new patch set (#3). Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... iuup: Rework API to support RFCI IDs != RFCI index The initially merged IuUP API and implementation 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 breaks API and ABI compatibility with older versions of libosmogsm, but not with any previous release of libosmocore since the API is only available in master so far (it was added in 9fe1f9fb0b3197cdecaa55017d3afd7355e59c36). Similary, it's only user (osmo-mgw) only uses the API in master, so there's no API breakage with older releases. Related: SYS#5969 Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 --- M TODO-RELEASE M include/osmocom/gsm/iuup.h M src/gsm/iuup.c M tests/iuup/iuup_test.c 4 files changed, 76 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/28182/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 3 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: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(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-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by osmith

Attention is currently required from: iedemam, neels. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: iedemam <michael(a)kapsulate.com> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 10:40:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: separate gsm0503_tch_a[fh]s_decode_inband()

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28177 ) Change subject: coding: separate gsm0503_tch_a[fh]s_decode_inband() ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28177 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0106de7a7f87517006e323299b2dc08457d1c6cf Gerrit-Change-Number: 28177 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 10:17:09 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: add gsm0503_detect_a[fh]s_dtx_frame2()

by osmith

Attention is currently required from: fixeria, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28176 ) Change subject: coding: add gsm0503_detect_a[fh]s_dtx_frame2() ...................................................................... Patch Set 2: Code-Review+1 (1 comment) File src/coding/gsm0503_amr_dtx.c: https://gerrit.osmocom.org/c/libosmocore/+/28176/comment/36fd18d1_572775f2 PS2, Line 279: * \param[in] sbits input soft-bits (456 bit). new parameter mode_id is not documented -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28176 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibcac395f800bb64150c97fcdaca3523ecfc5fcee Gerrit-Change-Number: 28176 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 10:10:38 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: coding: do not reset codec ID on receipt of DTX frames

by osmith

Attention is currently required from: fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28175 ) Change subject: coding: do not reset codec ID on receipt of DTX frames ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28175 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ic4edbb8ab873fe0bdd69a8710803628bc4f447d0 Gerrit-Change-Number: 28175 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 09:39:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni

by osmith

Attention is currently required from: laforge, pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 ) Change subject: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni ...................................................................... Patch Set 2: Code-Review+1 (1 comment) Patchset: PS2: I've read through the conversation... > This looks like a similar issue to what I encountered before. If so the race is most likely that the f_IPA_send and the second f_vty_config2 have arrived in the same main loop iteration in the stp and the config change is being handled before the data is forwarded. This sounds plausible to me, and that's how it is is implemented now. Therefore +1. -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 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: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 Gerrit-Change-Number: 28131 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-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 25 May 2022 09:34:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( 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 breaks API and ABI compatibility with older versions of libosmogsm. 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-mgw refs/changes/83/28183/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index c5a3b36..5aef211 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 API breakage in IuUP (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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: WIP: workaround gcc 12.1.0 error

by pespin

pespin has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28181 ) Change subject: WIP: workaround gcc 12.1.0 error ...................................................................... Abandoned -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b1650280965ba4f7722d8882f630b5fb75e6029 Gerrit-Change-Number: 28181 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: abandon

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: iuup: Rework API to support RFCI IDs != RFCI index

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28182 ) Change subject: iuup: Rework API to support RFCI IDs != RFCI index ...................................................................... iuup: Rework API to support RFCI IDs != RFCI index The initially merged IuUP API and implementation 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 breaks API and ABI compatibility with older versions of libosmogsm. This mainly affects its only known user: osmo-mgw. Related: SYS#5969 Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 --- M TODO-RELEASE M include/osmocom/gsm/iuup.h M src/gsm/iuup.c M tests/iuup/iuup_test.c 4 files changed, 76 insertions(+), 48 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/82/28182/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index 0ae28c0..a02a346 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -11,3 +11,4 @@ libosmogsm add struct member Add codec_list_bss_supported to gsm0808_handover_request_ack (more_items flag ensures ABI compat) libosmogb ABI BREAKAGE Add reset_ack_notification function pointer to struct bssgp_bvc_fsm_ops libosmogsm add API Add rach_tx_integer_raw2val() in gsm_utils.h +libosmogsm API BREAKAGE iuup.h osmo_iuup_rnl_config and osmo_iuup_rnl_status (affects osmo-mgw) diff --git a/include/osmocom/gsm/iuup.h b/include/osmocom/gsm/iuup.h index 1ea2b2e..db3d5e0 100644 --- a/include/osmocom/gsm/iuup.h +++ b/include/osmocom/gsm/iuup.h @@ -42,6 +42,14 @@ uint32_t t_ms; /* time in ms */ uint32_t n_max; /* max number of repetitions */ }; +struct osmo_iuup_rfci { + uint8_t used:1, + spare1:1, + id:6; + uint8_t spare2:4, + IPTI:4; /* values range 0-15, 4 bits */; + uint16_t subflow_sizes[IUUP_MAX_SUBFLOWS]; +}; struct osmo_iuup_rnl_config { /* transparent (true) or SMpSDU (false): */ bool transparent; @@ -56,9 +64,8 @@ uint16_t supported_versions_mask; uint8_t num_rfci; uint8_t num_subflows; - uint16_t subflow_sizes[IUUP_MAX_RFCIS][IUUP_MAX_SUBFLOWS]; bool IPTIs_present; - uint8_t IPTIs[IUUP_MAX_RFCIS]; /* values range 0-15, 4 bits */ + struct osmo_iuup_rfci rfci[IUUP_MAX_RFCIS]; /* TODO: Indication of delivery of erroneous SDUs*/ struct osmo_iuup_rnl_config_timer t_init; @@ -84,9 +91,8 @@ uint8_t data_pdu_type; uint8_t num_rfci; uint8_t num_subflows; - uint16_t subflow_sizes[IUUP_MAX_RFCIS][IUUP_MAX_SUBFLOWS]; bool IPTIs_present; - uint8_t IPTIs[IUUP_MAX_RFCIS]; /* values range 0-15, 4 bits */ + struct osmo_iuup_rfci rfci[IUUP_MAX_RFCIS]; } initialization; struct { } rate_control; diff --git a/src/gsm/iuup.c b/src/gsm/iuup.c index eb595ce..edcea3b 100644 --- a/src/gsm/iuup.c +++ b/src/gsm/iuup.c @@ -286,13 +286,10 @@ struct iuup_ctrl_init_rfci_hdr *ihdr_rfci; struct iuup_ctrl_init_tail *itail; unsigned int i, j; - uint8_t num_subflows, num_rfci; uint16_t payload_crc; + uint8_t rfci_cnt; struct msgb *msg; - num_subflows = iui->config.num_subflows; - num_rfci = iui->config.num_rfci; - itp = osmo_iuup_tnl_prim_alloc(iui, OSMO_IUUP_TNL_UNITDATA, PRIM_OP_REQUEST, IUUP_MSGB_SIZE); msg = itp->oph.msg; @@ -307,42 +304,68 @@ ihdr = (struct iuup_ctrl_init_hdr *)msgb_put(msg, sizeof(*ihdr)); ihdr->chain_ind = 0; /* this frame is the last frame for the procedure. TODO: support several */ - ihdr->num_subflows_per_rfci = num_subflows; + ihdr->num_subflows_per_rfci = iui->config.num_subflows; ihdr->ti = iui->config.IPTIs_present ? 1 : 0; ihdr->spare = 0; /* RFCI + subflow size part: */ - for (i = 0; i < num_rfci; i++) { - bool last = (i+1 == num_rfci); - uint8_t len_size = 1; - for (j = 0; j < num_subflows; j++) { - if (iui->config.subflow_sizes[i][j] > UINT8_MAX) + rfci_cnt = 0; + for (i = 0; i < ARRAY_SIZE(iui->config.rfci); i++) { + bool last; + uint8_t len_size; + struct osmo_iuup_rfci *rfci = &iui->config.rfci[i]; + if (!rfci->used) + continue; + rfci_cnt++; + last = (rfci_cnt == iui->config.num_rfci); + + len_size = 1; + for (j = 0; j < iui->config.num_subflows; j++) { + if (rfci->subflow_sizes[j] > UINT8_MAX) len_size = 2; } - ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)msgb_put(msg, sizeof(*ihdr_rfci) + len_size * num_subflows); - ihdr_rfci->rfci = i; + + ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)msgb_put(msg, sizeof(*ihdr_rfci) + len_size * iui->config.num_subflows); + ihdr_rfci->rfci = rfci->id; ihdr_rfci->li = len_size - 1; ihdr_rfci->lri = last; if (len_size == 2) { uint16_t *buf = (uint16_t *)&ihdr_rfci->subflow_length[0]; - for (j = 0; j < num_subflows; j++) - osmo_store16be(iui->config.subflow_sizes[i][j], buf++); + for (j = 0; j < iui->config.num_subflows; j++) + osmo_store16be(rfci->subflow_sizes[j], buf++); } else { - for (j = 0; j < num_subflows; j++) - ihdr_rfci->subflow_length[j] = iui->config.subflow_sizes[i][j]; + for (j = 0; j < iui->config.num_subflows; j++) + ihdr_rfci->subflow_length[j] = rfci->subflow_sizes[j]; } + /* early loop termination: */ + if (last) + break; + } + /* Sanity check: */ + if (rfci_cnt != iui->config.num_rfci) { + LOGP(DLIUUP, LOGL_ERROR, "rfci_cnt %u != num_rfci %u\n", + rfci_cnt, iui->config.num_rfci); + msgb_free(msg); + return NULL; } if (iui->config.IPTIs_present) { - uint8_t num_bytes = (num_rfci + 1) / 2; + uint8_t num_bytes = (iui->config.num_rfci + 1) / 2; uint8_t *buf = msgb_put(msg, num_bytes); - for (i = 0; i < num_bytes - 1; i++) - buf[i] = iui->config.IPTIs[i*2] << 4 | - (iui->config.IPTIs[i*2 + 1] & 0x0f); - buf[i] = iui->config.IPTIs[i*2] << 4; - if (!(num_rfci & 0x01)) /* is even: */ - buf[i] |= (iui->config.IPTIs[i*2 + 1] & 0x0f); - + rfci_cnt = 0; + for (i = 0; i < ARRAY_SIZE(iui->config.rfci); i++) { + struct osmo_iuup_rfci *rfci = &iui->config.rfci[i]; + if (!rfci->used) + continue; + if (!(rfci_cnt & 0x01)) /* is even: */ + buf[rfci_cnt / 2] = (((uint8_t)rfci->IPTI) << 4); + else + buf[rfci_cnt / 2] |= (rfci->IPTI & 0x0F); + rfci_cnt++; + /* early loop termination: */ + if (rfci_cnt == iui->config.num_rfci) + break; + } } itail = (struct iuup_ctrl_init_tail *)msgb_put(msg, sizeof(*itail)); @@ -368,12 +391,8 @@ irp->u.status.u.initialization.data_pdu_type = iui->config.data_pdu_type; irp->u.status.u.initialization.num_subflows = iui->config.num_subflows; irp->u.status.u.initialization.num_rfci = iui->config.num_rfci; - memcpy(irp->u.status.u.initialization.subflow_sizes, iui->config.subflow_sizes, - IUUP_MAX_RFCIS * IUUP_MAX_SUBFLOWS * sizeof(iui->config.subflow_sizes[0][0])); irp->u.status.u.initialization.IPTIs_present = iui->config.IPTIs_present; - if (iui->config.IPTIs_present) - memcpy(irp->u.status.u.initialization.IPTIs, iui->config.IPTIs, - IUUP_MAX_RFCIS * sizeof(iui->config.IPTIs[0])); + memcpy(irp->u.status.u.initialization.rfci, iui->config.rfci, sizeof(iui->config.rfci)); return irp; } @@ -530,24 +549,27 @@ ihdr_rfci = (struct iuup_ctrl_init_rfci_hdr *)ihdr->rfci_data; do { + struct osmo_iuup_rfci *rfci = &iui->config.rfci[num_rfci]; uint8_t l_size_bytes = ihdr_rfci->li + 1; is_last = ihdr_rfci->lri; - if (ihdr_rfci->rfci != num_rfci) { - LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Unexpected RFCI %u at position %u received\n", - ihdr_rfci->rfci, num_rfci); + if (num_rfci >= IUUP_MAX_RFCIS) { + LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Too many RFCIs received (%u)\n", + num_rfci); err_cause = IUUP_ERR_CAUSE_UNEXPECTED_RFCI; goto send_nack; } + rfci->used = 1; + rfci->id = ihdr_rfci->rfci; if (l_size_bytes == 2) { uint16_t *subflow_size = (uint16_t *)ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = osmo_load16be(subflow_size); + rfci->subflow_sizes[i] = osmo_load16be(subflow_size); subflow_size++; } } else { uint8_t *subflow_size = ihdr_rfci->subflow_length; for (i = 0; i < ihdr->num_subflows_per_rfci; i++) { - iui->config.subflow_sizes[ihdr_rfci->rfci][i] = *subflow_size; + rfci->subflow_sizes[i] = *subflow_size; subflow_size++; } } @@ -561,19 +583,18 @@ uint8_t num_bytes = (num_rfci + 1) / 2; iui->config.IPTIs_present = true; for (i = 0; i < num_bytes - 1; i++) { - iui->config.IPTIs[i*2] = *buf >> 4; - iui->config.IPTIs[i*2 + 1] = *buf & 0x0f; + iui->config.rfci[i*2].IPTI = *buf >> 4; + iui->config.rfci[i*2 + 1].IPTI = *buf & 0x0f; buf++; } - iui->config.IPTIs[i*2] = *buf >> 4; + iui->config.rfci[i*2].IPTI = *buf >> 4; if (!(num_rfci & 0x01)) /* is even: */ - iui->config.IPTIs[i*2 + 1] = *buf & 0x0f; + iui->config.rfci[i*2 + 1].IPTI = *buf & 0x0f; buf++; itail = (struct iuup_ctrl_init_tail *)buf; } else { itail = (struct iuup_ctrl_init_tail *)ihdr_rfci; } - if (itail->data_pdu_type > 1) { LOGPFSML(iui->fi, LOGL_NOTICE, "Initialization: Unexpected Data PDU Type %u received\n", itail->data_pdu_type); err_cause = IUUP_ERR_CAUSE_UNEXPECTED_VALUE; diff --git a/tests/iuup/iuup_test.c b/tests/iuup/iuup_test.c index a58481d..6e3d8ca 100644 --- a/tests/iuup/iuup_test.c +++ b/tests/iuup/iuup_test.c @@ -19,14 +19,14 @@ .supported_versions_mask = 0x0001, .num_rfci = 3, .num_subflows = 3, - .subflow_sizes = { - {81, 103, 60}, - {39, 0, 0}, - {0, 0, 0}, + .IPTIs_present = true, + .rfci = { + {.used = 1, .id = 0, .IPTI = 1, .subflow_sizes = {81, 103, 60} }, + {.used = 1, .id = 1, .IPTI = 7, .subflow_sizes = {39, 0, 0} }, + {.used = 1, .id = 2, .IPTI = 1, .subflow_sizes = {0, 0, 0} }, }, /* .delivery_err_sdu = All set to 0 (YES) by default, */ .IPTIs_present = true, - .IPTIs = {1, 7, 1}, .t_init = { .t_ms = IUUP_TIMER_INIT_T_DEFAULT, .n_max = IUUP_TIMER_INIT_N_DEFAULT }, .t_ta = { .t_ms = IUUP_TIMER_TA_T_DEFAULT, .n_max = IUUP_TIMER_TA_N_DEFAULT }, .t_rc = { .t_ms = IUUP_TIMER_RC_T_DEFAULT, .n_max = IUUP_TIMER_RC_N_DEFAULT }, -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28182 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ib21cee2e30bf83dff4e167f79541796007af9845 Gerrit-Change-Number: 28182 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: WIP: workaround gcc 12.1.0 error

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28181 ) Change subject: WIP: workaround gcc 12.1.0 error ...................................................................... WIP: workaround gcc 12.1.0 error Change-Id: I0b1650280965ba4f7722d8882f630b5fb75e6029 --- M src/sim/reader.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/81/28181/1 diff --git a/src/sim/reader.c b/src/sim/reader.c index b41b730..cceb7d9 100644 --- a/src/sim/reader.c +++ b/src/sim/reader.c @@ -40,7 +40,7 @@ { int ret; - if (!msgb_apdu_de(resp) || msgb_apdu_le(resp) < 2) + if (msgb_apdu_le(resp) < 2) return -EIO; ret = msgb_get_u16(resp); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28181 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0b1650280965ba4f7722d8882f630b5fb75e6029 Gerrit-Change-Number: 28181 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: reader: more meaningful null pointer check in get_sw

by fixeria

Attention is currently required from: neels, laforge, daniel, dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/28180 ) Change subject: reader: more meaningful null pointer check in get_sw ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Gerrit-Change-Number: 28180 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(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: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 May 2022 17:49:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

Change in libosmocore[master]: reader: more meaningful null pointer check in get_sw

by dexter

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/28180 ) Change subject: reader: more meaningful null pointer check in get_sw ...................................................................... reader: more meaningful null pointer check in get_sw At the moment msgb_apdu_de(resp) is used to check if the msgb that is handed over to get_sw is properly populated with data. However, since msgb_apdu_de() is just adding an offset, which cannot be 0 to ->l2h the returned value also can never be NULL. This means that we cannot use msgb_apdu_de() to detect if resp contains a nullpointer. Lets check if ->l2h is not NULL instead. This will make sure that ->l2h is populated. Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Related: OS#5560 --- M src/sim/reader.c 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/80/28180/1 diff --git a/src/sim/reader.c b/src/sim/reader.c index b41b730..982b2ee 100644 --- a/src/sim/reader.c +++ b/src/sim/reader.c @@ -40,7 +40,7 @@ { int ret; - if (!msgb_apdu_de(resp) || msgb_apdu_le(resp) < 2) + if (!resp->l2h || msgb_apdu_le(resp) < 2) return -EIO; ret = msgb_get_u16(resp); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/28180 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I32bc56c9264c01911a4f4b4f911b09e955205010 Gerrit-Change-Number: 28180 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

Change in osmo-ttcn3-hacks[master]: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni

by pespin

Attention is currently required from: laforge, pespin. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 to look at the new patch set (#2). Change subject: stp: Fix sporadic failure in TC_ipa_to_m3ua_ni ...................................................................... stp: Fix sporadic failure in TC_ipa_to_m3ua_ni It was spotted that from time to time the test set NI international instead of national. This is presumable due to a race condition between VTY and messages being received and forwarded. Let's delay resetting the VTY config after the message is recieved, to avoid the race conditions between them. Change-Id: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 --- M stp/STP_Tests.ttcn 1 file changed, 1 insertion(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/28131/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28131 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: I3ef08447d2e36b6948d3db4ec9d1459beebc9384 Gerrit-Change-Number: 28131 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-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 1 month

1
0
0 0

Change in osmo-bsc[master]: stats: new trackers for lchan life duration (v2)

by iedemam

Attention is currently required from: neels. iedemam has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/28165 ) Change subject: stats: new trackers for lchan life duration (v2) ...................................................................... Patch Set 4: (1 comment) Patchset: PS4: Patchset 4 has now been deployed. It is providing reliable statistics and not causing any more performance impact than the aforementioned global timers such as update_t3122_chan_load_timer and bsc_store_bts_uptime. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/28165 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ie3771233ecbd4bc24a24fb22c1064a18e7b8b2b0 Gerrit-Change-Number: 28165 Gerrit-PatchSet: 4 Gerrit-Owner: iedemam <michael(a)kapsulate.com> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Comment-Date: Tue, 24 May 2022 13:12:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 1 month

1
0
0 0

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

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/28179 ) 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/1 diff --git a/ggsn_tests/GGSN_Tests.ttcn b/ggsn_tests/GGSN_Tests.ttcn index 875a9d6..6443027 100644 --- a/ggsn_tests/GGSN_Tests.ttcn +++ b/ggsn_tests/GGSN_Tests.ttcn @@ -141,6 +141,7 @@ port DIAMETER_PT Gy_UNIT; port DIAMETEREM_PROC_PT Gy_PROC; var integer g_gy_validity_time := 0; /* In seconds. 0 => disabled, !0 => grant over CC-Time period */ + var integer g_gy_volume_threshold := 0; /* In octets.0 => disabled, !0 => request IUT to revalidate after N octets */ var PDU_DIAMETER g_rx_gy; /* Store last received Gy message */ } @@ -667,8 +668,13 @@ avp := f_DIAMETER_get_avp(g_rx_gy, c_AVP_Code_DCC_NONE_CC_Request_Number); req_num := valueof(avp.avp_data.avp_DCC_NONE_CC_Request_Number); if (g_gy_validity_time > 0) { - tx_dia := ts_DIA_Gy_CCA_ValidityTime(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, - req_type, req_num, g_gy_validity_time); + if (g_gy_volume_threshold > 0) { + tx_dia := ts_DIA_Gy_CCA_ValidityTimeVolumeThreshold(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, + req_type, req_num, g_gy_validity_time, g_gy_volume_threshold); + } else { + tx_dia := ts_DIA_Gy_CCA_ValidityTime(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, + req_type, req_num, g_gy_validity_time); + } } else { tx_dia := ts_DIA_Gy_CCA(g_rx_gy.hop_by_hop_id, g_rx_gy.end_to_end_id, sess_id, req_type, req_num); @@ -812,14 +818,14 @@ const octetstring c_neigh_solicit:= '6000000000203afffe800000000000000000000000000002ff0200000000000000000001ff00000287009f9600000000fe80000000000000000000000000000201010288b51f2559'O; /* template for sending an ICMPv4 echo request */ - template PDU_ICMP ts_ICMPv4_ERQ := { + template PDU_ICMP ts_ICMPv4_ERQ(octetstring data := ''O) := { echo := { type_field := 8, code := 0, checksum := '0000'O, identifier := '0345'O, sequence_number := '0001'O, - data := ''O + data := data } } @@ -1112,8 +1118,8 @@ } /* Send an ICMPv4 echo msg through GTP given pdp ctx, and ip src and dst addr */ - function f_gen_icmpv4_echo(OCT4 saddr, OCT4 daddr) return octetstring { - var octetstring tmp := f_enc_PDU_ICMP(valueof(ts_ICMPv4_ERQ)); + function f_gen_icmpv4_echo(OCT4 saddr, OCT4 daddr, octetstring pl := ''O) return octetstring { + var octetstring tmp := f_enc_PDU_ICMP(valueof(ts_ICMPv4_ERQ(pl))); var IPv4_packet ip4 := valueof(ts_IP4(saddr, daddr, 1, 50, tmp)); var octetstring data := f_IPv4_enc(ip4); var OCT2 cksum := f_IPv4_checksum(data); @@ -2429,6 +2435,60 @@ f_shutdown_helper(); } + /* Test Volume-Quota-Thresold AVP triggers request before Validity-Time */ + testcase TC_gy_charging_volume_quota_threshold() runs on GT_CT { + var default d; + timer Tout; + g_gy_volume_threshold := 1000; /* Will make a trigger when we send bigger payload below */ + g_gy_validity_time := 8; /* Grant access for 10 seconds, needs to be re-validated afterwards */ + f_init(); + var float tout_sec := int2float(g_gy_validity_time) / 2.0; + var PdpContext ctx := valueof(t_DefinePDP(f_rnd_imsi('26242'H), "1234", c_ApnInternet, valueof(t_EuaIPv4Dyn))); + ctx.pco_req := valueof(ts_PCO_IPv4_DNS_CONT); + f_pdp_ctx_act(ctx); + + var OCT4 dns1_addr := f_PCO_extract_proto(ctx.pco_neg, '000d'O); + + T_default.start(40.0); + d := activate(pingpong()); + + /* Send some UL traffic: */ + var octetstring payload := f_rnd_octstring(1200); + var OCT4 saddr := ctx.eua.endUserAddress.endUserAddressIPv4.ipv4_address; + f_send_gtpu(ctx, f_gen_icmpv4_echo(saddr, dns1_addr, payload)); + f_wait_icmp4_echo_reply(ctx); + + /* ICMP Req generates one report: */ + Tout.start(tout_sec); + alt { + [] as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); + [] Tout.timeout { + Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, + "TImeout waiting for Gy UPDATE triggered by Volume-Quota-Threshold"); + } + } + f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..6), 0, (1200..1400)); + + /* ICMP Resp (echo back) generates one report: */ + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); + f_validate_gy_cc_report(g_rx_gy, THRESHOLD, (0..1), (1200..1400), 0); + + /* Second update: 0 ul/dl pkt/octet should be reported, since nothing was sent */ + as_DIA_Gy_CCR(ctx, UPDATE_REQUEST); + f_validate_gy_cc_report(g_rx_gy, VALIDITY_TIME, (8..9), 0, 0); + + /* Let the CCA reach the GGSN */ + f_sleep(0.5); + deactivate(d); + T_default.stop; + + f_pdp_ctx_del(ctx, '1'B); + f_validate_gy_cc_report(g_rx_gy, FINAL, (0..2), 0, 0); + + + f_shutdown_helper(); + } + control { execute(TC_pdp4_act_deact()); execute(TC_pdp4_act_deact_ipcp()); @@ -2479,6 +2539,7 @@ /* open5gs specific tests: */ if (m_ggsn_impl == GGSN_IMPL_OPEN5GS) { execute(TC_gy_charging_cc_time()); + execute(TC_gy_charging_volume_quota_threshold()); } } } diff --git a/library/DIAMETER_Templates.ttcn b/library/DIAMETER_Templates.ttcn index 03fec7c..2bc9e77 100644 --- a/library/DIAMETER_Templates.ttcn +++ b/library/DIAMETER_Templates.ttcn @@ -1195,6 +1195,15 @@ } } +template (value) GenericAVP ts_AVP_3GPP_VolumeQuotaThreshold(uint32_t volume_quota_thresh_val) := { + avp := { + avp_header := ts_DIA_Hdr_3GPP(c_AVP_Code_DCA_3GPP_Volume_Quota_Threshold), + avp_data := { + avp_DCA_3GPP_Volume_Quota_Threshold := int2oct(volume_quota_thresh_val, 4) + } + } +} + template (present) GenericAVP tr_AVP_3GPP_CalledStationId(template (present) DNAS_NONE_Called_Station_Id id := ?) := { avp := { avp_header := tr_DIA_Hdr(c_AVP_Code_DNAS_NONE_Called_Station_Id), @@ -1541,6 +1550,36 @@ // supported features // origin }); +/* Same as ts_DIA_Gy_CCA_ValidityTime, but with extra AVP to grant access for limited amount of octets */ +template (value) PDU_DIAMETER +ts_DIA_Gy_CCA_ValidityTimeVolumeThreshold(template (value) UINT32 hbh_id, template (value) UINT32 ete_id, + template (value) octetstring sess_id, + template (value) DCC_NONE_CC_Request_Type req_type, + template (value) AVP_Unsigned32 req_num, + uint32_t validity_time, uint32_t volume_threhsold) +:= ts_DIAMETER(flags:='01000000'B, cmd_code:=Credit_Control, + app_id:=int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4), hbh_id:=hbh_id, ete_id:=ete_id, + avps := { + ts_AVP_SessionId(sess_id), + ts_AVP_ResultCode(DIAMETER_SUCCESS), + ts_AVP_OriginHost("ocs.localdomain"), + ts_AVP_OriginRealm("localdomain"), + ts_AVP_AuthAppId(int2oct(c_DIAMETER_CREDIT_CONTROL_AID, 4)), + ts_AVP_CcReqType(req_type), + ts_AVP_CcReqNum(req_num), + ts_AVP_Multiple_Services_Credit_Control({ + ts_AVP_Validity_Time(validity_time), + ts_AVP_Granted_Service_Unit({ + ts_AVP_CC_Total_Octets(volume_threhsold*100) + }), + ts_AVP_3GPP_VolumeQuotaThreshold(volume_threhsold) + }) + //, + // qos + // default eps bearer qos + // supported features + // origin + }); /* RFC 6733, section 5.5.1 "Device-Watchdog-Request" */ template (value) PDU_DIAMETER -- 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: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 1 month

1
0
0 0

2024

2023

2022

gerrit-log May 2022