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

[M] Change in osmo-pcu[master]: Fix DL_TBF PACCH ass done on UL_TBF already scheduled to tx last PKT ...
by pespin 19 Jun '23

19 Jun '23

Attention is currently required from: fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/32339 ) Change subject: Fix DL_TBF PACCH ass done on UL_TBF already scheduled to tx last PKT CTRL ACK ...................................................................... Patch Set 5: (1 comment) This change is ready for review. Patchset: PS5: Marking as active, since this patch is about assigning a DL TBF over an UL TBF, and T3192 turns out be about assigning overa DL TBF over the previous DL TBF. -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/32339 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I62ae91b494e4fd0ade3f4a3ba3817bcaedbdebf5 Gerrit-Change-Number: 32339 Gerrit-PatchSet: 5 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: Mon, 19 Jun 2023 16:44:18 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: gsm/ipa: Add segmentation callback
by daniel 19 Jun '23

19 Jun '23

Attention is currently required from: arehbein, fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33083 ) Change subject: gsm/ipa: Add segmentation callback ...................................................................... Patch Set 11: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33083 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I3a639e6896cc3b3fc8e9b2e1a58254710efa0d3f Gerrit-Change-Number: 33083 Gerrit-PatchSet: 11 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-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jun 2023 16:00:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-pcu[master]: cosmetic: tbf_fsm: Fix typo in comment
by pespin 19 Jun '23

19 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33372 ) Change subject: cosmetic: tbf_fsm: Fix typo in comment ...................................................................... cosmetic: tbf_fsm: Fix typo in comment Change-Id: Iba0d438f9ce20a5a4e293b0b36565f182824a136 --- M src/tbf_fsm.h 1 file changed, 10 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/72/33372/1 diff --git a/src/tbf_fsm.h b/src/tbf_fsm.h index cb075f1..999b3c0 100644 --- a/src/tbf_fsm.h +++ b/src/tbf_fsm.h @@ -53,7 +53,7 @@ TBF_ST_FLOW, /* RLC/MAC flow, resource needed */ TBF_ST_FINISHED, /* flow finished, wait for release */ TBF_ST_WAIT_RELEASE,/* DL TBF: wait for release or restart */ - TBF_ST_RELEASING, /* releasing, wait to free TBI/USF */ + TBF_ST_RELEASING, /* releasing, wait to free TFI/USF */ }; struct tbf_dl_fsm_ctx { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33372 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Iba0d438f9ce20a5a4e293b0b36565f182824a136 Gerrit-Change-Number: 33372 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: core/osmo_io: Fix reception of partial packets
by arehbein 19 Jun '23

19 Jun '23

arehbein has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33346 ) Change subject: core/osmo_io: Fix reception of partial packets ...................................................................... core/osmo_io: Fix reception of partial packets Always append to 'msg->tail' instead of to 'msg->data'. Change-Id: I0ab8028c807b4181fddd3c00ea2e037c40cf0813 --- M src/core/osmo_io_poll.c 1 file changed, 12 insertions(+), 1 deletion(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/osmo_io_poll.c b/src/core/osmo_io_poll.c index dd86f29..c4819fa 100644 --- a/src/core/osmo_io_poll.c +++ b/src/core/osmo_io_poll.c @@ -56,7 +56,7 @@ } hdr.msg = msg; - hdr.iov[0].iov_base = msgb_data(msg); + hdr.iov[0].iov_base = msg->tail; hdr.iov[0].iov_len = msgb_tailroom(msg); hdr.hdr.msg_iov = &hdr.iov[0]; hdr.hdr.msg_iovlen = 1; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ab8028c807b4181fddd3c00ea2e037c40cf0813 Gerrit-Change-Number: 33346 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: arehbein <arehbein(a)sysmocom.de> 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

[S] Change in libosmocore[master]: core/osmo_io: Fix reception of partial packets
by daniel 19 Jun '23

