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

[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame ...................................................................... LAPDm: Add a flag to enable suppression of subsequent REJ frame This behaviour was default in earlier versions of LAPDm/LAPD. Because it is only required for osmocom-bb, a flag is added to enable it there. Related: OS#5969 Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 --- M include/osmocom/gsm/lapdm.h M include/osmocom/isdn/lapd_core.h M src/gsm/lapdm.c M src/isdn/lapd_core.c 4 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?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: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Gerrit-Change-Number: 35015 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

by jolly

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email to look at the new patch set (#12). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: LAPDm: Add support for RTS based polling ...................................................................... LAPDm: Add support for RTS based polling The lower layer must set the 'POLLING_ONLY' flag and provide frame number when polling a frame. If T200 is pending, it is started with a timeout frame number in advance to given frame number. The lower layer must call lapdm_t200_fn() after a frame has been received or if a frame has not been received. Also it must be called after a TCH frame has been received. LAPDm uses this to check the T200 timeout condition. A new function is used to set the frame number based timeout values. Related: OS#4074 Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/gsm/lapdm.c M src/gsm/libosmogsm.map 4 files changed, 175 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/34986/12 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?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: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 12 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

by laforge

Attention is currently required from: jolly. laforge has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling ...................................................................... Patch Set 11: Code-Review+1 (1 comment) Patchset: PS11: entire series needs to be rebase on top of master to be merged (see MERGE CONFLICT) warning -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?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: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 11 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 20 Nov 2023 12:18:07 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test

by jolly

Attention is currently required from: fixeria, laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email ) Change subject: BTS_Tests_LAPDm.TC_nr_seq_error: Fix test ...................................................................... Patch Set 1: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047/comment/afe777ff_2847… PS1, Line 9: OS: > `OS#` Done Patchset: PS1: > I think this needs a more elaborate explanation. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/35047?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ttcn3-hacks Gerrit-Branch: master Gerrit-Change-Id: I4cdff6ab607e158d4956a1bd87f74e9e75579cff Gerrit-Change-Number: 35047 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 20 Nov 2023 12:01:49 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

by jolly

Attention is currently required from: laforge. jolly has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email ) Change subject: LAPDm: Add support for RTS based polling ...................................................................... Patch Set 10: (2 comments) File src/gsm/lapdm.c: https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/c2c2804c_336a21a6 PS10, Line 1619: i > array should be "const uint32_t *" as it's just read and never modified. Done https://gerrit.osmocom.org/c/libosmocore/+/34986/comment/184a8337_06f0837b PS10, Line 1631: void lapdm_channel_set_t200_fn(struct lapdm_channel *lc, uint32_t *t200_fn_dcch, uint32_t *t200_fn_acch) > arrays should be "const uint32_t *" as it's just read and never modified. Done -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?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: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 10 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 20 Nov 2023 12:01:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 year, 7 months

1
0
0 0

[M] Change in libosmocore[master]: LAPDm: Add support for RTS based polling

by jolly

