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

[M] Change in osmo-hnbgw[master]: rua: validate correct RUA ctx state per RUA message type

by neels

neels has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-hnbgw/+/35329?usp=email ) Change subject: rua: validate correct RUA ctx state per RUA message type ...................................................................... rua: validate correct RUA ctx state per RUA message type It helps in a pretty complex situation seen in the field. A third-party MSC releases SCCP in one fell swoop, not waiting for the Iu Release Complete to come back from RAN as the specs would suggest. The result is this odd sequence, where late rx of RUA Disconnect actually causes a new SCCP connection to be established and torn down again: RAN HNBGW MSC |--active-RUA-ctx----|--active-sccp------| | |<--IU-Release-Cmd--| | |<--SCCP-RLSD-------| (this should have waited) |...<-RUA-Disconnect-| (this is the consequence) | x |--RUA-Disconnect--->| (IU Release Complete) | <create-new-ctx> | |-SCCP-CR---------->| | |-IU-Release-Compl->| | |<--CREF------------| x This patch is a relatively simple practical improvement of above situation that is logically obvious: Validate the correct message type for creating a new RUA-to-SCCP context: RUA Connect. That means the IU Release Complete is ignored: RAN HNBGW MSC |--active-RUA-ctx----|--active-sccp------| | |<--IU-Release-Cmd--| | |<--SCCP-RLSD-------| (this should have waited) |...<-RUA-Disconnect-| (this is the consequence) | x |--RUA-Disconnect--->| (IU Release Complete) <error> x Related: SYS#6602 Change-Id: Ie359fcada98fb19f56015cf462e6d8c039f5fce5 --- M src/osmo-hnbgw/hnbgw_rua.c 1 file changed, 80 insertions(+), 14 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-hnbgw refs/changes/29/35329/1 diff --git a/src/osmo-hnbgw/hnbgw_rua.c b/src/osmo-hnbgw/hnbgw_rua.c index 073f3ce..84bd817 100644 --- a/src/osmo-hnbgw/hnbgw_rua.c +++ b/src/osmo-hnbgw/hnbgw_rua.c @@ -179,18 +179,12 @@ return get_value_string(rua_procedure_code_names, val); } -static struct hnbgw_context_map *find_or_create_context_map(struct hnb_context *hnb, uint32_t rua_ctx_id, bool is_ps, - struct msgb *ranap_msg) +static struct hnbgw_context_map *create_context_map(struct hnb_context *hnb, uint32_t rua_ctx_id, bool is_ps, + struct msgb *ranap_msg) { struct hnbgw_context_map *map; struct hnbgw_cnlink *cnlink; - map = context_map_find_by_rua_ctx_id(hnb, rua_ctx_id, is_ps); - if (map) { - /* Already established SCCP link. Continue to use that. */ - return map; - } - /* Establish a new context map. From the RUA Connect, extract a mobile identity, if any, and select a CN link * based on an NRI found in the mobile identity, if any. */ @@ -255,12 +249,35 @@ memcpy(ranap_msg->l2h, data, len); } - map = find_or_create_context_map(hnb, context_id, is_ps, ranap_msg); - if (!map) { - LOGHNB(hnb, DRUA, LOGL_ERROR, - "Failed to create context map for %s: rx RUA %s with %u bytes RANAP data\n", - is_ps ? "IuPS" : "IuCS", rua_procedure_code_name(rua_procedure), data ? len : 0); - return -1; + map = context_map_find_by_rua_ctx_id(hnb, context_id, is_ps); + + switch (rua_procedure) { + case RUA_ProcedureCode_id_Connect: + /* A Connect message can only be the first message for an unused RUA context */ + if (map) { + /* Already established this RUA context. But then how can it be a Connect message. */ + LOGHNB(hnb, DRUA, LOGL_ERROR, "rx RUA %s for already active RUA context %u\n", + rua_procedure_code_name(rua_procedure), context_id); + return -EINVAL; + } + /* ok, this RUA context does not exist yet, so create one. */ + map = create_context_map(hnb, context_id, is_ps, ranap_msg); + if (!map) { + LOGHNB(hnb, DRUA, LOGL_ERROR, + "Failed to create context map for %s: rx RUA %s with %u bytes RANAP data\n", + is_ps ? "IuPS" : "IuCS", rua_procedure_code_name(rua_procedure), data ? len : 0); + return -EINVAL; + } + break; + + default: + /* Any message other than Connect must have a valid RUA context */ + if (!map) { + LOGHNB(hnb, DRUA, LOGL_ERROR, "rx RUA %s for unknown RUA context %u\n", + rua_procedure_code_name(rua_procedure), context_id); + return -EINVAL; + } + break; } LOG_MAP(map, DRUA, LOGL_DEBUG, "rx RUA %s with %u bytes RANAP data\n", -- To view, visit https://gerrit.osmocom.org/c/osmo-hnbgw/+/35329?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: Ie359fcada98fb19f56015cf462e6d8c039f5fce5 Gerrit-Change-Number: 35329 Gerrit-PatchSet: 1 Gerrit-Owner: neels <nhofmeyr(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 6 months