19 Jun '23

Attention is currently required from: arehbein. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33346 ) Change subject: core/osmo_io: Fix reception of partial packets ...................................................................... Patch Set 2: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33346 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I0ab8028c807b4181fddd3c00ea2e037c40cf0813 Gerrit-Change-Number: 33346 Gerrit-PatchSet: 2 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-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jun 2023 15:27:26 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmocore[master]: socket: Ensure fd is not negative in osmo_sock_get_name_buf()
by daniel 19 Jun '23

19 Jun '23

daniel has submitted this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33333 ) Change subject: socket: Ensure fd is not negative in osmo_sock_get_name_buf() ...................................................................... socket: Ensure fd is not negative in osmo_sock_get_name_buf() Write to str even in case of error because this is already the current behaviour and it's what osmo_stream_cli_get_sockname() and osmo_sock_get_name2{,_c}() expect. Change-Id: I76727993224ef87b475c33360c24966e82e866ec Fixes: Coverity CID#321044 --- M src/core/socket.c 1 file changed, 19 insertions(+), 0 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve daniel: Looks good to me, approved fixeria: Looks good to me, but someone else must approve pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/core/socket.c b/src/core/socket.c index 1b14794..02e16bc 100644 --- a/src/core/socket.c +++ b/src/core/socket.c @@ -1550,6 +1550,11 @@ char portbuf_l[6], portbuf_r[6]; int rc; + if (fd < 0) { + osmo_strlcpy(str, "<error-bad-fd>", str_len); + return -EBADF; + } + /* get local */ if ((rc = osmo_sock_get_ip_and_port(fd, hostbuf_l, sizeof(hostbuf_l), portbuf_l, sizeof(portbuf_l), true))) { osmo_strlcpy(str, "<error-in-getsockname>", str_len); -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I76727993224ef87b475c33360c24966e82e866ec Gerrit-Change-Number: 33333 Gerrit-PatchSet: 2 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

[S] Change in libosmocore[master]: socket: Ensure fd is not negative in osmo_sock_get_name_buf()
by daniel 19 Jun '23

19 Jun '23

Attention is currently required from: fixeria. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/33333 ) Change subject: socket: Ensure fd is not negative in osmo_sock_get_name_buf() ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/33333 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I76727993224ef87b475c33360c24966e82e866ec Gerrit-Change-Number: 33333 Gerrit-PatchSet: 1 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-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jun 2023 15:12:13 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in libosmo-sccp[master]: Set stream_cli/srv name to contain ASP + sockname
by daniel 19 Jun '23

19 Jun '23

Attention is currently required from: pespin. daniel has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-sccp/+/33335 ) Change subject: Set stream_cli/srv name to contain ASP + sockname ...................................................................... Patch Set 6: Code-Review+1 (1 comment) Commit Message: https://gerrit.osmocom.org/c/libosmo-sccp/+/33335/comment/7e64341e_5ca1bd77 PS6, Line 21: asp0,(r=::1:2905<->l=::ffff:127.0.0.2:35911) I think the example is now wrong (_ instead of ,). Minor issue, though -- To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/33335 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-sccp Gerrit-Branch: master Gerrit-Change-Id: I05bc5f6c7795f62c1814c1c774287b41ee85a475 Gerrit-Change-Number: 33335 Gerrit-PatchSet: 6 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-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Mon, 19 Jun 2023 15:10:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[XL] Change in osmo-pcu[master]: tbf_dl_fsm: Drop impossible event
by pespin 19 Jun '23

