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

[M] Change in osmo-pcu[master]: nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells
by dexter 03 Jul '23

03 Jul '23

Attention is currently required from: pespin. Hello Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-pcu/+/33538 to look at the new patch set (#3). Change subject: nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells ...................................................................... nacc_fsm: Add support for NACC with UTRAN and E-UTRAN cells The NACC procedure in OsmoPCU currently only supports NACC with GERAN cells. When an UTRAN or E-UTRAN cell is proposed in the PacketCellChangeNotification, then the FSM is immediately terminated, meaning that the NACC procedure can not commence. When the NACC procedure is carried out for UTRAN or E-UTRAN cells, the PCU will not send any system information to the UE. Instead it immediately sends a PacketCellChangeContinue message. This also means that we do not carry out any RAN Information Requests in the background. This patch adds logic to detect if the proprosed cell is an UTRAN or E-UTRAN cell and the adds a new transition to the FSM so that a short route to NACC_ST_TX_CELL_CHG_CONTINUE can be taken. Related: OS#6044 Change-Id: I96280f0ec5955ed3cb17641bf4118496c929bdac --- M src/nacc_fsm.c M src/nacc_fsm.h 2 files changed, 132 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/38/33538/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33538 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I96280f0ec5955ed3cb17641bf4118496c929bdac Gerrit-Change-Number: 33538 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in docker-playground[master]: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version
by pespin 03 Jul '23

03 Jul '23

Attention is currently required from: dexter. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/docker-playground/+/33521 ) Change subject: ttcn3-bts-test/jenkins.sh: set mp_pcuif_version ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/docker-playground/+/33521 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: docker-playground Gerrit-Branch: master Gerrit-Change-Id: Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb Gerrit-Change-Number: 33521 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 09:37:51 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: fix record PCUIF_pch_dt
by dexter 03 Jul '23

03 Jul '23

Attention is currently required from: fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417 ) Change subject: PCUIF_Types: fix record PCUIF_pch_dt ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417/comment/6fdbdf16_2286… PS1, Line 10: it would pad the data with zeros if it does not fit the : specified length. This is unwanted > This is weird. […] Done -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417 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: I011eb2496b1422c49736b227dfa1e2a2d6096d67 Gerrit-Change-Number: 33417 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 09:37:26 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: fix record PCUIF_pch_dt
by dexter 03 Jul '23

03 Jul '23

Attention is currently required from: fixeria. Hello Jenkins Builder, laforge, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417 to look at the new patch set (#2). Change subject: PCUIF_Types: fix record PCUIF_pch_dt ...................................................................... PCUIF_Types: fix record PCUIF_pch_dt The record PCUIF_pch_dt uses ALIGN(left) variants for imsi data. This is not correct, since it would left-pad the data with zeros if it does not fit the specified length. This is a problem with IMSIs shorter than 17 characters, because the left padded zeros would appear like a null-string to the receiving end. When the ALIGN(left) modifier is removed, the encoder will apply the padding from the right. This will fill the unused space after the string with zeros. Related: OS#5927 Change-Id: I011eb2496b1422c49736b227dfa1e2a2d6096d67 --- M library/PCUIF_Types.ttcn 1 file changed, 22 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/17/33417/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33417 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: I011eb2496b1422c49736b227dfa1e2a2d6096d67 Gerrit-Change-Number: 33417 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in libosmo-netif[master]: stream: Notify stream_cli on connect()
by daniel 03 Jul '23

03 Jul '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33542 ) Change subject: stream: Notify stream_cli on connect() ...................................................................... stream: Notify stream_cli on connect() Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Depends: Ieed10bc94c8aad821c0a8f7764db0e05c054c1e3 (libosmocore.git) --- M src/stream.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve daniel: Looks good to me, approved; Verified diff --git a/src/stream.c b/src/stream.c index f007cc4..8de6cb8 100644 --- a/src/stream.c +++ b/src/stream.c @@ -1039,6 +1039,7 @@ if (osmo_iofd_register(cli->iofd, fd) < 0) goto error_close_socket; + osmo_iofd_notify_connected(cli->iofd); break; default: OSMO_ASSERT(false); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Gerrit-Change-Number: 33542 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[S] Change in libosmo-netif[master]: stream: Notify stream_cli on connect()
by daniel 03 Jul '23

03 Jul '23

Attention is currently required from: daniel. daniel has removed a vote from this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33542 ) Change subject: stream: Notify stream_cli on connect() ...................................................................... Removed Verified-1 by Jenkins Builder (1000002) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Gerrit-Change-Number: 33542 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: deleteVote

1 0

[M] Change in osmocom-bb[master]: modem: properly handle Dedicated mode or TBF IE
by osmith 03 Jul '23

03 Jul '23

Attention is currently required from: laforge, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/33414 ) Change subject: modem: properly handle Dedicated mode or TBF IE ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/host/layer23/src/modem/grr.c: https://gerrit.osmocom.org/c/osmocom-bb/+/33414/comment/cf2aa5ae_a2125561 PS4, Line 279: E A -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/33414 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Idb9b3203147be3b42256c0bcab3ecdabcf2d2fa9 Gerrit-Change-Number: 33414 Gerrit-PatchSet: 4 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-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 09:15:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Notify stream_cli on connect()
by daniel 03 Jul '23