Attention is currently required from: jolly, laforge. Hello Jenkins Builder, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34986?usp=email to look at the new patch set (#11). The following approvals got outdated and were removed: Code-Review+1 by laforge, Verified+1 by Jenkins Builder Change subject: LAPDm: Add support for RTS based polling ...................................................................... LAPDm: Add support for RTS based polling The lower layer must set the 'POLLING_ONLY' flag and provide frame number when polling a frame. If T200 is pending, it is started with a timeout frame number in advance to given frame number. The lower layer must call lapdm_t200_fn() after a frame has been received or if a frame has not been received. Also it must be called after a TCH frame has been received. LAPDm uses this to check the T200 timeout condition. A new function is used to set the frame number based timeout values. Related: OS#4074 Change-Id: I6ebe83f829d7751ea9de1d90eb478c7a628db64c --- M TODO-RELEASE M include/osmocom/gsm/lapdm.h M src/core/gsmtap_util.c M src/gsm/lapdm.c M src/gsm/libosmogsm.map 5 files changed, 182 insertions(+), 11 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/86/34986/11 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34986?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: I6ebe83f829d7751ea9de1d90eb478c7a628db64c Gerrit-Change-Number: 34986 Gerrit-PatchSet: 11 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[S] Change in libosmocore[master]: LAPDm: Add a flag to enable suppression of subsequent REJ frame

by jolly

Attention is currently required from: jolly. Hello Jenkins Builder, fixeria, laforge, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/35015?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder The change is no longer submittable: Verified is unsatisfied now. Change subject: LAPDm: Add a flag to enable suppression of subsequent REJ frame ...................................................................... LAPDm: Add a flag to enable suppression of subsequent REJ frame This behaviour was default in earlier versions of LAPDm/LAPD. Because it is only required for osmocom-bb, a flag is added to enable it there. Related: OS#5969 Change-Id: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 --- M include/osmocom/gsm/lapdm.h M include/osmocom/isdn/lapd_core.h M src/gsm/lapdm.c M src/isdn/lapd_core.c 4 files changed, 19 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/15/35015/3 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/35015?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: I93994dbbd1fc2c9edb8f3015c6b18ecd0fce0565 Gerrit-Change-Number: 35015 Gerrit-PatchSet: 3 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newpatchset

1 year, 7 months

1
0
0 0

[M] Change in libosmo-sccp[master]: port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd()

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/35073?usp=email ) Change subject: port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd() ...................................................................... port from osmo_stream_*_get_ofd() to osmo_stream_srv_get_fd() The existing/old osmo_stream_{srv,cli}_get_ofd() API functions are only compatible with OSMO_FD mode of libosmo-netif/stream. In the OSMO_IO mode, there is no osmo_fd involved, and hence those functions are illagal to call. Let's instead migrate over to the new osmo_stream_{srv,cli}_get_fd() which directly return the file descriptor integer value. Change-Id: I12c66badfb4bdfdfe71f1716de960d353d3548b1 Related: OS#5752 --- M TODO-RELEASE M src/osmo_ss7_asp.c M src/osmo_ss7_vty.c M src/xua_asp_fsm.c 4 files changed, 61 insertions(+), 32 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/73/35073/1 diff --git a/TODO-RELEASE b/TODO-RELEASE index ae21a12..1e4c41a 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,4 +7,5 @@ # If any interfaces have been added since the last public release: c:r:a + 1. # If any interfaces have been removed or changed since the last public release: c:r:0. #library what description / commit summary line -libosmocore >1.9.0 osmo_sock_multiaddr_{add,del}_local_addr() \ No newline at end of file +libosmocore >1.9.0 osmo_sock_multiaddr_{add,del}_local_addr() +libosmo-netif >1.4.0 osmo_stream_{srv,cli}_get_fd() diff --git a/src/osmo_ss7_asp.c b/src/osmo_ss7_asp.c index 0662085..ce4fb39 100644 --- a/src/osmo_ss7_asp.c +++ b/src/osmo_ss7_asp.c @@ -171,7 +171,7 @@ int ss7_asp_apply_new_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx) { const char *new_loc_addr; - struct osmo_fd *ofd; + int fd; OSMO_ASSERT(loc_idx < asp->cfg.local.host_cnt); new_loc_addr = asp->cfg.local.host[loc_idx]; @@ -180,17 +180,20 @@ new_loc_addr); if (asp->cfg.is_server) - ofd = osmo_stream_srv_get_ofd(asp->server); + fd = osmo_stream_srv_get_fd(asp->server); else - ofd = osmo_stream_cli_get_ofd(asp->client); + fd = osmo_stream_cli_get_fd(asp->client); - return osmo_sock_multiaddr_add_local_addr(ofd->fd, &new_loc_addr, 1); + if (fd < 0) + return fd; + + return osmo_sock_multiaddr_add_local_addr(fd, &new_loc_addr, 1); } int ss7_asp_apply_drop_local_address(const struct osmo_ss7_asp *asp, unsigned int loc_idx) { const char *new_loc_addr; - struct osmo_fd *ofd; + int fd; OSMO_ASSERT(loc_idx < asp->cfg.local.host_cnt); new_loc_addr = asp->cfg.local.host[loc_idx]; @@ -199,20 +202,22 @@ new_loc_addr); if (asp->cfg.is_server) - ofd = osmo_stream_srv_get_ofd(asp->server); + fd = osmo_stream_srv_get_fd(asp->server); else - ofd = osmo_stream_cli_get_ofd(asp->client); + fd = osmo_stream_cli_get_fd(asp->client); - return osmo_sock_multiaddr_del_local_addr(ofd->fd, &new_loc_addr, 1); + if (fd < 0) + return fd; + + return osmo_sock_multiaddr_del_local_addr(fd, &new_loc_addr, 1); } int ss7_asp_apply_peer_primary_address(const struct osmo_ss7_asp *asp) { - struct osmo_fd *ofd; struct osmo_sockaddr_str addr_str; struct osmo_sockaddr addr; uint16_t local_port; - int rc; + int fd, rc; /* No SCTP Peer Primary Address explicitly configured, do nothing. */ if (asp->cfg.local.idx_primary == -1) @@ -220,13 +225,16 @@ OSMO_ASSERT(asp->cfg.local.idx_primary < asp->cfg.local.host_cnt); if (asp->cfg.is_server) - ofd = osmo_stream_srv_get_ofd(asp->server); + fd = osmo_stream_srv_get_fd(asp->server); else - ofd = osmo_stream_cli_get_ofd(asp->client); + fd = osmo_stream_cli_get_fd(asp->client); + + if (fd < 0) + return fd; if (asp->cfg.local.port == 0) { char port_buf[16]; - osmo_sock_get_local_ip_port(ofd->fd, port_buf, sizeof(port_buf)); + osmo_sock_get_local_ip_port(fd, port_buf, sizeof(port_buf)); local_port = atoi(port_buf); } else { local_port = asp->cfg.local.port; @@ -241,17 +249,16 @@ return rc; LOGPASP(asp, DLSS7, LOGL_INFO, "Set Peer's Primary Address %s\n", osmo_sockaddr_to_str(&addr)); - rc = _setsockopt_peer_primary_addr(ofd->fd, &addr); + rc = _setsockopt_peer_primary_addr(fd, &addr); return rc; } int ss7_asp_apply_primary_address(const struct osmo_ss7_asp *asp) { - struct osmo_fd *ofd; struct osmo_sockaddr_str addr_str; struct osmo_sockaddr addr; - int rc; + int fd, rc; /* No SCTP Primary Address explicitly configured, do nothing. */ if (asp->cfg.remote.idx_primary == -1) @@ -259,9 +266,12 @@ OSMO_ASSERT(asp->cfg.remote.idx_primary < asp->cfg.remote.host_cnt); if (asp->cfg.is_server) - ofd = osmo_stream_srv_get_ofd(asp->server); + fd = osmo_stream_srv_get_fd(asp->server); else - ofd = osmo_stream_cli_get_ofd(asp->client); + fd = osmo_stream_cli_get_fd(asp->client); + + if (fd < 0) + return fd; rc = osmo_sockaddr_str_from_str(&addr_str, asp->cfg.remote.host[asp->cfg.remote.idx_primary], @@ -273,7 +283,7 @@ return rc; LOGPASP(asp, DLSS7, LOGL_INFO, "Set Primary Address %s\n", osmo_sockaddr_to_str(&addr)); - rc = _setsockopt_primary_addr(ofd->fd, &addr); + rc = _setsockopt_primary_addr(fd, &addr); return rc; } @@ -729,7 +739,7 @@ /* netif code tells us we can read something from the socket */ int ss7_asp_ipa_srv_conn_cb(struct osmo_stream_srv *conn) { - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(conn); + int fd = osmo_stream_srv_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_srv_get_data(conn); struct msgb *msg = NULL; int rc; @@ -754,7 +764,7 @@ } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, ofd->fd & 0xf); + return ipa_rx_msg(asp, msg, fd & 0xf); } /* netif code tells us we can read something from the socket */ @@ -827,13 +837,13 @@ /* client has established SCTP connection to server */ static int xua_cli_connect_cb(struct osmo_stream_cli *cli) { - struct osmo_fd *ofd = osmo_stream_cli_get_ofd(cli); + int fd = osmo_stream_cli_get_fd(cli); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(cli); int rc = 0; /* update the socket name */ talloc_free(asp->sock_name); - asp->sock_name = osmo_sock_get_name(asp, ofd->fd); + asp->sock_name = osmo_sock_get_name(asp, fd); LOGPASP(asp, DLSS7, LOGL_INFO, "Client connected %s\n", asp->sock_name); @@ -877,7 +887,7 @@ /* read call-back for IPA/SCCPlite socket */ static int ipa_cli_read_cb(struct osmo_stream_cli *conn) { - struct osmo_fd *ofd = osmo_stream_cli_get_ofd(conn); + int fd = osmo_stream_cli_get_fd(conn); struct osmo_ss7_asp *asp = osmo_stream_cli_get_data(conn); struct msgb *msg = NULL; int rc; @@ -902,7 +912,7 @@ } msg->dst = asp; rate_ctr_inc2(asp->ctrg, SS7_ASP_CTR_PKT_RX_TOTAL); - return ipa_rx_msg(asp, msg, ofd->fd & 0xf); + return ipa_rx_msg(asp, msg, fd & 0xf); } static int xua_cli_read_cb(struct osmo_stream_cli *conn) diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c index ff27cf3..5a637b4 100644 --- a/src/osmo_ss7_vty.c +++ b/src/osmo_ss7_vty.c @@ -1133,10 +1133,10 @@ llist_for_each_entry(asp, &inst->asp_list, list) { if (asp->cfg.proto == OSMO_SS7_ASP_PROT_IPA && asp->cfg.remote.port == 0 && asp->server) { - struct osmo_fd *ofd = osmo_stream_srv_get_ofd(asp->server); + int fd = osmo_stream_srv_get_fd(asp->server); char hostbuf[64]; char portbuf[16]; - osmo_sock_get_ip_and_port(ofd->fd, hostbuf, sizeof(hostbuf), + osmo_sock_get_ip_and_port(fd, hostbuf, sizeof(hostbuf), portbuf, sizeof(portbuf), false); snprintf(buf, sizeof(buf), "%s:%s", hostbuf, portbuf); } else diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c index 0080497..2d81bc3 100644 --- a/src/xua_asp_fsm.c +++ b/src/xua_asp_fsm.c @@ -848,16 +848,16 @@ static int get_fd_from_iafp(struct ipa_asp_fsm_priv *iafp) { struct osmo_ss7_asp *asp = iafp->asp; - struct osmo_fd *ofd; + int fd; if (asp->server) - ofd = osmo_stream_srv_get_ofd(asp->server); + fd = osmo_stream_srv_get_fd(asp->server); else if (asp->client) - ofd = osmo_stream_cli_get_ofd(asp->client); + fd = osmo_stream_cli_get_fd(asp->client); else return -1; - return ofd->fd; + return fd; } /*************** -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/35073?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I12c66badfb4bdfdfe71f1716de960d353d3548b1 Gerrit-Change-Number: 35073 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

