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

Change in libosmo-netif[master]: amr: Add missing header stdbool.h

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30753 ) Change subject: amr: Add missing header stdbool.h ...................................................................... amr: Add missing header stdbool.h Change-Id: I84e447960c4912147d2f3a6170393370d354625b --- M include/osmocom/netif/amr.h 1 file changed, 1 insertion(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/53/30753/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 1cc4385..47f7f3d 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -2,6 +2,7 @@ #define _OSMO_AMR_H_ #include <stddef.h> +#include <stdbool.h> #include <stdint.h> #include <osmocom/core/endian.h> -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30753 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I84e447960c4912147d2f3a6170393370d354625b Gerrit-Change-Number: 30753 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30752 ) Change subject: amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN ...................................................................... amr.h: Fix AMR_FT_{GSM,TDMA,PDC}_EFR_SID_LEN Fixes: 678c7fc8fe4fd11e09ccd642ad60c10c365bd19a Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24 --- M include/osmocom/netif/amr.h 1 file changed, 13 insertions(+), 13 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/52/30752/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 0eb26e2..1cc4385 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -139,20 +139,20 @@ * * NOTE: These constants refer to the length of one AMR speech frame-block, * not counting CMR, TOC. */ -#define AMR_FT_0_LEN ((AMR_FT_0_LEN_BITS+7)/8) /* 4.75 */ -#define AMR_FT_1_LEN ((AMR_FT_1_LEN_BITS+7)/8) /* 5.15 */ -#define AMR_FT_2_LEN ((AMR_FT_2_LEN_BITS+7)/8) /* 5.90 */ -#define AMR_FT_3_LEN ((AMR_FT_3_LEN_BITS+7)/8) /* 6.70 */ -#define AMR_FT_4_LEN ((AMR_FT_4_LEN_BITS+7)/8) /* 7.40 */ -#define AMR_FT_5_LEN ((AMR_FT_5_LEN_BITS+7)/8) /* 7.95 */ -#define AMR_FT_6_LEN ((AMR_FT_6_LEN_BITS+7)/8) /* 10.2 */ -#define AMR_FT_7_LEN ((AMR_FT_7_LEN_BITS+7)/8) /* 12.2 */ -#define AMR_FT_SID_LEN ((AMR_FT_SID_LEN_BITS+7)/8) /* SID */ -#define AMR_FT_GSM_EFR_SID_LEN 43 /* GSM-EFR SID */ -#define AMR_FT_TDMA_EFR_SID_LEN 38 /* TDMA-EFR SID */ -#define AMR_FT_PDC_EFR_SID_LEN 37 /* PDC-EFR SID */ +#define AMR_FT_0_LEN ((AMR_FT_0_LEN_BITS+7)/8) /* 4.75 */ +#define AMR_FT_1_LEN ((AMR_FT_1_LEN_BITS+7)/8) /* 5.15 */ +#define AMR_FT_2_LEN ((AMR_FT_2_LEN_BITS+7)/8) /* 5.90 */ +#define AMR_FT_3_LEN ((AMR_FT_3_LEN_BITS+7)/8) /* 6.70 */ +#define AMR_FT_4_LEN ((AMR_FT_4_LEN_BITS+7)/8) /* 7.40 */ +#define AMR_FT_5_LEN ((AMR_FT_5_LEN_BITS+7)/8) /* 7.95 */ +#define AMR_FT_6_LEN ((AMR_FT_6_LEN_BITS+7)/8) /* 10.2 */ +#define AMR_FT_7_LEN ((AMR_FT_7_LEN_BITS+7)/8) /* 12.2 */ +#define AMR_FT_SID_LEN ((AMR_FT_SID_LEN_BITS+7)/8) /* SID */ +#define AMR_FT_GSM_EFR_SID_LEN ((AMR_FT_GSM_EFR_SID_LEN_BITS+7)/8) /* GSM-EFR SID */ +#define AMR_FT_TDMA_EFR_SID_LEN ((AMR_FT_TDMA_EFR_SID_LEN_BITS+7)/8) /* TDMA-EFR SID */ +#define AMR_FT_PDC_EFR_SID_LEN ((AMR_FT_PDC_EFR_SID_LEN_BITS+7)/8) /* PDC-EFR SID */ /* version 16.0.0 Release 16: 12-14 for future use */ -#define AMR_FT_NO_DATA_LEN 0 /* NO_DATA */ +#define AMR_FT_NO_DATA_LEN ((AMR_FT_NO_DATA_LEN_BITS+7)/8) /* NO_DATA */ int osmo_amr_ft_valid(uint8_t amr_ft); size_t osmo_amr_bytes(uint8_t amr_cmr); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30752 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I63c8082bec12bf81760330d1fc0b13de23ac6a24 Gerrit-Change-Number: 30752 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: amr: constify input buffer in osmo_amr_is_oa()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30754 ) Change subject: amr: constify input buffer in osmo_amr_is_oa() ...................................................................... amr: constify input buffer in osmo_amr_is_oa() Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e --- M include/osmocom/netif/amr.h M src/amr.c 2 files changed, 2 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/54/30754/1 diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index 47f7f3d..e8f08d4 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -159,7 +159,7 @@ size_t osmo_amr_bytes(uint8_t amr_cmr); size_t osmo_amr_bits(uint8_t amr_ft); -bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len); +bool osmo_amr_is_oa(const uint8_t *payload, unsigned int payload_len); int osmo_amr_oa_to_bwe(uint8_t *payload, unsigned int payload_len); int osmo_amr_bwe_to_oa(uint8_t *payload, unsigned int payload_len, unsigned int payload_maxlen); diff --git a/src/amr.c b/src/amr.c index 66f41c6..b648d54 100644 --- a/src/amr.c +++ b/src/amr.c @@ -113,7 +113,7 @@ * \param[inout] payload user provided memory containing the AMR payload. * \param[in] payload_len overall length of the AMR payload. * \returns true when the payload is octet aligned. */ -bool osmo_amr_is_oa(uint8_t *payload, unsigned int payload_len) +bool osmo_amr_is_oa(const uint8_t *payload, unsigned int payload_len) { /* NOTE: The distinction between octet-aligned and bandwith-efficient * mode normally relys on out of band methods that explicitly select -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30754 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I72ef6fc700f628ea158ea888a5f1e9dc8776ab7e Gerrit-Change-Number: 30754 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: amr: use struct bwe_hdr in osmo_amr_bwe_to_oa()

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30755 ) Change subject: amr: use struct bwe_hdr in osmo_amr_bwe_to_oa() ...................................................................... amr: use struct bwe_hdr in osmo_amr_bwe_to_oa() The header conversion is now much clearer. Take the chance to delay the memset(buf) after the checks. Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528 --- M src/amr.c 1 file changed, 15 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/55/30755/1 diff --git a/src/amr.c b/src/amr.c index b648d54..e4f0dd8 100644 --- a/src/amr.c +++ b/src/amr.c @@ -203,11 +203,14 @@ { uint8_t buf[256]; /* The header is only valid after shifting first two bytes to OA mode */ + struct amr_hdr_bwe *bwe_hdr = (struct amr_hdr_bwe *)payload; struct amr_hdr *oa_hdr; unsigned int i; unsigned int oa_payload_len; + uint8_t ft; - memset(buf, 0, sizeof(buf)); + if (payload_len < sizeof(struct amr_hdr_bwe)) + return -1; if (payload_len + 1 > payload_maxlen) return -1; @@ -215,15 +218,19 @@ if (payload_len + 1 > sizeof(buf)) return -1; - buf[0] = payload[0] & 0xf0; - buf[1] = payload[0] << 4; - buf[1] |= (payload[1] >> 4) & 0x0c; + ft = (bwe_hdr->ft_hi << 1) | bwe_hdr->ft_lo; + if (!osmo_amr_ft_valid(ft)) + return -1; + + memset(buf, 0, sizeof(buf)); + oa_hdr = (struct amr_hdr *)buf; + oa_hdr->cmr = bwe_hdr->cmr; + oa_hdr->f = bwe_hdr->f; + oa_hdr->ft = ft; + oa_hdr->q = bwe_hdr->q; /* Calculate new payload length */ - oa_hdr = (struct amr_hdr *)buf; - if (!osmo_amr_ft_valid(oa_hdr->ft)) - return -1; - oa_payload_len = 2 + osmo_amr_bytes(oa_hdr->ft); + oa_payload_len = 2 + osmo_amr_bytes(ft); for (i = 2; i < oa_payload_len - 1; i++) { buf[i] = payload[i - 1] << 2; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30755 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I5042dc628ac70eca62b4980f4acae991dd976528 Gerrit-Change-Number: 30755 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use osmo-iuh/master for asn1c

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/30751 ) Change subject: jobs/master-builds: use osmo-iuh/master for asn1c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 Gerrit-Change-Number: 30751 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, 21 Dec 2022 16:09:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power

by daniel

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30689 ) Change subject: shutdown_fsm: Add power_ramp_force() to jump straight to the tgt power ...................................................................... Patch Set 2: (1 comment) Patchset: PS2: I reran the tests and the only ones that failed on my machine (that don't fail in jenkins) are TC_speech_osmux_tch{h,f} I believe this is unrelated to this patch and some sort of configuration issue on my part: 20221220150640643 DL1P NOTICE (bts=0,trx=0,ts=1,ss=0) SACCH no SI available (lchan.c:266) 20221220150640643 DRSL INFO (bts=0,trx=0,ts=1,ss=0) Rx RSL IPAC_CRCX (rsl.c:3819) 20221220150640643 DRSL ERROR (bts=0,trx=0,ts=1,ss=0) Rx RSL IPAC XXcx with Osmux CIDgoes against configured Osmux policy 'off' (rsl.c:2823) 20221220150640643 DRSL NOTICE (bts=0,trx=0,ts=1,ss=0) RSL Tx IPAC_CRCX_NACK (rsl.c:2651) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30689 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ida1d7bbf094958b9142af306dbf84206729a609e Gerrit-Change-Number: 30689 Gerrit-PatchSet: 2 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 16:09:25 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: rsl: allow configuration of HR GSM RTP format via CHANNEL ACTIVATE

by Jenkins Builder

Attention is currently required from: dexter. Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/30726 ) Change subject: rsl: allow configuration of HR GSM RTP format via CHANNEL ACTIVATE ...................................................................... Patch Set 2: (1 comment) File src/common/rsl.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-2181): https://gerrit.osmocom.org/c/osmo-bts/+/30726/comment/6b62f5a5_4ad76eaa PS2, Line 1633: } else if (TLVP_VAL(tp, RSL_IE_OSMO_HR_GSM_RTP_FMT)[0] == 0x01) { please, no space before tabs -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30726 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id53ebebdf987fc59cf4e38bcddb75663fd7bb8fc Gerrit-Change-Number: 30726 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Wed, 21 Dec 2022 15:28:37 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-bts[master]: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload

