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

[S] Change in simtrace2[osmith/0.8.2]: firmware/Makefile: don't use distribution's CFLAGS

by pespin

Attention is currently required from: Hoernchen, fixeria, osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email ) Change subject: firmware/Makefile: don't use distribution's CFLAGS ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: osmith/0.8.2 Gerrit-Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70 Gerrit-Change-Number: 34437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Hoernchen <ewild(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Attention: Hoernchen <ewild(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 09:31:47 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

by pespin

Attention is currently required from: osmith. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email ) Change subject: repo-install-test: skip soapysdr-module-lms7 ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94 Gerrit-Change-Number: 34436 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 09:30:49 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in simtrace2[osmith/0.8.2]: Bump version: 0.8.1 → 0.8.2

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email ) Change subject: Bump version: 0.8.1 → 0.8.2 ...................................................................... Bump version: 0.8.1 → 0.8.2 Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c --- M debian/changelog 1 file changed, 15 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/38/34438/1 diff --git a/debian/changelog b/debian/changelog index 99cfb8b..0b341fb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +simtrace2 (0.8.2) unstable; urgency=medium + + * firmware/Makefile: don't use distribution's CFLAGS + + -- Oliver Smith <osmith(a)sysmocom.de> Fri, 15 Sep 2023 11:17:37 +0200 + simtrace2 (0.8.1) unstable; urgency=medium * host/contrib/simtrace2.spec.in: fix soname -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34438?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: osmith/0.8.2 Gerrit-Change-Id: I4f0510da6135fcd4d0b86d4fdfc114c27c82420c Gerrit-Change-Number: 34438 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in simtrace2[osmith/0.8.2]: firmware/Makefile: don't use distribution's CFLAGS

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email ) Change subject: firmware/Makefile: don't use distribution's CFLAGS ...................................................................... firmware/Makefile: don't use distribution's CFLAGS Set CFLAGS on top of the Makefile, to avoid using the distribution's default CFLAGS. In debian testing and unstable, -fcf-protection was recently added to the default CFLAGS, but it cannot be used with the cross compiler: [COMPILING libosmocore/source/backtrace.c] cc1: error: '-fcf-protection=full' is not supported for this target make[2]: *** [Makefile:270: obj/simtrace/flash_backtrace.o] Error 1 Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70 (cherry picked from commit e6e77399d6c723c8a4f76c70b20c116004885a80) --- M firmware/Makefile 1 file changed, 26 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/simtrace2 refs/changes/37/34437/1 diff --git a/firmware/Makefile b/firmware/Makefile index c30dc9a..eefe836 100644 --- a/firmware/Makefile +++ b/firmware/Makefile @@ -29,6 +29,13 @@ # Makefile for compiling the Getting Started with SAM3S Microcontrollers project GIT_VERSION=$(shell $(TOP)/git-version-gen $(TOP)/.tarball-version) + +CFLAGS = \ + -Werror=format-security \ + -Wformat \ + -g \ + $(NULL) + #------------------------------------------------------------------------------- # User-modifiable options #------------------------------------------------------------------------------- -- To view, visit https://gerrit.osmocom.org/c/simtrace2/+/34437?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: simtrace2 Gerrit-Branch: osmith/0.8.2 Gerrit-Change-Id: I5f7cd0402f9bb85dd600204fdf8855773ddbeb70 Gerrit-Change-Number: 34437 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[M] Change in osmo-ci[master]: OBS: fix generating wrong limesuite version

by osmith

