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

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... pcu: Split f_ms_tx_ul_data_block() into helper functions This allows shrinking some tests which wish to send specificaly crafter LlcBlocks (since the way LlcBlocks are created for f_ms_tx_ul_data_block only allows sending data related to the same upper LLC PDU) Change-Id: I81176fa5c7caa2535bcc97eec26833579933ed7a --- M pcu/GPRS_Components.ttcn M pcu/PCU_Tests.ttcn 2 files changed, 57 insertions(+), 42 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/GPRS_Components.ttcn b/pcu/GPRS_Components.ttcn index 64a39dd..491a496 100644 --- a/pcu/GPRS_Components.ttcn +++ b/pcu/GPRS_Components.ttcn @@ -669,6 +669,45 @@ f_ms_tx_data_ind(ms, data, fn, nr := nr); } +function f_ms_tx_ul_data_blocks_gprs(inout GprsMS ms, template (value) LlcBlocks blocks, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var template (value) RlcmacUlBlock ul_data; + + ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, + tfi := ms.ul_tbf.tfi, + cv := cv, + bsn := ms.ul_tbf.bsn, + blocks := blocks); + if (with_tlli) { + ul_data.data.mac_hdr.tlli_ind := true; + ul_data.data.tlli := ms.tlli; + } + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); +} + +function f_ms_tx_ul_data_blocks_egprs(inout GprsMS ms, template (value) EgprsLlcBlocks blocks, + uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, + template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) +runs on MS_BTS_IFACE_CT { + var template (value) RlcmacUlBlock ul_data; + + ul_data := t_RLCMAC_UL_EGPRS_DATA(mcs := ms.ul_tbf.tx_cs_mcs, + tfi := ms.ul_tbf.tfi, + cv := cv, + bsn1 := ms.ul_tbf.bsn, + bsn2_offset := 0, + blocks := blocks); + if (with_tlli) { + ul_data.data_egprs.tlli_ind := true; + ul_data.data_egprs.tlli := ms.tlli; + } + f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); +} + function f_ms_tx_ul_data_block(inout GprsMS ms, octetstring payload, uint4_t cv := 15, boolean with_tlli := false, uint32_t fn := 0, template (value) TsTrxBtsNum nr := ts_TsTrxBtsNum) @@ -676,29 +715,10 @@ var template (value) RlcmacUlBlock ul_data; if (f_rlcmac_cs_mcs_is_mcs(ms.ul_tbf.tx_cs_mcs)) { - ul_data := t_RLCMAC_UL_EGPRS_DATA(mcs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := cv, - bsn1 := ms.ul_tbf.bsn, - bsn2_offset := 0, - blocks := {t_RLCMAC_LLCBLOCK_EGPRS(payload)}) - if (with_tlli) { - ul_data.data_egprs.tlli_ind := true; - ul_data.data_egprs.tlli := ms.tlli; - } + f_ms_tx_ul_data_blocks_egprs(ms, {t_RLCMAC_LLCBLOCK_EGPRS(payload)}, cv, with_tlli, fn, nr) } else { - ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := cv, - bsn := ms.ul_tbf.bsn, - blocks := {t_RLCMAC_LLCBLOCK(payload)}); - if (with_tlli) { - ul_data.data.mac_hdr.tlli_ind := true; - ul_data.data.tlli := ms.tlli; - } + f_ms_tx_ul_data_blocks_gprs(ms, {t_RLCMAC_LLCBLOCK(payload)}, cv, with_tlli, fn, nr); } - f_ultbf_inc_bsn(ms.ul_tbf); - f_ms_tx_ul_block(ms, ul_data, fn, nr := nr); } /* Send random payload for last "num_blocks" blocks in Ul TBF (ending with CV=0). */ diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index c360e97..82ecb57 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3603,7 +3603,6 @@ var PCUIF_info_ind info_ind; var RlcmacDlBlock dl_block; var octetstring payload; - var template (value) RlcmacUlBlock ul_data; var template (value) LlcBlockHdr blk_hdr; var template (value) LlcBlocks blocks; var uint32_t sched_fn; @@ -3644,14 +3643,7 @@ more := false, e := true); blocks := { t_RLCMAC_LLCBLOCK(payload, blk_hdr) }; /* Set CV = 15 to signal there's still more than BS_CV_MAX blocks to be sent */ - ul_data := t_RLCMAC_UL_DATA_TLLI(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := 15, - bsn := ms.ul_tbf.bsn, - blocks := blocks, - tlli := ms.tlli); - f_ultbf_inc_bsn(ms.ul_tbf); - f_ms_tx_ul_block(ms, ul_data, f_next_pdch_block(sched_fn)); + f_ms_tx_ul_data_blocks_gprs(ms, blocks, cv := 15, with_tlli := true, fn := sched_fn); blocks_sent := blocks_sent + 1; /* UL block should be received in SGSN */ @@ -3662,12 +3654,6 @@ tr_AckNackDescription(final_ack := '0'B))) f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, sched_fn, acknack_tmpl); - ul_data := t_RLCMAC_UL_DATA(cs := ms.ul_tbf.tx_cs_mcs, - tfi := ms.ul_tbf.tfi, - cv := 15, - bsn := ms.ul_tbf.bsn, - blocks := blocks); - nr := f_ms_tx_TsTrxBtsNum(ms); BTS.send(ts_PCUIF_RTS_REQ(nr.bts_nr, nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH, fn := 0, @@ -3683,9 +3669,7 @@ log("ACKING FN ", data_msg.raw.fn, " on FN ", ack_fn); f_ms_tx_ul_block(ms, ts_RLCMAC_CTRL_ACK(ms.tlli), ack_fn); } - ul_data.data.mac_hdr.bsn := ms.ul_tbf.bsn; - f_ms_tx_ul_block(ms, ul_data, 0); - f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_data_blocks_gprs(ms, blocks); blocks_sent := blocks_sent + 1; if (blocks_sent == target_bsn_set) { @@ -3703,9 +3687,7 @@ tr_PCUIF_DATA(nr.trx_nr, nr.ts_nr, sapi := PCU_IF_SAPI_PDTCH), tr_RLCMAC_DL_DUMMY_CTRL)) -> value data_msg { - ul_data.data.mac_hdr.bsn := ms.ul_tbf.bsn; - f_ms_tx_ul_block(ms, ul_data, 0); - f_ultbf_inc_bsn(ms.ul_tbf); + f_ms_tx_ul_data_blocks_gprs(ms, blocks); blocks_sent := blocks_sent + 1; if (blocks_sent == target_bsn_set) { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 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: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

1 year, 10 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF

by pespin

pespin has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 ) Change subject: pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF ...................................................................... pcu: TC_dl_multislot_tbf_ms_class_from_sgsn(): Properly wait for USF Change-Id: I34b31c292c00b6880311906ce6713a8e3c69a0d2 --- M pcu/PCU_Tests.ttcn 1 file changed, 13 insertions(+), 2 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/pcu/PCU_Tests.ttcn b/pcu/PCU_Tests.ttcn index 82ecb57..e381c59 100644 --- a/pcu/PCU_Tests.ttcn +++ b/pcu/PCU_Tests.ttcn @@ -3198,6 +3198,7 @@ var PacketDlAssign dl_tbf_ass; var RlcmacDlBlock dl_block; var uint32_t poll_fn; + var uint32_t dl_fn; var uint32_t sched_fn; var GprsMS ms; timer T := 5.0; @@ -3224,11 +3225,12 @@ f_ms_establish_ul_tbf(ms); /* Wait until PCU starts requesting for UL block on this TBF: */ - f_ms_wait_usf(ms); + dl_fn := f_ms_wait_usf(ms, nr := f_ms_tx_TsTrxBtsNum(ms)); + sched_fn := f_next_pdch_block(dl_fn); /* Send one UL block (with TLLI since we are in One-Phase Access contention resolution) and make sure it is ACKED fine */ - f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := ms.ul_tbf.start_time_fn, + f_ms_tx_ul_data_block(ms, data, with_tlli := true, fn := sched_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); /* DL ACK/NACK sets poll+rrbp requesting PACKET CONTROL ACK */ f_rx_rlcmac_dl_block_exp_ack_nack(dl_block, poll_fn, nr := f_ms_tx_TsTrxBtsNum(ms)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34003 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: I34b31c292c00b6880311906ce6713a8e3c69a0d2 Gerrit-Change-Number: 34003 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(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-MessageType: merged

1 year, 10 months

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: pcu: Split f_ms_tx_ul_data_block() into helper functions

by pespin

pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 ) Change subject: pcu: Split f_ms_tx_ul_data_block() into helper functions ...................................................................... Patch Set 1: (1 comment) File pcu/GPRS_Components.ttcn: https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995/comment/f04ec889_11e8… PS1, Line 672: blocks > Why "blocks" (plural), btw? I see this function is sending exactly one RLC/MAC block. […] this function is not sending exactly one block. It's sending a record of LlcBlocks, because an RLC/MAC block can transport more than 1 LlcBlocks (or segments of them). Another topic is that so far we only call this function to submit 1 Llc block because we don't need sending more for simplicity (there's some test which validates sending several llc blocks in one Rlc/MAC block iirc, and it may be possible to move it to use this API, but that would be another patch which is not really high prio). -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33995 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: I81176fa5c7caa2535bcc97eec26833579933ed7a Gerrit-Change-Number: 33995 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:14:35 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 10 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/osmocom-release-{manuals,tarballs}: set node

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34017 ) Change subject: jobs/osmocom-release-{manuals,tarballs}: set node ...................................................................... jobs/osmocom-release-{manuals,tarballs}: set node Set node to osmocom-master, so these jobs don't run on any node. Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 --- M jobs/osmocom-release-manuals.yml M jobs/osmocom-release-tarballs.yml 2 files changed, 13 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/17/34017/1 diff --git a/jobs/osmocom-release-manuals.yml b/jobs/osmocom-release-manuals.yml index 0628377..a120127 100644 --- a/jobs/osmocom-release-manuals.yml +++ b/jobs/osmocom-release-manuals.yml @@ -6,6 +6,7 @@ - job: name: 'Osmocom-release-manuals' + node: osmocom-master project-type: freestyle defaults: global description: | diff --git a/jobs/osmocom-release-tarballs.yml b/jobs/osmocom-release-tarballs.yml index 17b7c58..2e6bb04 100644 --- a/jobs/osmocom-release-tarballs.yml +++ b/jobs/osmocom-release-tarballs.yml @@ -6,6 +6,7 @@ - job-template: name: 'Osmocom-release-tarballs' + node: osmocom-master project-type: freestyle defaults: global description: | -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34017 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I3142b0463f7c61d47991822bf592f49ab4a421f7 Gerrit-Change-Number: 34017 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 10 months

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add server-side (segmentation) support for IPA

by pespin

Attention is currently required from: arehbein, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33197 ) Change subject: stream: Add server-side (segmentation) support for IPA ...................................................................... Patch Set 13: (2 comments) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/cbe57ba9_19151a37 PS10, Line 540: osmo_stream_cli_set_addr(osc, "127.0.0.11"); > I don't understand the second part of the sentence... […] What I meant is that in linux for the loopback interface the range 127.0.0.X of addresses don't need to explicitly be assigned to the network interface, they are added automagically when needed. Not critical, just sharing that this may pose problems on other systems. https://gerrit.osmocom.org/c/libosmo-netif/+/33197/comment/52147af6_055fb052 PS10, Line 621: rc = clock_gettime(CLOCK_MONOTONIC, &start); > What is the advantage of using `alarm()` instead, and how wouldn't I need to register some sort of ( […] The advantage is not mixing the code testing the API with the test-code itself. That makes the test easier to read, easier to extend, easier to debug. -- 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: 13 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:11:42 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Comment-In-Reply-To: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 10 months

1
0
0 0

[M] Change in libosmo-netif[master]: stream: Add and use IPA send function

by pespin

Attention is currently required from: arehbein, laforge, daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33201 ) Change subject: stream: Add and use IPA send function ...................................................................... Patch Set 14: (4 comments) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/414107df_7aa2db2f PS14, Line 387: #define IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER\ missing space before \ https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/a8607de9_bdcca102 PS14, Line 388: IPAC_MSGT_ID_GET,\ same https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/2316bf99_62c7c085 PS14, Line 397: IPAC_MSG_IDREQ_PAYLOAD_INITIALIZER why did this change here? unrelated? https://gerrit.osmocom.org/c/libosmo-netif/+/33201/comment/c1a202f9_5ccd4db6 PS14, Line 582: osmo_ipa_stream_srv_send(conn, IPAC_PROTO_IPACCESS, -1, m); I still think mixing filling the msgb (just 1-2 API calls) + sending is a bad idea, but since others seem to prefer this way then so be it. -- 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: 14 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-CC: daniel <dwillmann(a)sysmocom.de> Gerrit-CC: laforge <laforge(a)osmocom.org> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: laforge <laforge(a)osmocom.org> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Mon, 31 Jul 2023 09:06:29 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 10 months

