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

[S] Change in osmo-bsc[master]: pcuif_proto: increment version number
by dexter 06 Mar '23

06 Mar '23

Attention is currently required from: neels, laforge. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31597 ) Change subject: pcuif_proto: increment version number ...................................................................... Patch Set 7: (2 comments) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31597/comment/343c71a3_20af8994 PS6, Line 10: lets > ("let's") Done Patchset: PS1: > currently there is no prevention of accidental merge in place I have added a Depends tag that relates to the corresponding patch in Osmo-PCU. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31597 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I8315bd67c7f3eb0d7ee71b64cd4dff889a84fcf1 Gerrit-Change-Number: 31597 Gerrit-PatchSet: 7 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 06 Mar 2023 15:47:48 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: neels <nhofmeyr(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: fix PCU socket accept behavior
by dexter 06 Mar '23

06 Mar '23

Attention is currently required from: fixeria, msuraev. Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/31678 to look at the new patch set (#2). Change subject: pcu_sock: fix PCU socket accept behavior ...................................................................... pcu_sock: fix PCU socket accept behavior When a new PCU connection is accepted while the old connection is still present, then the new connection should replace the old one. At the moment we disable the active connection and closei the one, which leaves us with no connection at all. Change-Id: I695b93fd8109ef4943f36716563c147927611e85 --- M src/common/pcu_sock.c 1 file changed, 15 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/78/31678/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I695b93fd8109ef4943f36716563c147927611e85 Gerrit-Change-Number: 31678 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bts[master]: pcu_sock: do not mess with the osmo fd flags directly
by dexter 06 Mar '23

06 Mar '23

Attention is currently required from: dexter. Hello Jenkins Builder, fixeria, msuraev, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-bts/+/31679 to look at the new patch set (#2). Change subject: pcu_sock: do not mess with the osmo fd flags directly ...................................................................... pcu_sock: do not mess with the osmo fd flags directly When we disable the old socket connection, let's use osmo_fd_read_disable(). Change-Id: I6b6854e9881c79b5c4794bde4ba4f6841dd06386 --- M src/common/pcu_sock.c 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/79/31679/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b6854e9881c79b5c4794bde4ba4f6841dd06386 Gerrit-Change-Number: 31679 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-bts[master]: pcu_sock: fix PCU socket accept behavior
by dexter 06 Mar '23

06 Mar '23

Attention is currently required from: fixeria, msuraev. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31678 ) Change subject: pcu_sock: fix PCU socket accept behavior ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/31678/comment/89354766_ffeb6628 PS1, Line 11: moment we disable the active connection and close the the one, which > typo: the the Done -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I695b93fd8109ef4943f36716563c147927611e85 Gerrit-Change-Number: 31678 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: msuraev <msuraev(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 15:45:50 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: msuraev <msuraev(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: Makefile.am: Make libraries depend on .map files
by msuraev 06 Mar '23

06 Mar '23

Attention is currently required from: laforge. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31667 ) Change subject: Makefile.am: Make libraries depend on .map files ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31667 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: If0ea6f41730a28b04562d45efa6ca376abaf3f6b Gerrit-Change-Number: 31667 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 06 Mar 2023 15:45:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: cosmetic: remove unnecessary line breaks
by dexter 06 Mar '23

06 Mar '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31677 ) Change subject: pcu_sock: cosmetic: remove unnecessary line breaks ...................................................................... pcu_sock: cosmetic: remove unnecessary line breaks Change-Id: I8cb2979c62ebb05d06af49b40b145b7dee826cb1 --- M src/common/pcu_sock.c 1 file changed, 11 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 7f0af56..119d7b8 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1170,8 +1170,7 @@ } if (conn_bfd->fd >= 0) { - LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have " - "another active connection ?!?\n"); + LOGP(DPCU, LOGL_NOTICE, "PCU connects but we already have another active connection ?!?\n"); /* We already have one PCU connected, this is all we support */ state->listen_bfd.when &= ~OSMO_FD_READ; close(fd); @@ -1181,8 +1180,7 @@ osmo_fd_setup(conn_bfd, fd, OSMO_FD_READ, pcu_sock_cb, state, 0); if (osmo_fd_register(conn_bfd) != 0) { - LOGP(DPCU, LOGL_ERROR, "Failed to register new connection " - "fd\n"); + LOGP(DPCU, LOGL_ERROR, "Failed to register new connection fd\n"); close(conn_bfd->fd); conn_bfd->fd = -1; return -1; -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31677 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I8cb2979c62ebb05d06af49b40b145b7dee826cb1 Gerrit-Change-Number: 31677 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-pcu[master]: pcu_l1_if_phy: support multiple BTS (in theory)
by msuraev 06 Mar '23

06 Mar '23

Attention is currently required from: fixeria, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31649 ) Change subject: pcu_l1_if_phy: support multiple BTS (in theory) ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31649 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I33518cbbe83f7f8c071afa5e995d30930099ba92 Gerrit-Change-Number: 31649 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 15:37:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: do not mess with the osmo fd flags directly
by msuraev 06 Mar '23

06 Mar '23

Attention is currently required from: dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31679 ) Change subject: pcu_sock: do not mess with the osmo fd flags directly ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31679 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b6854e9881c79b5c4794bde4ba4f6841dd06386 Gerrit-Change-Number: 31679 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 15:34:39 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: fix PCU socket accept behavior
by msuraev 06 Mar '23

06 Mar '23

Attention is currently required from: fixeria, dexter. msuraev has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31678 ) Change subject: pcu_sock: fix PCU socket accept behavior ...................................................................... Patch Set 1: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/31678/comment/92792986_e3577c6f PS1, Line 11: moment we disable the active connection and close the the one, which typo: the the -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31678 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I695b93fd8109ef4943f36716563c147927611e85 Gerrit-Change-Number: 31678 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: msuraev <msuraev(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 15:33:40 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: pcu_sock: get rid of leaking message buffer
by dexter 06 Mar '23

06 Mar '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31673 ) ( 1 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: pcu_sock: get rid of leaking message buffer ...................................................................... pcu_sock: get rid of leaking message buffer When a data request is received from the PCU, some of the switch cases allocate a message buffer but the message buffer is only used to pass its data and length to other functions. The message buffer itself is not passed anywhere and it is also not freed. Lets get rid of the message buffer and avoid unnecessary memcopy calls. Related: OS#5198 Change-Id: Ibfaae177585a4d42d797b6bbd90e402641620140 --- M src/osmo-bsc/pcu_sock.c 1 file changed, 19 insertions(+), 23 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index a0c9827..1d5e56c 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -531,7 +531,6 @@ static int pcu_rx_data_req(struct gsm_bts *bts, uint8_t msg_type, struct gsm_pcu_if_data *data_req) { - struct msgb *msg; uint32_t tlli = -1; uint8_t pag_grp; int rc = 0; @@ -548,18 +547,8 @@ pcu_rx_rr_paging(bts, pag_grp, data_req->data+3); break; case PCU_IF_SAPI_AGCH: - msg = msgb_alloc(data_req->len, "pcu_agch"); - if (!msg) { - rc = -ENOMEM; - break; - } - msg->l3h = msgb_put(msg, data_req->len); - memcpy(msg->l3h, data_req->data, data_req->len); - - if (rsl_imm_assign_cmd(bts, msg->len, msg->data)) { - msgb_free(msg); + if (rsl_imm_assign_cmd(bts, data_req->len, data_req->data)) rc = -EIO; - } break; case PCU_IF_SAPI_PCH_DT: /* DT = direct TLLI. A tlli is prefixed so that the BSC/BTS can confirm the sending of the downlink @@ -579,29 +568,20 @@ LOGP(DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH (tlli=0x%08x, pag_grp=0x%02x)\n", tlli, pag_grp); - msg = msgb_alloc(data_req->len - 7, "pcu_pch"); - if (!msg) { - rc = -ENOMEM; - break; - } - msg->l3h = msgb_put(msg, data_req->len - 7); - memcpy(msg->l3h, data_req->data + 7, data_req->len - 7); /* NOTE: Sending an IMMEDIATE ASSIGNMENT via PCH became necessary with GPRS in order to be able to * assign downlink TBFs directly through the paging channel. However, this method never became part * of the RSL specs. This means that each BTS vendor has to come up with a proprietary method. At * the moment we only support Ericsson RBS here. */ if (bts->type == GSM_BTS_TYPE_RBS2000) { - rc = rsl_ericsson_imm_assign_cmd(bts, tlli, msg->len, msg->data, pag_grp); + rc = rsl_ericsson_imm_assign_cmd(bts, tlli, data_req->len - 7, data_req->data + 7, pag_grp); } else { LOGP(DPCU, LOGL_ERROR, "BTS model does not support sending immediate assignment via PCH!\n"); rc = -ENOTSUP; } - if (rc) { - msgb_free(msg); + if (rc) rc = -EIO; - } break; default: LOGP(DPCU, LOGL_ERROR, "Received PCU data request with " -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31673 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ibfaae177585a4d42d797b6bbd90e402641620140 Gerrit-Change-Number: 31673 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: merged

1 0