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

[S] Change in osmo-trx[master]: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31892 ) Change subject: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 --- M Transceiver52M/Transceiver.h M Transceiver52M/device/ipc/IPCDevice.cpp M Transceiver52M/device/ipc/ipc_sock.c 3 files changed, 12 insertions(+), 3 deletions(-) Approvals: fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/Transceiver52M/Transceiver.h b/Transceiver52M/Transceiver.h index 1860884..babe420 100644 --- a/Transceiver52M/Transceiver.h +++ b/Transceiver52M/Transceiver.h @@ -162,9 +162,9 @@ } ~ctrl_sock_state() { if(conn_bfd.fd >= 0) { + osmo_fd_unregister(&conn_bfd); close(conn_bfd.fd); conn_bfd.fd = -1; - osmo_fd_unregister(&conn_bfd); } } }; diff --git a/Transceiver52M/device/ipc/IPCDevice.cpp b/Transceiver52M/device/ipc/IPCDevice.cpp index 8bf4836..4b4ba37 100644 --- a/Transceiver52M/device/ipc/IPCDevice.cpp +++ b/Transceiver52M/device/ipc/IPCDevice.cpp @@ -537,9 +537,9 @@ LOGP(DDEV, LOGL_NOTICE, "IPC socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* flush the queue */ while (!llist_empty(&state->upqueue)) { diff --git a/Transceiver52M/device/ipc/ipc_sock.c b/Transceiver52M/device/ipc/ipc_sock.c index ca8e1b0..9e8ab82 100644 --- a/Transceiver52M/device/ipc/ipc_sock.c +++ b/Transceiver52M/device/ipc/ipc_sock.c @@ -97,9 +97,9 @@ ipc_exit_requested = 1; + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ osmo_fd_read_enable(&state->listen_bfd); -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 Gerrit-Change-Number: 31892 Gerrit-PatchSet: 3 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-msc[master]: mncc_sock: Call osmo_fd_unregister() before closing and changing bfd->fd
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-msc/+/31896 ) Change subject: mncc_sock: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-msc/+/31896 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-msc Gerrit-Branch: master Gerrit-Change-Id: I90f840da4cc26c1d970c3f5d18d3185678a1dba9 Gerrit-Change-Number: 31896 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 12:54:18 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-trx[master]: Call osmo_fd_unregister() before closing and changing bfd->fd
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-trx/+/31892 ) Change subject: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-trx/+/31892 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-trx Gerrit-Branch: master Gerrit-Change-Id: Iffc7d89166be1cf3cd1f8c3effe90f04d5c5a9c1 Gerrit-Change-Number: 31892 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 12:54:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp-client: Call osmo_fd_unregister() before closing and changing bf...
by pespin 14 Mar '23