1
0
0 0

[S] Change in osmo-ci[master]: Revert "coverity: build osmo-trx with USRP1 support"

by laforge

laforge has abandoned this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/35291?usp=email ) Change subject: Revert "coverity: build osmo-trx with USRP1 support" ...................................................................... Abandoned we ignore libusrp stuff in coverity now instead. -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/35291?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I5f47bbcc1388fd7bbe6830481e6a8abcdc582029 Gerrit-Change-Number: 35291 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-MessageType: abandon

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: demonstrate a problem with manual flush()ing

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35326?usp=email ) Change subject: soft_uart: demonstrate a problem with manual flush()ing ...................................................................... soft_uart: demonstrate a problem with manual flush()ing This problem can only happen if the user is flush()ing the Rx buffer manually by calling osmo_soft_uart_flush_rx(). Let's demonstrate it in the unit test, so that we don't forget about it (add FIXME). Change-Id: Iad932a505d6fd98360f90510651501f8708ff5d2 --- M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 37 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index e9adb29..0ea7fa8 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -226,6 +226,7 @@ static void test_rx_flush(void) { + struct osmo_soft_uart_cfg cfg; struct osmo_soft_uart *suart; SUART_TEST_BEGIN; @@ -242,6 +243,25 @@ printf("calling osmo_soft_uart_flush_rx() while Rx enabled, but no data\n"); osmo_soft_uart_flush_rx(suart); + /* FIXME: this scenario demonstrates a problem that may occur when the user + * flushes the Rx buffer manually while the soft-UART state reflects flags + * of an incomplete symbol, for which we're waiting the stop bit. */ + printf("testing corner case: manual flushing during a parity error (8-E-1)\n"); + cfg = suart_test_default_cfg; + cfg.parity_mode = OSMO_SUART_PARITY_EVEN; + osmo_soft_uart_configure(suart, &cfg); + test_rx_exec(suart, "1111111" /* no data */ + "0 01010101 0 1" /* even parity, correct */ + "0 10101010 0 1" /* even parity, correct */ + "0 11111111 1" /* odd parity, incorrect, but stop bit is pending */ + "F" /* manual flush happens before receiving the stop bit */ + "1" /* finally, the stop bit is received */ + ); + /* test_rx_exec() @ 47: flush the Rx buffer + * suart_rx_cb(flags=02): aa 55 <--- this is wrong, should be flags=00 + * suart_rx_cb(flags=02): ff <--- this is expected due to odd parity */ + + osmo_soft_uart_free(suart); } diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index c42d0f5..baf3483 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -71,6 +71,10 @@ calling osmo_soft_uart_flush_rx() while Rx disabled enabling the receiver calling osmo_soft_uart_flush_rx() while Rx enabled, but no data +testing corner case: manual flushing during a parity error (8-E-1) +test_rx_exec() @ 47: flush the Rx buffer +suart_rx_cb(flags=02): aa 55 +suart_rx_cb(flags=02): ff Executing test_tx_rx ======== testing 8-N-1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35326?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: Iad932a505d6fd98360f90510651501f8708ff5d2 Gerrit-Change-Number: 35326 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: fix the Rx flushing logic, add a unit test

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35297?usp=email ) Change subject: soft_uart: fix the Rx flushing logic, add a unit test ...................................................................... soft_uart: fix the Rx flushing logic, add a unit test Coverity tells us that with the current logic it's possible (in theory) that we may dereference NULL pointer in osmo_soft_uart_flush_rx(). This is highly unlikely, because the Rx buffer gets allocated once when the Rx is enabled and remains even after the Rx gets disabled. The Rx flags cannot be anything than 0x00 before the Rx gets enabled. Even though this NULL pointer dereference is unlikely, the Rx flushing logic is still not entirely correct. As can be seen from the unit test output, the Rx callback of the application may be called with an empty msgb if the following conditions are both met: a) the osmo_soft_uart_flush_rx() is invoked manually, and b) a parity and/or a framing error has occurred previously. We should not be checking suart->rx.flags in osmo_soft_uart_flush_rx(), since this is already done in suart_rx_ch(), which is calling it. Removing this check also eliminates a theoretical possibility of the NULL pointer dereference, so we're killing two birds with one stone. - Do not check suart->rx.flags in osmo_soft_uart_flush_rx(). - Add a unit test for various flush()ing scenarios. Change-Id: I5179f5fd2361e4e96ac9bf48e80b99e53a7e4712 Fixes: CID#336545 --- M src/core/soft_uart.c M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 3 files changed, 60 insertions(+), 3 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified laforge: Looks good to me, approved diff --git a/src/core/soft_uart.c b/src/core/soft_uart.c index c6a6dbd..f969ab7 100644 --- a/src/core/soft_uart.c +++ b/src/core/soft_uart.c @@ -79,7 +79,7 @@ * \param[in] suart soft-UART instance holding the receive buffer. */ void osmo_soft_uart_flush_rx(struct osmo_soft_uart *suart) { - if ((suart->rx.msg && msgb_length(suart->rx.msg)) || suart->rx.flags) { + if (suart->rx.msg && msgb_length(suart->rx.msg)) { osmo_timer_del(&suart->rx.timer); if (suart->cfg.rx_cb) { suart->cfg.rx_cb(suart->cfg.priv, suart->rx.msg, suart->rx.flags); diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index 8c12dcd..e9adb29 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -224,6 +224,27 @@ osmo_soft_uart_free(suart); } +static void test_rx_flush(void) +{ + struct osmo_soft_uart *suart; + + SUART_TEST_BEGIN; + + suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg); + OSMO_ASSERT(suart != NULL); + + printf("calling osmo_soft_uart_flush_rx() while Rx disabled\n"); + osmo_soft_uart_flush_rx(suart); + + printf("enabling the receiver\n"); + osmo_soft_uart_set_rx(suart, true); + + printf("calling osmo_soft_uart_flush_rx() while Rx enabled, but no data\n"); + osmo_soft_uart_flush_rx(suart); + + osmo_soft_uart_free(suart); +} + static void test_tx_rx_exec_one(struct osmo_soft_uart *suart, size_t n_bits_total, size_t n_bits_frame) { @@ -566,6 +587,7 @@ int main(int argc, char **argv) { test_rx(); + test_rx_flush(); test_tx_rx(); /* test pulling small number of bits at a time */ diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index 6edac16..c42d0f5 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -51,7 +51,6 @@ suart_rx_cb(flags=02): 01 suart_rx_cb(flags=02): ff test_rx_exec() @ 49: flush the Rx buffer -suart_rx_cb(flags=02): ======== testing 8-E-1 (valid parity) test_rx_exec() @ 63: flush the Rx buffer suart_rx_cb(flags=00): 00 ff aa 55 @@ -62,13 +61,17 @@ suart_rx_cb(flags=02): 01 suart_rx_cb(flags=02): ff test_rx_exec() @ 42: flush the Rx buffer -suart_rx_cb(flags=02): ======== testing 8-O-1 (valid parity) test_rx_exec() @ 63: flush the Rx buffer suart_rx_cb(flags=00): 00 ff aa 55 test_rx_exec() @ 120: flush the Rx buffer suart_rx_cb(flags=00): 80 e0 f8 fe +Executing test_rx_flush +calling osmo_soft_uart_flush_rx() while Rx disabled +enabling the receiver +calling osmo_soft_uart_flush_rx() while Rx enabled, but no data + Executing test_tx_rx ======== testing 8-N-1 suart_tx_cb(len=4/4): de ad be ef -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35297?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: I5179f5fd2361e4e96ac9bf48e80b99e53a7e4712 Gerrit-Change-Number: 35297 Gerrit-PatchSet: 6 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: demonstrate a problem with inefficient polling

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35327?usp=email ) Change subject: soft_uart: demonstrate a problem with inefficient polling ...................................................................... soft_uart: demonstrate a problem with inefficient polling As outlined in the test case, we pull a total of 50 bits from the transmitter in two rounds, pulling 25 bits at a time. In the default 8-N-1 configuration, 50 bits should ideally comprise 5 characters. However, as observed, only a total of 4 characters are retrieved from the application, leaving the remaining 10 bits (5 + 5) unused. Change-Id: Ic2539681a4adf6c1822e0bc256e4c829813d0e21 --- M tests/soft_uart/soft_uart_test.c M tests/soft_uart/soft_uart_test.ok 2 files changed, 54 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/tests/soft_uart/soft_uart_test.c b/tests/soft_uart/soft_uart_test.c index 0ea7fa8..7280bdc 100644 --- a/tests/soft_uart/soft_uart_test.c +++ b/tests/soft_uart/soft_uart_test.c @@ -604,6 +604,37 @@ osmo_soft_uart_free(suart); } +static void test_tx_pull(void) +{ + struct osmo_soft_uart *suart; + ubit_t tx_buf[25 * 2]; + int rc; + + SUART_TEST_BEGIN; + + g_tx_cb_cfg.data = (void *)"\x42\x42\x42\x42\x42"; + g_tx_cb_cfg.data_len = 5; + + suart = osmo_soft_uart_alloc(NULL, __func__, &suart_test_default_cfg); + OSMO_ASSERT(suart != NULL); + + osmo_soft_uart_set_tx(suart, true); + + printf("pulling 25 bits (first time) out of the transmitter\n"); + rc = osmo_soft_uart_tx_ubits(suart, &tx_buf[0], sizeof(tx_buf) / 2); + OSMO_ASSERT(rc == 25); + + printf("pulling 25 bits (second time) out of the transmitter\n"); + rc = osmo_soft_uart_tx_ubits(suart, &tx_buf[25], sizeof(tx_buf) / 2); + OSMO_ASSERT(rc == 25); + + /* FIXME: we pull total 25 + 25 == 50 bits out of the transmitter, which is enough + * to fit 5 characters (assuming 8-N-1). However, the current impelementation would + * pull only 2 + 2 == characters total, wasting 5 + 5 == 10 bits for padding. */ + + osmo_soft_uart_free(suart); +} + int main(int argc, char **argv) { test_rx(); @@ -616,6 +647,8 @@ test_tx_rx_pull_n(4); test_tx_rx_pull_n(8); + test_tx_pull(); + /* test flow control */ test_modem_status(); test_flow_control_dtr_dsr(); diff --git a/tests/soft_uart/soft_uart_test.ok b/tests/soft_uart/soft_uart_test.ok index baf3483..dcd7ceb 100644 --- a/tests/soft_uart/soft_uart_test.ok +++ b/tests/soft_uart/soft_uart_test.ok @@ -220,6 +220,12 @@ ======== feeding 32 bits into the receiver suart_rx_cb(flags=00): 55 55 +Executing test_tx_pull +pulling 25 bits (first time) out of the transmitter +suart_tx_cb(len=2/2): 42 42 +pulling 25 bits (second time) out of the transmitter +suart_tx_cb(len=2/2): 42 42 + Executing test_modem_status initial status=0x00000000 de-asserting DCD, which was not asserted -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35327?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: Ic2539681a4adf6c1822e0bc256e4c829813d0e21 Gerrit-Change-Number: 35327 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: demonstrate a problem with inefficient polling

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35327?usp=email ) Change subject: soft_uart: demonstrate a problem with inefficient polling ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35327?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: Ic2539681a4adf6c1822e0bc256e4c829813d0e21 Gerrit-Change-Number: 35327 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 20:49:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[S] Change in libosmocore[master]: soft_uart: demonstrate a problem with manual flush()ing

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35326?usp=email ) Change subject: soft_uart: demonstrate a problem with manual flush()ing ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35326?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: Iad932a505d6fd98360f90510651501f8708ff5d2 Gerrit-Change-Number: 35326 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 20:48:53 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: soft_uart: fix the Rx flushing logic, add a unit test