[S] Change in libosmo-netif[master]: stream_srv: osmo_stream_srv_get_ofd() works only in OSMO_FD mode

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35071?usp=email ) Change subject: stream_srv: osmo_stream_srv_get_ofd() works only in OSMO_FD mode ...................................................................... stream_srv: osmo_stream_srv_get_ofd() works only in OSMO_FD mode The corresponding client function osmo_stream_cli_get_ofd() already contained an OSMO_ASSERT, but the server side was missing this so far. The 'ofd' member only has meaning in the context of OSMO_FD, so calling that function from generic code is wrong! Change-Id: I50df259040e011135a31fe1aee231eba430fa94a Fixes: Change-Id I2f52c7107c392b6f4b0bf2a84f8c873c084a200c Related: OS#5753 --- M src/stream_srv.c 1 file changed, 17 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/71/35071/1 diff --git a/src/stream_srv.c b/src/stream_srv.c index 1370e42..36e21cc 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -834,6 +834,7 @@ struct osmo_fd * osmo_stream_srv_get_ofd(struct osmo_stream_srv *conn) { + OSMO_ASSERT(conn->mode == OSMO_STREAM_MODE_OSMO_FD); return &conn->ofd; } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35071?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: I50df259040e011135a31fe1aee231eba430fa94a Gerrit-Change-Number: 35071 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