03 Jul '23

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33542 ) Change subject: stream: Notify stream_cli on connect() ...................................................................... Patch Set 1: Verified+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Gerrit-Change-Number: 33542 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 09:09:43 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Notify stream_cli on connect()
by daniel 03 Jul '23

03 Jul '23

daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33542 ) Change subject: stream: Notify stream_cli on connect() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33542 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I29621ca53cdbdf8b5b2d128307fcb6432db669d3 Gerrit-Change-Number: 33542 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 03 Jul 2023 09:09:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: osmo_io: Add osmo_iofd_notify_connected()
by daniel 03 Jul '23

03 Jul '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33497 ) Change subject: osmo_io: Add osmo_iofd_notify_connected() ...................................................................... osmo_io: Add osmo_iofd_notify_connected() Don't call write_enable() in osmo_iofd_register(). This was used to detect whether a socket is connected or not, but would always be enabled, even on unconnected sockets. Instead make this behaviour explicit by calling osmo_iofd_notify_connected(). Change-Id: Ieed10bc94c8aad821c0a8f7764db0e05c054c1e3 --- M include/osmocom/core/osmo_io.h M src/core/libosmocore.map M src/core/osmo_io.c M tests/osmo_io/osmo_io_test.c M tests/osmo_io/osmo_io_test.ok 5 files changed, 32 insertions(+), 5 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/core/osmo_io.h b/include/osmocom/core/osmo_io.h index aac25a3..932b909 100644 --- a/include/osmocom/core/osmo_io.h +++ b/include/osmocom/core/osmo_io.h @@ -75,6 +75,8 @@ int osmo_iofd_close(struct osmo_io_fd *iofd); void osmo_iofd_free(struct osmo_io_fd *iofd); +void osmo_iofd_notify_connected(struct osmo_io_fd *iofd); + int osmo_iofd_write_msgb(struct osmo_io_fd *iofd, struct msgb *msg); int osmo_iofd_sendto_msgb(struct osmo_io_fd *iofd, struct msgb *msg, int sendto_flags, const struct osmo_sockaddr *dest); diff --git a/src/core/libosmocore.map b/src/core/libosmocore.map index d31392b..50be67c 100644 --- a/src/core/libosmocore.map +++ b/src/core/libosmocore.map @@ -273,6 +273,7 @@ osmo_iofd_txqueue_len; osmo_iofd_unregister; osmo_iofd_uring_init; +osmo_iofd_notify_connected; osmo_iofd_write_msgb; osmo_ip_str_type; osmo_isdnhdlc_decode; diff --git a/src/core/osmo_io.c b/src/core/osmo_io.c index 4cef142..fdb9e32 100644 --- a/src/core/osmo_io.c +++ b/src/core/osmo_io.c @@ -433,7 +433,9 @@ IOFD_FLAG_UNSET(iofd, IOFD_FLAG_CLOSED); osmo_iofd_ops.read_enable(iofd); - osmo_iofd_ops.write_enable(iofd); + + if (iofd->tx_queue.current_length > 0) + osmo_iofd_ops.write_enable(iofd); return rc; } @@ -603,4 +605,14 @@ iofd->io_ops = *ioops; } +/*! Notify the user if/when the socket is connected + * When the socket is connected the write_cb will be called. + * \param[in] iofd the file descriptor */ +void osmo_iofd_notify_connected(struct osmo_io_fd *iofd) +{ + OSMO_ASSERT(iofd->mode == OSMO_IO_FD_MODE_READ_WRITE); + osmo_iofd_ops.write_enable(iofd); +} + + #endif /* defined(__linux__) */ diff --git a/tests/osmo_io/osmo_io_test.c b/tests/osmo_io/osmo_io_test.c index a42e6d0..cff594b 100644 --- a/tests/osmo_io/osmo_io_test.c +++ b/tests/osmo_io/osmo_io_test.c @@ -86,6 +86,8 @@ osmo_iofd_register(iofd1, fds[0]); iofd2 = osmo_iofd_setup(ctx, fds[1], "ep2", OSMO_IO_FD_MODE_READ_WRITE, &ioops_conn_read_write, NULL); osmo_iofd_register(iofd2, fds[1]); + // Explicitly check if ep1 is connected through write_cb + osmo_iofd_notify_connected(iofd1); /* Allow enough cycles to handle the messages */ for (int i = 0; i < 128; i++) diff --git a/tests/osmo_io/osmo_io_test.ok b/tests/osmo_io/osmo_io_test.ok index 82a6f38..6527c19 100644 --- a/tests/osmo_io/osmo_io_test.ok +++ b/tests/osmo_io/osmo_io_test.ok @@ -1,10 +1,6 @@ Running test_connected ep1: write() returned rc=0 -ep2: write() returned rc=0 ep1: write() returned rc=16 -ep2: write() returned rc=16 -ep1: read() msg with len=16 -01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 ep2: read() msg with len=16 01 02 03 04 05 06 07 08 09 0a 0b 0c 0d 0e 0f 10 Running test_unconnected -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33497 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ieed10bc94c8aad821c0a8f7764db0e05c054c1e3 Gerrit-Change-Number: 33497 Gerrit-PatchSet: 4 Gerrit-Owner: daniel <dwillmann(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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0