- gerrit-log - lists.osmocom.org

[L] Change in osmo-hnbgw[master]: [cosmetic] re-order hnbgw.c to group code in major blocks
by laforge 07 Mar '24

07 Mar '24

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36080?usp=email ) Change subject: [cosmetic] re-order hnbgw.c to group code in major blocks ...................................................................... Patch Set 1: (1 comment) This change is ready for review. Patchset: PS1: > You could even take the chance to split hnb_context to its own file. […] Sorry, not now, I have just spent multiple hours rebasing/weaving/merge-conflict-resolving. That should be done at a time when there's not significant changes piled on top of it. -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36080?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: Ia7ce60e6f80d10b7712de1aa6d8a30dd61690dcc Gerrit-Change-Number: 36080 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 17:25:16 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-hnbgw[master]: Introduce umts_cell_id_from_str() as inverse of umts_cell_id_name()
by laforge 07 Mar '24

07 Mar '24

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36204?usp=email ) Change subject: Introduce umts_cell_id_from_str() as inverse of umts_cell_id_name() ...................................................................... Introduce umts_cell_id_from_str() as inverse of umts_cell_id_name() We are about to introduce the stringified UMTS cell identifier to the VTY, and for that we need to not only print but also parse the related string. Related: SYS#6773 Change-Id: I6da947d1f2316241e44e53bb6aaec4221cfaa2c0 --- M include/osmocom/hnbgw/hnbgw.h M src/osmo-hnbgw/hnbgw.c 2 files changed, 41 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/04/36204/1 diff --git a/include/osmocom/hnbgw/hnbgw.h b/include/osmocom/hnbgw/hnbgw.h index f4f7dc1..62b548c 100644 --- a/include/osmocom/hnbgw/hnbgw.h +++ b/include/osmocom/hnbgw/hnbgw.h @@ -79,6 +79,7 @@ uint32_t cid; /*!< Cell ID */ }; const char *umts_cell_id_name(const struct umts_cell_id *ucid); +int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr); struct hnbgw_context_map; diff --git a/src/osmo-hnbgw/hnbgw.c b/src/osmo-hnbgw/hnbgw.c index 8b00ecb..4fc4e3d 100644 --- a/src/osmo-hnbgw/hnbgw.c +++ b/src/osmo-hnbgw/hnbgw.c @@ -202,6 +202,32 @@ ucid->sac, ucid->cid); } +/* parse a string representation of an umts_cell_id into its decoded representation */ +int umts_cell_id_from_str(struct umts_cell_id *ucid, const char *instr) +{ + int rc = sscanf(instr, "%hu-%hu-L%hu-R%hu-S%hu-C%u", &ucid->mcc, &ucid->mnc, &ucid->lac, &ucid->rac, &ucid->sac, &ucid->cid); + if (rc < 0) + return -errno; + + if (rc != 6) + return -EINVAL; + + if (ucid->mcc > 999) + return -EINVAL; + + if (ucid->mnc > 999) + return -EINVAL; + + if (ucid->lac == 0 || ucid->lac == 0xffff) + return -EINVAL; + + /* CellIdentity in the ASN.1 syntax is a bit-string of 28 bits length */ + if (ucid->cid >= (1 << 28)) + return -EINVAL; + + return 0; +} + const char *hnb_context_name(struct hnb_context *ctx) { char *result; -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36204?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I6da947d1f2316241e44e53bb6aaec4221cfaa2c0 Gerrit-Change-Number: 36204 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-hnbgw[master]: osmo_hnbgw_main: Install our usual SIGUSR1/SIGUSR2/SIGABRT handlers
by fixeria 07 Mar '24

07 Mar '24

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/36203?usp=email ) Change subject: osmo_hnbgw_main: Install our usual SIGUSR1/SIGUSR2/SIGABRT handlers ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/36203?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-hnbgw Gerrit-Branch: master Gerrit-Change-Id: I1209a2fadacf62afd5027480426285f527249788 Gerrit-Change-Number: 36203 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Thu, 07 Mar 2024 16:57:24 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream_cli: Correctly setup and free osmo_io client instance
by laforge 07 Mar '24