[M] Change in libosmo-netif[master]: Introduce generic osmo_stream_{cli,srv}_get_fd() API

by laforge

laforge has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/35072?usp=email ) Change subject: Introduce generic osmo_stream_{cli,srv}_get_fd() API ...................................................................... Introduce generic osmo_stream_{cli,srv}_get_fd() API The old osmo_stream_{cli,srv}_get_ofd() API only works for streams in OSMO_FD mode. However, it is legitimate for an application wanting to get low-level access to the file descriptor, for example to issue some {get,set}sockopt() calls on it. Change-Id: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab Related: OS#5753 --- M include/osmocom/netif/stream.h M src/stream_cli.c M src/stream_srv.c 3 files changed, 45 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/72/35072/1 diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index a24244c..218b635 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -64,6 +64,7 @@ void *osmo_stream_srv_get_data(struct osmo_stream_srv *conn); struct osmo_stream_srv_link *osmo_stream_srv_get_master(struct osmo_stream_srv *conn); struct osmo_fd *osmo_stream_srv_get_ofd(struct osmo_stream_srv *srv); +int osmo_stream_srv_get_fd(const struct osmo_stream_srv *srv); void osmo_stream_srv_destroy(struct osmo_stream_srv *conn); void osmo_stream_srv_set_flush_and_destroy(struct osmo_stream_srv *conn); @@ -96,6 +97,7 @@ void *osmo_stream_cli_get_data(struct osmo_stream_cli *cli); char *osmo_stream_cli_get_sockname(const struct osmo_stream_cli *cli); struct osmo_fd *osmo_stream_cli_get_ofd(struct osmo_stream_cli *cli); +int osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli); void osmo_stream_cli_set_connect_cb(struct osmo_stream_cli *cli, int (*connect_cb)(struct osmo_stream_cli *cli)); void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, int (*disconnect_cb)(struct osmo_stream_cli *cli)); void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli)); diff --git a/src/stream_cli.c b/src/stream_cli.c index ef571cc..6769051 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -210,7 +210,11 @@ } } -static inline int osmo_stream_cli_fd(const struct osmo_stream_cli *cli) +/*! \brief Get File Descriptor of the stream client socket + * \param[in] cli Stream Client to modify + * \returns File descriptor */ +int +osmo_stream_cli_get_fd(const struct osmo_stream_cli *cli) { switch (cli->mode) { case OSMO_STREAM_MODE_OSMO_FD: @@ -314,7 +318,7 @@ #ifdef SO_NOSIGPIPE int ret; int val = 1; - ret = setsockopt(osmo_stream_cli_fd(cli), SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); + ret = setsockopt(osmo_stream_cli_get_fd(cli), SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); if (ret < 0) LOGSCLI(cli, LOGL_ERROR, "Failed setting SO_NOSIGPIPE: %s\n", strerror(errno)); return ret; @@ -328,7 +332,7 @@ int error, ret = res; socklen_t len = sizeof(error); - int fd = osmo_stream_cli_fd(cli); + int fd = osmo_stream_cli_get_fd(cli); OSMO_ASSERT(fd >= 0); if (ret < 0) { @@ -347,7 +351,7 @@ osmo_fd_write_disable(&cli->ofd); /* Update sockname based on socket info: */ - osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_fd(cli)); + osmo_sock_get_name_buf(cli->sockname, sizeof(cli->sockname), osmo_stream_cli_get_fd(cli)); LOGSCLI(cli, LOGL_INFO, "connection established\n"); cli->state = STREAM_CLI_STATE_CONNECTED; @@ -683,7 +687,7 @@ { static char buf[OSMO_SOCK_NAME_MAXLEN]; - osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, osmo_stream_cli_fd(cli)); + osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, osmo_stream_cli_get_fd(cli)); return buf; } @@ -837,7 +841,7 @@ int ret, fd = -1; /* we are reconfiguring this socket, close existing first. */ - if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_fd(cli) >= 0) + if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_get_fd(cli) >= 0) osmo_stream_cli_close(cli); cli->flags &= ~OSMO_STREAM_CLI_F_RECONF; diff --git a/src/stream_srv.c b/src/stream_srv.c index 36e21cc..42b04ad 100644 --- a/src/stream_srv.c +++ b/src/stream_srv.c @@ -838,6 +838,24 @@ return &conn->ofd; } +/*! \brief Get File Descriptor of the stream server + * \param[in] conn Stream Server + * \returns file descriptor or negative on error */ +int +osmo_stream_srv_get_fd(const struct osmo_stream_srv *conn) +{ + switch (conn->mode) { + case OSMO_STREAM_MODE_OSMO_FD: + return conn->ofd.fd; + case OSMO_STREAM_MODE_OSMO_IO: + if (conn->iofd) + return osmo_iofd_get_fd(conn->iofd); + default: + break; + } + return -EINVAL; +} + /*! \brief Get the master (Link) from a Stream Server * \param[in] conn Stream Server of which we want to know the Link * \returns Link through which the given Stream Server is established */ -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/35072?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: Ib0737f21150f6ac8d524b92c7ddb098f2afdeaab Gerrit-Change-Number: 35072 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-MessageType: newchange

1 year, 7 months

1
0
0 0

2025

2024

2023

2022

gerrit-log November 2023