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

[S] Change in libosmo-netif[master]: stream: (typo) Change callback param name of struct osmo_stream_cli f...

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33103 ) Change subject: stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665 Gerrit-Change-Number: 33103 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 11:04:42 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[XL] Change in osmo-pcu[master]: tbf: Improve TBF name description in logs

by dexter

Attention is currently required from: pespin. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/33105 ) Change subject: tbf: Improve TBF name description in logs ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/33105 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I86b5f042fae77721b22fc026228677bd56768ba9 Gerrit-Change-Number: 33105 Gerrit-PatchSet: 1 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 11:04:31 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Introduce and use osmo_stream_cli_fd() to get the fd

by pespin

Attention is currently required from: daniel. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33102 ) Change subject: stream: Introduce and use osmo_stream_cli_fd() to get the fd ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e964dea0adee8edbb9b75d2d17e7d0c5d8917d5 Gerrit-Change-Number: 33102 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 11:04:29 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests.TC_pcu_data_ind_lqual_cb: properly send UL BLOCK.req

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33108 ) Change subject: BTS_Tests.TC_pcu_data_ind_lqual_cb: properly send UL BLOCK.req ...................................................................... BTS_Tests.TC_pcu_data_ind_lqual_cb: properly send UL BLOCK.req We must be using a valid TDMA Fn when scheduling UL BLOCK.req, so so wait for a DL BLOCK.ind, take the current Fn from there and calculate a proper TDMA Fn for the next UL block. Change-Id: If0fb615a4136a76a939588af0131ddcfb7acd877 Related: OS#5954 --- M bts/BTS_Tests.ttcn 1 file changed, 79 insertions(+), 3 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/08/33108/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 0a044e7..192338b 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5326,6 +5326,66 @@ } } +/* Catch a L1CTL DL BLOCK.ind with the given parameters */ +private altstep as_l1ctl_dl_block_ind(out L1ctlGprsDlBlockInd block_ind, + template (present) GsmFrameNumber fn := ?, + template (present) uint3_t tn := ?, + template (present) uint3_t usf := ?, + template (present) octetstring data := ?) +runs on test_CT { + var L1ctlMessage l1_dl; + + [] L1CTL.receive(tr_L1CTL_GPRS_DL_BLOCK_IND(fn, tn, usf, data)) -> value l1_dl { + block_ind := l1_dl.payload.dl_block_ind; + } +} + +/* tuple of TDMA frame number and timeslot number */ +private type record TdmaFnTn { + GsmFrameNumber fn, + uint3_t tn +} + +/* Wait for a L1CTL DL BLOCK.ind and send an UL BLOCK.req */ +private function f_TC_pcu_tx_ul_block_req(octetstring data, + template (present) uint3_t tn := ?, + template (present) uint3_t usf := ?) +runs on test_CT return TdmaFnTn { + var L1ctlGprsDlBlockInd block_ind; + timer T; + + T.start(1.0); + alt { + [] as_l1ctl_dl_block_ind(block_ind, tn := tn, usf := usf) { + var integer fn := block_ind.hdr.fn; + + /* Ignore PTCCH/D blocks, their Fn is too far away */ + if (fn mod 104 == 12) { + repeat; + } + + /* Every fn % 13 == 12 we have either a PTCCH or an IDLE slot, thus + * every fn % 13 == 8 we add 5 frames, or 4 frames othrwise. The + * resulting value is first fn of the next block. */ + if (fn mod 13 == 8) { + fn := (fn + 5) mod (2048 * 51 * 26); + } else { + fn := (fn + 4) mod (2048 * 51 * 26); + } + + L1CTL.send(ts_L1CTL_GPRS_UL_BLOCK_REQ(fn, block_ind.hdr.tn, data)); + return {fn, block_ind.hdr.tn}; + } + [] L1CTL.receive { repeat; } + [] T.timeout { + setverdict(fail, "Timeout waiting for DL BLOCK.ind (RTS)"); + Misc_Helpers.f_shutdown(__BFILE__, __LINE__); + } + } + + return {0, 0}; /* make TITAN happy */ +} + /* Tune the L1 to PDCH on the given timeslot number */ private function f_TC_pcu_l1ctl_est_pdch(uint3_t tn) runs on test_CT { var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(tn), ts_RSL_ChanMode_SIGN)); @@ -5890,9 +5950,11 @@ var int16_t lqual_cb; timer T := 1.0; - /* Send a random PDTCH frame over Um - * FIXME: we need to wait for a DL block and user Fn from there. */ - L1CTL.send(ts_L1CTL_GPRS_UL_BLOCK_REQ(0, 7, '0000'O & f_rnd_octstring(21))); + L1CTL.clear; + PCU.clear; + + /* Send a random Uplink block over the Um */ + f_TC_pcu_tx_ul_block_req('0000'O & f_rnd_octstring(21), tn := 7); T.start; alt { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33108 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: If0fb615a4136a76a939588af0131ddcfb7acd877 Gerrit-Change-Number: 33108 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests.TC_pcu_data_ind_lqual_cb: remove lqual threshold

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33109 ) Change subject: BTS_Tests.TC_pcu_data_ind_lqual_cb: remove lqual threshold ...................................................................... BTS_Tests.TC_pcu_data_ind_lqual_cb: remove lqual threshold Since recently [1], osmo-bts does submit all PCUIF DATA.ind regardless of the Uplink link quality (C/I ratio in case of osmo-bts-trx). Change-Id: If801e9112c1207ccdc40f9e675c52fadccdd1411 Related: [1] osmo-bts.git I8f1856dd9061c1bfca8b15be30df7a51760231b0 --- M bts/BTS_Tests.ttcn 1 file changed, 20 insertions(+), 18 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/09/33109/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 192338b..7a24889 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5944,23 +5944,22 @@ setverdict(pass); } -private function f_TC_pcu_data_ind_lqual_cb(int16_t lqual_cb_exp, int16_t thresh) +private function f_TC_pcu_data_ind_lqual_cb(int16_t lqual_cb_exp) runs on test_CT { var PCUIF_Message msg; - var int16_t lqual_cb; timer T := 1.0; L1CTL.clear; PCU.clear; /* Send a random Uplink block over the Um */ - f_TC_pcu_tx_ul_block_req('0000'O & f_rnd_octstring(21), tn := 7); + var octetstring data := '0000'O & f_rnd_octstring(21); + f_TC_pcu_tx_ul_block_req(data, tn := 7); T.start; alt { - /* If expected link quality is above the threshold */ - [lqual_cb_exp >= thresh] as_pcuif_msg(msg, tr_PCUIF_DATA_IND) { - lqual_cb := msg.u.data_ind.lqual_cb; + [] as_pcuif_msg(msg, tr_PCUIF_DATA_IND(data := data)) { + var integer lqual_cb := msg.u.data_ind.lqual_cb; log("Rx PCUIF_DATA.ind (lqual_cb=", lqual_cb, ")"); /* Make sure the actual link quality matches the expected value */ @@ -5971,18 +5970,9 @@ setverdict(pass); } } - /* If expected link quality is below the threshold */ - [lqual_cb_exp < thresh] as_pcuif_msg(msg, tr_PCUIF_DATA_IND) { - Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Rx unexpected PCUIF_DATA.ind: ", msg)); - } /* Ignore PCUIF_RTS.req and PCUIF_TIME.ind */ [] PCU.receive { repeat; } - [lqual_cb_exp < thresh] T.timeout { - log("Rx nothing, as expected"); - setverdict(pass); - } - [lqual_cb_exp >= thresh] T.timeout { + [] T.timeout { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Timeout waiting for PCUIF_DATA.ind"); } @@ -6010,9 +6000,8 @@ ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(i)); - /* FIXME: OsmoBTS may have different threshold (see MIN_QUAL_NORM) */ log("Testing C/I=", i, " cB"); - f_TC_pcu_data_ind_lqual_cb(i, thresh := 0); + f_TC_pcu_data_ind_lqual_cb(i); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33109 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: If801e9112c1207ccdc40f9e675c52fadccdd1411 Gerrit-Change-Number: 33109 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: BTS_Tests.TC_pcu_data_ind_lqual_cb: log lqual values

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33107 ) Change subject: BTS_Tests.TC_pcu_data_ind_lqual_cb: log lqual values ...................................................................... BTS_Tests.TC_pcu_data_ind_lqual_cb: log lqual values Change-Id: Ia8cb340005b58331e1e032a53c0a93163a517fb0 Related: OS#5954 --- M bts/BTS_Tests.ttcn 1 file changed, 11 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/07/33107/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index 4d52e49..0a044e7 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5949,6 +5949,7 @@ ret := f_TRXC_transceive(BTS_TRXC, g_bts_trxc_conn_id, ts_TRXC_FAKE_CI(i)); /* FIXME: OsmoBTS may have different threshold (see MIN_QUAL_NORM) */ + log("Testing C/I=", i, " cB"); f_TC_pcu_data_ind_lqual_cb(i, thresh := 0); } } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33107 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: Ia8cb340005b58331e1e032a53c0a93163a517fb0 Gerrit-Change-Number: 33107 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-ttcn3-hacks[master]: BTS_Tests: cosmetic: add as_pcuif_msg() for convenience

