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

[M] Change in osmo-bts[master]: osmo-bts-trx: fix recent regression in Tx lchan handlers
by pespin 06 Jun '23

06 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33156 ) Change subject: osmo-bts-trx: fix recent regression in Tx lchan handlers ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/33156/comment/c19b12d6_69fcbcb5 PS1, Line 9: Change-Id: I4538a8fe6b29f8d6eca33ad27d4a9852e3a3e86c Fixes: a0770250bc70024fcba4ec787587006ff508a6dd -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33156 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I4538a8fe6b29f8d6eca33ad27d4a9852e3a3e86c Gerrit-Change-Number: 33156 Gerrit-PatchSet: 2 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: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Jun 2023 15:23:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in pysim[master]: HPSIM application support
by fixeria 06 Jun '23

06 Jun '23

Attention is currently required from: laforge. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/pysim/+/33183 ) Change subject: HPSIM application support ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File pySim/ts_31_104.py: https://gerrit.osmocom.org/c/pysim/+/33183/comment/bae5e5a6_88944dcf PS1, Line 51: sw_isim isim -> hpsim? -- To view, visit https://gerrit.osmocom.org/c/pysim/+/33183 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I2729fd2b88cd13c36d7128753ad8d3e3d08a9b52 Gerrit-Change-Number: 33183 Gerrit-PatchSet: 1 Gerrit-Owner: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Tue, 06 Jun 2023 15:10:03 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPAC
by Jenkins Builder 06 Jun '23

06 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPAC ...................................................................... Patch Set 1: (4 comments) File tests/stream/stream_test.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7904): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/6408b110_1817eac9 PS1, Line 397: #define ipac_msg_idreq_half (sizeof (ipac_msg_idreq)/2) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7904): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/23185ed9_3f62419c PS1, Line 398: #define ipac_msg_idreq_other_half (sizeof (ipac_msg_idreq) - ipac_msg_idreq_half) space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7904): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/3050c289_80756db9 PS1, Line 408: (unsigned_char_ptr) = msgb_put(struct_msgb_ptr, sizeof (byte_array));\ space prohibited between function name and open parenthesis '(' Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7904): https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/6827917f_e9a3ff6e PS1, Line 409: memcpy(unsigned_char_ptr, byte_array, sizeof (byte_array));\ space prohibited between function name and open parenthesis '(' -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33197 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I6c91ff385cb5f36ab6b6c96d0e44997995d0d24c Gerrit-Change-Number: 33197 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 06 Jun 2023 15:07:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: Add osmo_io support to osmo_stream_cli and osmo_stream_srv
by Jenkins Builder 06 Jun '23

06 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33193 ) Change subject: Add osmo_io support to osmo_stream_cli and osmo_stream_srv ...................................................................... Patch Set 1: (3 comments) File include/osmocom/netif/stream.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7898): https://gerrit.osmocom.org/c/libosmo-netif/+/33193/comment/5a5590f3_cf5589a7 PS1, Line 83: void osmo_stream_cli_set_iofd_read_cb(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli, struct msgb* msg)); "foo* bar" should be "foo *bar" File src/stream.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7898): https://gerrit.osmocom.org/c/libosmo-netif/+/33193/comment/a3857a0b_3d9626cd PS1, Line 931: int (*read_cb)(struct osmo_stream_cli *cli, struct msgb* msg)) "foo* bar" should be "foo *bar" Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7898): https://gerrit.osmocom.org/c/libosmo-netif/+/33193/comment/53f8a81e_80dd734c PS1, Line 1729: } void function return statements are not generally useful -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33193 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I2f52c7107c392b6f4b0bf2a84f8c873c084a200c Gerrit-Change-Number: 33193 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Jun 2023 15:07:12 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream: Move some code in preparation of next commit
by Jenkins Builder 06 Jun '23

06 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33195 ) Change subject: stream: Move some code in preparation of next commit ...................................................................... Patch Set 1: (1 comment) File src/stream.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7895): https://gerrit.osmocom.org/c/libosmo-netif/+/33195/comment/70fe2928_794e4c04 PS1, Line 1413: } void function return statements are not generally useful -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33195 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ic3f21967fe929b17327eb95739ace16c9734a151 Gerrit-Change-Number: 33195 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 06 Jun 2023 15:07:04 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: stream: Add IPA send function/IPA-mode read to srv
by Jenkins Builder 06 Jun '23

06 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add IPA send function/IPA-mode read to srv ...................................................................... Patch Set 1: (2 comments) File include/osmocom/netif/stream.h: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7894): https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/4453a3b8_1f718ec0 PS1, Line 75: enum ipaccess_proto_ext pe, struct msgb *msg); code indent should use tabs where possible Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7894): https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/10287664_464ed64f PS1, Line 75: enum ipaccess_proto_ext pe, struct msgb *msg); please, no spaces at the start of a line -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33201 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I61e1fe59166c46595efe8c1f32b8f2607cb6c529 Gerrit-Change-Number: 33201 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Comment-Date: Tue, 06 Jun 2023 15:07:02 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[M] Change in libosmo-netif[master]: examples: Use osmo_io in {ipa-,}stream-{client,server}
by Jenkins Builder 06 Jun '23

