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

[M] Change in osmo-ttcn3-hacks[master]: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt

by dexter

Attention is currently required from: dexter. Hello osmith, Jenkins Builder, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 to look at the new patch set (#5). Change subject: PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt ...................................................................... PCUIF_Types: remove unnecessary members from record PCUIF_data_cnf_dt The record PCUIF_data_cnf_dt was added when the first experiments with Ericsson RBS base stations were made. It is essentially a copy of record PCUIF_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Related: OS#5927 Change-Id: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d --- M library/PCUIF_CodecPort.ttcn M library/PCUIF_Types.ttcn 2 files changed, 29 insertions(+), 39 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ttcn3-hacks refs/changes/10/34110/5 -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34110 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: Ie17d73d4c4bf2921800f87f6d6be7c05ce3a291d Gerrit-Change-Number: 34110 Gerrit-PatchSet: 5 Gerrit-Owner: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 12 months

1
0
0 0

[S] Change in pysim[master]: setup.py: fix package name

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34146 ) Change subject: setup.py: fix package name ...................................................................... setup.py: fix package name The package providing the serial python module seems to be called pyserial, which also matches what's written in requirements.txt. Change-Id: I71ef6a19a487101e552219f10f2fa6215b966abd --- M setup.py 1 file changed, 13 insertions(+), 1 deletion(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/setup.py b/setup.py index f776443..620e246 100644 --- a/setup.py +++ b/setup.py @@ -10,7 +10,7 @@ description='Tools related to SIM/USIM/ISIM cards', install_requires=[ "pyscard", - "serial", + "pyserial", "pytlv", "cmd2 >= 1.5.0", "jsonpath-ng", -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34146 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I71ef6a19a487101e552219f10f2fa6215b966abd Gerrit-Change-Number: 34146 Gerrit-PatchSet: 1 Gerrit-Owner: Florian Klink <flokli(a)flokli.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[S] Change in pysim[master]: README.md: sort dependencies, document smpp.pdu

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/pysim/+/34147 ) Change subject: README.md: sort dependencies, document smpp.pdu ...................................................................... README.md: sort dependencies, document smpp.pdu This dependency is currently only mentioned in requirements.txt, it makes sense to also document it here. Change-Id: I89760dd4008829c91fafbd442483d076c92a7ed4 --- M README.md 1 file changed, 21 insertions(+), 8 deletions(-) Approvals: Jenkins Builder: Verified fixeria: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/README.md b/README.md index c3c5a25..7801283 100644 --- a/README.md +++ b/README.md @@ -73,19 +73,20 @@ Please install the following dependencies: + - bidict + - cmd2 >= 1.5.0 + - colorlog + - construct >= 2.9.51 + - gsm0338 + - jsonpath-ng + - packaging + - pycryptodomex - pyscard - pyserial - pytlv - - cmd2 >= 1.5.0 - - jsonpath-ng - - construct >= 2.9.51 - - bidict - - gsm0338 - pyyaml >= 5.1 + - smpp.pdu (from `github.com/hologram-io/smpp.pdu`) - termcolor - - colorlog - - packaging - - pycryptodomex Example for Debian: ```sh -- To view, visit https://gerrit.osmocom.org/c/pysim/+/34147 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: pysim Gerrit-Branch: master Gerrit-Change-Id: I89760dd4008829c91fafbd442483d076c92a7ed4 Gerrit-Change-Number: 34147 Gerrit-PatchSet: 1 Gerrit-Owner: Florian Klink <flokli(a)flokli.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: lynxis lazus <lynxis(a)fe80.eu> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[S] Change in osmo-bts[master]: pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34104 ) Change subject: pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf ...................................................................... pcu_sock: get rid of fn parameter in pcu_tx_pch_data_cnf The function pcu_tx_pch_data_cnf() gets a parameter fn (frame number). This parameter is then used to populate the member fn in gsm_pcu_if_data_cnf_dt of the PCUIF protocol. However, the PCU only uses this parameter for logging and nothing else. Hence it it is not needed and we can remove it. Related: OS#5927 Depends: osmo-pcu.git I35bc99eaec5d0287ae3916bc668f0babaddfd6ce Change-Id: Id1c8fa77725129ec2ea7e92e1df493f35a277659 --- M include/osmo-bts/pcu_if.h M src/common/paging.c M src/common/pcu_sock.c 3 files changed, 20 insertions(+), 4 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index 59e1d3d..4b37560 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, uint32_t msg_id); +int pcu_tx_pch_data_cnf(uint32_t msg_id); 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/src/common/paging.c b/src/common/paging.c index ebfb84b..9738bd6 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -734,7 +734,7 @@ 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.msg_id); + pcu_tx_pch_data_cnf(pr[num_pr]->u.macblock.msg_id); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index ad645a0..67958f6 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -618,7 +618,7 @@ return pcu_sock_send(msg); } -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id) +int pcu_tx_pch_data_cnf(uint32_t msg_id) { struct gsm_bts *bts; struct msgb *msg; @@ -636,7 +636,6 @@ pcu_prim->u.data_cnf_dt = (struct gsm_pcu_if_data_cnf_dt) { .sapi = PCU_IF_SAPI_PCH_DT, .msg_id = msg_id, - .fn = fn, }; return pcu_sock_send(msg); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34104 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Id1c8fa77725129ec2ea7e92e1df493f35a277659 Gerrit-Change-Number: 34104 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34102 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Change-Id: Id6109264e4144c2ab7b8410d4087705d857cd4c9 Related: OS#5927 --- M include/osmocom/pcu/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index c538b91..f9465e4 100644 --- a/include/osmocom/pcu/pcuif_proto.h +++ b/include/osmocom/pcu/pcuif_proto.h @@ -97,15 +97,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34102 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: Id6109264e4144c2ab7b8410d4087705d857cd4c9 Gerrit-Change-Number: 34102 Gerrit-PatchSet: 2 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, 12 months

1
0
0 0

[S] Change in osmo-bsc[master]: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34135 ) Change subject: pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt ...................................................................... pcuif_proto: remove unnecessary members from gsm_pcu_if_data_cnf_dt The struct gsm_pcu_if_data_cnf_dt was added when the first experiments mit Ericsson RBS base stations were made. It is essentially a copy of gsm_pcu_if_data, where the mamber "data" was replaced with a member "msg_id" (which was originally called "tlli"). Since we didn't know back then which parameters we would still need at some later point we kept all the other parameters. However, to this day we never used the parameters below fn. Even fn was only used for logging purposes, but is now also unused. Let's remove all those unused members. (Since all removed members are at the tail of the struct, compatibility with other programs that use the PCUIF should not break.) Change-Id: I37845408edd96017b50559964c82b2cdc5e143a7 Related: OS#5927 --- M include/osmocom/bsc/pcuif_proto.h 1 file changed, 24 insertions(+), 9 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved diff --git a/include/osmocom/bsc/pcuif_proto.h b/include/osmocom/bsc/pcuif_proto.h index 80e3b6d..d28aec0 100644 --- a/include/osmocom/bsc/pcuif_proto.h +++ b/include/osmocom/bsc/pcuif_proto.h @@ -97,15 +97,6 @@ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; uint32_t msg_id; - uint32_t fn; - uint16_t arfcn; - uint8_t trx_nr; - uint8_t ts_nr; - uint8_t block_nr; - int8_t rssi; - uint16_t ber10k; /* !< \brief BER in units of 0.01% */ - int16_t ta_offs_qbits; /* !< \brief Burst TA Offset in quarter bits */ - int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); struct gsm_pcu_if_rts_req { -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34135 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I37845408edd96017b50559964c82b2cdc5e143a7 Gerrit-Change-Number: 34135 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, 12 months

1
0
0 0

[S] Change in osmo-ttcn3-hacks[master]: PCUIF_Codec port, do not return fn in f_PCUIF_tx_imm_ass_pch

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34109 ) ( 3 is the latest approved patch-set. No files were changed between the latest approved patch-set and the submitted one. )Change subject: PCUIF_Codec port, do not return fn in f_PCUIF_tx_imm_ass_pch ...................................................................... PCUIF_Codec port, do not return fn in f_PCUIF_tx_imm_ass_pch The function f_PCUIF_tx_imm_ass_pch() retuns the frame number, that is sent back from osmo-bts via PCUIF / gsm_pcu_if_data_cnf_dt. Since we are about to remove this field from gsm_pcu_if_data_cnf_dt, lets no longer access it here as well. Also the return code is never used anywhere in the tests. (In osmo-pcu the fn parameter was used for logging only, in osmo-bts it was set to constant 0) Related: OS#5927 Change-Id: I0e5bad7a0d74e5032f2818f6fdf5b9b2ecb531cc --- M bts/BTS_Tests.ttcn M library/PCUIF_CodecPort.ttcn 2 files changed, 23 insertions(+), 7 deletions(-) Approvals: osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/bts/BTS_Tests.ttcn b/bts/BTS_Tests.ttcn index e8ae1c0..ad6ae5a 100644 --- a/bts/BTS_Tests.ttcn +++ b/bts/BTS_Tests.ttcn @@ -5848,7 +5848,7 @@ f_l1_tune(L1CTL); /* append 3 last imsi digits so BTS can compute pagng group */ - var uint32_t fn := f_PCUIF_tx_imm_ass_pch(PCU, g_pcu_conn_id, imm_ass, '123459987'H); + f_PCUIF_tx_imm_ass_pch(PCU, g_pcu_conn_id, imm_ass, '123459987'H); timer T := 0.5; T.start; diff --git a/library/PCUIF_CodecPort.ttcn b/library/PCUIF_CodecPort.ttcn index 87a5b15..6d06ad4 100644 --- a/library/PCUIF_CodecPort.ttcn +++ b/library/PCUIF_CodecPort.ttcn @@ -140,7 +140,7 @@ } function f_PCUIF_tx_imm_ass_pch(PCUIF_CODEC_PT pt, integer conn_id, octetstring imm_ass, hexstring imsi, - uint8_t bts_nr := 0, boolean wait_for_cnf := true, OCT4 msg_id := '01020304'O) return uint32_t { + uint8_t bts_nr := 0, boolean wait_for_cnf := true, OCT4 msg_id := '01020304'O) { var PCUIF_send_data sd; timer T := 3.0; @@ -164,7 +164,7 @@ /* Exit early when the caller is not interested in the confirmation message */ if (wait_for_cnf == false) { - return 0; + return; } T.start; @@ -175,7 +175,7 @@ mtc.stop; } else { log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf.fn); - return sd.data.u.data_cnf.fn; + return; } } [] pt.receive(t_SD_PCUIF(conn_id, tr_PCUIF_DATA_CNF_DT(bts_nr, 0, 0, PCU_IF_SAPI_PCH_DT))) -> value sd { @@ -183,8 +183,8 @@ setverdict(fail, "expecting tr_PCUIF_DATA_CNF in PCUIF v.10 or earlier"); mtc.stop; } else { - log("IMM.ASS was sent on PCH at fn ", sd.data.u.data_cnf_dt.fn); - return sd.data.u.data_cnf_dt.fn; + log("IMM.ASS was sent on PCH"); + return; } } [] pt.receive { repeat; } @@ -193,7 +193,6 @@ mtc.stop; } } - return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-ttcn3-hacks/+/34109 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: I0e5bad7a0d74e5032f2818f6fdf5b9b2ecb531cc Gerrit-Change-Number: 34109 Gerrit-PatchSet: 4 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, 12 months

1
0
0 0

[M] Change in osmo-pcu[master]: bts: get rid of fn parameter in bts_rcv_imm_ass_cnf

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34101 ) Change subject: bts: get rid of fn parameter in bts_rcv_imm_ass_cnf ...................................................................... bts: get rid of fn parameter in bts_rcv_imm_ass_cnf The function bts_rcv_imm_ass_cnf, which processes the confirmation message from osmo-bts or osmo-bsc has an fn (frame number) parameter. This parameter not used for anything other than logging. The source of this frame number parameter is the conformation message that comes from osmo-pcu or osmo-bsc. In the case of osmo-bsc the frame number is always 0, since osmo-bsc uses RSL and can not know the exact frame numbers. since we do not really need the frame number for the confirmation, lets remove the fn parameter entirely. Related: OS#5927 Change-Id: I35bc99eaec5d0287ae3916bc668f0babaddfd6ce --- M src/bts.cpp M src/bts.h M src/pcu_l1_if.cpp 3 files changed, 34 insertions(+), 18 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/bts.cpp b/src/bts.cpp index fe48018..6bc415f 100644 --- a/src/bts.cpp +++ b/src/bts.cpp @@ -666,7 +666,7 @@ return best_first_tfi; } -static int tlli_from_imm_ass(uint32_t *tlli, const uint8_t *data, uint32_t fn) +static int tlli_from_imm_ass(uint32_t *tlli, const uint8_t *data) { const struct gsm48_imm_ass *imm_ass = (struct gsm48_imm_ass *)data; uint8_t plen; @@ -680,9 +680,9 @@ data += 1 + plen; if ((*data & 0xf0) != 0xd0) { - LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but rest " + LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but rest " "octets do not start with bit sequence 'HH01' " - "(Packet Downlink Assignment)\n", fn); + "(Packet Downlink Assignment)\n"); return -EINVAL; } @@ -696,7 +696,7 @@ return 0; } -int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli, uint32_t fn) +int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli) { struct gprs_rlcmac_dl_tbf *dl_tbf; GprsMs *ms; @@ -710,30 +710,30 @@ /* Extract TLLI from the presented IMMEDIATE ASSIGNMENT * (if present and only when TLLI that is supplied as function parameter is valid.) */ if (data && tlli == GSM_RESERVED_TMSI) { - rc = tlli_from_imm_ass(&tlli, data, fn); + rc = tlli_from_imm_ass(&tlli, data); if (rc != 0) return -EINVAL; } /* Make sure TLLI is valid */ if (tlli == GSM_RESERVED_TMSI) { - LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but TLLI is invalid!\n", fn); + LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but TLLI is invalid!\n"); return -EINVAL; } /* Find related TBF and send confirmation signal to FSM */ ms = bts_get_ms_by_tlli(bts, tlli, GSM_RESERVED_TMSI); if (!ms) { - LOGP(DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", fn, tlli); + LOGP(DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm for unknown MS with TLLI=%08x\n", tlli); return -EINVAL; } dl_tbf = ms_dl_tbf(ms); if (!dl_tbf) { - LOGPMS(ms, DTBFDL, LOGL_ERROR, "FN=%u Got IMM.ASS confirm, but MS has no DL TBF!\n", fn); + LOGPMS(ms, DTBFDL, LOGL_ERROR, "Got IMM.ASS confirm, but MS has no DL TBF!\n"); return -EINVAL; } - LOGPTBFDL(dl_tbf, LOGL_DEBUG, "FN=%u Got IMM.ASS confirm\n", fn); + LOGPTBFDL(dl_tbf, LOGL_DEBUG, "Got IMM.ASS confirm\n"); osmo_fsm_inst_dispatch(dl_tbf->state_fi, TBF_EV_ASSIGN_PCUIF_CNF, NULL); return 0; diff --git a/src/bts.h b/src/bts.h index 9a18cf3..3fe4503 100644 --- a/src/bts.h +++ b/src/bts.h @@ -307,7 +307,7 @@ int bts_rcv_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip); int bts_rcv_ptcch_rach(struct gprs_rlcmac_bts *bts, const struct rach_ind_params *rip); -int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli, uint32_t fn); +int bts_rcv_imm_ass_cnf(struct gprs_rlcmac_bts *bts, const uint8_t *data, uint32_t tlli); void bts_send_gsmtap(struct gprs_rlcmac_bts *bts, enum pcu_gsmtap_category categ, bool uplink, uint8_t trx_no, diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 8597dd4..a022647 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -534,15 +534,13 @@ static int pcu_rx_data_cnf(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data *data_cnf) { int rc = 0; - int current_fn = bts_current_frame_number(bts); - LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d cur_fn=%d\n", - data_cnf->sapi, data_cnf->fn, current_fn); + LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf->sapi); switch (data_cnf->sapi) { case PCU_IF_SAPI_PCH: if (data_cnf->data[2] == GSM48_MT_RR_IMM_ASS) - bts_rcv_imm_ass_cnf(bts, data_cnf->data, GSM_RESERVED_TMSI, data_cnf->fn); + bts_rcv_imm_ass_cnf(bts, data_cnf->data, GSM_RESERVED_TMSI); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with " @@ -556,14 +554,12 @@ static int pcu_rx_data_cnf_dt(struct gprs_rlcmac_bts *bts, struct gsm_pcu_if_data_cnf_dt *data_cnf_dt) { int rc = 0; - int current_fn = bts_current_frame_number(bts); - LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d fn=%d cur_fn=%d\n", - data_cnf_dt->sapi, data_cnf_dt->fn, current_fn); + LOGP(DL1IF, LOGL_DEBUG, "Data confirm received: sapi=%d\n", data_cnf_dt->sapi); switch (data_cnf_dt->sapi) { case PCU_IF_SAPI_PCH_DT: - bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id, data_cnf_dt->fn); + bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/34101 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I35bc99eaec5d0287ae3916bc668f0babaddfd6ce Gerrit-Change-Number: 34101 Gerrit-PatchSet: 2 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, 12 months

1
0
0 0

[M] Change in osmo-bts[master]: pcuif_proto: rename tlli to msg_id

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34103 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... pcuif_proto: rename tlli to msg_id To confirm downlink IMMEDIATE ASSIGNMENT messages, we use the TLLI as an identifier and the related struct member is also called "tlli". Unfortunately this is misleading since the message identifier does not necessarly have to be a TLLI. It is just an implementation detail that osmo-pcu uses the TLLI as a message identifier. To make that clear, lets rename the tlli member (and variable and parameter names where it is passed on) to "msg_id". (Since this change only renames variables and struct members it will not break compatibility with other programs that use the PCUIF) Related: OS#5927 Depends: osmo-pcu.git I4a25039dfe329e68879bc68936e49c4b190625e6 Change-Id: Ie6b34d5df64f4bed6b14581c7957dcba6af44136 --- 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, 38 insertions(+), 15 deletions(-) Approvals: Jenkins Builder: Verified laforge: Looks good to me, but someone else must approve pespin: Looks good to me, approved diff --git a/include/osmo-bts/paging.h b/include/osmo-bts/paging.h index 93e7b38..e74ba3c 100644 --- a/include/osmo-bts/paging.h +++ b/include/osmo-bts/paging.h @@ -86,7 +86,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, uint32_t tlli, const char *imsi, bool confirm, const uint8_t *macblock); +int paging_add_macblock(struct paging_state *ps, uint32_t msg_id, const char *imsi, bool confirm, const uint8_t *macblock); /* Paging rest octests */ void append_p1_rest_octets(struct bitvec *bv, const struct p1_rest_octets *p1ro, diff --git a/include/osmo-bts/pcu_if.h b/include/osmo-bts/pcu_if.h index d6e5d24..59e1d3d 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, uint32_t tlli); +int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id); 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 bae6cda..3e3d6cc 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 (with direct tlli) */ +#define PCU_IF_MSG_DATA_CNF_DT 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 TLLI) */ +#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -87,10 +87,10 @@ int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); -/* data confirmation with direct tlli (instead of raw mac block with tlli) */ +/* data confirmation with message id (instead of raw mac block) */ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; - uint32_t tlli; + uint32_t msg_id; uint32_t fn; uint16_t arfcn; uint8_t trx_nr; @@ -233,8 +233,8 @@ /* 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; + /* message id as reference for confirmation */ + uint32_t msg_id; /* IMSI (to derive paging group) */ char imsi[OSMO_IMSI_BUF_SIZE]; /* GSM mac-block (with immediate assignment message) */ diff --git a/src/common/paging.c b/src/common/paging.c index 914a4b5..ebfb84b 100644 --- a/src/common/paging.c +++ b/src/common/paging.c @@ -65,7 +65,7 @@ struct { uint8_t msg[GSM_MACBLOCK_LEN]; bool confirm; - uint32_t tlli; /* used as identifier for confirmation */ + uint32_t msg_id; /* used as identifier for confirmation */ } macblock; } u; }; @@ -293,7 +293,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, uint32_t tlli, const char *imsi, bool confirm, const uint8_t *macblock) +int paging_add_macblock(struct paging_state *ps, uint32_t msg_id, const char *imsi, bool confirm, const uint8_t *macblock) { struct llist_head *group_q; struct paging_record *pr; @@ -322,7 +322,7 @@ paging_group); memcpy(pr->u.macblock.msg, macblock, GSM_MACBLOCK_LEN); pr->u.macblock.confirm = confirm; - pr->u.macblock.tlli = tlli; + pr->u.macblock.msg_id = msg_id; /* enqueue the new message to the HEAD of the queue */ llist_add(&pr->list, group_q); @@ -734,7 +734,7 @@ 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); + pcu_tx_pch_data_cnf(gt->fn, pr[num_pr]->u.macblock.msg_id); talloc_free(pr[num_pr]); return GSM_MACBLOCK_LEN; } diff --git a/src/common/pcu_sock.c b/src/common/pcu_sock.c index 9e34fe8..ad645a0 100644 --- a/src/common/pcu_sock.c +++ b/src/common/pcu_sock.c @@ -618,7 +618,7 @@ return pcu_sock_send(msg); } -int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t tlli) +int pcu_tx_pch_data_cnf(uint32_t fn, uint32_t msg_id) { struct gsm_bts *bts; struct msgb *msg; @@ -635,7 +635,7 @@ 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, - .tlli = tlli, + .msg_id = msg_id, .fn = fn, }; @@ -689,7 +689,7 @@ 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); - rc = paging_add_macblock(bts->paging_state, gsm_pcu_if_pch_dt->tlli, + 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); break; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34103 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: Ie6b34d5df64f4bed6b14581c7957dcba6af44136 Gerrit-Change-Number: 34103 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 12 months

1
0
0 0

[S] Change in osmo-pcu[master]: pcuif_proto: rename tlli to msg_id

by dexter

dexter has submitted this change. ( https://gerrit.osmocom.org/c/osmo-pcu/+/34100 ) Change subject: pcuif_proto: rename tlli to msg_id ...................................................................... pcuif_proto: rename tlli to msg_id To confirm downlink IMMEDIATE ASSIGNMENT messages, we use the TLLI as an identifier and the related struct member is also called "tlli". Unfortunately this is misleading since the message identifier does not necessarly have to be a TLLI. It is just an implementation detail that osmo-pcu uses the TLLI as a message identifier. To make that clear, lets rename the tlli member (and variable and parameter names where it is passed on) to "msg_id". (Since this change only renames variables and struct members it will not break compatibility with other programs that use the PCUIF) Related: OS#5927 Change-Id: I4a25039dfe329e68879bc68936e49c4b190625e6 --- M include/osmocom/pcu/pcuif_proto.h M src/pcu_l1_if.cpp M src/pcu_l1_if.h 3 files changed, 33 insertions(+), 11 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/include/osmocom/pcu/pcuif_proto.h b/include/osmocom/pcu/pcuif_proto.h index 1dda160..c538b91 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 (with direct tlli) */ +#define PCU_IF_MSG_DATA_CNF_DT 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 TLLI) */ +#define PCU_IF_SAPI_PCH_DT 0x08 /* assignment on PCH (confirmed using message id) */ /* flags */ #define PCU_IF_FLAG_ACTIVE (1 << 0)/* BTS is active */ @@ -93,10 +93,10 @@ int16_t lqual_cb; /* !< \brief Link quality in centiBel */ } __attribute__ ((packed)); -/* data confirmation with direct tlli (instead of raw mac block with tlli) */ +/* data confirmation with message id (instead of raw mac block) */ struct gsm_pcu_if_data_cnf_dt { uint8_t sapi; - uint32_t tlli; + uint32_t msg_id; uint32_t fn; uint16_t arfcn; uint8_t trx_nr; @@ -274,8 +274,8 @@ /* 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; + /* message id as reference for confirmation */ + uint32_t msg_id; /* IMSI (to derive paging group) */ char imsi[OSMO_IMSI_BUF_SIZE]; /* GSM mac-block (with immediate assignment message) */ diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index ed64cc1..8597dd4 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -300,11 +300,11 @@ /* 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 tlli) +void pcu_l1if_tx_pch_dt(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 }; - pch_dt.tlli = tlli; + pch_dt.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 @@ -563,7 +563,7 @@ switch (data_cnf_dt->sapi) { case PCU_IF_SAPI_PCH_DT: - bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->tlli, data_cnf_dt->fn); + bts_rcv_imm_ass_cnf(bts, NULL, data_cnf_dt->msg_id, data_cnf_dt->fn); break; default: LOGP(DL1IF, LOGL_ERROR, "Received PCU data confirm with unsupported sapi %d\n", data_cnf_dt->sapi); @@ -789,7 +789,7 @@ /* NOTE: The classic way to confirm an IMMEDIATE assignment is to send the whole MAC block payload back to the * PCU. So it is the MAC block itsself that serves a reference for the confirmation. This method has certain - * disadvantages so it was replaced with a method that uses the TLLI as a reference ("Direct TLLI"). This new + * disadvantages so it was replaced with a method that uses the TLLI as a reference (msg_id). This new * method will replace the old one. The code that handles the old method will be removed in the foreseeable * future. (see also OS#5927) */ if (info_ind->version == 0x0a) { diff --git a/src/pcu_l1_if.h b/src/pcu_l1_if.h index bc036bf..3ff17dc 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 tlli); +void pcu_l1if_tx_pch_dt(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/+/34100 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I4a25039dfe329e68879bc68936e49c4b190625e6 Gerrit-Change-Number: 34100 Gerrit-PatchSet: 2 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, 12 months

1
0
0 0

2025

2024

2023

2022

gerrit-log August 2023