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

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: PCUIF_Types: get rid of _DT, _dt (Direct TLLI) ...................................................................... PCUIF_Types: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 Change-Id: I15e754ce3ceed92a517586a073d3e3ed008b5eef --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn M pcu/PCUIF_Components.ttcn 4 files changed, 53 insertions(+), 38 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index ad6ae5a..63a9a05 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5819,11 +5819,11 @@ /* three characters prefix: last 3 digits of IMSI as ASCII */ f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH, '313233'O & c_PCU_DATA); } else { - var PCUIF_pch_dt pch_dt; - pch_dt.msg_id := '01020304'O; - pch_dt.imsi := "00101000000000123"; - pch_dt.data := c_PCU_DATA; - f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)); + var PCUIF_pch pch; + pch.msg_id := '01020304'O; + pch.imsi := "00101000000000123"; + pch.data := c_PCU_DATA; + f_pcu_data_req(0, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)); } T.start; diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index ff87ee9..e56303e 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -155,11 +155,11 @@ pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH, prefix & imm_ass))); } else { - var PCUIF_pch_dt pch_dt; - pch_dt.msg_id := msg_id; - pch_dt.imsi := hex2str(imsi); - pch_dt.data := imm_ass; - pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_DT, enc_PCUIF_pch_dt(pch_dt)))); + var PCUIF_pch pch; + pch.msg_id := msg_id; + pch.imsi := hex2str(imsi); + pch.data := imm_ass; + pt.send(t_SD_PCUIF(conn_id, ts_PCUIF_DATA_REQ(bts_nr, 0, 0, 0, 0, PCU_IF_SAPI_PCH_2, enc_PCUIF_pch(pch)))); } /* Exit early when the caller is not interested in the confirmation message */ @@ -171,14 +171,14 @@ alt { [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF(bts_nr, 0, 0, PCU_IF_SAPI_PCH))) -> value sd { if (mp_pcuif_version >= 11) { - setverdict(fail, "expecting tr_PCUIF_DATA_CNF_DT in PCUIF v.11 or later"); + setverdict(fail, "expecting tr_PCUIF_DATA_CNF_2 in PCUIF v.11 or later"); mtc.stop; } else { log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf.fn); return; } } - [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, PCU_IF_SAPI_PCH_DT))) -> value sd { + [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_2(bts_nr, PCU_IF_SAPI_PCH_2))) -> value sd { if (mp_pcuif_version < 11) { setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); mtc.stop; diff --git a/library/PCUIF_Types.ttcn b/library/PCUIF_Types.ttcn index 2a86b54..8583504 100644 --- a/library/PCUIF_Types.ttcn +++ b/library/PCUIF_Types.ttcn @@ -30,7 +30,7 @@ PCU_IF_MSG_SUSP_REQ ('03'O), PCU_IF_MSG_APP_INFO_REQ ('04'O), PCU_IF_MSG_RTS_REQ ('10'O), - PCU_IF_MSG_DATA_CNF_DT ('11'O), + PCU_IF_MSG_DATA_CNF_2 ('11'O), PCU_IF_MSG_RACH_IND ('22'O), PCU_IF_MSG_INFO_IND ('32'O), PCU_IF_MSG_E1_CCU_IND ('33'O), @@ -54,7 +54,7 @@ PCU_IF_SAPI_PDTCH ('05'O), PCU_IF_SAPI_PRACH ('06'O), PCU_IF_SAPI_PTCCH ('07'O), - PCU_IF_SAPI_PCH_DT ('08'O) + PCU_IF_SAPI_PCH_2 ('08'O) } with { variant "FIELDLENGTH(8)" }; type record PCUIF_Flags { @@ -104,7 +104,7 @@ int16_t lqual_cb } with { variant (data) "FIELDLENGTH(162), ALIGN(left)" }; -type record PCUIF_data_cnf_dt { +type record PCUIF_data_cnf { PCUIF_Sapi sapi, OCT4 msg_id } with { variant "" }; @@ -304,8 +304,8 @@ }; /* Record to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The record is sent by the PCU to the BTS as a - * data request (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -type record PCUIF_pch_dt { + * data request (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +type record PCUIF_pch { OCT4 msg_id, charstring imsi length(17), octetstring data length(23) @@ -315,15 +315,15 @@ variant (data) "FIELDLENGTH(23)" }; -external function enc_PCUIF_pch_dt(in PCUIF_pch_dt pdu) return octetstring +external function enc_PCUIF_pch(in PCUIF_pch pdu) return octetstring with { extension "prototype(convert) encode(RAW)" }; -external function dec_PCUIF_pch_dt(in octetstring stream) return PCUIF_pch_dt +external function dec_PCUIF_pch(in octetstring stream) return PCUIF_pch with { extension "prototype(convert) decode(RAW)" }; type union PCUIF_MsgUnion { PCUIF_data data_req, PCUIF_data data_cnf, - PCUIF_data_cnf_dt data_cnf_dt, + PCUIF_data_cnf data_cnf2, PCUIF_data data_ind, PCUIF_susp_req susp_req, PCUIF_rts_req rts_req, @@ -347,7 +347,7 @@ } with { variant (u) "CROSSTAG( data_req, msg_type = PCU_IF_MSG_DATA_REQ; data_cnf, msg_type = PCU_IF_MSG_DATA_CNF; - data_cnf_dt, msg_type = PCU_IF_MSG_DATA_CNF_DT; + data_cnf2, msg_type = PCU_IF_MSG_DATA_CNF_2; data_ind, msg_type = PCU_IF_MSG_DATA_IND; susp_req, msg_type = PCU_IF_MSG_SUSP_REQ; rts_req, msg_type = PCU_IF_MSG_RTS_REQ; @@ -682,27 +682,27 @@ } } -template (value) PCUIF_Message ts_PCUIF_DATA_CNF_DT(template (value) uint8_t bts_nr, - template (value) PCUIF_Sapi sapi, - template (value) OCT4 msg_id) := { - msg_type := PCU_IF_MSG_DATA_CNF_DT, +template (value) PCUIF_Message ts_PCUIF_DATA_CNF_2(template (value) uint8_t bts_nr, + template (value) PCUIF_Sapi sapi, + template (value) OCT4 msg_id) := { + msg_type := PCU_IF_MSG_DATA_CNF_2, bts_nr := bts_nr, spare := '0000'O, u := { - data_cnf_dt := { + data_cnf2 := { sapi := sapi, msg_id := msg_id } } } -template PCUIF_Message tr_PCUIF_DATA_CNF_DT(template uint8_t bts_nr, - template PCUIF_Sapi sapi := ?, - template OCT4 msg_id := ?) := { - msg_type := PCU_IF_MSG_DATA_CNF_DT, +template PCUIF_Message tr_PCUIF_DATA_CNF_2(template uint8_t bts_nr, + template PCUIF_Sapi sapi := ?, + template OCT4 msg_id := ?) := { + msg_type := PCU_IF_MSG_DATA_CNF_2, bts_nr := bts_nr, spare := ?, u := { - data_cnf_dt := { + data_cnf2 := { sapi := sapi, msg_id := msg_id } diff --git a/pcu/PCUIF_Components.ttcn b/pcu/PCUIF_Components.ttcn index a6c5bae..d7e2ed5 100644 --- a/pcu/PCUIF_Components.ttcn +++ b/pcu/PCUIF_Components.ttcn @@ -499,7 +499,7 @@ /* Wait until the PCU is connected */ PCUIF.receive(tr_RAW_PCU_EV(PCU_EV_CONNECT)); - var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_DT, PCU_IF_SAPI_AGCH); + var template PCUIF_Sapi tr_ccch_sapi := (PCU_IF_SAPI_PCH, PCU_IF_SAPI_PCH_2, PCU_IF_SAPI_AGCH); alt { /* Wait for TXT.ind (PCU_VERSION) and respond with INFO.ind (SI13) */ [] PCUIF.receive(tr_PCUIF_TXT_IND(bts_nr, PCU_VERSION, ?)) -> value pcu_msg { @@ -537,7 +537,7 @@ } [decode_data_req] PCUIF.receive(tr_PCUIF_DATA_REQ(bts_nr, ?, ?, sapi := tr_ccch_sapi)) -> value pcu_msg { var octetstring data; - var PCUIF_pch_dt pch_dt; + var PCUIF_pch pch; /* On PCH the payload is prefixed with paging group (3 octets): skip it. * TODO: add an additional template parameter, so we can match it. */ if (pcu_msg.u.data_req.sapi == PCU_IF_SAPI_PCH) { @@ -548,11 +548,11 @@ pcu_msg_rr.bts_nr := bts_nr; pcu_msg_rr.raw := pcu_msg.u.data_req; - if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_DT) { - pch_dt := dec_PCUIF_pch_dt(pcu_msg_rr.raw.data); - pcu_msg_rr.msg_id := pch_dt.msg_id; - pcu_msg_rr.imsi := pch_dt.imsi; - pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch_dt.data); + if (pcu_msg_rr.raw.sapi == PCU_IF_SAPI_PCH_2) { + pch := dec_PCUIF_pch(pcu_msg_rr.raw.data); + pcu_msg_rr.msg_id := pch.msg_id; + pcu_msg_rr.imsi := pch.imsi; + pcu_msg_rr.rr_msg := dec_GsmRrMessage(pch.data); } else { pcu_msg_rr.msg_id := omit; pcu_msg_rr.imsi := omit; -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34138 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: I15e754ce3ceed92a517586a073d3e3ed008b5eef Gerrit-Change-Number: 34138 Gerrit-PatchSet: 6 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34136 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Change-Id: I628aaf19999a0004d0760d25ecd323cdbc0076f5 Related: OS#5927 --- M include/osmocom/bsc/pcuif_proto.h M src/osmo-bsc/pcu_sock.c 2 files changed, 40 insertions(+), 25 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, but someone else must approve dexter: Looks good to me, approved diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index d28aec0..bf49b06 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -18,7 +18,7 @@ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (with direct tlli) */ +#define PCU_IF_MSG_DATA_CNF_2 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_E1_CCU_IND 0x33 /* retrieve E1 CCU comm. parameters */ @@ -41,7 +41,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -94,7 +94,7 @@ } __attribute__ ((packed)); /* data confirmation with message id (instead of raw mac block) */ -struct gsm_pcu_if_data_cnf_dt { +struct gsm_pcu_if_data_cnf { uint8_t sapi; uint32_t msg_id; } __attribute__ ((packed)); @@ -263,8 +263,8 @@ } __attribute__ ((packed)); /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request - * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -struct gsm_pcu_if_pch_dt { + * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +struct gsm_pcu_if_pch { /* message id as reference for confirmation */ uint32_t msg_id; /* IMSI (to derive paging group) */ @@ -282,7 +282,7 @@ union { struct gsm_pcu_if_data data_req; struct gsm_pcu_if_data data_cnf; - struct gsm_pcu_if_data_cnf_dt data_cnf_dt; + struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; diff --git a/src/osmo-bsc/pcu_sock.c b/src/osmo-bsc/pcu_sock.c index 5353081..6f48f0f 100644 --- a/src/osmo-bsc/pcu_sock.c +++ b/src/osmo-bsc/pcu_sock.c @@ -56,7 +56,7 @@ [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", - [PCU_IF_SAPI_PCH_DT] = "PCH_DT", + [PCU_IF_SAPI_PCH_2] = "PCH_2", }; bool pcu_connected(const struct gsm_network *net) @@ -440,18 +440,18 @@ { struct msgb *msg; struct gsm_pcu_if *pcu_prim; - struct gsm_pcu_if_data_cnf_dt *data_cnf_dt; + struct gsm_pcu_if_data_cnf *data_cnf; LOG_BTS(bts, DPCU, LOGL_INFO, "Sending PCH confirm with message id\n"); - msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; - data_cnf_dt = &pcu_prim->u.data_cnf_dt; + data_cnf = &pcu_prim->u.data_cnf2; - data_cnf_dt->sapi = PCU_IF_SAPI_PCH_DT; - data_cnf_dt->msg_id = msg_id; + data_cnf->sapi = PCU_IF_SAPI_PCH_2; + data_cnf->msg_id = msg_id; return pcu_sock_send(bts->network, msg); } @@ -460,9 +460,9 @@ * Encoding::write_paging_request) and extract the mobile identity * (P-TMSI) from it */ static int pcu_rx_rr_paging_pch(struct gsm_bts *bts, uint8_t paging_group, - const struct gsm_pcu_if_pch_dt *pch_dt) + const struct gsm_pcu_if_pch *pch) { - struct gsm48_paging1 *p1 = (struct gsm48_paging1 *) pch_dt->data; + struct gsm48_paging1 *p1 = (struct gsm48_paging1 *) pch->data; uint8_t chan_needed; struct osmo_mobile_identity mi; int rc; @@ -506,17 +506,17 @@ } static int pcu_rx_rr_imm_ass_pch(struct gsm_bts *bts, uint8_t paging_group, - const struct gsm_pcu_if_pch_dt *pch_dt) + const struct gsm_pcu_if_pch *pch) { LOG_BTS(bts, DPCU, LOGL_DEBUG, "PCU Sends immediate assignment via PCH (msg_id=0x%08x, IMSI=%s, Paging group=0x%02x)\n", - pch_dt->msg_id, pch_dt->imsi, paging_group); + pch->msg_id, pch->imsi, paging_group); /* NOTE: Sending an IMMEDIATE ASSIGNMENT via PCH became necessary with GPRS in order to be able to * assign downlink TBFs directly through the paging channel. However, this method never became part * of the RSL specs. This means that each BTS vendor has to come up with a proprietary method. At * the moment we only support Ericsson RBS here. */ if (is_ericsson_bts(bts)) - return rsl_ericsson_imm_assign_cmd(bts, pch_dt->msg_id, sizeof(pch_dt->data), pch_dt->data, paging_group); + return rsl_ericsson_imm_assign_cmd(bts, pch->msg_id, sizeof(pch->data), pch->data, paging_group); LOG_BTS(bts, DPCU, LOGL_ERROR, "BTS model does not support sending immediate assignment via PCH!\n"); return -ENOTSUP; @@ -527,7 +527,7 @@ { uint8_t pag_grp; int rc = 0; - struct gsm_pcu_if_pch_dt *pch_dt; + struct gsm_pcu_if_pch *pch; struct gsm48_imm_ass *gsm48_imm_ass; LOG_BTS(bts, DPCU, LOGL_DEBUG, "Data request received: sapi=%s arfcn=%d " @@ -540,20 +540,20 @@ if (rsl_imm_assign_cmd(bts, data_req->len, data_req->data)) rc = -EIO; break; - case PCU_IF_SAPI_PCH_DT: - if (data_req->len < sizeof(struct gsm_pcu_if_pch_dt)) { + case PCU_IF_SAPI_PCH_2: + if (data_req->len < sizeof(struct gsm_pcu_if_pch)) { LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with invalid/small length %d\n", data_req->len); break; } - pch_dt = (struct gsm_pcu_if_pch_dt *)data_req->data; - pag_grp = gsm0502_calc_paging_group(&bts->si_common.chan_desc, str_to_imsi(pch_dt->imsi)); + pch = (struct gsm_pcu_if_pch *)data_req->data; + pag_grp = gsm0502_calc_paging_group(&bts->si_common.chan_desc, str_to_imsi(pch->imsi)); - gsm48_imm_ass = (struct gsm48_imm_ass *)pch_dt->data; + gsm48_imm_ass = (struct gsm48_imm_ass *)pch->data; if (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS) - return pcu_rx_rr_imm_ass_pch(bts, pag_grp, pch_dt); - return pcu_rx_rr_paging_pch(bts, pag_grp, pch_dt); + return pcu_rx_rr_imm_ass_pch(bts, pag_grp, pch); + return pcu_rx_rr_paging_pch(bts, pag_grp, pch); default: LOG_BTS(bts, DPCU, LOGL_ERROR, "Received PCU data request with " "unsupported sapi %d\n", data_req->sapi); -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I628aaf19999a0004d0760d25ecd323cdbc0076f5 Gerrit-Change-Number: 34136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-bsc[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34136 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... Patch Set 1: Code-Review+2 (1 comment) Patchset: PS1: The corresponding patches are merged, so we can merge this one too. -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34136 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I628aaf19999a0004d0760d25ecd323cdbc0076f5 Gerrit-Change-Number: 34136 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Aug 2023 10:33:01 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-bts[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34137 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Depends: osmo-pcu.git If641b507dcb6b176109c99dce7cff2a7561364b0 Change-Id: Icf85f60ae86fbe1f3b98e1457c0598bb09cb08c5 Related: OS#5927 --- M include/osmo-bts/pcuif_proto.h M src/common/pcu_sock.c 2 files changed, 32 insertions(+), 17 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, approved diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index b93822d..d584ba4 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -17,7 +17,7 @@ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (using message id) */ +#define PCU_IF_MSG_DATA_CNF_2 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_ACT_REQ 0x40 /* activate/deactivate PDCH */ @@ -35,7 +35,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -88,7 +88,7 @@ } __attribute__ ((packed)); /* data confirmation with message id (instead of raw mac block) */ -struct gsm_pcu_if_data_cnf_dt { +struct gsm_pcu_if_data_cnf { uint8_t sapi; uint32_t msg_id; } __attribute__ ((packed)); @@ -222,8 +222,8 @@ } __attribute__ ((packed)); /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request - * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -struct gsm_pcu_if_pch_dt { + * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +struct gsm_pcu_if_pch { /* message id as reference for confirmation */ uint32_t msg_id; /* IMSI (to derive paging group) */ @@ -241,7 +241,7 @@ union { struct gsm_pcu_if_data data_req; struct gsm_pcu_if_data data_cnf; - struct gsm_pcu_if_data_cnf_dt data_cnf_dt; + struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 67958f6..2431e85 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -59,7 +59,7 @@ [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", - [PCU_IF_SAPI_PCH_DT] = "PCH_DT", + [PCU_IF_SAPI_PCH_2] = "PCH_2", }; /* @@ -629,12 +629,12 @@ LOGP(DPCU, LOGL_DEBUG, "Sending PCH confirm\n"); - msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_2, bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; - pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { - .sapi = PCU_IF_SAPI_PCH_DT, + pcu_prim->u.data_cnf2 = (struct gsm_pcu_if_data_cnf) { + .sapi = PCU_IF_SAPI_PCH_2, .msg_id = msg_id, }; @@ -673,23 +673,23 @@ osmo_hexdump(data_req->data, data_req->len)); switch (data_req->sapi) { - case PCU_IF_SAPI_PCH_DT: + case PCU_IF_SAPI_PCH_2: { - const struct gsm_pcu_if_pch_dt *gsm_pcu_if_pch_dt; + const struct gsm_pcu_if_pch *gsm_pcu_if_pch; const struct gsm48_imm_ass *gsm48_imm_ass; bool confirm; - if (OSMO_UNLIKELY(data_req->len != sizeof(*gsm_pcu_if_pch_dt))) { + if (OSMO_UNLIKELY(data_req->len != sizeof(*gsm_pcu_if_pch))) { LOGP(DPCU, LOGL_ERROR, "Rx malformed DATA.req for PCH\n"); rc = -EINVAL; break; } - gsm_pcu_if_pch_dt = (struct gsm_pcu_if_pch_dt *)data_req->data; - gsm48_imm_ass = (struct gsm48_imm_ass *)gsm_pcu_if_pch_dt->data; + gsm_pcu_if_pch = (struct gsm_pcu_if_pch *)data_req->data; + gsm48_imm_ass = (struct gsm48_imm_ass *)gsm_pcu_if_pch->data; confirm = (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS); - rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch_dt->msg_id, - gsm_pcu_if_pch_dt->imsi, confirm, gsm_pcu_if_pch_dt->data); + rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch->msg_id, + gsm_pcu_if_pch->imsi, confirm, gsm_pcu_if_pch->data); break; } case PCU_IF_SAPI_AGCH: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34137 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Icf85f60ae86fbe1f3b98e1457c0598bb09cb08c5 Gerrit-Change-Number: 34137 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 11 months

1
0
0 0

[M] Change in osmo-pcu[master]: pcuif_proto: get rid of _DT, _dt (Direct TLLI)

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34134 ) Change subject: pcuif_proto: get rid of _DT, _dt (Direct TLLI) ...................................................................... pcuif_proto: get rid of _DT, _dt (Direct TLLI) Since we now no longer refer to TLLI when we mean "message ID" (msg_id), we should also remove the "_DT" / "_dt" suffix from structs and define constants and replace it with "_2" if required. Change-Id: If641b507dcb6b176109c99dce7cff2a7561364b0 Related: OS#5927 --- M include/osmocom/pcu/pcuif_proto.h M src/bts.cpp M src/gprs_rlcmac.c M src/pcu_l1_if.cpp M src/pcu_l1_if.h 5 files changed, 42 insertions(+), 28 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index f9465e4..bf49b06 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -18,7 +18,7 @@ #define PCU_IF_MSG_SUSP_REQ 0x03 /* BTS forwards GPRS SUSP REQ to PCU */ #define PCU_IF_MSG_APP_INFO_REQ 0x04 /* BTS asks PCU to transmit APP INFO via PACCH */ #define PCU_IF_MSG_RTS_REQ 0x10 /* ready to send request */ -#define PCU_IF_MSG_DATA_CNF_DT 0x11 /* confirm (using message id) */ +#define PCU_IF_MSG_DATA_CNF_2 0x11 /* confirm (using message id) */ #define PCU_IF_MSG_RACH_IND 0x22 /* receive RACH */ #define PCU_IF_MSG_INFO_IND 0x32 /* retrieve BTS info */ #define PCU_IF_MSG_E1_CCU_IND 0x33 /* retrieve E1 CCU comm. parameters */ @@ -41,7 +41,7 @@ #define PCU_IF_SAPI_PDTCH 0x05 /* packet data/control/ccch block */ #define PCU_IF_SAPI_PRACH 0x06 /* packet random access channel */ #define PCU_IF_SAPI_PTCCH 0x07 /* packet TA control channel */ -#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ +#define PCU_IF_SAPI_PCH_2 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -94,7 +94,7 @@ } __attribute__ ((packed)); /* data confirmation with message id (instead of raw mac block) */ -struct gsm_pcu_if_data_cnf_dt { +struct gsm_pcu_if_data_cnf { uint8_t sapi; uint32_t msg_id; } __attribute__ ((packed)); @@ -263,8 +263,8 @@ } __attribute__ ((packed)); /* Struct to send a (confirmed) IMMEDIATE ASSIGNMENT message via PCH. The struct is sent as a data request - * (data_req) under SAPI PCU_IF_SAPI_PCH_DT. */ -struct gsm_pcu_if_pch_dt { + * (data_req) under SAPI PCU_IF_SAPI_PCH_2. */ +struct gsm_pcu_if_pch { /* message id as reference for confirmation */ uint32_t msg_id; /* IMSI (to derive paging group) */ @@ -282,7 +282,7 @@ union { struct gsm_pcu_if_data data_req; struct gsm_pcu_if_data data_cnf; - struct gsm_pcu_if_data_cnf_dt data_cnf_dt; + struct gsm_pcu_if_data_cnf data_cnf2; struct gsm_pcu_if_data data_ind; struct gsm_pcu_if_susp_req susp_req; struct gsm_pcu_if_rts_req rts_req; diff --git a/src/bts.cpp b/src/bts.cpp index 6bc415f..497c2ce 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -1129,7 +1129,7 @@ if (plen >= 0) { bts_do_rate_ctr_inc(bts, CTR_IMMEDIATE_ASSIGN_DL_TBF); if (the_pcu->pcu_if_version >= 0x0b) - pcu_l1if_tx_pch_dt(bts, immediate_assignment, plen, tbf->imsi(), tbf->tlli()); + pcu_l1if_tx_pch2(bts, immediate_assignment, plen, tbf->imsi(), tbf->tlli()); else pcu_l1if_tx_pch(bts, immediate_assignment, plen, tbf->imsi()); } diff --git a/src/gprs_rlcmac.c b/src/gprs_rlcmac.c index 88fcc59..40fdfaf 100644 --- a/src/gprs_rlcmac.c +++ b/src/gprs_rlcmac.c @@ -45,7 +45,7 @@ bts_do_rate_ctr_inc(bts, CTR_PCH_REQUESTS); if (the_pcu->pcu_if_version >= 0x0b) - pcu_l1if_tx_pch_dt(bts, paging_request, plen, imsi, GSM_RESERVED_TMSI); + pcu_l1if_tx_pch2(bts, paging_request, plen, imsi, GSM_RESERVED_TMSI); else pcu_l1if_tx_pch(bts, paging_request, plen, imsi); diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index a022647..654063e 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -281,7 +281,7 @@ * Hence, pgroup 000 is taken "randomly" to send it over it. This of * course not optimal since it can actually be sent on any CCCH blocks, * so we are delaying the ImmAss for no good reason. But anyway, - * pcu_l1if_tx_pch() is deprecated and pcu_l1if_tx_pch_dt() should be + * pcu_l1if_tx_pch() is deprecated and pcu_l1if_tx_pch2() should be * used instead, which doesn't suffer from this problem. */ @@ -300,26 +300,26 @@ /* Send a MAC block via the paging channel. This will (obviously) only work for MAC blocks that contain an * IMMEDIATE ASSIGNMENT or a PAGING COMMAND message. In case the MAC block contains an IMMEDIATE ASSIGNMENT * message, the receiving end is required to confirm when the IMMEDIATE ASSIGNMENT has been sent. */ -void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id) +void pcu_l1if_tx_pch2(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id) { - struct gsm_pcu_if_pch_dt pch_dt = { 0 }; + struct gsm_pcu_if_pch pch = { 0 }; - pch_dt.msg_id = msg_id; + pch.msg_id = msg_id; if (imsi) - OSMO_STRLCPY_ARRAY(pch_dt.imsi, imsi); - /* OS#6097: if strlen(pch_dt.imsi) == 0: We assume the MS is in non-DRX + OSMO_STRLCPY_ARRAY(pch.imsi, imsi); + /* OS#6097: if strlen(pch.imsi) == 0: We assume the MS is in non-DRX * mode (TS 44.060 5.5.1.5) and hence it is listening on all CCCH blocks * (TS 45.002 6.5.3, 6.5.6). */ - pch_dt.data[0] = (plen << 2) | 0x01; - bitvec_pack(block, pch_dt.data + 1); + pch.data[0] = (plen << 2) | 0x01; + bitvec_pack(block, pch.data + 1); if (the_pcu->gsmtap_categ_mask & (1 << PCU_GSMTAP_C_DL_PCH)) gsmtap_send(the_pcu->gsmtap, 0, 0, GSMTAP_CHANNEL_PCH, 0, 0, 0, 0, - pch_dt.data, GSM_MACBLOCK_LEN); + pch.data, GSM_MACBLOCK_LEN); - pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_PCH_DT, 0, 0, 0, (uint8_t*)&pch_dt, sizeof(pch_dt)); + pcu_tx_data_req(bts, 0, 0, PCU_IF_SAPI_PCH_2, 0, 0, 0, (uint8_t*)&pch, sizeof(pch)); } int pcu_tx_neigh_addr_res_req(struct gprs_rlcmac_bts *bts, const struct neigh_cache_entry_key *neigh_key) @@ -551,18 +551,18 @@ return rc; } -static int pcu_rx_data_cnf_dt(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf_dt *data_cnf_dt) +static int pcu_rx_data_cnf2(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf *data_cnf) { int rc = 0; - LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf_dt->sapi); + LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf->sapi); - switch (data_cnf_dt->sapi) { - case PCU_IF_SAPI_PCH_DT: - bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id); + switch (data_cnf->sapi) { + case PCU_IF_SAPI_PCH_2: + bts_rcv_imm_ass_cnf(bts, NULL, data_cnf->msg_id); break; default: - LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi); + LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf->sapi); rc = -EINVAL; } @@ -1272,9 +1272,9 @@ CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_cnf); rc = pcu_rx_data_cnf(bts, &pcu_prim->u.data_cnf); break; - case PCU_IF_MSG_DATA_CNF_DT: - CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_cnf_dt); - rc = pcu_rx_data_cnf_dt(bts, &pcu_prim->u.data_cnf_dt); + case PCU_IF_MSG_DATA_CNF_2: + CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.data_cnf2); + rc = pcu_rx_data_cnf2(bts, &pcu_prim->u.data_cnf2); break; case PCU_IF_MSG_RTS_REQ: CHECK_IF_MSG_SIZE(pcu_prim_length, pcu_prim->u.rts_req); diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index 3ff17dc..19ec60a 100644 --- a/src/pcu_l1_if.h +++ b/src/pcu_l1_if.h @@ -156,7 +156,7 @@ int pcu_tx_neigh_addr_res_req(struct gprs_rlcmac_bts *bts, const struct neigh_cache_entry_key *neigh_key); void pcu_l1if_tx_pch(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi); -void pcu_l1if_tx_pch_dt(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id); +void pcu_l1if_tx_pch2(struct gprs_rlcmac_bts *bts, struct bitvec *block, int plen, const char *imsi, uint32_t msg_id); int pcu_rx(struct gsm_pcu_if *pcu_prim, size_t pcu_prim_length); int pcu_l1if_open(void); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34134 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: If641b507dcb6b176109c99dce7cff2a7561364b0 Gerrit-Change-Number: 34134 Gerrit-PatchSet: 1 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> 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, 11 months

1
0
0 0

[S] Change in osmocom-bb[master]: layer23: modem: Pass fn from lapdm to L1CTL-CCCH_DATA.ind

by osmith

Attention is currently required from: jolly, pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/34133 ) Change subject: layer23: modem: Pass fn from lapdm to L1CTL-CCCH_DATA.ind ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/34133 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: I7a9f31ae363fe7de019ff1a906f3978ff3074036 Gerrit-Change-Number: 34133 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Aug 2023 10:06:38 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in libosmo-gprs[master]: rlcmac: Move FN related helper functions to private header inside lib...

by osmith

Attention is currently required from: pespin. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34168 ) Change subject: rlcmac: Move FN related helper functions to private header inside libosmo-gprs ...................................................................... Patch Set 2: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34168 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I87393239b05a1c11498323139866aec9f6550f3b Gerrit-Change-Number: 34168 Gerrit-PatchSet: 2 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Aug 2023 10:05:00 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[M] Change in libosmo-gprs[master]: rlcmac: Fix Starting Time rfn->fn calculation

