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

[S] Change in osmo-bts[master]: pcu_sock: rename rc to fd
by dexter 06 Mar '23

06 Mar '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31674 ) Change subject: pcu_sock: rename rc to fd ...................................................................... pcu_sock: rename rc to fd The variable rc holds the return code of accept(), which returns a file descriptor on success. So lets call the variable "fd" to make this clear. Change-Id: Ibc359d941786b1d1d52b356e239a76a090b52c1f --- M src/common/pcu_sock.c 1 file changed, 18 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index bdf5958..b0fd936 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1160,11 +1160,11 @@ struct osmo_fd *conn_bfd = &state->conn_bfd; struct sockaddr_un un_addr; socklen_t len; - int rc; + int fd; len = sizeof(un_addr); - rc = accept(bfd->fd, (struct sockaddr *) &un_addr, &len); - if (rc < 0) { + fd = accept(bfd->fd, (struct sockaddr *) &un_addr, &len); + if (fd < 0) { LOGP(DPCU, LOGL_ERROR, "Failed to accept a new connection\n"); return -1; } @@ -1174,11 +1174,11 @@ "another active connection ?!?\n"); /* We already have one PCU connected, this is all we support */ state->listen_bfd.when &= ~OSMO_FD_READ; - close(rc); + close(fd); return 0; } - osmo_fd_setup(conn_bfd, rc, OSMO_FD_READ, pcu_sock_cb, state, 0); + 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 " -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibc359d941786b1d1d52b356e239a76a090b52c1f Gerrit-Change-Number: 31674 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

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 uploaded this change for review. ( 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(-) git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/77/31677/1 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-MessageType: newchange

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

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/31679 ) 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, lets 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/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index ae78939..4eb7c27 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1172,7 +1172,7 @@ if (conn_bfd->fd >= 0) { 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; + osmo_fd_read_disable(&state->listen_bfd); close(conn_bfd->fd); return 0; } -- 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-MessageType: newchange

1 0

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

06 Mar '23

dexter has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-bts/+/31678 ) 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 close the 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/1 diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 119d7b8..ae78939 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -1173,7 +1173,7 @@ 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); + close(conn_bfd->fd); return 0; } -- 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-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: bsc-sccplite: fix TC_ho_in_fail_mgw_mdcx_timeout
by osmith 06 Mar '23

06 Mar '23

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31676 ) Change subject: bsc-sccplite: fix TC_ho_in_fail_mgw_mdcx_timeout ...................................................................... bsc-sccplite: fix TC_ho_in_fail_mgw_mdcx_timeout Make the test pass with sccplite too. Related: OS#5787 Fixes: 7a8594a8 ("bsc: TC_ho_in_fail_mgw_mdcx_timeout: new test") Change-Id: If09c0ab5f668aefe262905bbd4f8c676f3b05fd3 --- M bsc/BSC_Tests.ttcn 1 file changed, 22 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, approved diff --git a/bsc/BSC_Tests.ttcn b/bsc/BSC_Tests.ttcn index ebcd576..98f60ef 100644 --- a/bsc/BSC_Tests.ttcn +++ b/bsc/BSC_Tests.ttcn @@ -6374,11 +6374,16 @@ /* When we let MGCP MDCX run into a timeout, it's still in the * queue and additionally after BSSAP HandoverFailure, two DLCX - * get sent. */ + * get sent (for AoIP, for SCCPlite one DLCX). */ if (g_pars.ignore_mgw_mdcx) { - MGCP.receive(tr_MDCX); - MGCP.receive(tr_DLCX); - MGCP.receive(tr_DLCX); + if (g_pars.aoip) { + MGCP.receive(tr_MDCX); + MGCP.receive(tr_DLCX); + MGCP.receive(tr_DLCX); + } else { + MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_MDCX})); + MGCP_MULTI.receive(tr_MGCP_RecvFrom_any({command := tr_DLCX})); + } } return; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/31676 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: If09c0ab5f668aefe262905bbd4f8c676f3b05fd3 Gerrit-Change-Number: 31676 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH
by pespin 06 Mar '23

06 Mar '23

Attention is currently required from: neels, dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31578 ) Change subject: pcu_sock: use struct to transfer IMMEDIATE ASSIGNMENT for PCH ...................................................................... Patch Set 10: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bsc/+/31578/comment/05275a7a_df265aee PS10, Line 14: to access the fields directly. Lets also transfer the full IMSI. "Let's" Pay attention to this typo, I see you do it every time. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31578 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Id6acbd243adf26169e5e8319dd66bb68dd6a3c22 Gerrit-Change-Number: 31578 Gerrit-PatchSet: 10 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: pespin <pespin(a)sysmocom.de> Gerrit-CC: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 11:50:55 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: cosmetic: remove whitespace after type cast
by fixeria 06 Mar '23

06 Mar '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31675 ) Change subject: pcu_sock: cosmetic: remove whitespace after type cast ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31675 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I373b510efab4874f59f75385bd0e1229692299ec Gerrit-Change-Number: 31675 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 11:47:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: rename rc to fd
by pespin 06 Mar '23

06 Mar '23

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31674 ) Change subject: pcu_sock: rename rc to fd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibc359d941786b1d1d52b356e239a76a090b52c1f Gerrit-Change-Number: 31674 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 11:47:14 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bts[master]: pcu_sock: rename rc to fd
by fixeria 06 Mar '23

06 Mar '23

Attention is currently required from: dexter. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/31674 ) Change subject: pcu_sock: rename rc to fd ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/31674 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ibc359d941786b1d1d52b356e239a76a090b52c1f Gerrit-Change-Number: 31674 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 11:47:08 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm0502: add burst length definitions from chapter 5.2
by pespin 06 Mar '23

06 Mar '23

Attention is currently required from: neels, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/31669 ) Change subject: gsm0502: add burst length definitions from chapter 5.2 ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31669 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I1c38ccc2b64ba9046bb3b1221d99cc55ec493802 Gerrit-Change-Number: 31669 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: neels <nhofmeyr(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: neels <nhofmeyr(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 06 Mar 2023 11:46:36 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0