19 Jun '23

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33371 ) Change subject: tbf_dl_fsm: Drop impossible event ...................................................................... tbf_dl_fsm: Drop impossible event When sending the last DL block, the FSM moves FLOW->FINISHED. Hence, it is impossible to receive the FINAL_ACK in state flow, when we didn't yet sent the last DL block (it's only possible if there's a bug in the MS). TbfTest need to be adapted since they where acting wrong. Change-Id: I3288743ff01ff84c3d345b6efb7c3fb6ca934791 --- M src/tbf_dl_fsm.c M tests/tbf/TbfTest.cpp M tests/tbf/TbfTest.err 3 files changed, 2,346 insertions(+), 831 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/71/33371/1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33371 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I3288743ff01ff84c3d345b6efb7c3fb6ca934791 Gerrit-Change-Number: 33371 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in libosmo-gprs[master]: rlcmac: add OSMO_GPRS_RLCMAC_L1CTL_PDCH_{ESTABLISH,RELEASE}.req
by fixeria 19 Jun '23

19 Jun '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/33370 ) Change subject: rlcmac: add OSMO_GPRS_RLCMAC_L1CTL_PDCH_{ESTABLISH,RELEASE}.req ...................................................................... rlcmac: add OSMO_GPRS_RLCMAC_L1CTL_PDCH_{ESTABLISH,RELEASE}.req * Send the PDCH_ESTABLISH.req on receipt of RR IMM ASS, * Sending of PDCH_RELEASE.req is to be implemented. Change-Id: I2568c58646ce7511367275ac96cd55e7fdd7ec18 Related: OS#5500 --- M include/osmocom/gprs/rlcmac/rlcmac_prim.h M src/rlcmac/rlcmac.c M src/rlcmac/rlcmac_prim.c 3 files changed, 74 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/70/33370/1 diff --git a/include/osmocom/gprs/rlcmac/rlcmac_prim.h b/include/osmocom/gprs/rlcmac/rlcmac_prim.h index fa1ee52..ce02e8f 100644 --- a/include/osmocom/gprs/rlcmac/rlcmac_prim.h +++ b/include/osmocom/gprs/rlcmac/rlcmac_prim.h @@ -111,6 +111,8 @@ OSMO_GPRS_RLCMAC_L1CTL_PDCH_RTS, OSMO_GPRS_RLCMAC_L1CTL_CFG_UL_TBF, OSMO_GPRS_RLCMAC_L1CTL_CFG_DL_TBF, + OSMO_GPRS_RLCMAC_L1CTL_PDCH_ESTABLISH, + OSMO_GPRS_RLCMAC_L1CTL_PDCH_RELEASE, }; extern const struct value_string osmo_gprs_rlcmac_l1ctl_prim_type_names[]; @@ -174,6 +176,21 @@ uint8_t dl_slotmask; uint8_t dl_tfi; /* DL TFI for all PDCHs indicated in the slotmask */ } cfg_dl_tbf_req; + /* OSMO_GPRS_RLCMAC_L1CTL_PDCH_ESTABLISH | Req */ + struct { + uint8_t tsc; /* Training Sequence Code */ + uint8_t ta; /* Timing Advance */ + bool fh; /* Frequency Hopping */ + union { + uint16_t arfcn; + struct { + uint8_t hsn; + uint8_t maio; + uint8_t ma_len; + uint8_t ma[8]; + } fhp; /* fh == true */ + }; + } pdch_est_req; }; }; @@ -211,3 +228,5 @@ uint8_t rx_lev, uint16_t ber10k, int16_t ci_cb, uint8_t *data, uint8_t data_len); struct osmo_gprs_rlcmac_prim *osmo_gprs_rlcmac_prim_alloc_l1ctl_pdch_rts_ind(uint8_t ts_nr, uint32_t fn, uint8_t usf); +struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_est_req(uint8_t tsc, uint8_t ta); +struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_rel_req(void); diff --git a/src/rlcmac/rlcmac.c b/src/rlcmac/rlcmac.c index 318e3a7..45e5aa5 100644 --- a/src/rlcmac/rlcmac.c +++ b/src/rlcmac/rlcmac.c @@ -252,6 +252,7 @@ IA_RestOctets_t iaro; const uint8_t *iaro_raw = ((uint8_t *)ia) + sizeof(*ia) + ia->mob_alloc_len; size_t iaro_raw_len = GSM_MACBLOCK_LEN - (sizeof(*ia) + ia->mob_alloc_len); + struct osmo_gprs_rlcmac_prim *prim; rc = rsl_dec_chan_nr(ia->chan_desc.chan_nr, &ch_type, &ch_subch, &ch_ts); if (rc != 0) { @@ -267,6 +268,29 @@ return rc; } + prim = gprs_rlcmac_prim_alloc_l1ctl_pdch_est_req(ia->chan_desc.h0.tsc, + ia->timing_advance); + if (!ia->chan_desc.h0.h) { + prim->l1ctl.pdch_est_req.fh = false; + prim->l1ctl.pdch_est_req.arfcn = (ia->chan_desc.h0.arfcn_low) + | (ia->chan_desc.h0.arfcn_high << 8); + } else { + prim->l1ctl.pdch_est_req.fh = true; + prim->l1ctl.pdch_est_req.fhp.hsn = ia->chan_desc.h1.hsn; + prim->l1ctl.pdch_est_req.fhp.maio = (ia->chan_desc.h1.maio_low) + | (ia->chan_desc.h1.maio_high << 2); + /* TODO: ensure ia->mob_alloc_len <= sizeof(pdch_est_req.fhp.ma) */ + prim->l1ctl.pdch_est_req.fhp.ma_len = ia->mob_alloc_len; + memcpy(&prim->l1ctl.pdch_est_req.fhp.ma[0], &ia->mob_alloc[0], ia->mob_alloc_len); + } + + /* Request the lower layers to establish a PDCH channel */ + rc = gprs_rlcmac_prim_call_down_cb(prim); + if (rc != 0) { + LOGRLCMAC(LOGL_ERROR, "PDCH channel establishment failed\n"); + return rc; + } + switch (iaro.UnionType) { case 0: /* iaro.u.ll.* (IA_RestOctetsLL_t) */ /* TODO: iaro.u.ll.Compressed_Inter_RAT_HO_INFO_IND */ diff --git a/src/rlcmac/rlcmac_prim.c b/src/rlcmac/rlcmac_prim.c index a5f796a..b073240 100644 --- a/src/rlcmac/rlcmac_prim.c +++ b/src/rlcmac/rlcmac_prim.c @@ -325,6 +325,24 @@ return rlcmac_prim; } +/* L1CTL-PDCH_ESTABLISH.req */ +struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_est_req(uint8_t tsc, uint8_t ta) +{ + struct osmo_gprs_rlcmac_prim *rlcmac_prim; + rlcmac_prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_PDCH_ESTABLISH, PRIM_OP_REQUEST, 0); + rlcmac_prim->l1ctl.pdch_est_req.tsc = tsc; + rlcmac_prim->l1ctl.pdch_est_req.ta = ta; + return rlcmac_prim; +} + +/* L1CTL-PDCH_RELEASE.req */ +struct osmo_gprs_rlcmac_prim *gprs_rlcmac_prim_alloc_l1ctl_pdch_rel_req(void) +{ + struct osmo_gprs_rlcmac_prim *rlcmac_prim; + rlcmac_prim = rlcmac_prim_l1ctl_alloc(OSMO_GPRS_RLCMAC_L1CTL_PDCH_RELEASE, PRIM_OP_REQUEST, 0); + return rlcmac_prim; +} + int gprs_rlcmac_prim_handle_unsupported(struct osmo_gprs_rlcmac_prim *rlcmac_prim) { LOGRLCMAC(LOGL_ERROR, "Unsupported rlcmac_prim! %s\n", osmo_gprs_rlcmac_prim_name(rlcmac_prim)); -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/33370 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I2568c58646ce7511367275ac96cd55e7fdd7ec18 Gerrit-Change-Number: 33370 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0