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

[M] Change in osmo-ttcn3-hacks[master]: msc: TC_lu_and_mo_csd: test multiple bearer services
by osmith 10 Jul '23

10 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33665 to look at the new patch set (#2). Change subject: msc: TC_lu_and_mo_csd: test multiple bearer services ...................................................................... msc: TC_lu_and_mo_csd: test multiple bearer services Related: OS#4394 Change-Id: I74f983e1f5c0fef61018a9a5b92ed3b3cdbdfb5f --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 46 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/33665/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33665 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: I74f983e1f5c0fef61018a9a5b92ed3b3cdbdfb5f Gerrit-Change-Number: 33665 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_call_hangup: add missing rx MNCC_REL_cnf
by osmith 10 Jul '23

10 Jul '23

Hello Jenkins Builder, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33664 to look at the new patch set (#2). Change subject: msc: f_call_hangup: add missing rx MNCC_REL_cnf ...................................................................... msc: f_call_hangup: add missing rx MNCC_REL_cnf Add the missing rx of MNCC_REL_cnf to f_call_hangup for the MO case (called with release_by_ms = false, see f_mo_call()). This is in preparation for running f_mo_call several times in a row to test multiple bearer services in a CSD test (follow up patch). Without this patch, calling f_mo_call_establish() for the second time fails to rx the MNCC_RTP_CREATE because the REL cnf is still in the port. This leads to a timeout of X2 and OsmoMSC sending a CC RELEASE. Adjust the log numbers next to f_call_hangup to re-use numbers 2 and 3 from above, as only one of the two code paths gets executed (similar to numbers 5 and 6 below). Related: OS#4394 Change-Id: Ia2ed7ce092e73e17c4243e83bfd239ead8266b49 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/33664/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33664 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: Ia2ed7ce092e73e17c4243e83bfd239ead8266b49 Gerrit-Change-Number: 33664 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: TC_lu_and_mt/mo_csd: reduce call open time
by osmith 10 Jul '23

10 Jul '23

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 to look at the new patch set (#3). Change subject: msc: TC_lu_and_mt/mo_csd: reduce call open time ...................................................................... msc: TC_lu_and_mt/mo_csd: reduce call open time Related: OS#4394 Change-Id: Ie733028f7953d5d9fa1907efdb19485dee93ece9 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/33631/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 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: Ie733028f7953d5d9fa1907efdb19485dee93ece9 Gerrit-Change-Number: 33631 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ttcn3-hacks[master]: msc: f_call_hangup: add missing rx MNCC_REL_cnf
by osmith 10 Jul '23

10 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33664 ) Change subject: msc: f_call_hangup: add missing rx MNCC_REL_cnf ...................................................................... msc: f_call_hangup: add missing rx MNCC_REL_cnf Add the missing rx of MNCC_REL_cnf to f_call_hangup for the MO case (called with release_by_ms = false, see f_mo_call()). This is in preparation for running f_mo_call several times in a row to test multiple bearer services in a CSD test (follow up patch). Without this patch, calling f_mo_call_establish() for the second time fails to rx the MNCC_RTP_CREATE because the REL cnf is still in the port. This leads to a timeout of X2 and OsmoMSC sending a CC RELEASE. Adjust the log numbers next to f_call_hangup to re-use numbers 2 and 3 from above, as only one of the two code paths gets executed (similar to numbers 5 and 6 below). Related: OS#4394 Change-Id: Ia2ed7ce092e73e17c4243e83bfd239ead8266b49 --- M msc/BSC_ConnectionHandler.ttcn 1 file changed, 26 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/64/33664/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 1359dc7..996f54a 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1801,8 +1801,10 @@ /* A-side (PLMN) Release of call */ MNCC.send(ts_MNCC_REL_req(cpars.mncc_callref, valueof(ts_MNCC_cause(42)))); BSSAP.receive(tr_PDU_DTAP_MT(tr_ML3_MT_CC_RELEASE(cpars.transaction_id))); - log("f_call_hangup 4: rx DTAP CC RELEASE"); + log("f_call_hangup 2.a: rx DTAP CC RELEASE"); BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_REL_COMPL(cpars.transaction_id))); + log("f_call_hangup 3.a: rx MNCC REL cnf"); + MNCC.receive(tr_MNCC_REL_cnf(cpars.mncc_callref, cause := *)); } respond_to_dlcx := not (isbound(cpars.mgw_drop_dlcx) and valueof(cpars.mgw_drop_dlcx)); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33664 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: Ia2ed7ce092e73e17c4243e83bfd239ead8266b49 Gerrit-Change-Number: 33664 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[M] Change in osmo-ttcn3-hacks[master]: TC_lu_and_mo_csd: test multiple bearer services
by osmith 10 Jul '23

10 Jul '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33665 ) Change subject: TC_lu_and_mo_csd: test multiple bearer services ...................................................................... TC_lu_and_mo_csd: test multiple bearer services Related: OS#4394 Change-Id: I74f983e1f5c0fef61018a9a5b92ed3b3cdbdfb5f --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 46 insertions(+), 5 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/65/33665/1 diff --git a/msc/BSC_ConnectionHandler.ttcn b/msc/BSC_ConnectionHandler.ttcn index 996f54a..9a21b5d 100644 --- a/msc/BSC_ConnectionHandler.ttcn +++ b/msc/BSC_ConnectionHandler.ttcn @@ -1559,10 +1559,9 @@ if (cpars.emergency) { BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_EMERG_SETUP(cpars.transaction_id))); - } if (cpars.csd) { - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party, ts_Bcap_csd))); } else { - BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party))); + BSSAP.send(ts_PDU_DTAP_MO(ts_ML3_MO_CC_SETUP(cpars.transaction_id, cpars.called_party, + cpars.bearer_cap))); } if (cpars.stop_after_cc_setup) { diff --git a/msc/MSC_Tests.ttcn b/msc/MSC_Tests.ttcn index 1340252..81819ff 100644 --- a/msc/MSC_Tests.ttcn +++ b/msc/MSC_Tests.ttcn @@ -7187,13 +7187,45 @@ f_TC_auth_options(11); } -friend function f_tc_lu_and_mo_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { - f_init_handler(pars); +friend function f_mo_csd(charstring bs_name, BIT1 async, GSM48_bcap_transp transp, GSM48_bcap_user_rate user_rate) + runs on BSC_ConnHdlr { + log("-----------------------------------------------"); + log("MO CSD: " & bs_name); + log("-----------------------------------------------"); + g_Tguard.start(20.0); + var CallParameters cpars := valueof(t_CallParams); + cpars.csd := true; + cpars.bearer_cap := valueof(ts_Bcap_csd); + cpars.bearer_cap.octet6.synchronous_asynchronous := async; + cpars.bearer_cap.octet6.connectionElement := int2bit(enum2int(transp), 2); + cpars.bearer_cap.octet6.userRate := int2bit(enum2int(user_rate), 4); + f_perform_lu(); f_mo_call(cpars); } + +friend function f_tc_lu_and_mo_csd(charstring id, BSC_ConnHdlrPars pars) runs on BSC_ConnHdlr { + f_init_handler(pars); + + f_mo_csd("BS21T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_300); + f_mo_csd("BS22T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_1200); + f_mo_csd("BS24T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_2400); + f_mo_csd("BS25T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + f_mo_csd("BS26T", '1'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_9600); + + f_mo_csd("BS21NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_300); + f_mo_csd("BS22NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_1200); + f_mo_csd("BS24NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_2400); + f_mo_csd("BS25NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_4800); + f_mo_csd("BS26NT", '1'B, GSM48_BCAP_TR_RLP, GSM48_BCAP_UR_9600); + + f_mo_csd("BS31T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_1200); + f_mo_csd("BS32T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_2400); + f_mo_csd("BS33T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_4800); + f_mo_csd("BS34T", '0'B, GSM48_BCAP_TR_TRANSP, GSM48_BCAP_UR_9600); +} testcase TC_lu_and_mo_csd() runs on MTC_CT { var BSC_ConnHdlr vc_conn; f_init(); -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33665 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: I74f983e1f5c0fef61018a9a5b92ed3b3cdbdfb5f Gerrit-Change-Number: 33665 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-ttcn3-hacks[master]: TC_lu_and_mt/mo_csd: reduce call open time
by osmith 10 Jul '23

10 Jul '23

Attention is currently required from: osmith. Hello Jenkins Builder, laforge, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 to look at the new patch set (#2). Change subject: TC_lu_and_mt/mo_csd: reduce call open time ...................................................................... TC_lu_and_mt/mo_csd: reduce call open time Related: OS#4394 Change-Id: Ie733028f7953d5d9fa1907efdb19485dee93ece9 --- M msc/BSC_ConnectionHandler.ttcn M msc/MSC_Tests.ttcn 2 files changed, 16 insertions(+), 6 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/31/33631/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/33631 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: Ie733028f7953d5d9fa1907efdb19485dee93ece9 Gerrit-Change-Number: 33631 Gerrit-PatchSet: 2 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-bts[master]: pcu_sock: use PCUIF version 11 (direct TLLI)
by dexter 10 Jul '23

10 Jul '23

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33522 ) Change subject: pcu_sock: use PCUIF version 11 (direct TLLI) ...................................................................... pcu_sock: use PCUIF version 11 (direct TLLI) OsmoBTS still uses the deprecated version 10 of the PCUIF protocol. OsmoPCU is still compatible to version 10, but to maintain a clean interface it is planned to drop the support for version 10 in the near future. Moving to PCUIF v.11 essentially means using the "Direct TLLI" method to convey IMMEDIATE ASSIGNMENT and also PAGING COMMAND messages through the PCU socket. This means in particular that we use a TLLI as an identifier to confirm IMMEDIATE ASSIGNMENT messages towards the PCU (PAGING COMMAND is not confirmed at all). Also we now use struct gsm_pcu_if_pch_dt to parse the incoming PCU_IF_SAPI_PCH_DT, which is much cleaner than using offsets in a buffer. Change-Id: I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25 Depends: osmo-ttcn3-hacks.git I08de02e951e10bc8b4381cc2ad32e63f2747e3c4 Depends: docker-playground.git Ia28bc0d6d3cbfe63be19443db86631fb67bb80fb Related: OS#5927 --- M include/osmo-bts/paging.h M include/osmo-bts/pcu_if.h M include/osmo-bts/pcuif_proto.h M src/common/paging.c M src/common/pcu_sock.c 5 files changed, 67 insertions(+), 28 deletions(-) Approvals: laforge: Looks good to me, but someone else must approve fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index 9a30abb..d604536 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -37,7 +37,7 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, const char *imsi, bool confirm, const uint8_t *macblock); +int paging_add_macblock(struct paging_state *ps, uint32_t tlli, const char *imsi, bool confirm, const uint8_t *macblock); /* generate paging message for given gsm time */ int paging_gen_msg(struct paging_state *ps, uint8_t *out_buf, struct gsm_time *gt, diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 8e3b3ba..b8ce9c4 100644 --- a/include/osmo-bts/pcu_if.h +++ b/include/osmo-bts/pcu_if.h @@ -23,7 +23,7 @@ int pcu_tx_time_ind(uint32_t fn); int pcu_tx_interf_ind(const struct gsm_bts_trx *trx, uint32_t fn); int pcu_tx_pag_req(const uint8_t *identity_lv, uint8_t chan_needed); -int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len); +int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t tlli); int pcu_tx_susp_req(struct gsm_lchan *lchan, uint32_t tlli, const uint8_t *ra_id, uint8_t cause); int pcu_sock_send(struct msgb *msg); diff --git a/include/osmo-bts/pcuif_proto.h b/include/osmo-bts/pcuif_proto.h index 0fece48..bae6cda 100644 --- a/include/osmo-bts/pcuif_proto.h +++ b/include/osmo-bts/pcuif_proto.h @@ -3,10 +3,11 @@ #include <osmocom/gsm/l1sap.h> #include <arpa/inet.h> +#include <osmocom/gsm/protocol/gsm_23_003.h> #define PCU_SOCK_DEFAULT "/tmp/pcu_bts" -#define PCU_IF_VERSION 0x0a +#define PCU_IF_VERSION 0x0b #define TXT_MAX_LEN 128 /* msg_type */ @@ -34,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_AGCH_DT 0x08 /* assignment on AGCH but with additional TLLI */ +#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using TLLI) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -229,6 +230,17 @@ uint8_t data[0]; } __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 { + /* TLLI as reference for confirmation */ + uint32_t tlli; + /* IMSI (to derive paging group) */ + char imsi[OSMO_IMSI_BUF_SIZE]; + /* GSM mac-block (with immediate assignment message) */ + uint8_t data[GSM_MACBLOCK_LEN]; +} __attribute__((packed)); + struct gsm_pcu_if { /* context based information */ uint8_t msg_type; /* message type */ diff --git a/src/common/paging.c b/src/common/paging.c index 55f85f6..0ea7de7 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -64,6 +64,7 @@ struct { uint8_t msg[GSM_MACBLOCK_LEN]; bool confirm; + uint32_t tlli; /* used as identifier for confirmation */ } macblock; } u; }; @@ -270,7 +271,7 @@ /* Add a ready formatted MAC block message to the paging queue, this can be an IMMEDIATE ASSIGNMENT, or a * PAGING COMMAND (from the PCU) */ -int paging_add_macblock(struct paging_state *ps, const char *imsi, bool confirm, const uint8_t *macblock) +int paging_add_macblock(struct paging_state *ps, uint32_t tlli, const char *imsi, bool confirm, const uint8_t *macblock) { struct llist_head *group_q; struct paging_record *pr; @@ -308,6 +309,7 @@ paging_group); memcpy(pr->u.macblock.msg, macblock, GSM_MACBLOCK_LEN); pr->u.macblock.confirm = confirm; + pr->u.macblock.tlli = tlli; /* enqueue the new message to the HEAD of the queue */ llist_add(&pr->list, group_q); @@ -627,7 +629,7 @@ num_imsi++; } - /* if we have a MAC block (from the PCU), we send a conformation back */ + /* Handle MAC block (from the PCU) */ if (macblock) { /* re-add normal paging records */ for (i = 0; i < num_pr; i++) @@ -636,10 +638,9 @@ /* get MAC block message and free record */ memcpy(out_buf, pr[num_pr]->u.macblock.msg, GSM_MACBLOCK_LEN); - if (pr[num_pr]->u.macblock.confirm) { - pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg, - GSM_MACBLOCK_LEN); - } + /* send a confirmation back (if required) */ + if (pr[num_pr]->u.macblock.confirm) + pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.tlli); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 33b6740..8f34c33 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -59,6 +59,7 @@ [PCU_IF_SAPI_PDTCH] = "PDTCH", [PCU_IF_SAPI_PRACH] = "PRACH", [PCU_IF_SAPI_PTCCH] = "PTCCH", + [PCU_IF_SAPI_PCH_DT] = "PCH_DT", }; /* @@ -617,28 +618,26 @@ return pcu_sock_send(msg); } -int pcu_tx_pch_data_cnf(uint32_t fn, uint8_t *data, uint8_t len) +int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t tlli) { struct gsm_bts *bts; struct msgb *msg; struct gsm_pcu_if *pcu_prim; - struct gsm_pcu_if_data *data_cnf; /* FIXME: allow multiple BTS */ bts = llist_entry(g_bts_sm->bts_list.next, struct gsm_bts, list); LOGP(DPCU, LOGL_DEBUG, "Sending PCH confirm\n"); - msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF, bts->nr); + msg = pcu_msgb_alloc(PCU_IF_MSG_DATA_CNF_DT, bts->nr); if (!msg) return -ENOMEM; pcu_prim = (struct gsm_pcu_if *) msg->data; - data_cnf = &pcu_prim->u.data_cnf; - - data_cnf->sapi = PCU_IF_SAPI_PCH; - data_cnf->fn = fn; - memcpy(data_cnf->data, data, len); - data_cnf->len = len; + pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { + .sapi = PCU_IF_SAPI_PCH_DT, + .tlli = tlli, + .fn = fn, + }; return pcu_sock_send(msg); } @@ -675,21 +674,23 @@ osmo_hexdump(data_req->data, data_req->len)); switch (data_req->sapi) { - case PCU_IF_SAPI_PCH: + case PCU_IF_SAPI_PCH_DT: { + const struct gsm_pcu_if_pch_dt *gsm_pcu_if_pch_dt; const struct gsm48_imm_ass *gsm48_imm_ass; bool confirm; - char imsi[4]; - OSMO_STRLCPY_ARRAY(imsi, (char *)data_req->data); - if (data_req->len-3 != GSM_MACBLOCK_LEN) { - LOGP(DPCU, LOGL_ERROR, "MAC block with invalid length %d (expecting GSM_MACBLOCK_LEN = %d)\n", - data_req->len-3, GSM_MACBLOCK_LEN); - rc = -ENOMEM; + + if (OSMO_UNLIKELY(data_req->len != sizeof(*gsm_pcu_if_pch_dt))) { + LOGP(DPCU, LOGL_ERROR, "Rx malformed DATA.req for PCH\n"); + rc = -EINVAL; break; } - gsm48_imm_ass = (struct gsm48_imm_ass *)(data_req->data + 3); + + 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; confirm = (gsm48_imm_ass->msg_type == GSM48_MT_RR_IMM_ASS); - paging_add_macblock(bts->paging_state, imsi, confirm, data_req->data + 3); + rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch_dt->tlli, + gsm_pcu_if_pch_dt->imsi, confirm, gsm_pcu_if_pch_dt->data); break; } case PCU_IF_SAPI_AGCH: -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25 Gerrit-Change-Number: 33522 Gerrit-PatchSet: 3 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: laforge <laforge(a)osmocom.org> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 0

[M] Change in osmo-bts[master]: pcu_sock: use PCUIF version 11 (direct TLLI)
by dexter 10 Jul '23

10 Jul '23

dexter has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/33522 ) Change subject: pcu_sock: use PCUIF version 11 (direct TLLI) ...................................................................... Patch Set 2: (1 comment) Commit Message: https://gerrit.osmocom.org/c/osmo-bts/+/33522/comment/bfac1079_1f6f46ad PS2, Line 23: Depends > Related? Depends is correct, this was the patch that that adds support for v11 PCUIF in the TTCN3 testsuite. (All dependencies are meanwhile merged) -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/33522 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I25816ac12e63cc6b641eb414e6bc7eaa9c85fc25 Gerrit-Change-Number: 33522 Gerrit-PatchSet: 2 Gerrit-Owner: dexter <pmaier(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-Comment-Date: Mon, 10 Jul 2023 12:06:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 0

[M] Change in osmo-bsc[master]: ASCI: Add new rate counters to support VGCS/VBS messages
by pespin 10 Jul '23

10 Jul '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33596 ) Change subject: ASCI: Add new rate counters to support VGCS/VBS messages ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33596 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I18e4ca3599e480de2d0f64cc1b6f4bb6ce8020d4 Gerrit-Change-Number: 33596 Gerrit-PatchSet: 1 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 10 Jul 2023 12:05:05 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0

[S] Change in osmo-bsc[master]: ASCI: Send release on VGCS/VBS channel via unit data
by pespin 10 Jul '23

10 Jul '23

Attention is currently required from: jolly. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/33617 ) Change subject: ASCI: Send release on VGCS/VBS channel via unit data ...................................................................... Patch Set 4: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/33617 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib777fe98c8ce2342082d88d227b796167d92cfe1 Gerrit-Change-Number: 33617 Gerrit-PatchSet: 4 Gerrit-Owner: jolly <andreas(a)eversberg.eu> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: jolly <andreas(a)eversberg.eu> Gerrit-Comment-Date: Mon, 10 Jul 2023 12:04:45 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 0