osmith has submitted this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email ) Change subject: OBS: fix generating wrong limesuite version ...................................................................... OBS: fix generating wrong limesuite version Instead of using git-version-gen in all git repositories, only use it where it is part of the repository. Use git directly to build the version string otherwise. To fix generating the wrong version string for limesuite, use "git describe --tags" instead of "git describe" as in git-version-gen. This is needed because limesuite releases > 20.01 only have lightweight (non-annotated) tags. Fix for: limesuite: WARNING: version from changelog (22.09.1-1) is higher than version based on git tag (20.01.0.182-4828.202309140026), using version from changelog (git tag not pushed yet?) Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36 --- M scripts/obs/lib/srcpkg.py 1 file changed, 50 insertions(+), 27 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve fixeria: Looks good to me, approved Jenkins Builder: Verified diff --git a/scripts/obs/lib/srcpkg.py b/scripts/obs/lib/srcpkg.py index 13404a7..cffb961 100644 --- a/scripts/obs/lib/srcpkg.py +++ b/scripts/obs/lib/srcpkg.py @@ -24,38 +24,40 @@ lib.git.checkout(project, f"origin/{feed}") -def get_git_version_gen_path(project): - # Use git-version-gen in the project's repository if available - repo_path = lib.git.get_repo_path(project) - ret = f"{repo_path}/git-version-gen" - if os.path.exists(ret): - return ret - - # Use git-version-gen script from libosmocore.git as fallback - print(f"{project}: has no git-version-gen, using the one from libosmocore") - repo_path = lib.git.get_repo_path("libosmocore") - ret = f"{repo_path}/git-version-gen" - if not os.path.exists(ret): - lib.git.clone("libosmocore") - if os.path.exists(ret): - return ret - - print(f"ERROR: {project}.git doesn't have a git-version-gen script and" - " couldn't find libosmocore.git's copy of the script here either: " - + ret) - sys.exit(1) - - def get_git_version(project): """ :returns: the string from git-version-gen, e.g. '1.7.0.10-76bdb' """ repo_path = lib.git.get_repo_path(project) - script_path = get_git_version_gen_path(project) - ret = lib.run_cmd([script_path, "."], cwd=repo_path) - if not ret.output: - lib.exit_error_cmd(ret, "empty output from git-version-gen") + # Run git-version-gen if it is in the repository + script_path = f"{repo_path}/git-version-gen" + if os.path.exists(script_path): + ret = lib.run_cmd([script_path, "."], cwd=repo_path).output + if not ret: + lib.exit_error_cmd(ret, "empty output from git-version-gen") + return ret - return ret.output + # Generate a version string similar to git-version-gen, but run use git + # describe --tags, so it works with non-annotated tags as well (needed for + # e.g. limesuite's tags). + pattern = lib.git.get_latest_tag_pattern(project) + pattern = pattern.replace("^", "", 1) + pattern = pattern.replace("$", "", -1) + ret = lib.run_cmd(["git", "describe", + "--abbrev=4", + "--tags", + f"--match={pattern}", + "HEAD"], cwd=repo_path).output.rstrip() + + # Like git-version-gen: + # * Change the first '-' to '.' + # * Remove the 'g' in git describe's output string + # * Remove the leading 'v' + ret = ret.replace("-", ".", 1) + ret = ret.replace("-g", "-", 1) + if ret.startswith("v"): + ret = ret[1:] + + return ret def get_version_for_feed(project): -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36 Gerrit-Change-Number: 34422 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(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 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email ) Change subject: repo-install-test: skip soapysdr-module-lms7 ...................................................................... Patch Set 1: Code-Review+1 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94 Gerrit-Change-Number: 34436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 09:09:16 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in osmo-ci[master]: OBS: fix generating wrong limesuite version

by fixeria

Attention is currently required from: osmith. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email ) Change subject: OBS: fix generating wrong limesuite version ...................................................................... Patch Set 1: Code-Review+2 -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34422?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I00d97d5cd12b2938a002d3e5c8ada6503f976e36 Gerrit-Change-Number: 34422 Gerrit-PatchSet: 1 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: osmith <osmith(a)sysmocom.de> Gerrit-Comment-Date: Fri, 15 Sep 2023 09:08:57 +0000 Gerrit-HasComments: No Gerrit-Has-Labels: Yes Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in osmo-ci[master]: repo-install-test: skip soapysdr-module-lms7

by osmith

osmith has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email ) Change subject: repo-install-test: skip soapysdr-module-lms7 ...................................................................... repo-install-test: skip soapysdr-module-lms7 Fix for: dpkg: error processing archive /tmp/apt-dpkg-install-4OjX3P/0924-soapysdr0.8-module-lms7_22.09.1+dfsg-1+b2_amd64.deb (--unpack): trying to overwrite '/usr/lib/x86_64-linux-gnu/SoapySDR/modules0.8/libLMS7Support.so', which is also in package soapysdr0.7-module-lms7:amd64 22.09.1.17.4828.202309142026 Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94 --- M scripts/repo-install-test/blacklist_debian12.txt 1 file changed, 14 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/osmo-ci refs/changes/36/34436/1 diff --git a/scripts/repo-install-test/blacklist_debian12.txt b/scripts/repo-install-test/blacklist_debian12.txt index 4c9dbde..b470d44 100644 --- a/scripts/repo-install-test/blacklist_debian12.txt +++ b/scripts/repo-install-test/blacklist_debian12.txt @@ -34,6 +34,7 @@ limesuite-dbgsym soapysdr0.7-module-lms7 soapysdr0.7-module-lms7-dbgsym +soapysdr-module-lms7 # Depends on specific verions 0.5.4.38.0847 of rtl-sdr, which we won't install librtlsdr0-dbgsym -- To view, visit https://gerrit.osmocom.org/c/osmo-ci/+/34436?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-ci Gerrit-Branch: master Gerrit-Change-Id: I51f3541c62edc78842d4c461362dd8e5ea2f5d94 Gerrit-Change-Number: 34436 Gerrit-PatchSet: 1 Gerrit-Owner: osmith <osmith(a)sysmocom.de> Gerrit-MessageType: newchange

