Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmocom-bb/+/32786
to look at the new patch set (#3).
Change subject: Migrate network identifier fields to modern osmocom structures
......................................................................
Migrate network identifier fields to modern osmocom structures
This allows using well tested standarized API to print, compare, etc. usual
identifiers like PLMN, LAI, etc.
It also simplifies code by avoiding passing lots of parameters and
making it easier to identify which fields go packed together.
This is specially important since in the future more of those
identifiers will be added for GPRS.
Change-Id: I07a9289825c09ed748e53d36a746ea164c8a5d7f
---
M src/host/layer23/include/osmocom/bb/common/networks.h
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/include/osmocom/bb/common/subscriber.h
M src/host/layer23/include/osmocom/bb/common/sysinfo.h
M src/host/layer23/include/osmocom/bb/misc/log.h
M src/host/layer23/include/osmocom/bb/mobile/gsm322.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/src/common/networks.c
M src/host/layer23/src/common/settings.c
M src/host/layer23/src/common/subscriber.c
M src/host/layer23/src/common/sysinfo.c
M src/host/layer23/src/common/vty.c
M src/host/layer23/src/misc/cell_log.c
M src/host/layer23/src/misc/gsmmap.c
M src/host/layer23/src/misc/log.c
M src/host/layer23/src/mobile/gsm322.c
M src/host/layer23/src/mobile/gsm48_mm.c
M src/host/layer23/src/mobile/gsm48_rr.c
M src/host/layer23/src/mobile/vty_interface.c
19 files changed, 616 insertions(+), 766 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/32786/3
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32786
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I07a9289825c09ed748e53d36a746ea164c8a5d7f
Gerrit-Change-Number: 32786
Gerrit-PatchSet: 3
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
Hello Jenkins Builder,
I'd like you to reexamine a change. Please visit
https://gerrit.osmocom.org/c/osmocom-bb/+/32786
to look at the new patch set (#2).
Change subject: Migrate fields to modern osmocom structures
......................................................................
Migrate fields to modern osmocom structures
This allows using well tested standarized API to print, compare, etc. usual
identifiers like PLMN, LAI, etc.
It also simplifies code by avoiding passing lots of parameters and
making it easier to identify which fields go packed together.
This is specially important since in the future more of those
identifiers will be added for GPRS.
Change-Id: I07a9289825c09ed748e53d36a746ea164c8a5d7f
---
M src/host/layer23/include/osmocom/bb/common/networks.h
M src/host/layer23/include/osmocom/bb/common/settings.h
M src/host/layer23/include/osmocom/bb/common/subscriber.h
M src/host/layer23/include/osmocom/bb/common/sysinfo.h
M src/host/layer23/include/osmocom/bb/misc/log.h
M src/host/layer23/include/osmocom/bb/mobile/gsm322.h
M src/host/layer23/include/osmocom/bb/mobile/gsm48_mm.h
M src/host/layer23/src/common/networks.c
M src/host/layer23/src/common/settings.c
M src/host/layer23/src/common/subscriber.c
M src/host/layer23/src/common/sysinfo.c
M src/host/layer23/src/common/vty.c
M src/host/layer23/src/misc/cell_log.c
M src/host/layer23/src/misc/gsmmap.c
M src/host/layer23/src/misc/log.c
M src/host/layer23/src/mobile/gsm322.c
M src/host/layer23/src/mobile/gsm48_mm.c
M src/host/layer23/src/mobile/gsm48_rr.c
M src/host/layer23/src/mobile/vty_interface.c
19 files changed, 616 insertions(+), 766 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/86/32786/2
--
To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/32786
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmocom-bb
Gerrit-Branch: master
Gerrit-Change-Id: I07a9289825c09ed748e53d36a746ea164c8a5d7f
Gerrit-Change-Number: 32786
Gerrit-PatchSet: 2
Gerrit-Owner: pespin <pespin(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-MessageType: newpatchset
daniel has abandoned this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32713 )
Change subject: core: Add function to update osmo_io_ops field for osmo_io_fd
......................................................................
Abandoned
A copy was merged to master
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32713
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: arehbein/osmo_io_ipa
Gerrit-Change-Id: Ie45402ad8e86e3cecf75ad78a512c17e61e68b19
Gerrit-Change-Number: 32713
Gerrit-PatchSet: 3
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: abandon
daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32790 )
Change subject: core: Add function to update osmo_io_ops field for osmo_io_fd
......................................................................
core: Add function to update osmo_io_ops field for osmo_io_fd
Added, because the field 'io_ops' of 'struct osmo_io_fd' is not a
reference, so subsequent changes to the osmo_io_ops structure that was
used to set it up aren't automatically reflected in the osmo_io_fd
structure that got its copy.
Change-Id: Ie45402ad8e86e3cecf75ad78a512c17e61e68b19
---
M include/osmocom/core/osmo_io.h
M src/core/libosmocore.map
M src/core/osmo_io.c
3 files changed, 25 insertions(+), 0 deletions(-)
Approvals:
Jenkins Builder: Verified
pespin: Looks good to me, but someone else must approve
daniel: Looks good to me, approved
diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h
index ffc8cfa..c19ca67 100644
--- a/include/osmocom/core/osmo_io.h
+++ b/include/osmocom/core/osmo_io.h
@@ -88,3 +88,5 @@
int osmo_iofd_get_fd(const struct osmo_io_fd *iofd);
const char *osmo_iofd_get_name(const struct osmo_io_fd *iofd);
+
+void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops);
diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map
index 7bca331..bce3399 100644
--- a/src/core/libosmocore.map
+++ b/src/core/libosmocore.map
@@ -267,6 +267,7 @@
osmo_iofd_sendto_msgb;
osmo_iofd_set_alloc_info;
osmo_iofd_set_data;
+osmo_iofd_set_ioops;
osmo_iofd_set_priv_nr;
osmo_iofd_setup;
osmo_iofd_txqueue_clear;
diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c
index cfb6d68..b06e63c 100644
--- a/src/core/osmo_io.c
+++ b/src/core/osmo_io.c
@@ -599,4 +599,12 @@
return iofd->name;
}
+/*! Set the osmo_io_ops for an iofd
+ * \param[in] iofd Target iofd file descriptor
+ * \param[in] ioops osmo_io_ops structure to be set */
+void osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops)
+{
+ iofd->io_ops = *ioops;
+}
+
#endif /* defined(__linux__) */
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32790
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie45402ad8e86e3cecf75ad78a512c17e61e68b19
Gerrit-Change-Number: 32790
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: merged
Attention is currently required from: arehbein.
daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32790 )
Change subject: core: Add function to update osmo_io_ops field for osmo_io_fd
......................................................................
Patch Set 1: Code-Review+2
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32790
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie45402ad8e86e3cecf75ad78a512c17e61e68b19
Gerrit-Change-Number: 32790
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 May 2023 11:55:59 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: arehbein.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32790 )
Change subject: core: Add function to update osmo_io_ops field for osmo_io_fd
......................................................................
Patch Set 1: Code-Review+1
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32790
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: Ie45402ad8e86e3cecf75ad78a512c17e61e68b19
Gerrit-Change-Number: 32790
Gerrit-PatchSet: 1
Gerrit-Owner: arehbein <arehbein(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: arehbein <arehbein(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 May 2023 11:34:53 +0000
Gerrit-HasComments: No
Gerrit-Has-Labels: Yes
Gerrit-MessageType: comment
Attention is currently required from: pespin, dexter.
fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/32630 )
Change subject: l1sap: Accept RFC5993 and TS 101.318 HR GSM payload
......................................................................
Patch Set 4: Code-Review-1
(5 comments)
Patchset:
PS4:
CR-1 due to TS 101.138 vs TS 101.318.
File include/osmo-bts/bts.h:
https://gerrit.osmocom.org/c/osmo-bts/+/32630/comment/3650d1a3_413486bc
PS4, Line 71: 101.138
TS 101.318
File src/common/bts.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32630/comment/4b1d4102_9fab6d15
PS4, Line 208: 101.138
TS 101.318
File src/common/l1sap.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32630/comment/11c7b57f_2204b064
PS4, Line 1955: /* Since we already verified the payload in rtppayload_validate_hr(), we may trust that the payload length is
> I meant something like this (assuming no weird lengths like len=0 are to be received here): […]
Agreeing with pespin here, his proposed approach looks more readable. Also, given that it's just one optional byte in front of the payload, the code can be simplified further:
```
msg = l1sap_msgb_alloc(rtp_pl_len);
if (!msg)
return NULL;
memcpy(msgb_put(msg, rtp_pl_len), rtp_pl, rtp_pl_len);
switch (rtp_pl_len) {
case GSM_HR_BYTES_RTP_TS101318:
/* Convert from TS 101 318 to RFC 5993 */
if (OSMO_UNLIKELY(!ts101318 && rfc5993))
msgb_push_u8(msg, 0x00);
break;
case GSM_HR_BYTES_RTP_RFC5993:
/* Convert from RFC 5993 TS 101 318 */
if (OSMO_UNLIKELY(!rfc5993 && ts101318))
msgb_pull_u8(msg);
break;
default:
OSMO_ASSERT(0);
}
```
File src/osmo-bts-virtual/main.c:
https://gerrit.osmocom.org/c/osmo-bts/+/32630/comment/7167ecac_dbd7a54d
PS4, Line 76: BTS_INTERNAL_FLAG_SPEECH_H_V1_RTP_RFC5993
I am not 100% sure, but osmo-bts-virtual should in theory support both formats.
--
To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/32630
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bts
Gerrit-Branch: master
Gerrit-Change-Id: I9419b40c1171876879d41aba4f51c93e8ef5673c
Gerrit-Change-Number: 32630
Gerrit-PatchSet: 4
Gerrit-Owner: dexter <pmaier(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: dexter <pmaier(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 May 2023 11:19:13 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Gerrit-MessageType: comment
Attention is currently required from: laforge, daniel.
pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/32758 )
Change subject: osmo_io: Improve handling and documentation of segmentation_cb
......................................................................
Patch Set 5: Code-Review+1
(1 comment)
File src/core/osmo_io.c:
https://gerrit.osmocom.org/c/libosmocore/+/32758/comment/6dd0d565_e2ef76be
PS3, Line 249: } else if (pending_len < 0) {
> I think it's more important what someone else who didn't write this thinks. […]
Ah I see the rationale now :) It should have been "msg_pending_len" then or similar, otherwise it's confusing since there are 2 messages.
--
To view, visit https://gerrit.osmocom.org/c/libosmocore/+/32758
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings
Gerrit-Project: libosmocore
Gerrit-Branch: master
Gerrit-Change-Id: I6a0eebb8d4490f09a3cc6eb97d4ff47b4a8fd377
Gerrit-Change-Number: 32758
Gerrit-PatchSet: 5
Gerrit-Owner: daniel <dwillmann(a)sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <laforge(a)osmocom.org>
Gerrit-Reviewer: pespin <pespin(a)sysmocom.de>
Gerrit-Attention: laforge <laforge(a)osmocom.org>
Gerrit-Attention: daniel <dwillmann(a)sysmocom.de>
Gerrit-Comment-Date: Fri, 19 May 2023 11:05:24 +0000
Gerrit-HasComments: Yes
Gerrit-Has-Labels: Yes
Comment-In-Reply-To: pespin <pespin(a)sysmocom.de>
Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de>
Gerrit-MessageType: comment