by osmith

Attention is currently required from: pespin, fixeria. osmith has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-gprs/+/34044 ) Change subject: rlcmac: Fix Starting Time rfn->fn calculation ...................................................................... Patch Set 6: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/libosmo-gprs/+/34044 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-gprs Gerrit-Branch: master Gerrit-Change-Id: I00741289333853a8db472950ee2ac38dc2c74fd3 Gerrit-Change-Number: 34044 Gerrit-PatchSet: 6 Gerrit-Owner: pespin <pespin(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Tue, 22 Aug 2023 09:47:22 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 11 months

1
0
0 0

[S] Change in osmo-ci[master]: scripts/manuals: adjust patch for removing draft

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34159 ) Change subject: scripts/manuals: adjust patch for removing draft ...................................................................... scripts/manuals: adjust patch for removing draft Adjust the patch, to not remove the "NOTE: TO REMOVE DRAFT MODE" as it isn't in osmo-gsm-manuals anymore. Related: osmo-gsm-manuals I23d11bab274793eb8bcedc3fd9290901823e32d2 Change-Id: Ia27cb8e4dd0204c0a91c322bed65bf8c9847a7be --- M scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch 1 file changed, 16 insertions(+), 19 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch b/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch index 65a4e89..2addeb4 100644 --- a/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch +++ b/scripts/manuals/0001-build-custom-dblatex.sty-remove-DRAFT.patch @@ -1,4 +1,4 @@ -From ed812f2bd79e7e01c833d90ee279ae4750f82f2f Mon Sep 17 00:00:00 2001 +From 92a645d74fde8b86ab0a8f6e3d089a0f1edc34d0 Mon Sep 17 00:00:00 2001 From: Oliver Smith <osmith(a)sysmocom.de> Date: Wed, 8 Mar 2023 17:48:17 +0100 Subject: [PATCH] build/custom-dblatex.sty: remove DRAFT @@ -9,25 +9,9 @@ Related: OS#5902 Change-Id: Id9a27b01412b0e615638f20fa5e36f5b114a15d8 --- - build/Makefile.asciidoc.inc | 4 ---- - build/custom-dblatex.sty | 4 ---- - 2 files changed, 8 deletions(-) + build/custom-dblatex.sty | 4 ---- + 1 file changed, 4 deletions(-) -diff --git a/build/Makefile.asciidoc.inc b/build/Makefile.asciidoc.inc -index 1b7375e..9a9e829 100644 ---- a/build/Makefile.asciidoc.inc -+++ b/build/Makefile.asciidoc.inc -@@ -69,10 +69,6 @@ $(ASCIIDOC_PDF): %.pdf: %.adoc %-docinfo.xml \ - - # TEXINPUTS: find LaTeX includes like \includegraphics{./common/images/sysmocom.pdf} - # in $(OSMO_GSM_MANUALS_DIR). -- @test -n "$(BUILD_RELEASE)" && echo -e "\n\n\ -- NOTE: TO REMOVE DRAFT MODE, YOU NEED TO EDIT build/custom-dblatex.sty\n\ -- and remove three lines starting with '% \"DRAFT\" on first page'\n" \ -- || true - TEXINPUTS="$(OSMO_GSM_MANUALS_DIR)" \ - a2x -vv $(A2X_OPTS) $(notdir $<) - diff --git a/build/custom-dblatex.sty b/build/custom-dblatex.sty index 16931ad..0d53bb1 100644 --- a/build/custom-dblatex.sty -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34159 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ia27cb8e4dd0204c0a91c322bed65bf8c9847a7be Gerrit-Change-Number: 34159 Gerrit-PatchSet: 1 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, 11 months