by laforge

Attention is currently required from: fixeria. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35297?usp=email ) Change subject: soft_uart: fix the Rx flushing logic, add a unit test ...................................................................... Patch Set 5: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35297?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: I5179f5fd2361e4e96ac9bf48e80b99e53a7e4712 Gerrit-Change-Number: 35297 Gerrit-PatchSet: 5 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 20:48:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Introduce API osmo_sock_sctp_get_peer_addr_info()

by laforge

laforge has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35276?usp=email ) Change subject: socket: Introduce API osmo_sock_sctp_get_peer_addr_info() ...................................................................... socket: Introduce API osmo_sock_sctp_get_peer_addr_info() This is a convenience helper to reetrieve the whole set of remote addresses and call getsockopt() on them, making it easy for users to analyse the full set of remote addresses of a socket simply providing an fd. Related: SYS#6636 Change-Id: I3e1c84526b006baff435bbbca49dc6cf7d201cf5 --- M TODO-RELEASE M include/osmocom/core/socket.h M src/core/libosmocore.map M src/core/socket.c 4 files changed, 97 insertions(+), 0 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 316c0ec..9f5240f 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -9,6 +9,7 @@ #library what description / commit summary line core ADD osmo_sock_multiaddr_{add,del}_local_addr() core ADD osmo_sock_multiaddr_get_ip_and_port(), osmo_multiaddr_ip_and_port_snprintf(), osmo_sock_multiaddr_get_name_buf() +core ADD osmo_sock_sctp_get_peer_addr_info() core ADD gsmtap_inst_fd2() core, DEPRECATE gsmtap_inst_fd() isdn ABI change add states and flags for external T200 handling gsm ABI change add T200 timer states to lapdm_datalink diff --git a/include/osmocom/core/socket.h b/include/osmocom/core/socket.h index dd14556..0f4a8bd 100644 --- a/include/osmocom/core/socket.h +++ b/include/osmocom/core/socket.h @@ -22,6 +22,7 @@ struct sockaddr_in; struct sockaddr; struct osmo_fd; +struct sctp_paddrinfo; struct osmo_sockaddr { union { @@ -211,5 +212,7 @@ int osmo_sock_set_dscp(int fd, uint8_t dscp); int osmo_sock_set_priority(int fd, int prio); +int osmo_sock_sctp_get_peer_addr_info(int fd, struct sctp_paddrinfo *pinfo, size_t *pinfo_cnt); + #endif /* (!EMBEDDED) */ /*! @} */ diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index e7daced..b66e37d 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -439,6 +439,7 @@ osmo_sock_multiaddr_del_local_addr; osmo_sock_multiaddr_get_ip_and_port; osmo_sock_multiaddr_get_name_buf; +osmo_sock_sctp_get_peer_addr_info; osmo_sock_set_dscp; osmo_sock_set_priority; osmo_sock_unix_init; diff --git a/src/core/socket.c b/src/core/socket.c index 5b7489d..c497088 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -2653,6 +2653,83 @@ return setsockopt(fd, SOL_SOCKET, SO_PRIORITY, &prio, sizeof(prio)); } +#ifdef HAVE_LIBSCTP +/*! Fill in array of struct sctp_paddrinfo with each of the remote addresses of an SCTP socket + * \param[in] fd file descriptor of SCTP socket + * \param[out] pinfo Pointer to memory holding an array of struct sctp_paddrinfo (pinfo_cnt length). + * \param[in,out] pinfo_cnt length of pinfo array (in elements). On return it contains the number of addresses found. + * \returns 0 on success; negative otherwise + * + * Upon return, pinfo_cnt can be set to a higher value than the one set by the + * caller. This can be used by the caller to find out the required array length + * and then obtaining by calling the function twice. Only up to pinfo_cnt addresses + * are filled in, as per the value provided by the caller. + * + * Usage example retrieving struct sctp_paddrinfo for all (up to OSMO_SOCK_MAX_ADDRS, 32) remote IP addresses: + * struct sctp_paddrinfo pinfo[OSMO_SOCK_MAX_ADDRS]; + * size_t pinfo_cnt = ARRAY_SIZE(pinfo); + * rc = osmo_sock_sctp_get_peer_addr_info(fd, &pinfo[0], &num_hostbuf, pinfo_cnt); + * if (rc < 0) + * goto error; + * if (pinfo_cnt > ARRAY_SIZE(hostbuf)) + * goto not_enough_buffers; + */ +int osmo_sock_sctp_get_peer_addr_info(int fd, struct sctp_paddrinfo *pinfo, size_t *pinfo_cnt) +{ + struct sockaddr *addrs = NULL; + unsigned int n_addrs, i; + void *addr_buf; + int rc; + socklen_t optlen; + + rc = sctp_getpaddrs(fd, 0, &addrs); + + if (rc < 0) + return rc; + if (rc == 0) + return -ENOTCONN; + + n_addrs = rc; + addr_buf = (void *)addrs; + for (i = 0; i < n_addrs; i++) { + struct sockaddr *sa_addr = (struct sockaddr *)addr_buf; + size_t addrlen; + + switch (sa_addr->sa_family) { + case AF_INET: + addrlen = sizeof(struct sockaddr_in); + break; + case AF_INET6: + addrlen = sizeof(struct sockaddr_in6); + break; + default: + rc = -EINVAL; + goto free_addrs_ret; + } + + if (i >= *pinfo_cnt) { + addr_buf += addrlen; + continue; + } + + memset(&pinfo[i], 0, sizeof(pinfo[0])); + memcpy(&pinfo[i].spinfo_address, sa_addr, addrlen); + optlen = sizeof(pinfo[0]); + rc = getsockopt(fd, SOL_SCTP, SCTP_GET_PEER_ADDR_INFO, &pinfo[i], &optlen); + if (rc < 0) + goto free_addrs_ret; + + addr_buf += addrlen; + } + + *pinfo_cnt = n_addrs; + rc = 0; +free_addrs_ret: + sctp_freepaddrs(addrs); + return rc; +} +#endif + #endif /* HAVE_SYS_SOCKET_H */ /*! @} */ -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35276?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: I3e1c84526b006baff435bbbca49dc6cf7d201cf5 Gerrit-Change-Number: 35276 Gerrit-PatchSet: 3 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-MessageType: merged

1 year, 6 months

1
0
0 0

[M] Change in libosmocore[master]: socket: Introduce API osmo_sock_sctp_get_peer_addr_info()

by laforge

Attention is currently required from: pespin. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/35276?usp=email ) Change subject: socket: Introduce API osmo_sock_sctp_get_peer_addr_info() ...................................................................... Patch Set 3: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35276?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: I3e1c84526b006baff435bbbca49dc6cf7d201cf5 Gerrit-Change-Number: 35276 Gerrit-PatchSet: 3 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-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 11 Dec 2023 20:47:10 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 6 months

1
0
0 0

2025

2024

2023

2022

gerrit-log December 2023