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

[S] Change in osmo-ci[master]: obs: add --allow-unknown-package
by osmith 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/31935 to look at the new patch set (#3). Change subject: obs: add --allow-unknown-package ...................................................................... obs: add --allow-unknown-package Prepare to add a wireshark package. It will be in its own osmocom:wireshark repository, and not in osmocom:nightly, :latest, :master, so it's not added to lib/config.py. Move lib.set_args() before parse_packages(), so the latter is able to use lib.args.allow_unknown_package. Related: OS#2537 Change-Id: I007f937ccb629e0593ec9253541ed05df42fac66 --- M scripts/obs/lib/__init__.py M scripts/obs/update_obs_project.py 2 files changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/35/31935/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31935 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I007f937ccb629e0593ec9253541ed05df42fac66 Gerrit-Change-Number: 31935 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[M] Change in osmo-ci[master]: jobs: add Osmocom_OBS_wireshark
by osmith 17 Mar '23

17 Mar '23

Attention is currently required from: fixeria. Hello Jenkins Builder, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/osmo-ci/+/31937 to look at the new patch set (#3). Change subject: jobs: add Osmocom_OBS_wireshark ...................................................................... jobs: add Osmocom_OBS_wireshark Add a nightly jenkins job that does the following: * Clone Wireshark from upstream * Merge several Osmocom branches on top * Build a source package * Submit it to the osmocom:wireshark OBS project Related: OS#2537 Change-Id: Ifb49c5cb22a4de0da30a920e5450a27172b11d73 --- A jobs/osmocom-obs-wireshark.yml A scripts/obs/update_obs_wireshark.sh 2 files changed, 103 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/37/31937/3 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31937 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: Ifb49c5cb22a4de0da30a920e5450a27172b11d73 Gerrit-Change-Number: 31937 Gerrit-PatchSet: 3 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-ci[master]: lib.srcpkg.build: fix conflict_version regression
by osmith 17 Mar '23

17 Mar '23

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/31956 ) Change subject: lib.srcpkg.build: fix conflict_version regression ...................................................................... lib.srcpkg.build: fix conflict_version regression During refactoring, conflict_version was changed to version here, which was wrong. The packages need to depend on the conflict_version of the meta package, version is the version of the package itself. Fix for: The following packages have unmet dependencies: libosmo-netif-dev : Depends: osmocom-nightly (= 202303160009) but it is not going to be installed Depends: libosmocore but it is not going to be installed Depends: libosmonetif11 (= 1.3.0.8.9e65.202303160009) but it is not going to be installed libosmocore-dev : Depends: osmocom-nightly (= 1.8.0.79-b394d.202303170006) but it is not going to be installed Depends: libosmocore but it is not going to be installed Fixes: 0ed0e464 ("obs: don't pass conflict_version through functions") Change-Id: I2326e3817c6f6887ef1196e603c3877768119a66 --- M scripts/obs/lib/srcpkg.py 1 file changed, 25 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/56/31956/1 diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index b230353..5dbc862 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -134,6 +134,7 @@ def build(project, gerrit_id=0): + conflict_version = lib.args.conflict_version feed = lib.args.feed lib.git.clone(project) lib.git.clean(project) @@ -151,9 +152,9 @@ if project in lib.config.projects_osmocom: metapkg = f"osmocom-{feed}" - lib.debian.control_add_depend(project, metapkg, version) + lib.debian.control_add_depend(project, metapkg, conflict_version) if has_rpm_spec: - lib.rpm_spec.add_depend(project, metapkg, version) + lib.rpm_spec.add_depend(project, metapkg, conflict_version) lib.debian.changelog_add_entry_if_needed(project, version_epoch) -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/31956 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I2326e3817c6f6887ef1196e603c3877768119a66 Gerrit-Change-Number: 31956 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmo-pcu[master]: fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy()
by fixeria 17 Mar '23

17 Mar '23

fixeria has uploaded a new patch set (#2). ( https://gerrit.osmocom.org/c/osmo-pcu/+/31955 ) Change subject: fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy() ...................................................................... fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy() strcpy() is an unsafe function, it may overflow the destination buffer. Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f Fixes: CID#310961 --- M src/pcu_l1_if.cpp 1 file changed, 13 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/55/31955/2 -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f Gerrit-Change-Number: 31955 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: Jenkins Builder Gerrit-MessageType: newpatchset

1 0

[S] Change in osmo-pcu[master]: fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy()
by fixeria 17 Mar '23

17 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-pcu/+/31955 ) Change subject: fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy() ...................................................................... fix pcu_l1if_tx_pch_dt(): use osmo_strlcpy() instead of strcpy() strcpy() is an unsafe function, it may overflow the destination buffer. Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f --- M src/pcu_l1_if.cpp 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/osmo-pcu refs/changes/55/31955/1 diff --git a/src/pcu_l1_if.cpp b/src/pcu_l1_if.cpp index 14cc778..754177c 100644 --- a/src/pcu_l1_if.cpp +++ b/src/pcu_l1_if.cpp @@ -304,7 +304,7 @@ struct gsm_pcu_if_pch_dt pch_dt; pch_dt.tlli = tlli; - strcpy(pch_dt.imsi, imsi); + osmo_strlcpy(&pch_dt.imsi[0], imsi, sizeof(pch_dt.imsi)); pch_dt.data[0] = (plen << 2) | 0x01; bitvec_pack(block, pch_dt.data + 1); -- To view, visit https://gerrit.osmocom.org/c/osmo-pcu/+/31955 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-pcu Gerrit-Branch: master Gerrit-Change-Id: I04a86c1e00fc0a4066564693f6b563c88bf4e46f Gerrit-Change-Number: 31955 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in libosmocore[master]: isdn: fix identical operands in v110_adapt_IR8000_to_2400()
by fixeria 17 Mar '23

17 Mar '23

fixeria has uploaded this change for review. ( https://gerrit.osmocom.org/c/libosmocore/+/31954 ) Change subject: isdn: fix identical operands in v110_adapt_IR8000_to_2400() ...................................................................... isdn: fix identical operands in v110_adapt_IR8000_to_2400() Change-Id: I7df8b214e813cbd14726d5043f666547353e2947 Fixes: CID#310966 --- M src/isdn/v110.c 1 file changed, 12 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/54/31954/1 diff --git a/src/isdn/v110.c b/src/isdn/v110.c index 4d13547..46962bf 100644 --- a/src/isdn/v110.c +++ b/src/isdn/v110.c @@ -242,7 +242,8 @@ if (out_len < 24) return -ENOSPC; - if (fr->e_bits[1] != 1 || fr->e_bits[1] != 1 || fr->e_bits[2] != 0) + /* Table 6c / V.110 */ + if (fr->e_bits[0] != 1 || fr->e_bits[1] != 1 || fr->e_bits[2] != 0) return -EINVAL; for (int i = 0; i < 24; i++) { -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/31954 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: I7df8b214e813cbd14726d5043f666547353e2947 Gerrit-Change-Number: 31954 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: newchange

1 0

[S] Change in osmocom-bb[master]: modem: fix modem_gmm_prim_up_cb(): add missing break
by fixeria 17 Mar '23

17 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31951 ) Change subject: modem: fix modem_gmm_prim_up_cb(): add missing break ...................................................................... modem: fix modem_gmm_prim_up_cb(): add missing break Change-Id: Ibd16232d76d83d90f27d08b47aa38509161270b6 Fixes: CID#311019 --- M src/host/layer23/src/modem/gmm.c 1 file changed, 11 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/host/layer23/src/modem/gmm.c b/src/host/layer23/src/modem/gmm.c index 6a84909..3488162 100644 --- a/src/host/layer23/src/modem/gmm.c +++ b/src/host/layer23/src/modem/gmm.c @@ -58,6 +58,7 @@ LOGP(DGMM, LOGL_ERROR, "%s(): Rx %s UNIMPLEMENTED\n", __func__, pdu_name); break; }; + break; default: LOGP(DGMM, LOGL_ERROR, "%s(): Unexpected Rx %s\n", __func__, pdu_name); OSMO_ASSERT(0); -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31951 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Ibd16232d76d83d90f27d08b47aa38509161270b6 Gerrit-Change-Number: 31951 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

1 0

[S] Change in osmocom-bb[master]: layer23/{mobile,modem}: prefix VTY prompt with project's name
by fixeria 17 Mar '23

17 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/31946 ) Change subject: layer23/{mobile,modem}: prefix VTY prompt with project's name ...................................................................... layer23/{mobile,modem}: prefix VTY prompt with project's name Change-Id: If7ce89362c75e2c15995dfb08cfcfdcad24e2529 --- M src/host/layer23/src/mobile/app_mobile.c M src/host/layer23/src/modem/app_modem.c 2 files changed, 11 insertions(+), 2 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/host/layer23/src/mobile/app_mobile.c b/src/host/layer23/src/mobile/app_mobile.c index a61774b..a0d2546 100644 --- a/src/host/layer23/src/mobile/app_mobile.c +++ b/src/host/layer23/src/mobile/app_mobile.c @@ -491,7 +491,7 @@ } static struct vty_app_info _mobile_vty_info = { - .name = "mobile", + .name = "OsmocomBB(mobile)", .version = PACKAGE_VERSION, }; diff --git a/src/host/layer23/src/modem/app_modem.c b/src/host/layer23/src/modem/app_modem.c index d9d40cd..cecf4e6 100644 --- a/src/host/layer23/src/modem/app_modem.c +++ b/src/host/layer23/src/modem/app_modem.c @@ -186,7 +186,7 @@ } static struct vty_app_info _modem_vty_info = { - .name = "modem", + .name = "OsmocomBB(modem)", .version = PACKAGE_VERSION, .go_parent_cb = modem_vty_go_parent, }; -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/31946 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: If7ce89362c75e2c15995dfb08cfcfdcad24e2529 Gerrit-Change-Number: 31946 Gerrit-PatchSet: 4 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(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 0

[S] Change in osmo-bsc[master]: fix bs11_read_swl_file(): properly clean up stale file list
by fixeria 17 Mar '23

17 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31939 ) Change subject: fix bs11_read_swl_file(): properly clean up stale file list ...................................................................... fix bs11_read_swl_file(): properly clean up stale file list Calling talloc_free() on struct llist_head is wrong and will lead to unexpected behavior. Call it on the containing struct instead. Change-Id: Ib5eaa328aaf6881ae9621ca14859e4e255af2b00 --- M src/osmo-bsc/abis_nm.c 1 file changed, 15 insertions(+), 5 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 fixeria: Looks good to me, approved diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c index 938f45d..95cb858 100644 --- a/src/osmo-bsc/abis_nm.c +++ b/src/osmo-bsc/abis_nm.c @@ -2645,8 +2645,8 @@ static int bs11_read_swl_file(struct abis_nm_bs11_sw *bs11_sw) { + struct file_list_entry *fle; char linebuf[255]; - struct llist_head *lh, *lh2; FILE *swl; int rc = 0; @@ -2655,10 +2655,8 @@ return -ENODEV; /* zero the stale file list, if any */ - llist_for_each_safe(lh, lh2, &bs11_sw->file_list) { - llist_del(lh); - talloc_free(lh); - } + while ((fle = fl_dequeue(&bs11_sw->file_list))) + talloc_free(fle); while (fgets(linebuf, sizeof(linebuf), swl)) { char file_id[12+1]; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31939 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ib5eaa328aaf6881ae9621ca14859e4e255af2b00 Gerrit-Change-Number: 31939 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(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-MessageType: merged

1 0

[S] Change in osmo-bsc[master]: fix ipacc_rtp_csd_fmt_non_transp(): add missing breaks
by fixeria 17 Mar '23

17 Mar '23

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/31953 ) Change subject: fix ipacc_rtp_csd_fmt_non_transp(): add missing breaks ...................................................................... fix ipacc_rtp_csd_fmt_non_transp(): add missing breaks Change-Id: I13adcabd26c5f6543681e418b87c70b2822e7dcf Fixes: CID#310964, CID#310965, CID#310967 --- M src/osmo-bsc/abis_rsl.c 1 file changed, 13 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified osmith: Looks good to me, approved diff --git a/src/osmo-bsc/abis_rsl.c b/src/osmo-bsc/abis_rsl.c index 8e89508..1880996 100644 --- a/src/osmo-bsc/abis_rsl.c +++ b/src/osmo-bsc/abis_rsl.c @@ -2624,13 +2624,16 @@ case RSL_CMOD_CSD_NTA_29k0_43k5: case RSL_CMOD_CSD_NT_43k5: ret |= RSL_IPAC_RTP_CSD_IR_64k << 5; + break; case RSL_CMOD_CSD_NTA_29k0_14k5: case RSL_CMOD_CSD_NTA_14k5_29k0: case RSL_CMOD_CSD_NT_28k8: ret |= RSL_IPAC_RTP_CSD_IR_32k << 5; + break; case RSL_CMOD_CSD_NT_14k5: case RSL_CMOD_CSD_NT_12k0: ret |= RSL_IPAC_RTP_CSD_IR_16k << 5; + break; case RSL_CMOD_CSD_NT_6k0: ret |= RSL_IPAC_RTP_CSD_IR_8k << 5; break; -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/31953 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I13adcabd26c5f6543681e418b87c70b2822e7dcf Gerrit-Change-Number: 31953 Gerrit-PatchSet: 1 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: merged

1 0