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

[S] Change in osmocom-bb[master]: Correctly use SUP_WRITE() macro for GSM 850
by pespin 02 Oct '23

02 Oct '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34606?usp=email ) Change subject: Correctly use SUP_WRITE() macro for GSM 850 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34606?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I52c99c63e38934fb26c26dba5bf2551ea311228b Gerrit-Change-Number: 34606 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 02 Oct 2023 14:36:19 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: Fix typo in sysinfo.c
by pespin 02 Oct '23

02 Oct '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34605?usp=email ) Change subject: Fix typo in sysinfo.c ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34605?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12405bef9f7910a354d9ac5153f4adc55095d747 Gerrit-Change-Number: 34605 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 02 Oct 2023 14:35:40 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: Correctly extract bits from SI2*/SI5*
by pespin 02 Oct '23

02 Oct '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email ) Change subject: Correctly extract bits from SI2*/SI5* ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34604?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ie5349464fed0a4276955235c7c87b5bcb299f20d Gerrit-Change-Number: 34604 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 02 Oct 2023 14:34:52 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[M] Change in osmocom-bb[master]: Cleaning gsm48_mm_data_ind()
by pespin 02 Oct '23

02 Oct '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34603?usp=email ) Change subject: Cleaning gsm48_mm_data_ind() ...................................................................... Patch Set 1: Code-Review+1 (1 comment) File src/host/layer23/src/mobile/gsm48_mm.c: https://gerrit.osmocom.org/c/osmocom-bb/+/34603/comment/c17e4872_f695f8ee PS1, Line 4707: LOGP(DMM, LOGL_NOTICE, "DATA IND ignored during IMSI " can perfectly fit in one line. -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34603?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I12454cab06c105ccd9e2495e3a6f0640f2884885 Gerrit-Change-Number: 34603 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 02 Oct 2023 14:34:32 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in osmocom-bb[master]: ASCI: Add group receive and transmit mode support to MM layer
by pespin 02 Oct '23

02 Oct '23

Attention is currently required from: fixeria, jolly, laforge. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email ) Change subject: ASCI: Add group receive and transmit mode support to MM layer ...................................................................... Patch Set 14: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34492?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I05957182a57423ad947ab200b52f65fde859e110 Gerrit-Change-Number: 34492 Gerrit-PatchSet: 14 Gerrit-Owner: jolly <andreas(a)eversberg.eu> 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: jolly <andreas(a)eversberg.eu> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 02 Oct 2023 14:21:33 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmocom-bb[master]: Fixed potential NULL pointer dereferences, discovered by Coverity Scan
by jolly 02 Oct '23

02 Oct '23

jolly has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email ) Change subject: Fixed potential NULL pointer dereferences, discovered by Coverity Scan ...................................................................... Fixed potential NULL pointer dereferences, discovered by Coverity Scan See: CID 323362 + CID 323363 Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 --- M src/host/layer23/src/mobile/gsm48_mm.c 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmocom-bb refs/changes/08/34608/1 diff --git a/src/host/layer23/src/mobile/gsm48_mm.c b/src/host/layer23/src/mobile/gsm48_mm.c index cec798b..810dfa7 100644 --- a/src/host/layer23/src/mobile/gsm48_mm.c +++ b/src/host/layer23/src/mobile/gsm48_mm.c @@ -3190,6 +3190,8 @@ (msg_type & GSM48_MMXX_MASK), mmh->ref, mmh->transaction_id, sapi); + if (!nmsg) + return -ENOMEM; nmmh = (struct gsm48_mmxx_hdr *)nmsg->data; nmmh->cause = cause; gsm48_mmxx_upmsg(ms, nmsg); @@ -3410,6 +3412,8 @@ (msg_type & GSM48_MMXX_MASK), mmh->ref, mmh->transaction_id, sapi); + if (!nmsg) + return -ENOMEM; nmmh = (struct gsm48_mmxx_hdr *)nmsg->data; nmmh->cause = 17; gsm48_mmxx_upmsg(ms, nmsg); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34608?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I47aa506014d8bddb8c8ce9b506c1c5c7b8056d30 Gerrit-Change-Number: 34608 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-MessageType: newchange

1 0