by dexter

Attention is currently required from: dexter. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/30725 to look at the new patch set (#2). Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload ...................................................................... l1sap: Accept RFC5993 and TS 101.318 HR GSM payload Unfotunately there are two different RTP formats for HR GSM specified and it is unclear which should be used with GSM networks. Also esch BTS model may have a preference for either one or the other format. Lets set internal flags to determine the preference for each BTS model and then lets use this information to convert incoming RTP packets into the prefered format. Doing so we will make sure that always both formats are accepted. Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Related: OS#5688 --- M include/osmo-bts/bts.h M src/common/l1sap.c M src/osmo-bts-lc15/main.c M src/osmo-bts-oc2g/main.c M src/osmo-bts-sysmo/main.c M src/osmo-bts-trx/main.c M src/osmo-bts-virtual/main.c 7 files changed, 71 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/25/30725/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/30725 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I17f0b546042fa333780fd2f5c315898ab0df574c Gerrit-Change-Number: 30725 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in osmo-ci[master]: jobs/master-builds: use osmo-iuh/master for asn1c

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/30751 ) Change subject: jobs/master-builds: use osmo-iuh/master for asn1c ...................................................................... jobs/master-builds: use osmo-iuh/master for asn1c As discussed with Pau, let's build the "osmo-iuh/master" branch of our asn1c.git repository in jenkins. This branch is what we actually use for osmo-iuh and "master" should track upstream master. Related: OS#2435 Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 --- M jobs/master-builds.yml 1 file changed, 6 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/51/30751/1 diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index fc713ed..0f22a77 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -48,12 +48,16 @@ trigger: email: jenkins-notifications(a)lists.osmocom.org laforge(a)gnumonks.org git_base_url: https://gerrit.osmocom.org + branches: + - master ssh: - docs_ftp.osmocom.org # in alphabetical order repos: - - asn1c + - asn1c: + branches: + - osmo-iuh/master - libasn1c: # Full triggers would be: @@ -518,8 +522,7 @@ scm: - git: url: "{git_base_url}/{repos}" - branches: - - 'origin/master' + branches: '{obj:branches}' refspec: name: wipe-workspace: false -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/30751 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ic97a23a175b301e6f42f7ca67deb84dcc3ee3f90 Gerrit-Change-Number: 30751 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

Change in osmo-iuh[master]: contrib/jenkins.sh: werror with WITH_MANUALS too

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-iuh/+/30750 ) Change subject: contrib/jenkins.sh: werror with WITH_MANUALS too ...................................................................... contrib/jenkins.sh: werror with WITH_MANUALS too Change-Id: I6f1bbbc8d3ac04e8a82fb954c59ec30d6be46c13 --- M contrib/jenkins.sh 1 file changed, 1 insertion(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-iuh refs/changes/50/30750/1 diff --git a/contrib/jenkins.sh b/contrib/jenkins.sh index ad59c84..36a4b61 100755 --- a/contrib/jenkins.sh +++ b/contrib/jenkins.sh @@ -28,7 +28,7 @@ CONFIG="--enable-werror" if [ "$WITH_MANUALS" = "1" ]; then - CONFIG=" --enable-manuals" + CONFIG="$CONFIG --enable-manuals" fi set +x -- To view, visit https://gerrit.osmocom.org/c/osmo-iuh/+/30750 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-iuh Gerrit-Branch: master Gerrit-Change-Id: I6f1bbbc8d3ac04e8a82fb954c59ec30d6be46c13 Gerrit-Change-Number: 30750 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022