07 Mar '24

Attention is currently required from: daniel, dexter, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email ) Change subject: stream_cli: Correctly setup and free osmo_io client instance ...................................................................... Patch Set 8: Code-Review+1 (1 comment) Patchset: PS7: > I don't get it. osmo_iofd_setup is somtehing you call once for allocation and configuration. […] ok, so normally osmo_stream_cli_create() should be calling osmo_iofd_setup(). In osmo_stream_cli_open() we should only call osmo_iofd_register(). That way we could do any number of open/close (vs. register/unregister) cycles without having to allocate a new iofd. The reason we're not using osmo_iofd as it is expected to use is probably because in osmo_stream_cli_create() we don't yet know the mode, and hence don't know if we should go the osmo_fd or the osmo_iofd route. Therefore we need to work-around this by doing osmo_iofd_setup() every time we go through osmo_stream_cli_open() - and hence we also need to free it. Sad, but we need to work around the mode not being known earlier. We might add some comments to explain the unusual use of osmo_iofd -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I91a6a76b9ff96034a7b333edf87af27490202932 Gerrit-Change-Number: 35979 Gerrit-PatchSet: 8 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 16:45:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream_cli: Correctly setup and free osmo_io client instance
by laforge 07 Mar '24

07 Mar '24

Attention is currently required from: daniel, dexter, jolly, pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email ) Change subject: stream_cli: Correctly setup and free osmo_io client instance ...................................................................... Patch Set 8: (1 comment) Patchset: PS7: > osmo_iofd_setup() creates a new osmi_io instance. […] I don't get it. osmo_iofd_setup is somtehing you call once for allocation and configuration. you can then many times do osmo_iofd_register/unregister/register/unregister with different file-descriptors. Why do we need more functions as you say? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35979?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I91a6a76b9ff96034a7b333edf87af27490202932 Gerrit-Change-Number: 35979 Gerrit-PatchSet: 8 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Thu, 07 Mar 2024 16:40:57 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: jolly <andreas(a)eversberg.eu> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Guard osmo_iofd_register() with invalid file descriptor
by laforge 07 Mar '24

07 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36188?usp=email ) Change subject: osmo_io: Guard osmo_iofd_register() with invalid file descriptor ...................................................................... osmo_io: Guard osmo_iofd_register() with invalid file descriptor Let's return an error if both osmo_iofd_setup() and osmo_iofd_register() are called with an invalid file descriptor like -1. Either one of them must have been called with a valid file descriptor. Change-Id: Ie4561cefad82e1bf5d37dd1a4815f4bc805343e6 --- M src/core/osmo_io.c 1 file changed, 18 insertions(+), 0 deletions(-) Approvals: dexter: Looks good to me, but someone else must approve Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 5a5e05c..f0d213c 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -672,6 +672,11 @@ if (fd >= 0) iofd->fd = fd; + else if (iofd->fd < 0) { + /* this might happen if both osmo_iofd_setup() and osmo_iofd_register() are called with -1 */ + LOGPIO(iofd, LOGL_ERROR, "Cannot register io_fd using invalid fd == %d\n", iofd->fd); + return -EBADF; + } if (osmo_iofd_ops.register_fd) rc = osmo_iofd_ops.register_fd(iofd); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36188?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ie4561cefad82e1bf5d37dd1a4815f4bc805343e6 Gerrit-Change-Number: 36188 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Don't pretend to support backends without close_cb
by laforge 07 Mar '24