[S] Change in libosmo-netif[master]: stream_test: Disable nagling
by daniel 02 Oct '23

02 Oct '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34599?usp=email ) Change subject: stream_test: Disable nagling ...................................................................... stream_test: Disable nagling Disable nagling to make kernel packet processing time more predictable Change-Id: I7e8f6851df28e006fcb714673b97cf7b6be367bf --- M tests/stream/stream_test.c 1 file changed, 12 insertions(+), 0 deletions(-) Approvals: pespin: Looks good to me, approved Jenkins Builder: Verified diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index 0977fde..be0b278 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -667,6 +667,7 @@ osmo_stream_srv_link_set_addr(srv, host); osmo_stream_srv_link_set_port(srv, port); osmo_stream_srv_link_set_accept_cb(srv, accept_cb_srv); + osmo_stream_srv_link_set_nodelay(srv, true); if (osmo_stream_srv_link_open(srv) < 0) { printf("Unable to open server\n"); -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34599?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e8f6851df28e006fcb714673b97cf7b6be367bf Gerrit-Change-Number: 34599 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
by daniel 02 Oct '23

02 Oct '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... stream: Add client-side (segmentation) support for IPA With this commit, IPA segmentation is taken care of by setting the segmentation callback provided by libosmo-netif. The ipa-stream-server example needs to prepend IPA headers now because those are stripped by the segm. cb on both sides. Depends: libosmocore.git I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Related: OS#5753, OS#5751 Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 --- M examples/ipa-stream-client.c M examples/ipa-stream-server.c M include/osmocom/netif/stream.h M src/stream_cli.c M tests/stream/stream_test.c M tests/stream/stream_test.err M tests/stream/stream_test.ok 7 files changed, 333 insertions(+), 18 deletions(-) Approvals: daniel: Looks good to me, approved Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, but someone else must approve diff --git a/examples/ipa-stream-client.c b/examples/ipa-stream-client.c index 10eb786..db7d441 100644 --- a/examples/ipa-stream-client.c +++ b/examples/ipa-stream-client.c @@ -106,7 +106,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 +116,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 = osmo_load32be(msg->data); LOGP(DLINP, LOGL_DEBUG, "received msg number %d\n", num); llist_for_each_entry_safe(cur, tmp, &msg_sent_list, head) { @@ -184,6 +184,8 @@ exit(EXIT_FAILURE); } + osmo_stream_cli_set_segmentation_cb(conn, osmo_ipa_segmentation_cb); + LOGP(DIPATEST, LOGL_NOTICE, "Entering main loop\n"); while(1) { diff --git a/examples/ipa-stream-server.c b/examples/ipa-stream-server.c index 1caef96..d31b752 100644 --- a/examples/ipa-stream-server.c +++ b/examples/ipa-stream-server.c @@ -49,7 +49,10 @@ int read_cb(struct osmo_stream_srv *conn, struct msgb *msg) { - LOGP(DSTREAMTEST, LOGL_DEBUG, "received message from stream (len=%d)\n", msgb_length(msg)); + LOGP(DSTREAMTEST, LOGL_DEBUG, "received message from stream (payload len=%d)\n", msgb_length(msg)); + + ipa_prepend_header_ext(msg, IPAC_PROTO_EXT_MGCP); + osmo_ipa_msg_push_header(msg, IPAC_PROTO_OSMO); osmo_stream_srv_send(conn, msg); return 0; diff --git a/include/osmocom/netif/stream.h b/include/osmocom/netif/stream.h index 6ee5820..a24244c 100644 --- a/include/osmocom/netif/stream.h +++ b/include/osmocom/netif/stream.h @@ -100,6 +100,7 @@ void osmo_stream_cli_set_disconnect_cb(struct osmo_stream_cli *cli, int (*disconnect_cb)(struct osmo_stream_cli *cli)); void osmo_stream_cli_set_read_cb(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli)); void osmo_stream_cli_set_read_cb2(struct osmo_stream_cli *cli, int (*read_cb)(struct osmo_stream_cli *cli, struct msgb *msg)); +void osmo_stream_cli_set_segmentation_cb(struct osmo_stream_cli *cli, int (*segmentation_cb)(struct msgb *msg)); void osmo_stream_cli_reconnect(struct osmo_stream_cli *cli); bool osmo_stream_cli_is_connected(struct osmo_stream_cli *cli); diff --git a/src/stream_cli.c b/src/stream_cli.c index 23e1900..ef571cc 100644 --- a/src/stream_cli.c +++ b/src/stream_cli.c @@ -119,6 +119,7 @@ int (*read_cb)(struct osmo_stream_cli *cli); int (*iofd_read_cb)(struct osmo_stream_cli *cli, struct msgb *msg); int (*write_cb)(struct osmo_stream_cli *cli); + int (*segmentation_cb)(struct msgb *msg); void *data; int flags; int reconnect_timeout; @@ -419,6 +420,7 @@ cli->state = STREAM_CLI_STATE_CLOSED; osmo_timer_setup(&cli->timer, cli_timer_cb, cli); cli->reconnect_timeout = 5; /* default is 5 seconds. */ + cli->segmentation_cb = NULL; INIT_LLIST_HEAD(&cli->tx_queue); cli->ma_pars.sctp.version = 0; @@ -585,6 +587,29 @@ cli->flags |= OSMO_STREAM_CLI_F_RECONF; } +/* Configure client side segmentation for the iofd */ +static void configure_cli_segmentation_cb(struct osmo_io_fd *iofd, + int (*segmentation_cb)(struct msgb *msg)) +{ + /* Copy default settings */ + struct osmo_io_ops client_ops = osmo_stream_cli_ioops; + /* Set segmentation cb for this client */ + client_ops.segmentation_cb = segmentation_cb; + osmo_iofd_set_ioops(iofd, &client_ops); +} + +/*! \brief Set the segmentation callback for the client + * \param[in,out] cli Stream Client to modify + * \param[in] segmentation_cb Target segmentation callback + */ +void osmo_stream_cli_set_segmentation_cb(struct osmo_stream_cli *cli, + int (*segmentation_cb)(struct msgb *msg)) +{ + cli->segmentation_cb = segmentation_cb; + if (cli->iofd) /* Otherwise, this will be done in osmo_stream_cli_open() */ + configure_cli_segmentation_cb(cli->iofd, segmentation_cb); +} + /*! \brief Set the socket type for the stream server link * \param[in] cli Stream Client to modify * \param[in] type Socket Type (like SOCK_STREAM (default), SOCK_SEQPACKET, ...) @@ -869,6 +894,7 @@ cli->iofd = osmo_iofd_setup(cli, fd, cli->name, OSMO_IO_FD_MODE_READ_WRITE, &osmo_stream_cli_ioops, cli); if (!cli->iofd) goto error_close_socket; + configure_cli_segmentation_cb(cli->iofd, cli->segmentation_cb); if (osmo_iofd_register(cli->iofd, fd) < 0) goto error_close_socket; diff --git a/tests/stream/stream_test.c b/tests/stream/stream_test.c index be0b278..e945a1e 100644 --- a/tests/stream/stream_test.c +++ b/tests/stream/stream_test.c @@ -490,14 +490,14 @@ static int test_segm_ipa_stream_srv_cli_read_cb(struct osmo_stream_cli *osc, struct msgb *msg) { unsigned char *data; - struct ipa_head *h = (struct ipa_head *) msg->data; - uint8_t ipac_msg_type = ((uint8_t *)h)[sizeof(struct ipa_head)]; + struct ipa_head *h = (struct ipa_head *) msg->l1h; + uint8_t ipac_msg_type = *msg->data; struct msgb *reply = msgb_alloc_headroom(128, 0, "IPA reply"); if (reply == NULL) { fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; } - LOGCLI(osc, "Received message from stream (total len = %" PRIu16 ")\n", msgb_length(msg)); + LOGCLI(osc, "Received message from stream (payload len = %" PRIu16 ")\n", msgb_length(msg)); if (ipac_msg_type < 0 || 5 < ipac_msg_type) { fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipac_msg_type); return -ENOMSG; @@ -526,7 +526,7 @@ return 0; } -static void *test_segm_ipa_stream_srv_run_client(void) +struct osmo_stream_cli *test_segm_ipa_stream_srv_run_client(void) { struct osmo_stream_cli *osc; void *ctx = talloc_named_const(NULL, 0, __func__); @@ -548,8 +548,9 @@ fprintf(stderr, "Cannot open stream client\n"); return NULL; } + osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb); - return NULL; + return osc; } int test_segm_ipa_stream_srv_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg) @@ -568,7 +569,7 @@ LOGSRV(conn, "\t(msg dump: %s)\n", osmo_hexdump(msg->l1h, msg->len + sizeof(struct ipa_head))); if (*msgt == IPAC_MSGT_ID_RESP) { /* */ LOGSRV(conn, "Send IPAC_MSGT_ID_GET to trigger client to send next third\n\n"); - m = msgb_alloc_headroom(128, 0, "IPA messages"); + m = osmo_ipa_msg_alloc(128); if (m == NULL) { fprintf(stderr, "Cannot allocate message\n"); return -ENOMEM; @@ -581,12 +582,6 @@ return 0; } -static int test_segm_ipa_stream_srv_srv_close_cb(struct osmo_stream_srv *conn) -{ - osmo_stream_srv_set_segmentation_cb(conn, NULL); - return 0; -} - static int test_segm_ipa_stream_srv_srv_accept_cb(struct osmo_stream_srv_link *srv, int fd) { void *ctx = talloc_named_const(NULL, 0, __func__); @@ -598,13 +593,13 @@ } osmo_stream_srv_set_segmentation_cb(oss, osmo_ipa_segmentation_cb); osmo_stream_srv_set_read_cb(oss, test_segm_ipa_stream_srv_srv_read_cb); - osmo_stream_srv_set_closed_cb(oss, test_segm_ipa_stream_srv_srv_close_cb); return 0; } static void test_segm_ipa_stream_srv_run(void *ctx, const char *host, unsigned port, struct osmo_stream_srv_link *srv) { + struct osmo_stream_cli *osc; const char *testname = "test_segm_ipa_stream_srv"; osmo_stream_srv_link_set_accept_cb(srv, test_segm_ipa_stream_srv_srv_accept_cb); @@ -612,7 +607,7 @@ printf("Unable to open server\n"); exit(1); } - test_segm_ipa_stream_srv_run_client(); + osc = test_segm_ipa_stream_srv_run_client(); printf("______________________________________Running test %s______________________________________\n", testname); alarm(2); @@ -623,6 +618,8 @@ } alarm(0); printf("==================================Test %s complete========================================\n\n", testname); + if (osc) + osmo_stream_cli_destroy(osc); } static void sigalarm_handler(int _foo) @@ -631,6 +628,202 @@ exit(EXIT_FAILURE); } +static struct osmo_timer_list fragmented_send_tl_srv; + +static unsigned test_segm_ipa_stream_cli_srv_msglognum = 0; + +/* Like CLI_APPEND_MSG, but for server side */ +#define SRV_APPEND_MSG(OSMO_STREAM_SRV_PTR, UCHAR_PTR_DST, STRUCT_MSGB_PTR, SRC_IPAC_MSG_BUF) do {\ + LOGSRV(OSMO_STREAM_SRV_PTR, "[%u-srv] Appending msg of type %s into buffer\n",\ + ++test_segm_ipa_stream_cli_srv_msglognum, IPAC_MSG_TYPES[SRC_IPAC_MSG_BUF[IPAC_MSGT_OFFSET]]);\ + LOGSRV(OSMO_STREAM_SRV_PTR, "\t(msg dump: %s)\n", osmo_hexdump(SRC_IPAC_MSG_BUF,\ + sizeof(SRC_IPAC_MSG_BUF)));\ + put_ipa_msg(UCHAR_PTR_DST, STRUCT_MSGB_PTR, SRC_IPAC_MSG_BUF);\ +} while (0) + +static void send_last_third_srv(void *osmo_stream_srv_arg) +{ + struct osmo_stream_srv *oss = osmo_stream_srv_arg; + unsigned char *data; + struct msgb *reply = msgb_alloc_headroom(128, 0, "IPA delayed reply"); + + LOGSRV(oss, "Delay for sending last third of message is over\n"); + if (reply == NULL) { + fprintf(stderr, "Cannot allocate message\n"); + return; + } + LOGSRV(oss, "[%u-srv] Appending: Last third of IPAC_MSGT_ID_GET\n", + ++test_segm_ipa_stream_cli_srv_msglognum); + data = msgb_put(reply, ipac_msg_idreq_last_third); + memcpy(data, ipac_msg_idreq + 2 * ipac_msg_idreq_third, + ipac_msg_idreq_last_third); + /* Append two entire messages */ + SRV_APPEND_MSG(oss, data, reply, ipac_msg_pong); + SRV_APPEND_MSG(oss, data, reply, ipac_msg_pong); + LOGSRV(oss, "\tSending:" + "[ Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG ]\n"); + LOGSRV(oss, "\t(msg dump: %s)\n\n", osmo_hexdump(reply->data, reply->len)); + osmo_stream_srv_send(oss, reply); +} + +int test_segm_ipa_stream_cli_srv_read_cb(struct osmo_stream_srv *conn, struct msgb *msg) +{ + unsigned char *data; + struct ipa_head *h = (struct ipa_head *) msg->l1h; + uint8_t ipa_msg_type = ((uint8_t *)h)[sizeof(struct ipa_head)]; + struct msgb *reply = msgb_alloc_headroom(128, 0, "IPA reply"); + if (reply == NULL) { + fprintf(stderr, "Cannot allocate message\n"); + return -ENOMEM; + } + LOGSRV(conn, "Received message from stream (total len including stripped headers = %lu)\n", + osmo_ntohs(h->len) + sizeof(*h)); + if (ipa_msg_type < 0 || 5 < ipa_msg_type) { + fprintf(stderr, "Received unexpected IPAC message type %"PRIu8"\n", ipa_msg_type); + return -ENOMSG; + } + LOGSRV(conn, "\tType: %s\n", IPAC_MSG_TYPES[ipa_msg_type]); + if (ipa_msg_type == IPAC_MSGT_ID_GET) { + LOGSRV(conn, "Got IPAC_MSGT_ID_GET from client\n"); + LOGSRV(conn, "[(%u + 2/3) -srv] Appending: Second third of IPAC_MSGT_ID_GET\n", + test_segm_ipa_stream_cli_srv_msglognum); + data = msgb_put(reply, ipac_msg_idreq_third); + memcpy(data, ipac_msg_idreq + ipac_msg_idreq_third, + ipac_msg_idreq_third); + LOGSRV(conn, "\tSending: Second third of IPAC_MSGT_ID_GET\n"); + LOGSRV(conn, "\t(msg dump: %s)\n", osmo_hexdump(reply->data, reply->len)); + osmo_stream_srv_send(conn, reply); + osmo_timer_setup(&fragmented_send_tl_srv, send_last_third_srv, conn); + osmo_timer_add(&fragmented_send_tl_srv); + osmo_timer_schedule(&fragmented_send_tl_srv, 0, 125000); + } else if (ipa_msg_type == IPAC_MSGT_ID_RESP) { + LOGSRV(conn, "\tresult= %s\n", + osmo_hexdump((const unsigned char *)h, sizeof(*h) + h->len)); + LOGSRV(conn, "\texpected=%s\n", + osmo_hexdump(ipac_msg_idresp, sizeof(ipac_msg_idresp))); + } + printf("\n"); + return 0; +} + +static int test_segm_ipa_stream_cli_srv_accept_cb(struct osmo_stream_srv_link *srv, int fd) +{ + void *ctx = talloc_named_const(NULL, 0, __func__); + struct osmo_stream_srv *oss = + osmo_stream_srv_create2(ctx, srv, fd, NULL); + unsigned char *data; + struct msgb *m = msgb_alloc_headroom(128, 0, "IPA messages"); + if (oss == NULL) { + fprintf(stderr, "Error while creating connection\n"); + return -1; + } + if (m == NULL) { + fprintf(stderr, "Cannot allocate message\n"); + return -ENOMEM; + } + osmo_stream_srv_set_segmentation_cb(oss, osmo_ipa_segmentation_cb); + osmo_stream_srv_set_read_cb(oss, test_segm_ipa_stream_cli_srv_read_cb); + + /* Send 4 and 1/3 messages, as done analogously in test_segm_ipa_stream_srv_cli_connect_cb() */ + /* Append 4 */ + SRV_APPEND_MSG(oss, data, m, ipac_msg_ping); + SRV_APPEND_MSG(oss, data, m, ipac_msg_pong); + SRV_APPEND_MSG(oss, data, m, ipac_msg_ping); + SRV_APPEND_MSG(oss, data, m, ipac_msg_idresp); + /* Append 1/3 */ + LOGSRV(oss, "[(0%u + 1/3)-srv] Appending 1st third of msg of type %s into buffer\n", + test_segm_ipa_stream_cli_srv_msglognum, IPAC_MSG_TYPES[ipac_msg_idreq[3]]); + LOGSRV(oss, "\t(dump: %s)\n", osmo_hexdump(ipac_msg_idreq, ipac_msg_idreq_third)); + data = msgb_put(m, ipac_msg_idreq_third); + memcpy(data, ipac_msg_idreq, ipac_msg_idreq_third); + + LOGSRV(oss, "Sending 4 + 1/3 messages as one:\n"); + LOGSRV(oss, "\t(msg dump: %s)\n\n", osmo_hexdump(m->data, m->len)); + osmo_stream_srv_send(oss, m); + return 0; +} + +static bool test_segm_ipa_stream_cli_all_msgs_processed = false; + +static int test_segm_ipa_stream_cli_cli_read_cb(struct osmo_stream_cli *osc, struct msgb *msg) +{ + static unsigned msgnum_cli = 0; + unsigned char *data; + struct msgb *m; + uint8_t *msgt = msg->data; + LOGCLI(osc, "[%u-cli] Received message from stream (len = %" PRIu16 ")\n", + ++msgnum_cli, msgb_length(msg)); + LOGCLI(osc, "\tmsg buff data: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGCLI(osc, "\tIPA payload: %s\n", osmo_hexdump(msg->data, msg->len)); + LOGCLI(osc, "\tType: %s\n", IPAC_MSG_TYPES[*msgt]); + LOGCLI(osc, "\t(msg dump (including stripped headers): %s)\n", + osmo_hexdump(msg->l1h, sizeof(struct ipa_head) + msg->len)); + if (*msgt == IPAC_MSGT_ID_RESP) { + LOGCLI(osc, "Send IPAC_MSGT_ID_GET to trigger server to send next third\n\n"); + m = msgb_alloc_headroom(128, sizeof(struct ipa_head) + + sizeof(struct ipa_head_ext), "IPA messages"); + if (m == NULL) { + fprintf(stderr, "Cannot allocate message\n"); + return -ENOMEM; + } + put_ipa_msg(data, m, ipac_msg_idreq); + osmo_stream_cli_send(osc, m); + } else if (msgnum_cli == 7 && *msgt == IPAC_MSGT_PONG) { + test_segm_ipa_stream_cli_all_msgs_processed = true; + } + return 0; +} + +static void *test_segm_ipa_stream_cli_run_client(void) +{ + struct osmo_stream_cli *osc; + void *ctx = talloc_named_const(NULL, 0, __func__); + + (void) msgb_talloc_ctx_init(ctx, 0); + osc = osmo_stream_cli_create(ctx); + if (osc == NULL) { + fprintf(stderr, "osmo_stream_cli_create_iofd()\n"); + return NULL; + } + osmo_stream_cli_set_addr(osc, "127.0.0.11"); + osmo_stream_cli_set_local_port(osc, 8977); + osmo_stream_cli_set_port(osc, 1112); + osmo_stream_cli_set_data(osc, ctx); + osmo_stream_cli_set_read_cb2(osc, test_segm_ipa_stream_cli_cli_read_cb); + osmo_stream_cli_set_nodelay(osc, true); + osmo_stream_cli_set_segmentation_cb(osc, osmo_ipa_segmentation_cb); + if (osmo_stream_cli_open(osc) < 0) { + fprintf(stderr, "Cannot open stream client\n"); + return NULL; + } + + return NULL; +} + +static void test_segm_ipa_stream_cli_run(void *ctx, const char *host, unsigned port, + struct osmo_stream_srv_link *srv) +{ + const char *testname = "test_segm_ipa_stream_cli"; + osmo_stream_srv_link_set_accept_cb(srv, + test_segm_ipa_stream_cli_srv_accept_cb); + osmo_stream_srv_link_set_port(srv, 1112); + if (osmo_stream_srv_link_open(srv) < 0) { + printf("Unable to open server\n"); + exit(1); + } + test_segm_ipa_stream_cli_run_client(); + + printf("______________________________________Running test %s______________________________________\n", testname); + alarm(2); + + while (!test_segm_ipa_stream_cli_all_msgs_processed) { + osmo_gettimeofday_override_add(0, 1); /* small increment to easily spot iterations */ + osmo_select_main(1); + } + alarm(0); + printf("==================================Test %s complete========================================\n\n", testname); +} + int main(void) { @@ -679,6 +872,7 @@ test_recon(tall_test, host, port, 8, srv, false); test_segm_ipa_stream_srv_run(tall_test, host, port, srv); + test_segm_ipa_stream_cli_run(tall_test, host, port, srv); printf("Stream tests completed\n"); diff --git a/tests/stream/stream_test.err b/tests/stream/stream_test.err index 03ce0cf..6c85c43 100644 --- a/tests/stream/stream_test.err +++ b/tests/stream/stream_test.err @@ -49,3 +49,5 @@ {20.000019} non-reconnecting test step 0 [client OK, server OK], FD reg 0 SRV(srv_link_test,127.0.0.11:1111) accept()ed new link from 127.0.0.1:8977 CLICONN(,r=127.0.0.11:1111<->l=127.0.0.1:8977){CONNECTING} connection established +SRV(srv_link_test,127.0.0.11:1112) accept()ed new link from 127.0.0.1:8977 +CLICONN(,r=127.0.0.11:1112<->l=127.0.0.1:8977){CONNECTING} connection established diff --git a/tests/stream/stream_test.ok b/tests/stream/stream_test.ok index f21b486..fb65aa7 100644 --- a/tests/stream/stream_test.ok +++ b/tests/stream/stream_test.ok @@ -84,7 +84,7 @@ {20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 07 fe 05 01 01 de ad be ef ) {20.000022} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): Send IPAC_MSGT_ID_GET to trigger client to send next third -{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Received message from stream (total len = 6) +{20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Received message from stream (payload len = 3) {20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Type: IPAC_MSGT_ID_GET {20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): Got IPAC_MSGT_ID_GET from server {20.000024} [OK] Client's test_segm_ipa_stream_srv_cli_read_cb(): [(4 + 2/3) -cli] Appending: Second third of IPAC_MSGT_ID_GET @@ -117,4 +117,73 @@ {20.500026} [NA|OK] Server's test_segm_ipa_stream_srv_srv_read_cb(): (msg dump: 00 01 fe 01 ) ==================================Test test_segm_ipa_stream_srv complete======================================== +______________________________________Running test test_segm_ipa_stream_cli______________________________________ +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): [1-srv] Appending msg of type IPAC_MSGT_PING into buffer +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): (msg dump: 00 01 fe 00 ) +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): [2-srv] Appending msg of type IPAC_MSGT_PONG into buffer +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): (msg dump: 00 01 fe 01 ) +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): [3-srv] Appending msg of type IPAC_MSGT_PING into buffer +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): (msg dump: 00 01 fe 00 ) +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): [4-srv] Appending msg of type IPAC_MSGT_ID_RESP into buffer +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): (msg dump: 00 07 fe 05 01 01 de ad be ef ) +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): [(04 + 1/3)-srv] Appending 1st third of msg of type IPAC_MSGT_ID_GET into buffer +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): (dump: 00 03 ) +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): Sending 4 + 1/3 messages as one: +{20.500027} [NA|OK] Server's test_segm_ipa_stream_cli_srv_accept_cb(): (msg dump: 00 01 fe 00 00 01 fe 01 00 01 fe 00 00 07 fe 05 01 01 de ad be ef 00 03 ) + +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [1-cli] Received message from stream (len = 1) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 00 +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 00 +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_PING +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 01 fe 00 ) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [2-cli] Received message from stream (len = 1) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 01 +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 01 +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_PONG +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 01 fe 01 ) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [3-cli] Received message from stream (len = 1) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 00 +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 00 +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_PING +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 01 fe 00 ) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [4-cli] Received message from stream (len = 7) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 05 01 01 de ad be ef +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 05 01 01 de ad be ef +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_ID_RESP +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 07 fe 05 01 01 de ad be ef ) +{20.500029} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Send IPAC_MSGT_ID_GET to trigger server to send next third + +{20.500031} [NA|OK] Server's test_segm_ipa_stream_cli_srv_read_cb(): Received message from stream (total len including stripped headers = 6) +{20.500031} [NA|OK] Server's test_segm_ipa_stream_cli_srv_read_cb(): Type: IPAC_MSGT_ID_GET +{20.500031} [NA|OK] Server's test_segm_ipa_stream_cli_srv_read_cb(): Got IPAC_MSGT_ID_GET from client +{20.500031} [NA|OK] Server's test_segm_ipa_stream_cli_srv_read_cb(): [(4 + 2/3) -srv] Appending: Second third of IPAC_MSGT_ID_GET +{20.500031} [NA|OK] Server's test_segm_ipa_stream_cli_srv_read_cb(): Sending: Second third of IPAC_MSGT_ID_GET +{20.500031} [NA|OK] Server's test_segm_ipa_stream_cli_srv_read_cb(): (msg dump: fe 04 ) + +{20.625031} [NA|OK] Server's send_last_third_srv(): Delay for sending last third of message is over +{20.625031} [NA|OK] Server's send_last_third_srv(): [5-srv] Appending: Last third of IPAC_MSGT_ID_GET +{20.625031} [NA|OK] Server's send_last_third_srv(): [6-srv] Appending msg of type IPAC_MSGT_PONG into buffer +{20.625031} [NA|OK] Server's send_last_third_srv(): (msg dump: 00 01 fe 01 ) +{20.625031} [NA|OK] Server's send_last_third_srv(): [7-srv] Appending msg of type IPAC_MSGT_PONG into buffer +{20.625031} [NA|OK] Server's send_last_third_srv(): (msg dump: 00 01 fe 01 ) +{20.625031} [NA|OK] Server's send_last_third_srv(): Sending:[ Last third of IPAC_MSGT_ID_GET | IPAC_MSGT_PONG | IPAC_MSGT_PONG ] +{20.625031} [NA|OK] Server's send_last_third_srv(): (msg dump: 01 01 00 01 fe 01 00 01 fe 01 ) + +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [5-cli] Received message from stream (len = 3) +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 04 01 01 +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 04 01 01 +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_ID_GET +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 03 fe 04 01 01 ) +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [6-cli] Received message from stream (len = 1) +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 01 +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 01 +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_PONG +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 01 fe 01 ) +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): [7-cli] Received message from stream (len = 1) +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): msg buff data: 01 +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): IPA payload: 01 +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): Type: IPAC_MSGT_PONG +{20.625033} [OK] Client's test_segm_ipa_stream_cli_cli_read_cb(): (msg dump (including stripped headers): 00 01 fe 01 ) +==================================Test test_segm_ipa_stream_cli complete======================================== + Stream tests completed -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 24 Gerrit-Owner: arehbein <arehbein(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-CC: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
by daniel 02 Oct '23

02 Oct '23

Attention is currently required from: arehbein, laforge, osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 23: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 23 Gerrit-Owner: arehbein <arehbein(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-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 02 Oct 2023 13:39:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA
by daniel 02 Oct '23

02 Oct '23

Attention is currently required from: arehbein, laforge, osmith. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 23: (1 comment) Patchset: PS20: > Yes, it's about the test. […] osmo_sock_init2() has OSMO_SOCK_F_BIND set in flags which will enable SO_REUSEADDR (in src/core/socket.c l.392-405). For the timestamp issue ideally we are able to reproduce it at some point, so we should keep the timestamps in the test for now. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I822abf52c6ae396c90b5c50228a0a39c848d3de6 Gerrit-Change-Number: 33198 Gerrit-PatchSet: 23 Gerrit-Owner: arehbein <arehbein(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: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: osmith <osmith(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 02 Oct 2023 12:52:27 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: laforge <laforge(a)osmocom.org> Gerrit-MessageType: comment

1 0