1
0
0 0

[M] Change in osmo-ci[master]: ansible: osmocom_build_deps: remove

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34161 ) Change subject: ansible: osmocom_build_deps: remove ...................................................................... ansible: osmocom_build_deps: remove The builds for almost all jenkins jobs are done in docker now, we definitely don't need to install all of these dependencies on all jenkins nodes anymore. Remove the file for now, so it doesn't look like they still get used and so we don't need to keep it up-to-date (e.g. inkscape was just replaced with rsvg-convert). When we deploy a new jenkins node and notice that we still do need a few of these dependencies, we can bring them back later. Change-Id: I7c87bd516d1bcdbcc21f65909dabbd3ccc38eede --- M ansible/roles/osmocom-jenkins-slave/README.md M ansible/roles/osmocom-jenkins-slave/defaults/main.yml M ansible/roles/osmocom-jenkins-slave/tasks/main.yml D ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml M ansible/setup-simtest.yml 5 files changed, 20 insertions(+), 197 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/ansible/roles/osmocom-jenkins-slave/README.md b/ansible/roles/osmocom-jenkins-slave/README.md index 50aed16..81f68b3 100644 --- a/ansible/roles/osmocom-jenkins-slave/README.md +++ b/ansible/roles/osmocom-jenkins-slave/README.md @@ -3,7 +3,6 @@ Support the following variables: * `install_jenkins_utilities`: (true) install usefull utilities including qemu/debootstrap/fakeroot -* `install_osmocom_build_deps`: (true) install all osmocom runtime and build time dependencies * `generic_slave`: (true) contains tasks used by the most osmocom jenkins slaves * `osmocom_jenkins_slave_fstrim`: (false) calls fstrim periodical * `ttcn3_slave`: (true) install titan ttcn3 compiler and prepares the docker-playground diff --git a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml index 4e1f179..a4ce8ac 100644 --- a/ansible/roles/osmocom-jenkins-slave/defaults/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/defaults/main.yml @@ -6,9 +6,6 @@ # install usefull utilities including qemu/debootstrap/fakeroot install_jenkins_utilities: true -# install all osmocom runtime and build time dependencies -install_osmocom_build_deps: true - # E.g. a generic_slave requires different tasks as a # special slave including the gsm-tester generic_slave: true diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml index e5ebbe1..1868d97 100644 --- a/ansible/roles/osmocom-jenkins-slave/tasks/main.yml +++ b/ansible/roles/osmocom-jenkins-slave/tasks/main.yml @@ -38,10 +38,6 @@ include_tasks: ttcn3-slave.yml when: ttcn3_slave and ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 and not (ansible_architecture == "armv7l" or ansible_architecture == "arm64") -- name: include osmocom_build_deps.yml - include_tasks: osmocom_build_deps.yml - when: install_osmocom_build_deps - - name: include generic slave include_tasks: generic-slave.yml when: generic_slave diff --git a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml b/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml deleted file mode 100644 index 8faab77..0000000 --- a/ansible/roles/osmocom-jenkins-slave/tasks/osmocom_build_deps.yml +++ /dev/null @@ -1,188 +0,0 @@ ---- -- name: install build utilities - apt: - name: - - asciidoc - - autoconf - - autoconf-archive - - automake - - bc - - bison - - coccinelle - - cppcheck - - debhelper - - devscripts - - dh-autoreconf - - doxygen - - flex - - g++ - - gawk - - gcc - - gcc-arm-none-eabi - - git - - git-buildpackage - - graphviz - - libcsv-dev - - libtool - - libboost-all-dev - - make - - mscgen - - osc - - pkgconf - - python-setuptools - - python3 - - python3-setuptools - - stow - - texinfo - # by gsm-manuals - - python3-nwdiag - - inkscape - # by gapk - - libasound-dev - - libopencore-amrnb-dev - # by LimeSuite - - cmake - - patchelf - # by libusrp - - sdcc - # by mingw upload job - - rsync - cache_valid_time: 3600 - update_cache: yes - -- name: install build dependencies and libraries - apt: - name: - - dahdi-source - - docbook5-xml - - libboost-dev - - libc-ares-dev - - libdbd-sqlite3 - - libdbi-dev - - libffi-dev - - libffi-dev - - libfftw3-dev - - libgmp-dev - - libgnutls28-dev - - libgps-dev - - libgsm1-dev - - libnftables-dev - - libnl-3-dev - - libnl-route-3-dev - - libmnl-dev - # by osmo-sysmon - - liboping-dev - - libncurses5-dev - - libortp-dev - - libpcap-dev - - libpcsclite-dev - - libreadline-dev - - libsctp-dev - - libsigsegv-dev - - libsnmp-dev - - libsofia-sip-ua-glib-dev - - libsqlite3-dev - - libssl-dev - - libsystemd-dev - - libtalloc-dev - - libuhd-dev - - libusb-1.0-0-dev - - libusb-dev - - libzmq3-dev - - sqlite3 - - libaio-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - -- name: install liblua for jessie - apt: - name: liblua5.3-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - default_release: jessie-backports - when: ansible_distribution == 'Debian' and ansible_distribution_release == 'jessie' - -- name: install liblua for stretch or later - apt: - name: - - liblua5.3-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 - -- name: install liblimesuite-dev for stretch or later - apt: - name: - - liblimesuite-dev - cache_valid_time: 3600 - update_cache: yes - install_recommends: no - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 - -- name: install osmo-remsim dependencies - apt: - name: - - libjansson-dev - - libulfius-dev - cache_valid_time: 3600 - update_cache: yes - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 - -- name: install srsLTE build dependencies - apt: - name: - - cmake - - libfftw3-dev - - libmbedtls-dev - - libboost-program-options-dev - - libconfig++-dev - - libsctp-dev - - libpcsclite-dev - - libuhd-dev - - libczmq-dev - - libsoapysdr-dev - cache_valid_time: 3600 - update_cache: yes - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 9 - -- name: install open5gs build dependencies - apt: - name: - - meson - - ninja-build - - libgcrypt-dev - - libidn11-dev - - libmongoc-dev - - libbson-dev - - libyaml-dev - - libnghttp2-dev - cache_valid_time: 3600 - update_cache: yes - when: ansible_distribution == 'Debian' and ansible_distribution_version|int >= 10 - -- name: download osmo-python-tests for py2 - git: - repo: "https://gerrit.osmocom.org/python/osmo-python-tests" - dest: "/home/{{ jenkins_user }}/osmo-python-tests2" - version: "fb4b813d4df62b7b2445bdced961eb1847267eed" - -- name: install osmo-python-tests for py2 - shell: - cmd: "python2 setup.py clean build install && date > installed" - chdir: "/home/{{ jenkins_user }}/osmo-python-tests2" - creates: "/home/{{ jenkins_user }}/osmo-python-tests2/installed" - -- name: download osmo-python-tests for py3 - git: - repo: "https://gerrit.osmocom.org/python/osmo-python-tests" - dest: "/home/{{ jenkins_user }}/osmo-python-tests3" - version: "be7fcf5f28a5d0f9ad35510f09b5979268d76598" - -- name: install osmo-python-tests for py3 - shell: - cmd: "python3 setup.py clean build install && date > installed" - chdir: "/home/{{ jenkins_user }}/osmo-python-tests3" - creates: "/home/{{ jenkins_user }}/osmo-python-tests3/installed" diff --git a/ansible/setup-simtest.yml b/ansible/setup-simtest.yml index 7b6913c..eb37186 100644 --- a/ansible/setup-simtest.yml +++ b/ansible/setup-simtest.yml @@ -36,7 +36,6 @@ - name: osmocom-jenkins-slave generic_slave: false install_jenkins_utilities: false - install_osmocom_build_deps: false ttcn3_slave: false tags: - jenkins-slave -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34161 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I7c87bd516d1bcdbcc21f65909dabbd3ccc38eede Gerrit-Change-Number: 34161 Gerrit-PatchSet: 1 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, 11 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023