07 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36191?usp=email ) Change subject: osmo_io: Don't pretend to support backends without close_cb ...................................................................... osmo_io: Don't pretend to support backends without close_cb Let's not pretend we support backends without a close_cb. In such situations nobody would actually close(2) the file descriptor, but we would set iofd->fd to -1, effectively creating a file descriptor leak. Both of our two back-ends provide a close_cb, and we don't need to consider hypothetical future back-ends that would not like to register such a call-back. Related: OS#6393 Change-Id: Id285f1d7b73ae5805aa618897016ae8b73bf892d --- M src/core/osmo_io.c 1 file changed, 21 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index bcd4add..8b53aa6 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -787,8 +787,8 @@ iofd->pending = NULL; - if (osmo_iofd_ops.close) - rc = osmo_iofd_ops.close(iofd); + OSMO_ASSERT(osmo_iofd_ops.close); + rc = osmo_iofd_ops.close(iofd); iofd->fd = -1; return rc; } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36191?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id285f1d7b73ae5805aa618897016ae8b73bf892d Gerrit-Change-Number: 36191 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Log error message in case call-backs incompatible with mode
by laforge 07 Mar '24

07 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36190?usp=email ) Change subject: osmo_io: Log error message in case call-backs incompatible with mode ...................................................................... osmo_io: Log error message in case call-backs incompatible with mode Change-Id: I50ba6a76c0144f249d67488874a6c4edf01ec6f2 --- M include/osmocom/core/osmo_io.h M src/core/libosmocore.map M src/core/osmo_io.c 3 files changed, 29 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index 8a7e53a..8e613fa 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -36,6 +36,10 @@ static inline const char *osmo_io_backend_name(enum osmo_io_backend val) { return get_value_string(osmo_io_backend_names, val); } +extern const struct value_string osmo_iofd_mode_names[]; +static inline const char *osmo_iofd_mode_name(enum osmo_io_fd_mode val) +{ return get_value_string(osmo_iofd_mode_names, val); } + struct osmo_io_ops { /* mode OSMO_IO_FD_MODE_READ_WRITE: */ struct { diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index 72a6038..072efee 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -264,6 +264,7 @@ osmo_iofd_set_name; osmo_iofd_get_priv_nr; osmo_iofd_init; +osmo_iofd_mode_names; osmo_iofd_ops; osmo_iofd_register; osmo_iofd_sendto_msgb; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index f0d213c..bcd4add 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -51,6 +51,13 @@ { 0, NULL } }; +const struct value_string osmo_iofd_mode_names[] = { + { OSMO_IO_FD_MODE_READ_WRITE, "read/write" }, + { OSMO_IO_FD_MODE_RECVFROM_SENDTO, "recvfrom/sendto" }, + { OSMO_IO_FD_MODE_RECVMSG_SENDMSG, "recvmsg/sendmsg" }, + { 0, NULL } +}; + static enum osmo_io_backend g_io_backend; /* Used by some tests, can't be static */ @@ -619,8 +626,11 @@ return NULL; } - if (ioops && !check_mode_callback_compat(mode, ioops)) + if (ioops && !check_mode_callback_compat(mode, ioops)) { + LOGP(DLIO, LOGL_ERROR, "iofd(%s): rejecting call-backs incompatible with mode %s\n", + name ? name : "unknown", osmo_iofd_mode_name(mode)); return NULL; + } iofd = talloc_zero(ctx, struct osmo_io_fd); if (!iofd) @@ -868,8 +878,11 @@ * \param[in] ioops osmo_io_ops structure to be set */ int osmo_iofd_set_ioops(struct osmo_io_fd *iofd, const struct osmo_io_ops *ioops) { - if (!check_mode_callback_compat(iofd->mode, ioops)) + if (!check_mode_callback_compat(iofd->mode, ioops)) { + LOGPIO(iofd, LOGL_ERROR, "rejecting call-backs incompatible with mode %s\n", + osmo_iofd_mode_name(iofd->mode)); return -EINVAL; + } iofd->io_ops = *ioops; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36190?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I50ba6a76c0144f249d67488874a6c4edf01ec6f2 Gerrit-Change-Number: 36190 Gerrit-PatchSet: 3 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: avoid OSMO_ASSERT one each API call
by laforge 07 Mar '24

07 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36192?usp=email ) Change subject: osmo_io: avoid OSMO_ASSERT one each API call ...................................................................... osmo_io: avoid OSMO_ASSERT one each API call There's only one way to set the osmo_iofd_ops, which is by environment variable during the constructor time at shared library load time. There's hence no point in doing OSMO_ASSERT() on each and every call to osmo_iofd_notify_connected() at runtime. We can move those kind of asserts to the one-time load-time constructor instead. At the same time, we can extend those asserts to all the mandatory call-backs to be provided by the backend. Change-Id: Id9005ac6bb260236c88670373816bf7ee6a627f1 --- M src/core/osmo_io.c 1 file changed, 26 insertions(+), 2 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 8b53aa6..d52d601 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -105,6 +105,13 @@ exit(1); } + OSMO_ASSERT(osmo_iofd_ops.close); + OSMO_ASSERT(osmo_iofd_ops.write_enable); + OSMO_ASSERT(osmo_iofd_ops.write_disable); + OSMO_ASSERT(osmo_iofd_ops.read_enable); + OSMO_ASSERT(osmo_iofd_ops.read_disable); + OSMO_ASSERT(osmo_iofd_ops.notify_connected); + osmo_iofd_init(); } @@ -787,7 +794,6 @@ iofd->pending = NULL; - OSMO_ASSERT(osmo_iofd_ops.close); rc = osmo_iofd_ops.close(iofd); iofd->fd = -1; return rc; @@ -927,7 +933,6 @@ { OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE || iofd->mode == OSMO_IO_FD_MODE_RECVMSG_SENDMSG); - OSMO_ASSERT(osmo_iofd_ops.notify_connected); osmo_iofd_ops.notify_connected(iofd); } -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36192?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Id9005ac6bb260236c88670373816bf7ee6a627f1 Gerrit-Change-Number: 36192 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmocore[master]: osmo_io: Avoid implementing non-existant situations
by laforge 07 Mar '24