1
0
0 0

[L] Change in libosmo-netif[master]: stream: Add client-side (segmentation) support for IPA

by pespin

Attention is currently required from: arehbein. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33198 ) Change subject: stream: Add client-side (segmentation) support for IPA ...................................................................... Patch Set 16: (2 comments) File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/053cb1f6_4b0b2f69 PS13, Line 829: rc = clock_gettime(CLOCK_MONOTONIC, &start); > See answer to the same comment on change 33197 […] I think I already answered in there that the easiest/best way to timeout the test is to use the alarm() call, to avoid making the test even more complex with mixed calls to clock_gettime and osmo_clock_gettime. Not critical though. File tests/stream/stream_test.c: https://gerrit.osmocom.org/c/libosmo-netif/+/33198/comment/9b81ebfc_d4289221 PS16, Line 518: osmo_timer_schedule(&fragmented_send_tl_cli, 0, 125000); why this change in time? seems unrelated? -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33198 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: 16 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder 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, 31 Jul 2023 09:01:19 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 10 months

1
0
0 0

[S] Change in libosmo-gprs[master]: llc: Fix potential null ptr dereference in LL-Xid.Ind

by pespin

pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 ) Change subject: llc: Fix potential null ptr dereference in LL-Xid.Ind ...................................................................... llc: Fix potential null ptr dereference in LL-Xid.Ind Closes: Coverity CID#322365 Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b --- M src/llc/llc_ll.c 1 file changed, 17 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-gprs refs/changes/16/34016/1 diff --git a/src/llc/llc_ll.c b/src/llc/llc_ll.c index ad87dba..45675c3 100644 --- a/src/llc/llc_ll.c +++ b/src/llc/llc_ll.c @@ -172,17 +172,22 @@ const struct gprs_llc_xid_field *xid_field_request_l3) { struct osmo_gprs_llc_prim *llc_prim_tx; - llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); - OSMO_ASSERT(llc_prim_tx); + if (xid_field_request_l3) { + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, xid_field_request_l3->var.val_len); + OSMO_ASSERT(llc_prim_tx); llc_prim_tx->ll.l3_pdu_len = xid_field_request_l3->var.val_len; llc_prim_tx->ll.l3_pdu = msgb_put(llc_prim_tx->oph.msg, llc_prim_tx->ll.l3_pdu_len); if (llc_prim_tx->ll.l3_pdu_len > 0) memcpy(llc_prim_tx->ll.l3_pdu, xid_field_request_l3->var.val, llc_prim_tx->ll.l3_pdu_len); + } else { + llc_prim_tx = gprs_llc_prim_alloc_ll_xid_ind(lle->llme->tlli, lle->sapi, NULL, 0); + OSMO_ASSERT(llc_prim_tx); } llc_prim_tx->ll.xid.n201_i = lle->params.n201_i; llc_prim_tx->ll.xid.n201_u = lle->params.n201_u; + return gprs_llc_prim_call_up_cb(llc_prim_tx); } -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34016 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: Icc65af3ea9a44a5daf80e47717564f6adf37444b Gerrit-Change-Number: 34016 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 10 months