1 year, 9 months

1
0
0 0

[S] Change in osmo-bsc[master]: oml: ipacc: parse Object Version from SW Activated Report

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email ) Change subject: oml: ipacc: parse Object Version from SW Activated Report ...................................................................... oml: ipacc: parse Object Version from SW Activated Report Change-Id: I39105096a6b29bd7e4fb15287653074527c3e024 Related: OS#4505 --- M include/osmocom/bsc/gsm_data.h M src/osmo-bsc/bts_ipaccess_nanobts.c 2 files changed, 31 insertions(+), 0 deletions(-) Approvals: Jenkins Builder: Verified pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h index fa9213b..2876d24 100644 --- a/include/osmocom/bsc/gsm_data.h +++ b/include/osmocom/bsc/gsm_data.h @@ -537,6 +537,12 @@ bool rsl_connect_sent; bool rsl_connect_ack_received; bool force_rf_lock; + /* vendor specific fields below */ + union { + struct { + uint8_t obj_version; + } ipaccess; + }; }; /* Ericsson OM2000 Managed Object */ diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 941fe55..24966a7 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -199,6 +199,7 @@ struct e1inp_sign_link *sign_link = mb->dst; struct gsm_bts *bts = sign_link->trx->bts; struct gsm_abis_mo *mo; + struct tlv_parsed tp; if (!is_ipa_abisip_bts(bts)) return 0; @@ -209,6 +210,20 @@ return -ENOENT; } + if (abis_nm_tlv_parse(&tp, bts, &foh->data[0], msgb_l3len(mb) - sizeof(*foh)) < 0) { + LOGPFOH(DNM, LOGL_ERROR, foh, "%s(): tlv_parse failed\n", __func__); + return -EINVAL; + } + + mo->ipaccess.obj_version = 0; /* implicit default */ + if (TLVP_PRES_LEN(&tp, NM_ATT_IPACC_OBJ_VERSION, 1)) { + /* nanoBTS may report several Object Versions; the first one will + * be used by default unless requested explicitly before OPSTARTing. */ + mo->ipaccess.obj_version = *TLVP_VAL(&tp, NM_ATT_IPACC_OBJ_VERSION); + LOGPFOH(DNM, LOGL_INFO, foh, "IPA Object Version is %u (default)\n", + mo->ipaccess.obj_version); + } + osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL); return 0; } -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34356?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: I39105096a6b29bd7e4fb15287653074527c3e024 Gerrit-Change-Number: 34356 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