06 Jun '23

Jenkins Builder has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33194 ) Change subject: examples: Use osmo_io in {ipa-,}stream-{client,server} ...................................................................... Patch Set 1: (2 comments) File examples/stream-client.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7891): https://gerrit.osmocom.org/c/libosmo-netif/+/33194/comment/11abd558_e0579501 PS1, Line 53: static int read_cb(struct osmo_stream_cli *conn, struct msgb* msg) "foo* bar" should be "foo *bar" File examples/stream-server.c: Robot Comment from checkpatch (run ID jenkins-gerrit-lint-7891): https://gerrit.osmocom.org/c/libosmo-netif/+/33194/comment/164b4ce1_9952a8fd PS1, Line 45: int read_cb(struct osmo_stream_srv *conn, struct msgb* msg) "foo* bar" should be "foo *bar" -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33194 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I97a9979199c816686b32080534627f6f033e009e Gerrit-Change-Number: 33194 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Tue, 06 Jun 2023 15:05:46 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmo-netif[master]: stream: Add IPA send function/IPA-mode read to cli
by arehbein 06 Jun '23

06 Jun '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33204 ) Change subject: stream: Add IPA send function/IPA-mode read to cli ...................................................................... stream: Add IPA send function/IPA-mode read to cli - Also: Adapt ipa-stream-client example to work alongside new change Related: OS#5753 Change-Id: I042700af6614dd1879514dca0482e05b5ff22cb7 --- M examples/ipa-stream-client.c M include/osmocom/netif/stream.h M src/stream.c 3 files changed, 40 insertions(+), 8 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/04/33204/1 diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index c3bb2a3..6aa7d5f 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -93,10 +93,8 @@ msg_sent->num = i; llist_add(&msg_sent->head, &msg_sent_list); - ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_MGCP); - osmo_ipa_msg_push_header(msg, IPAC_PROTO_OSMO); - - osmo_stream_cli_send(conn, msg); + osmo_stream_cli_send_ipa(conn, IPAC_PROTO_OSMO, + IPAC_PROTO_EXT_MGCP, msg); LOGP(DIPATEST, LOGL_DEBUG, "enqueueing msg %d of " "%d bytes to be sent\n", i, msg->len); @@ -106,7 +104,7 @@ static int read_cb(struct osmo_stream_cli *conn, struct msgb *msg) { - LOGP(DIPATEST, LOGL_DEBUG, "received message from stream (len=%d)\n", msgb_length(msg)); + LOGP(DIPATEST, LOGL_DEBUG, "received message from stream (payload len=%d)\n", msgb_length(msg)); if (osmo_ipa_process_msg(msg) < 0) { LOGP(DIPATEST, LOGL_ERROR, "bad IPA message\n"); @@ -116,7 +114,7 @@ int num; struct msg_sent *cur, *tmp, *found = NULL; - num = ntohl(*((int *)(msg->data + sizeof(struct ipa_head) + sizeof(struct ipa_head_ext)))); + num = ntohl(*((int *)(msg->data))); LOGP(DLINP, LOGL_DEBUG, "received msg number %d\n", num); llist_for_each_entry_safe(cur, tmp, &msg_sent_list, head) { diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 16940dc..855f8d2 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -72,7 +72,7 @@ void osmo_stream_srv_send(struct osmo_stream_srv *conn, struct msgb *msg); void osmo_stream_srv_send_ipa(struct osmo_stream_srv *conn, int ipaccess_proto, - enum ipaccess_proto_ext pe, struct msgb *msg); + enum ipaccess_proto_ext pe, struct msgb *msg); int osmo_stream_srv_recv(struct osmo_stream_srv *conn, struct msgb *msg); void osmo_stream_srv_clear_tx_queue(struct osmo_stream_srv *conn); @@ -113,6 +113,8 @@ void osmo_stream_cli_close(struct osmo_stream_cli *cli); void osmo_stream_cli_send(struct osmo_stream_cli *cli, struct msgb *msg); +void osmo_stream_cli_send_ipa(struct osmo_stream_cli *cli, int ipaccess_proto, + enum ipaccess_proto_ext pe, struct msgb *msg); int osmo_stream_cli_recv(struct osmo_stream_cli *cli, struct msgb *msg); void osmo_stream_cli_clear_tx_queue(struct osmo_stream_cli *cli); diff --git a/src/stream.c b/src/stream.c index 30639e2..05fbff3 100644 --- a/src/stream.c +++ b/src/stream.c @@ -680,6 +680,8 @@ if (res == 0) osmo_stream_cli_reconnect(cli); else if (cli->iofd_read_cb) { + if (cli->stream_proto == OSMO_STREAM_IPAC) + ipa_check_pull_headers(msg, cli); cli->iofd_read_cb(cli, msg); } break; @@ -857,7 +859,6 @@ client_ops.segmentation_cb = segmentation_cbs[osp]; osmo_iofd_set_ioops(cli->iofd, &client_ops); cli->flags |= OSMO_STREAM_CLI_F_RECONF; - osmo_iofd_set_ioops(cli->iofd, &osmo_stream_cli_ioops); } /*! \brief Set the socket type for the stream server link @@ -1196,6 +1197,25 @@ /*! \brief Enqueue data to be sent via an Osmocom stream client * \param[in] cli Stream Client through which we want to send + * \param[in] p Protocol transported by IPA. When set to IPAC_PROTO_UNSPECIFIED, the protocol will be + * read from the msgb structure's l1 and possibly l2 headers. + * \param[in] pe Ignored, unless p == IPAC_PROTO_OSMO, in which case this specifies the + * Osmocom protocol extension + * \param[in] msg Message buffer to enqueue in transmit queue */ +void osmo_stream_cli_send_ipa(struct osmo_stream_cli *cli, int ipaccess_proto, + enum ipaccess_proto_ext pe, struct msgb *msg) +{ + OSMO_ASSERT(msg); + if (ipaccess_proto == IPAC_PROTO_UNSPECIFIED) { + ipaccess_proto = msg_get_ipa_proto(msg); + pe = msg_get_ipa_proto_ext(msg); + } + ipa_push_headers(ipaccess_proto, pe, msg); + osmo_stream_cli_send(cli, msg); +} + +/*! \brief Enqueue data to be sent via an Osmocom stream client + * \param[in] cli Stream Client through which we want to send * \param[in] msg Message buffer to enqueue in transmit queue */ void osmo_stream_cli_send(struct osmo_stream_cli *cli, struct msgb *msg) { -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33204 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I042700af6614dd1879514dca0482e05b5ff22cb7 Gerrit-Change-Number: 33204 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: example: Remove call to osmo_ipa_process_msg()
by arehbein 06 Jun '23

06 Jun '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33205 ) Change subject: example: Remove call to osmo_ipa_process_msg() ...................................................................... example: Remove call to osmo_ipa_process_msg() That call now happens up the call stack in IPA mode Change-Id: I53283ec7bd7f07dfa612681ae84af93d5cd098b9 --- M examples/ipa-stream-client.c 1 file changed, 11 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/05/33205/1 diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index 6aa7d5f..61292a3 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -106,11 +106,6 @@ { LOGP(DIPATEST, LOGL_DEBUG, "received message from stream (payload len=%d)\n", msgb_length(msg)); - if (osmo_ipa_process_msg(msg) < 0) { - LOGP(DIPATEST, LOGL_ERROR, "bad IPA message\n"); - return 0; - } - int num; struct msg_sent *cur, *tmp, *found = NULL; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33205 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I53283ec7bd7f07dfa612681ae84af93d5cd098b9 Gerrit-Change-Number: 33205 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream: Fix osmo_panic log fmts
by arehbein 06 Jun '23

06 Jun '23

arehbein has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33206 ) Change subject: stream: Fix osmo_panic log fmts ...................................................................... stream: Fix osmo_panic log fmts Change-Id: Id082a9473b788f8de20cdc2ba4430b3289f4ce5a --- M src/stream.c 1 file changed, 16 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/06/33206/1 diff --git a/src/stream.c b/src/stream.c index 05fbff3..c050798 100644 --- a/src/stream.c +++ b/src/stream.c @@ -520,8 +520,9 @@ } break; default: - /* Only CONNECTING and CONNECTED states are expected, since they are the only states where FD exists: */ - osmo_panic("osmo_stream_cli_fd_cb called with unexpected state %d\n", cli->state); + /* Only CONNECTING and CONNECTED states are expected, since they are the only states + * where FD exists: */ + osmo_panic("osmo_stream_cli_fd_cb() called with unexpected state %d\n", cli->state); } return 0; } @@ -686,7 +687,8 @@ } break; default: - osmo_panic("osmo_stream_cli_write_cb() called with unexpected state %d\n", cli->state); + osmo_panic("stream_cli_iofd_read_cb() called with unexpected state %d\n", + cli->state); } } @@ -705,7 +707,8 @@ } break; default: - osmo_panic("osmo_stream_cli_write_cb() called with unexpected state %d\n", cli->state); + osmo_panic("stream_cli_iofd_write_cb() called with unexpected state %d\n", + cli->state); } } -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33206 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Id082a9473b788f8de20cdc2ba4430b3289f4ce5a Gerrit-Change-Number: 33206 Gerrit-PatchSet: 1 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-MessageType: newchange

1 0