1
0
0 0

[S] Change in osmo-ci[master]: scripts/jenkins-gerrit: sort jobs list

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33992 ) Change subject: scripts/jenkins-gerrit: sort jobs list ...................................................................... scripts/jenkins-gerrit: sort jobs list Having two debian entries in there in random order looks weird so sort the job lists. Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 --- M scripts/jenkins-gerrit/comment_generate.py 1 file changed, 15 insertions(+), 3 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/scripts/jenkins-gerrit/comment_generate.py b/scripts/jenkins-gerrit/comment_generate.py index 147faac..e127c4c 100755 --- a/scripts/jenkins-gerrit/comment_generate.py +++ b/scripts/jenkins-gerrit/comment_generate.py @@ -171,10 +171,10 @@ def get_jobs_list_str(jobs): - ret = "" + lines = [] for job in jobs: - ret += f"* [{get_job_short_name(job)}] {job['url']}/consoleFull\n" - return ret + lines += [f"* [{get_job_short_name(job)}] {job['url']}/consoleFull\n"] + return "".join(sorted(lines)) def get_comment_result(build_url, notify_on_success): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33992 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I795f821783b52a6a9cd1967d33f67b656efccf22 Gerrit-Change-Number: 33992 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 10 months

1
0
0 0

[S] Change in osmo-ci[master]: jobs/master,gerrit: don't use bullseye for python2

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/33993 ) Change subject: jobs/master,gerrit: don't use bullseye for python2 ...................................................................... jobs/master,gerrit: don't use bullseye for python2 openbsc, osmo-e1-recorder, osmo-smlc have been adjusted to not require python2 anymore. Let them use debian 12 for building. Closes: OS#5950 Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 --- M jobs/gerrit-verifications.yml M jobs/master-builds.yml 2 files changed, 16 insertions(+), 10 deletions(-) Approvals: laforge: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/jobs/gerrit-verifications.yml b/jobs/gerrit-verifications.yml index 1324df6..d2aaaae 100644 --- a/jobs/gerrit-verifications.yml +++ b/jobs/gerrit-verifications.yml @@ -133,7 +133,6 @@ pipeline_binpkgs: "debian:10 debian:12" - openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -367,7 +366,6 @@ - osmo-cbc - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) pipeline_binpkgs: "" - gapk: @@ -378,9 +376,7 @@ - osmo-el2tpd: pipeline_binpkgs: "" - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) - + - osmo-smlc - osmo-gbproxy - osmo-hnodeb diff --git a/jobs/master-builds.yml b/jobs/master-builds.yml index 4b1609a..6837d78 100644 --- a/jobs/master-builds.yml +++ b/jobs/master-builds.yml @@ -222,7 +222,6 @@ trigger: master-osmo-trx - openbsc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) a1_name: SMPP a1: !!python/tuple [--enable-smpp] a2_name: MGCP @@ -464,13 +463,11 @@ - osmo-e1d - osmo-cbc - - osmo-e1-recorder: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-e1-recorder - gapk - osmo-uecups - osmo-el2tpd - - osmo-smlc: - docker_img: '$USER/debian-bullseye-jenkins' # needs python2 (OS#5950) + - osmo-smlc - osmo-gbproxy - osmo-hnodeb -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/33993 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I1d9204b5b59866fa79839221bb47ec4f7206a982 Gerrit-Change-Number: 33993 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(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-MessageType: merged

1 year, 10 months

1
0
0 0

2025

2024

2023

2022

gerrit-log July 2023