[M] Change in osmo-bsc[master]: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo()

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email ) Change subject: bts_ipaccess_nanobts: clean up, use gsm_objclass2mo() ...................................................................... bts_ipaccess_nanobts: clean up, use gsm_objclass2mo() Change-Id: Ic6c0dfe950459d07a8f506b5007a65fea1950c18 --- M src/osmo-bsc/bts_ipaccess_nanobts.c 1 file changed, 37 insertions(+), 141 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve laforge: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/osmo-bsc/bts_ipaccess_nanobts.c b/src/osmo-bsc/bts_ipaccess_nanobts.c index 8669d64..941fe55 100644 --- a/src/osmo-bsc/bts_ipaccess_nanobts.c +++ b/src/osmo-bsc/bts_ipaccess_nanobts.c @@ -195,156 +195,50 @@ /* Callback function to be called every time we receive a 12.21 SW activated report */ static int sw_activ_rep(struct msgb *mb) { - struct abis_om_fom_hdr *foh = msgb_l3(mb); + const struct abis_om_fom_hdr *foh = msgb_l3(mb); struct e1inp_sign_link *sign_link = mb->dst; struct gsm_bts *bts = sign_link->trx->bts; - struct gsm_bts_trx *trx; - struct gsm_gprs_nsvc *nsvc; - struct gsm_bts_trx_ts *ts; + struct gsm_abis_mo *mo; if (!is_ipa_abisip_bts(bts)) return 0; - switch (foh->obj_class) { - case NM_OC_SITE_MANAGER: - osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_BTS: - osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_BASEB_TRANSC: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return -EINVAL; - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_RADIO_CARRIER: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return -EINVAL; - osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_CHANNEL: - if (!(ts = abis_nm_get_ts(mb))) - return -EINVAL; - osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_GPRS_NSE: - osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_GPRS_CELL: - osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_SW_ACT_REP, NULL); - break; - case NM_OC_GPRS_NSVC: - if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr))) - return -EINVAL; - osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_SW_ACT_REP, NULL); - break; + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + if (mo == NULL) { + LOGPFOH(DNM, LOGL_ERROR, foh, "Rx SW activated report for non-existent MO\n"); + return -ENOENT; } - return 0; -} -static void nm_rx_opstart_ack_chan(struct msgb *oml_msg) -{ - struct gsm_bts_trx_ts *ts; - ts = abis_nm_get_ts(oml_msg); - if (!ts) - /* error already logged in abis_nm_get_ts() */ - return; - if (!ts->fi) { - LOG_TS(ts, LOGL_ERROR, "Channel OPSTART ACK for uninitialized TS\n"); - return; - } - osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_ACK, NULL); + osmo_fsm_inst_dispatch(mo->fi, NM_EV_SW_ACT_REP, NULL); + return 0; } static void nm_rx_opstart_ack(struct msgb *oml_msg) { - struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); + const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; struct gsm_bts *bts = sign_link->trx->bts; - struct gsm_bts_trx *trx; - struct gsm_gprs_nsvc *nsvc; + struct gsm_abis_mo *mo; - switch (foh->obj_class) { - case NM_OC_SITE_MANAGER: - osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_BTS: - osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_RADIO_CARRIER: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_BASEB_TRANSC: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_CHANNEL: - nm_rx_opstart_ack_chan(oml_msg); - break; - case NM_OC_GPRS_NSE: - osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_GPRS_CELL: - osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_GPRS_NSVC: - if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - default: - break; - } + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + if (mo == NULL) + LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART ACK for non-existent MO\n"); + else + osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_ACK, NULL); } static void nm_rx_opstart_nack(struct msgb *oml_msg) { - struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); + const struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; struct gsm_bts *bts = sign_link->trx->bts; - struct gsm_bts_trx *trx; - struct gsm_bts_trx_ts *ts; - struct gsm_gprs_nsvc *nsvc; + struct gsm_abis_mo *mo; - switch (foh->obj_class) { - case NM_OC_SITE_MANAGER: - osmo_fsm_inst_dispatch(bts->site_mgr->mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - case NM_OC_BTS: - osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_OPSTART_ACK, NULL); - break; - case NM_OC_RADIO_CARRIER: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(trx->mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - case NM_OC_BASEB_TRANSC: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - case NM_OC_CHANNEL: - if (!(ts = abis_nm_get_ts(oml_msg))) - return; - osmo_fsm_inst_dispatch(ts->mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - case NM_OC_GPRS_NSE: - osmo_fsm_inst_dispatch(bts->site_mgr->gprs.nse.mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - case NM_OC_GPRS_CELL: - osmo_fsm_inst_dispatch(bts->gprs.cell.mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - case NM_OC_GPRS_NSVC: - if (!(nsvc = gsm_bts_sm_nsvc_num(bts->site_mgr, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(nsvc->mo.fi, NM_EV_OPSTART_NACK, NULL); - break; - default: - break; - } + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + if (mo == NULL) + LOGPFOH(DNM, LOGL_ERROR, foh, "Rx OPSTART NACK for non-existent MO\n"); + else + osmo_fsm_inst_dispatch(mo->fi, NM_EV_OPSTART_NACK, NULL); } static void nm_rx_get_attr_rep(struct msgb *oml_msg) @@ -352,20 +246,13 @@ struct abis_om_fom_hdr *foh = msgb_l3(oml_msg); struct e1inp_sign_link *sign_link = oml_msg->dst; struct gsm_bts *bts = sign_link->trx->bts; - struct gsm_bts_trx *trx; + struct gsm_abis_mo *mo; - switch (foh->obj_class) { - case NM_OC_BTS: - osmo_fsm_inst_dispatch(bts->mo.fi, NM_EV_GET_ATTR_REP, NULL); - break; - case NM_OC_BASEB_TRANSC: - if (!(trx = gsm_bts_trx_num(bts, foh->obj_inst.trx_nr))) - return; - osmo_fsm_inst_dispatch(trx->bb_transc.mo.fi, NM_EV_GET_ATTR_REP, NULL); - break; - default: - LOGPFOH(DNM, LOGL_ERROR, foh, "Get Attributes Response received on incorrect object class %d!\n", foh->obj_class); - } + mo = gsm_objclass2mo(bts, foh->obj_class, &foh->obj_inst); + if (mo == NULL) + LOGPFOH(DNM, LOGL_ERROR, foh, "Rx Get Attribute Report for non-existent MO\n"); + else + osmo_fsm_inst_dispatch(mo->fi, NM_EV_GET_ATTR_REP, NULL); } static void nm_rx_set_bts_attr_ack(struct msgb *oml_msg) -- To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/34421?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bsc Gerrit-Branch: master Gerrit-Change-Id: Ic6c0dfe950459d07a8f506b5007a65fea1950c18 Gerrit-Change-Number: 34421 Gerrit-PatchSet: 3 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: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged

1 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023