by fixeria

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33106 ) Change subject: BTS_Tests: cosmetic: add as_pcuif_msg() for convenience ...................................................................... BTS_Tests: cosmetic: add as_pcuif_msg() for convenience This altstep eliminates the need to wrap the actual PCUIF message template into another (port specific) template t_SD_PCUIF. Change-Id: Iabefddd54a4a2e2183feea04fdb8526e74efc7ac --- M bts/BTS_Tests.ttcn 1 file changed, 80 insertions(+), 59 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/06/33106/1 diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index e715996..4d52e49 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5315,6 +5315,17 @@ * PCU Socket related tests ***********************************************************************/ +/* Catch a PCUIF message (without having to use t_SD_PCUIF) */ +private altstep as_pcuif_msg(out PCUIF_Message msg, + template (present) PCUIF_Message tr_msg := ?) +runs on test_CT { + var PCUIF_send_data sd; + + [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_msg)) -> value sd { + msg := sd.data; + } +} + /* Tune the L1 to PDCH on the given timeslot number */ private function f_TC_pcu_l1ctl_est_pdch(uint3_t tn) runs on test_CT { var ConnHdlrPars pars := valueof(t_Pars(ts_RslChanNr_PDCH(tn), ts_RSL_ChanMode_SIGN)); @@ -5326,12 +5337,13 @@ /* Verify no RTS before ACT_REQ; verify RTS after ACT_REQ */ friend function f_TC_pcu_act_req(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr, boolean exp_success) runs on test_CT { + var PCUIF_Message msg; timer T := 3.0; /* we don't expect any RTS.req before PDCH are active */ T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr))) { + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(bts_nr)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "PCU RTS.req before PDCH active?"); } [] PCU.receive { repeat; } @@ -5344,14 +5356,13 @@ /* we now expect RTS.req for this timeslot (only) */ T.start; alt { - [exp_success] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { + [exp_success] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr)) { setverdict(pass); } - [not exp_success] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, - tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { + [not exp_success] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RTS.req for supposedly failing activation"); } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ)) { + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "RTS.req for wrong TRX/TS"); } [] PCU.receive { repeat; } @@ -5367,6 +5378,7 @@ /* verify no more RTS after DEACT_REQ */ friend function f_TC_pcu_deact_req(uint8_t bts_nr, uint8_t trx_nr, uint8_t ts_nr) runs on test_CT { + var PCUIF_Message msg; timer T := 3.0; /* Send PDCH activate request for known PDCH timeslot */ @@ -5378,7 +5390,7 @@ /* we now expect no RTS.req for this timeslot */ T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr))) { + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr)) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Received unexpected PCU RTS.req"); } [] PCU.receive { repeat; } @@ -5443,8 +5455,9 @@ /* Test the PCU->BTS Version and BTS->PCU SI13 handshake */ function f_TC_pcu_ver_siXX(octetstring si, RSL_IE_SysinfoType rsl_si_type) runs on test_CT { - var PCUIF_send_data sd; - timer T:= 3.0; + var PCUIF_Message msg; + timer T := 3.0; + f_init_with_pcuif(); /* Set SI13 via RSL */ @@ -5452,8 +5465,8 @@ T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_DATA_IND(0, 0, 0, ?, PCU_IF_SAPI_BCCH))) -> value sd { - if (substr(sd.data.u.data_ind.data, 0, lengthof(si)) == si) { + [] as_pcuif_msg(msg, tr_PCUIF_DATA_IND(0, 0, 0, sapi := PCU_IF_SAPI_BCCH)) { + if (substr(msg.u.data_ind.data, 0, lengthof(si)) == si) { setverdict(pass); } else { repeat; @@ -5500,15 +5513,14 @@ PCUIF_Sapi sapi, octetstring data) runs on test_CT { - var PCUIF_send_data sd; - + var PCUIF_Message msg; timer T := 3.0; + T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, - tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr, sapi))) -> value sd { - f_pcu_data_req(bts_nr, trx_nr, ts_nr, sd.data.u.rts_req.block_nr, - sd.data.u.rts_req.fn, sapi, data); + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(bts_nr, trx_nr, ts_nr, sapi)) { + f_pcu_data_req(bts_nr, trx_nr, ts_nr, msg.u.rts_req.block_nr, + msg.u.rts_req.fn, sapi, data); } [] PCU.receive { repeat; } [] T.timeout { @@ -5638,7 +5650,7 @@ private function f_TC_pcu_ptcch_ul(uint16_t ra) runs on test_CT { var template PCUIF_Message pcu_rach_ind; - var PCUIF_send_data sd; + var PCUIF_Message msg; var GsmFrameNumber fn; timer T; @@ -5653,8 +5665,8 @@ /* Expect a RACH.ind on the PCU interface (timeout is one multi-frame) */ T.start(52.0 * 4.615 / 1000.0); alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, pcu_rach_ind)) -> value sd { - log("Rx an Access Burst on the PCU interface: ", sd.data); + [] as_pcuif_msg(msg, pcu_rach_ind) { + log("Rx an Access Burst on the PCU interface: ", msg); setverdict(pass); T.stop; } @@ -5787,6 +5799,7 @@ var GsmFrameNumber fn_last := 0; for (var integer i := 0; i < 1000; i := i+1) { + var PCUIF_Message msg; var OCT1 ra := f_rnd_ra_ps(); var GsmFrameNumber fn := f_L1CTL_RACH(L1CTL, oct2int(ra)); if (fn == fn_last) { @@ -5797,10 +5810,10 @@ timer T := 2.0; T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RACH_IND(0, 0, 0, oct2int(ra), 0, ?, fn))) { + [] as_pcuif_msg(msg, tr_PCUIF_RACH_IND(0, 0, 0, oct2int(ra), 0, ?, fn)) { T.stop; } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RACH_IND)) { + [] as_pcuif_msg(msg, tr_PCUIF_RACH_IND) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RACH IND"); } [] PCU.receive { repeat; } @@ -5819,7 +5832,7 @@ var GsmFrameNumber fn_last := 0; var L1ctlRachSynchSeq synch_seq; var PCUIF_BurstType pcu_bt; - var GsmFrameNumber fn; + var GsmFrameNumber fn var BIT11 ra11; f_init_with_pcuif(); @@ -5852,13 +5865,14 @@ burst_type := pcu_bt, fn := fn); + var PCUIF_Message msg; timer T := 2.0; T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, pcu_rach_ind)) { + [] as_pcuif_msg(msg, pcu_rach_ind) { T.stop; } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RACH_IND)) { + [] as_pcuif_msg(msg, tr_PCUIF_RACH_IND) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected RACH IND"); } [] PCU.receive { repeat; } @@ -5872,14 +5886,10 @@ private function f_TC_pcu_data_ind_lqual_cb(int16_t lqual_cb_exp, int16_t thresh) runs on test_CT { - var template PCUIF_send_data sdt; - var PCUIF_send_data sd; + var PCUIF_Message msg; var int16_t lqual_cb; timer T := 1.0; - /* PCUIF_DATA.ind is encapsulated into a supplementary record */ - sdt := t_SD_PCUIF_MSGT(g_pcu_conn_id, PCU_IF_MSG_DATA_IND); - /* Send a random PDTCH frame over Um * FIXME: we need to wait for a DL block and user Fn from there. */ L1CTL.send(ts_L1CTL_GPRS_UL_BLOCK_REQ(0, 7, '0000'O & f_rnd_octstring(21))); @@ -5887,8 +5897,8 @@ T.start; alt { /* If expected link quality is above the threshold */ - [lqual_cb_exp >= thresh] PCU.receive(sdt) -> value sd { - lqual_cb := sd.data.u.data_ind.lqual_cb; + [lqual_cb_exp >= thresh] as_pcuif_msg(msg, tr_PCUIF_DATA_IND) { + lqual_cb := msg.u.data_ind.lqual_cb; log("Rx PCUIF_DATA.ind (lqual_cb=", lqual_cb, ")"); /* Make sure the actual link quality matches the expected value */ @@ -5900,9 +5910,9 @@ } } /* If expected link quality is below the threshold */ - [lqual_cb_exp < thresh] PCU.receive(sdt) -> value sd { + [lqual_cb_exp < thresh] as_pcuif_msg(msg, tr_PCUIF_DATA_IND) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, - log2str("Rx unexpected PCUIF_DATA.ind: ", sd.data)); + log2str("Rx unexpected PCUIF_DATA.ind: ", msg)); } /* Ignore PCUIF_RTS.req and PCUIF_TIME.ind */ [] PCU.receive { repeat; } @@ -5951,6 +5961,7 @@ var MobileIdentityLV mi_lv; var octetstring mi_lv_enc; var MobileIdentityV mi; + var PCUIF_Message msg; timer T := 3.0; if (i < 50) { @@ -5968,9 +5979,9 @@ RSL_CCHAN.send(ts_ASP_RSL_UD(ts_RSL_PAGING_CMD(mi, i mod 4))); T.start; alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ(0, mi_lv_enc))) { + [] as_pcuif_msg(msg, tr_PCUIF_PAG_REQ(0, mi_lv_enc)) { } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_PAG_REQ)) { + [] as_pcuif_msg(msg, tr_PCUIF_PAG_REQ) { Misc_Helpers.f_shutdown(__BFILE__, __LINE__, fail, "Unexpected PAGING REQ"); } [] PCU.receive { repeat; } @@ -5984,10 +5995,10 @@ /* test for periodic TIME_IND; check number of FN expired and number of TIME_IND within frames */ testcase TC_pcu_time_ind() runs on test_CT { - var PCUIF_send_data pcu_sd; var integer num_time_ind := 0; var integer first_fn, last_fn; var float test_duration := 5.0; + var PCUIF_Message msg; timer T; f_init_with_pcuif(); @@ -5996,16 +6007,16 @@ PCU.clear; T.start(test_duration); alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TIME_IND(0, ?))) -> value pcu_sd { + [] as_pcuif_msg(msg, tr_PCUIF_TIME_IND(0, ?)) { num_time_ind := num_time_ind + 1; if (not isbound(first_fn)) { - first_fn := pcu_sd.data.u.time_ind.fn; + first_fn := msg.u.time_ind.fn; } - last_fn := pcu_sd.data.u.time_ind.fn; + last_fn := msg.u.time_ind.fn; repeat; } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_TIME_IND(?, ?))) -> value pcu_sd { - setverdict(fail, "Received unexpected PCUIF_TIME_IND: ", pcu_sd.data); + [] as_pcuif_msg(msg, tr_PCUIF_TIME_IND(?, ?)) { + setverdict(fail, "Received unexpected PCUIF_TIME_IND: ", msg); repeat; } [] PCU.receive { @@ -6037,11 +6048,11 @@ /* test for periodic RTS_REQ; check number of FN expired and number of RTS_IND per SAPI */ testcase TC_pcu_rts_req() runs on test_CT { - var PCUIF_send_data pcu_sd; var integer first_fn, last_fn; var integer num_rts_pdtch := 0; var integer num_rts_ptcch := 0; var float test_duration := 5.0; + var PCUIF_Message msg; timer T; f_init_with_pcuif(); @@ -6050,26 +6061,24 @@ PCU.clear; T.start(test_duration); alt { - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(0, 0, 7, PCU_IF_SAPI_PDTCH, ?, ?))) - -> value pcu_sd { + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(0, 0, 7, PCU_IF_SAPI_PDTCH, ?, ?)) { num_rts_pdtch := num_rts_pdtch + 1; if (not isbound(first_fn)) { - first_fn := pcu_sd.data.u.rts_req.fn; + first_fn := msg.u.rts_req.fn; } - last_fn := pcu_sd.data.u.rts_req.fn; + last_fn := msg.u.rts_req.fn; repeat; } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ(0, 0, 7, PCU_IF_SAPI_PTCCH, ?, ?))) - -> value pcu_sd { + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ(0, 0, 7, PCU_IF_SAPI_PTCCH, ?, ?)) { num_rts_ptcch := num_rts_ptcch + 1; if (not isbound(first_fn)) { - first_fn := pcu_sd.data.u.rts_req.fn; + first_fn := msg.u.rts_req.fn; } - last_fn := pcu_sd.data.u.rts_req.fn; + last_fn := msg.u.rts_req.fn; repeat; } - [] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_RTS_REQ)) -> value pcu_sd { - setverdict(fail, "Received unexpected PCUIF_RTS_REQ: ", pcu_sd.data); + [] as_pcuif_msg(msg, tr_PCUIF_RTS_REQ) { + setverdict(fail, "Received unexpected PCUIF_RTS_REQ: ", msg); repeat; } [] PCU.receive { @@ -6540,7 +6549,7 @@ var template PCUIF_Message tr_interf_ind; var integer interf_ind_num := 0; var boolean first := true; - var PCUIF_send_data sd; + var PCUIF_Message msg; timer T; /* Set the averaging/reporting period to 480ms */ @@ -6566,25 +6575,25 @@ T.start(0.480 * 1.5); alt { /* The first interference report may contain unreliable values, so we ignore it */ - [first] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_INTERF_IND(0, 0))) { + [first] as_pcuif_msg(msg, tr_PCUIF_INTERF_IND(0, 0)) { /* 4 SACCH periods => 4 reports (plus some guard time) */ T.start(0.480 * 4.0 + 0.480 / 2.0); first := false; repeat; } /* Subsequent interference reports shall match our expectations */ - [not first] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_interf_ind)) -> value sd { + [not first] as_pcuif_msg(msg, tr_interf_ind) { /* Check TDMA frame number period */ - if (sd.data.u.interf_ind.fn mod 104 != 0) { + if (msg.u.interf_ind.fn mod 104 != 0) { setverdict(fail, "Odd TDMA frame number := ", - sd.data.u.interf_ind.fn); + msg.u.interf_ind.fn); } interf_ind_num := interf_ind_num + 1; if (interf_ind_num < 4) { repeat; } } - [not first] PCU.receive(t_SD_PCUIF(g_pcu_conn_id, tr_PCUIF_INTERF_IND(0, 0))) -> value sd { - setverdict(fail, "Received unexpected interference report: ", sd.data); + [not first] as_pcuif_msg(msg, tr_PCUIF_INTERF_IND(0, 0)) { + setverdict(fail, "Received unexpected interference report: ", msg); } [] PCU.receive { repeat; } [] T.timeout { -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33106 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: Iabefddd54a4a2e2183feea04fdb8526e74efc7ac Gerrit-Change-Number: 33106 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[M] Change in osmo-bts[master]: trx TCH DL: transmit invalid speech frames instead of dummy FACCH

by dexter

Attention is currently required from: falconia, pespin, fixeria. dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33069 ) Change subject: trx TCH DL: transmit invalid speech frames instead of dummy FACCH ...................................................................... Patch Set 2: Code-Review+1 (3 comments) Patchset: PS2: This patch sounds reasonable for me. File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/b36d97a9_b17b32d0 PS1, Line 500: what is the correct BTS Tx behavior for frame : * gaps in TCH/AFS > I hear you - I just don't have the needed AMR expertise to implement proper BFI transmission for AMR […] What we could do though is to add a task in redmine and put the OS#xxxx number next to the fixme. File src/osmo-bts-trx/sched_lchan_tchf.c: https://gerrit.osmocom.org/c/osmo-bts/+/33069/comment/9820ac66_4a9ee9c6 PS2, Line 479: * speech frame with inverted CRC3, designed to induce a BFI Wouldn't it be more clear to call it "speech block"? -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33069 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I78106802a0aa4af39859c75d29fe0e77037899fe Gerrit-Change-Number: 33069 Gerrit-PatchSet: 2 Gerrit-Owner: falconia <falcon(a)freecalypso.org> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: falconia <falcon(a)freecalypso.org> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Wed, 31 May 2023 10:58:51 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: falconia <falcon(a)freecalypso.org> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

2 years

1
0
0 0

[S] Change in libosmo-netif[master]: stream: (typo) Change callback param name of struct osmo_stream_cli f...

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33103 ) Change subject: stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli ...................................................................... stream: (typo) Change callback param name of struct osmo_stream_cli from srv to cli Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665 --- M src/stream.c 1 file changed, 13 insertions(+), 4 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/03/33103/1 diff --git a/src/stream.c b/src/stream.c index b3721c5..6afb7ca 100644 --- a/src/stream.c +++ b/src/stream.c @@ -261,10 +261,10 @@ int sk_domain; int sk_type; uint16_t proto; - int (*connect_cb)(struct osmo_stream_cli *srv); - int (*disconnect_cb)(struct osmo_stream_cli *srv); - int (*read_cb)(struct osmo_stream_cli *srv); - int (*write_cb)(struct osmo_stream_cli *srv); + int (*connect_cb)(struct osmo_stream_cli *cli); + int (*disconnect_cb)(struct osmo_stream_cli *cli); + int (*read_cb)(struct osmo_stream_cli *cli); + int (*write_cb)(struct osmo_stream_cli *cli); void *data; int flags; int reconnect_timeout; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I742db401165477f85e66bb428f156ecbbd5d6665 Gerrit-Change-Number: 33103 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

[S] Change in libosmo-netif[master]: stream: Introduce and use osmo_stream_cli_fd() to get the fd

by daniel

daniel has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmo-netif/+/33102 ) Change subject: stream: Introduce and use osmo_stream_cli_fd() to get the fd ...................................................................... stream: Introduce and use osmo_stream_cli_fd() to get the fd This will become useful once osmo_io can be used as a backend. Change-Id: I7e964dea0adee8edbb9b75d2d17e7d0c5d8917d5 --- M libosmo-netif.pc.in M src/stream.c 2 files changed, 25 insertions(+), 7 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/02/33102/1 diff --git a/libosmo-netif.pc.in b/libosmo-netif.pc.in index 7f1335e..1a925f6 100644 --- a/libosmo-netif.pc.in +++ b/libosmo-netif.pc.in @@ -7,5 +7,5 @@ Description: C Utility Library Version: @VERSION@ Libs: -L${libdir} -losmonetif -Libs.private: @LIBSCTP_LIBS@ +Libs.private: @LIBSCTP_LIBS@ @LIBOSMOCORE_LIBS@ Cflags: -I${includedir}/ diff --git a/src/stream.c b/src/stream.c index cbf0b27..b3721c5 100644 --- a/src/stream.c +++ b/src/stream.c @@ -321,6 +321,11 @@ cli->state = STREAM_CLI_STATE_CLOSED; } +static inline int osmo_stream_cli_fd(const struct osmo_stream_cli *cli) +{ + return cli->ofd.fd; +} + static void osmo_stream_cli_read(struct osmo_stream_cli *cli) { LOGSCLI(cli, LOGL_DEBUG, "message received\n"); @@ -406,7 +411,7 @@ #ifdef SO_NOSIGPIPE int ret; int val = 1; - ret = setsockopt(cli->ofd.fd, SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); + ret = setsockopt(osmo_stream_cli_fd(cli), SOL_SOCKET, SO_NOSIGPIPE, (void *)&val, sizeof(val)); if (ret < 0) LOGSCLI(cli, LOGL_DEBUG, "Failed setting SO_NOSIGPIPE: %s\n", strerror(errno)); return ret; @@ -678,7 +683,7 @@ { static char buf[OSMO_SOCK_NAME_MAXLEN]; - osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, cli->ofd.fd); + osmo_sock_get_name_buf(buf, OSMO_SOCK_NAME_MAXLEN, osmo_stream_cli_fd(cli)); return buf; } @@ -811,10 +816,10 @@ * \return negative on error, 0 on success */ int osmo_stream_cli_open(struct osmo_stream_cli *cli) { - int ret; + int ret, fd = -1; /* we are reconfiguring this socket, close existing first. */ - if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && cli->ofd.fd >= 0) + if ((cli->flags & OSMO_STREAM_CLI_F_RECONF) && osmo_stream_cli_fd(cli) >= 0) osmo_stream_cli_close(cli); cli->flags &= ~OSMO_STREAM_CLI_F_RECONF; @@ -850,14 +855,16 @@ osmo_stream_cli_reconnect(cli); return ret; } - osmo_fd_setup(&cli->ofd, ret, OSMO_FD_READ | OSMO_FD_WRITE, cli->ofd.cb, cli->ofd.data, cli->ofd.priv_nr); + + fd = ret; if (cli->flags & OSMO_STREAM_CLI_F_NODELAY) { - ret = setsockopt_nodelay(cli->ofd.fd, cli->proto, 1); + ret = setsockopt_nodelay(fd, cli->proto, 1); if (ret < 0) goto error_close_socket; } + osmo_fd_setup(&cli->ofd, fd, OSMO_FD_READ | OSMO_FD_WRITE, cli->ofd.cb, cli->ofd.data, cli->ofd.priv_nr); if (osmo_fd_register(&cli->ofd) < 0) goto error_close_socket; -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/33102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: I7e964dea0adee8edbb9b75d2d17e7d0c5d8917d5 Gerrit-Change-Number: 33102 Gerrit-PatchSet: 1 Gerrit-Owner: daniel <dwillmann(a)sysmocom.de> Gerrit-MessageType: newchange

2 years

1
0
0 0

2025

2024

2023

2022

gerrit-log May 2023