14 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31899 ) Change subject: mgcp-client: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mgcp-client: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I95fbcc21a18cadd2c06608cc39b9fe8e12c8bccf --- M src/libosmo-mgcp-client/mgcp_client.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/src/libosmo-mgcp-client/mgcp_client.c b/src/libosmo-mgcp-client/mgcp_client.c index 81847ee..4dd278f 100644 --- a/src/libosmo-mgcp-client/mgcp_client.c +++ b/src/libosmo-mgcp-client/mgcp_client.c @@ -907,10 +907,10 @@ wq = &mgcp->wq; osmo_wqueue_clear(wq); LOGPMGW(mgcp, LOGL_INFO, "MGCP association: %s -- closed!\n", osmo_sock_get_name2(wq->bfd.fd)); - close(wq->bfd.fd); - wq->bfd.fd = -1; if (osmo_fd_is_registered(&wq->bfd)) osmo_fd_unregister(&wq->bfd); + close(wq->bfd.fd); + wq->bfd.fd = -1; } /*! Get the IP-Aaddress of the associated MGW as string. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I95fbcc21a18cadd2c06608cc39b9fe8e12c8bccf Gerrit-Change-Number: 31899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-mgw[master]: mgcp-client: Call osmo_fd_unregister() before closing and changing bf...
by pespin 14 Mar '23

14 Mar '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31899 ) Change subject: mgcp-client: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Patch Set 1: (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/31899/comment/27e69ef1_3800bf9e PS1, Line 910: osmo_fd_is_registered > Hmm-hmm. […] No. The API explicitly expects the user to make sure osmo_fd_unregister is only called on a registered osmo_fd. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I95fbcc21a18cadd2c06608cc39b9fe8e12c8bccf Gerrit-Change-Number: 31899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 12:46:33 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-mgw[master]: mgcp-client: Call osmo_fd_unregister() before closing and changing bf...
by fixeria 14 Mar '23

14 Mar '23

Attention is currently required from: pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-mgw/+/31899 ) Change subject: mgcp-client: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... Patch Set 1: Code-Review+2 (1 comment) File src/libosmo-mgcp-client/mgcp_client.c: https://gerrit.osmocom.org/c/osmo-mgw/+/31899/comment/d147dc49_1b3914e4 PS1, Line 910: osmo_fd_is_registered Hmm-hmm. This check can be removed (in a separate patch) because since recently libosmocore does this check for us if compiled with `OSMO_FD_CHECK`. -- To view, visit https://gerrit.osmocom.org/c/osmo-mgw/+/31899 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-mgw Gerrit-Branch: master Gerrit-Change-Id: I95fbcc21a18cadd2c06608cc39b9fe8e12c8bccf Gerrit-Change-Number: 31899 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 14 Mar 2023 12:45:20 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: osmo_bts_sock.c: Call osmo_fd_unregister() before closing and changin...
by pespin 14 Mar '23

14 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31887 ) Change subject: osmo_bts_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... osmo_bts_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Iec0faba781bcb2bc6de8710392655785790b9af4 --- M src/osmobts_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/src/osmobts_sock.c b/src/osmobts_sock.c index 282e33f..6d46a84 100644 --- a/src/osmobts_sock.c +++ b/src/osmobts_sock.c @@ -96,9 +96,9 @@ LOGP(DL1IF, LOGL_NOTICE, "PCU socket has %s connection\n", (lost) ? "LOST" : "closed"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* flush the queue */ while (!llist_empty(&pcu_sock_state.upqueue)) { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31887 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iec0faba781bcb2bc6de8710392655785790b9af4 Gerrit-Change-Number: 31887 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-pcu[master]: Update libosmogsm deprecated include
by pespin 14 Mar '23

14 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31888 ) Change subject: Update libosmogsm deprecated include ...................................................................... Update libosmogsm deprecated include The previous gprs/protocol/gsm_04_60.h header from libosmogsm was misleading because it was placed in the subdirectory used by libosmogb, and hence was recently deprecated in favour of gsm/protocol/gsm_04_60.h. Let's follow the pragma message advising to move to the new header file. Depends: libosmocore 0158b05337a825352d9fd7f074170b686e9fd1e5 Change-Id: I027abbf3ed4c71331000565af1ef4f08f10cfafc --- M TODO-RELEASE M tests/edge/EdgeTest.cpp M tests/tbf/TbfTest.cpp 3 files changed, 18 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve fixeria: Looks good to me, approved diff --git a/TODO-RELEASE b/TODO-RELEASE index cbfda24..6952029 100644 --- a/TODO-RELEASE +++ b/TODO-RELEASE @@ -7,3 +7,4 @@ # 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.8.0 osmocom/gsm/protocol/gsm_44_060.h \ No newline at end of file diff --git a/tests/edge/EdgeTest.cpp b/tests/edge/EdgeTest.cpp index 4cc7960..edce20f 100644 --- a/tests/edge/EdgeTest.cpp +++ b/tests/edge/EdgeTest.cpp @@ -38,7 +38,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/vty/vty.h> -#include <osmocom/gprs/protocol/gsm_04_60.h> +#include <osmocom/gsm/protocol/gsm_44_060.h> } #include <errno.h> diff --git a/tests/tbf/TbfTest.cpp b/tests/tbf/TbfTest.cpp index 0b2e868..cc62bc2 100644 --- a/tests/tbf/TbfTest.cpp +++ b/tests/tbf/TbfTest.cpp @@ -43,7 +43,7 @@ #include <osmocom/core/talloc.h> #include <osmocom/core/utils.h> #include <osmocom/vty/vty.h> -#include <osmocom/gprs/protocol/gsm_04_60.h> +#include <osmocom/gsm/protocol/gsm_44_060.h> #include <osmocom/gsm/l1sap.h> #include <osmocom/core/fsm.h> } -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31888 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I027abbf3ed4c71331000565af1ef4f08f10cfafc Gerrit-Change-Number: 31888 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in openbsc[master]: mncc_sock.c: Call osmo_fd_unregister() before closing and changing bf...
by pespin 14 Mar '23

14 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/31897 ) Change subject: mncc_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mncc_sock.c: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: Ib54a9caaf10293860a2893aab876198b1990045d --- M openbsc/src/libmsc/mncc_sock.c 1 file changed, 10 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/openbsc/src/libmsc/mncc_sock.c b/openbsc/src/libmsc/mncc_sock.c index 98cafa1..fc46a04 100644 --- a/openbsc/src/libmsc/mncc_sock.c +++ b/openbsc/src/libmsc/mncc_sock.c @@ -83,9 +83,9 @@ LOGP(DMNCC, LOGL_NOTICE, "MNCC Socket has LOST connection\n"); + osmo_fd_unregister(bfd); close(bfd->fd); bfd->fd = -1; - osmo_fd_unregister(bfd); /* re-enable the generation of ACCEPT for new connections */ state->listen_bfd.when |= OSMO_FD_READ; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/31897 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: Ib54a9caaf10293860a2893aab876198b1990045d Gerrit-Change-Number: 31897 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in openbsc[master]: mgcp: Call osmo_fd_unregister() before closing and changing bfd->fd
by pespin 14 Mar '23

14 Mar '23

pespin has submitted this change. ( https://gerrit.osmocom.org/c/openbsc/+/31898 ) Change subject: mgcp: Call osmo_fd_unregister() before closing and changing bfd->fd ...................................................................... mgcp: Call osmo_fd_unregister() before closing and changing bfd->fd Change-Id: I2227e97b1cffab5ab0138ce95a2523a824ec35f0 --- M openbsc/src/libmgcp/mgcp_network.c 1 file changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/openbsc/src/libmgcp/mgcp_network.c b/openbsc/src/libmgcp/mgcp_network.c index e268658..c52bd0b 100644 --- a/openbsc/src/libmgcp/mgcp_network.c +++ b/openbsc/src/libmgcp/mgcp_network.c @@ -1050,15 +1050,15 @@ int mgcp_free_rtp_port(struct mgcp_rtp_end *end) { if (end->rtp.fd != -1) { + osmo_fd_unregister(&end->rtp); close(end->rtp.fd); end->rtp.fd = -1; - osmo_fd_unregister(&end->rtp); } if (end->rtcp.fd != -1) { + osmo_fd_unregister(&end->rtcp); close(end->rtcp.fd); end->rtcp.fd = -1; - osmo_fd_unregister(&end->rtcp); } return 0; -- To view, visit https://gerrit.osmocom.org/c/openbsc/+/31898 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: openbsc Gerrit-Branch: master Gerrit-Change-Id: I2227e97b1cffab5ab0138ce95a2523a824ec35f0 Gerrit-Change-Number: 31898 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0