07 Mar '24

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/36193?usp=email ) Change subject: osmo_io: Avoid implementing non-existant situations ...................................................................... osmo_io: Avoid implementing non-existant situations Both of our back-ends have a register_fd and unregister_fd back-end. Let's simplify the code by not treating them as optional, which introduces code paths that we never take, adds small runtime overhead and makes the code harder to follow. Should we ever introduce more backends which might not need those call-backs, we can either have empty functions or think about how to make them optional. Change-Id: I0077151eb676f61320b3fa2124448852aa8fd4a9 --- M src/core/osmo_io.c 1 file changed, 23 insertions(+), 7 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified jolly: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index d52d601..57eba6c 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -106,6 +106,8 @@ } OSMO_ASSERT(osmo_iofd_ops.close); + OSMO_ASSERT(osmo_iofd_ops.register_fd); + OSMO_ASSERT(osmo_iofd_ops.unregister_fd); OSMO_ASSERT(osmo_iofd_ops.write_enable); OSMO_ASSERT(osmo_iofd_ops.write_disable); OSMO_ASSERT(osmo_iofd_ops.read_enable); @@ -695,8 +697,7 @@ return -EBADF; } - if (osmo_iofd_ops.register_fd) - rc = osmo_iofd_ops.register_fd(iofd); + rc = osmo_iofd_ops.register_fd(iofd); if (rc) return rc; @@ -720,11 +721,7 @@ */ int osmo_iofd_unregister(struct osmo_io_fd *iofd) { - if (osmo_iofd_ops.unregister_fd) - return osmo_iofd_ops.unregister_fd(iofd); - IOFD_FLAG_SET(iofd, IOFD_FLAG_CLOSED); - - return 0; + return osmo_iofd_ops.unregister_fd(iofd); } /*! Get the number of messages in the tx queue. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/36193?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0077151eb676f61320b3fa2124448852aa8fd4a9 Gerrit-Change-Number: 36193 Gerrit-PatchSet: 2 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

2026

2025

2024

2023

2022

gerrit-log