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

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30757 ) Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Patch Set 7: Code-Review+1 (1 comment) File utils/osmo-amr-inspect.c: https://gerrit.osmocom.org/c/libosmo-netif/+/30757/comment/85c3ce71_091762e4 PS6, Line 2: paylods > payloads Done -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 22 Dec 2022 13:11:28 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: Introduce utils/osmo-amr-inspect program

by pespin

Attention is currently required from: pespin. Hello osmith, Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 to look at the new patch set (#7). Change subject: Introduce utils/osmo-amr-inspect program ...................................................................... Introduce utils/osmo-amr-inspect program This program allows inspecting a list of AMR PDUs in hexstring format present in a text file. This allows easily finding out the properties of the PDU as well as finding potential errors on the data. It also allows forcing decode in different formats (octet-aligned, bandwidth-efficient) in order to detect which may be the correct one. Related: SYS#6161 Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 --- M Makefile.am M configure.ac M contrib/libosmo-netif.spec.in A utils/Makefile.am A utils/osmo-amr-inspect.c 5 files changed, 342 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/57/30757/7 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30757 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Iffa6cc2e5391b77e3097d4c3b8d3f5211427dbe2 Gerrit-Change-Number: 30757 Gerrit-PatchSet: 7 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: amr: Clarify size of AMR BWE header and ToC

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30758 ) Change subject: amr: Clarify size of AMR BWE header and ToC ...................................................................... amr: Clarify size of AMR BWE header and ToC Change-Id: I34c76b18ee45e12dba92864715e8ef91e6de3b01 --- M include/osmocom/netif/amr.h M src/amr.c 2 files changed, 8 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/include/osmocom/netif/amr.h b/include/osmocom/netif/amr.h index e8f08d4..9b8fb79 100644 --- a/include/osmocom/netif/amr.h +++ b/include/osmocom/netif/amr.h @@ -43,6 +43,9 @@ uint8_t data[0]; } __attribute__((packed)); +/* See diagram above: CMR (4) + F (1) + FT (4) + Q (1) = 10 */ +#define AMR_HDR_BWE_LEN_BITS 10 + /* * 4.4. Octet-aligned Mode: * diff --git a/src/amr.c b/src/amr.c index e4f0dd8..18e699c 100644 --- a/src/amr.c +++ b/src/amr.c @@ -188,7 +188,7 @@ } /* Calculate new payload length */ - bwe_payload_len = (10 + osmo_amr_bits(ft) + 7) / 8; + bwe_payload_len = (AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft) + 7) / 8; return bwe_payload_len; } @@ -266,7 +266,8 @@ amr_speech_len_bits = osmo_amr_bits(ft); amr_speech_len_bytes = osmo_amr_bytes(ft); - required_len_bits = amr_speech_len_bits + 10; /* shift of 10 bits */ + /* shift of AMR_HDR_BWE_LEN_BITS (10) bits, aka remove BWE Hdr + ToC: */ + required_len_bits = AMR_HDR_BWE_LEN_BITS + amr_speech_len_bits; if (payload_len < (required_len_bits + 7)/8) return -1; @@ -288,7 +289,7 @@ int osmo_amr_iuup_to_bwe(uint8_t *payload, unsigned int payload_len, unsigned int payload_maxlen) { - /* shift all bits by 10 */ + /* shift all bits by AMR_HDR_BWE_LEN_BITS (10) */ unsigned int i, required_len_bits, required_len_bytes; int ft = osmo_amr_bytes_to_ft(payload_len); @@ -303,7 +304,7 @@ i = payload_len + 1; payload[i] = (payload[i - 2] << 6); for (i = payload_len; i >= 2; i--) { - /* we have to shift the payload by 10 bits to get only the Class A, B, C bits */ + /* we have to shift the payload by AMR_HDR_BWE_LEN_BITS (10) bits to prepend BWE Hdr + ToC */ payload[i] = (payload[i - 1] >> 2) | (payload[i - 2] << 6); } payload[i] = (payload[i - 1] >> 2); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30758 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I34c76b18ee45e12dba92864715e8ef91e6de3b01 Gerrit-Change-Number: 30758 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: amr: osmo_amr_bwe_to_oa(): validate input data is long enough

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30756 ) Change subject: amr: osmo_amr_bwe_to_oa(): validate input data is long enough ...................................................................... amr: osmo_amr_bwe_to_oa(): validate input data is long enough Change-Id: I2d11ce71c29ae046c2feab1e59045d97dc3e5099 --- M src/amr.c 1 file changed, 2 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/amr.c b/src/amr.c index 81bcd08..f201e8a 100644 --- a/src/amr.c +++ b/src/amr.c @@ -221,6 +221,8 @@ ft = (bwe_hdr->ft_hi << 1) | bwe_hdr->ft_lo; if (!osmo_amr_ft_valid(ft)) return -1; + if (OSMO_BYTES_FOR_BITS(AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft)) > payload_len) + return -1; memset(buf, 0, sizeof(buf)); oa_hdr = (struct amr_hdr *)buf; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30756 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2d11ce71c29ae046c2feab1e59045d97dc3e5099 Gerrit-Change-Number: 30756 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in libosmo-netif[master]: amr: use OSMO_BYTES_FOR_BITS()

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/30759 ) Change subject: amr: use OSMO_BYTES_FOR_BITS() ...................................................................... amr: use OSMO_BYTES_FOR_BITS() Change-Id: Ib92856ede3f493615c24d883954989e952c51157 --- M src/amr.c 1 file changed, 3 insertions(+), 3 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved fixeria: Looks good to me, approved diff --git a/src/amr.c b/src/amr.c index 18e699c..81bcd08 100644 --- a/src/amr.c +++ b/src/amr.c @@ -188,7 +188,7 @@ } /* Calculate new payload length */ - bwe_payload_len = (AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft) + 7) / 8; + bwe_payload_len = OSMO_BYTES_FOR_BITS(AMR_HDR_BWE_LEN_BITS + osmo_amr_bits(ft)); return bwe_payload_len; } @@ -268,7 +268,7 @@ /* shift of AMR_HDR_BWE_LEN_BITS (10) bits, aka remove BWE Hdr + ToC: */ required_len_bits = AMR_HDR_BWE_LEN_BITS + amr_speech_len_bits; - if (payload_len < (required_len_bits + 7)/8) + if (payload_len < OSMO_BYTES_FOR_BITS(required_len_bits)) return -1; for (i = 0; i < amr_speech_len_bytes; i++) { @@ -297,7 +297,7 @@ return ft; required_len_bits = osmo_amr_bits(ft) + 10; - required_len_bytes = (required_len_bits + 7)/8; + required_len_bytes = OSMO_BYTES_FOR_BITS(required_len_bits); if (payload_maxlen < required_len_bytes) return -1; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/30759 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ib92856ede3f493615c24d883954989e952c51157 Gerrit-Change-Number: 30759 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

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

by pespin

pespin has submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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-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: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 submitted this change. ( 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(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved laforge: Looks good to me, approved 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-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

Change in osmo-e1d[master]: DAHDI trunkdev support

by pespin

Attention is currently required from: manawyrm, laforge, tnt. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-e1d/+/30068 ) Change subject: DAHDI trunkdev support ...................................................................... Patch Set 5: Code-Review+1 (1 comment) File src/log.c: https://gerrit.osmocom.org/c/osmo-e1d/+/30068/comment/74bb7d11_e1669364 PS5, Line 41: [DTRUNK] = { DTRUNKDEV would match better the terminology used here. -- To view, visit https://gerrit.osmocom.org/c/osmo-e1d/+/30068 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-e1d Gerrit-Branch: master Gerrit-Change-Id: Ib15a7313fcd63e1ed9f2f5b349df967bc4335ec2 Gerrit-Change-Number: 30068 Gerrit-PatchSet: 5 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: tnt <tnt(a)246tNt.com> Gerrit-Attention: manawyrm <osmocom.account(a)tbspace.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: tnt <tnt(a)246tNt.com> Gerrit-Comment-Date: Thu, 22 Dec 2022 12:53:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years, 6 months

1
0
0 0

Change in osmo-trx[master]: ctrl: take both address and port from vty config

by msuraev

msuraev has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/30671 ) Change subject: ctrl: take both address and port from vty config ...................................................................... ctrl: take both address and port from vty config Change-Id: Id7d1425e603cc62a62a63d1057291861f02782ba --- M Transceiver52M/osmo-trx.cpp 1 file changed, 1 insertion(+), 1 deletion(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/Transceiver52M/osmo-trx.cpp b/Transceiver52M/osmo-trx.cpp index b6f378b..18e9051 100644 --- a/Transceiver52M/osmo-trx.cpp +++ b/Transceiver52M/osmo-trx.cpp @@ -655,7 +655,7 @@ if (rc < 0) exit(1); - g_ctrlh = ctrl_interface_setup_dynip(NULL, ctrl_vty_get_bind_addr(), OSMO_CTRL_PORT_TRX, NULL); + g_ctrlh = ctrl_interface_setup(NULL, OSMO_CTRL_PORT_TRX, NULL); if (!g_ctrlh) { LOG(ERROR) << "Failed to create CTRL interface.\n"; exit(1); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/30671 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Id7d1425e603cc62a62a63d1057291861f02782ba Gerrit-Change-Number: 30671 Gerrit-PatchSet: 1 Gerrit-Owner: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

2 years, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2022