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

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

Attention is currently required from: arehbein, daniel, dexter, fixeria, pespin. Hello Jenkins Builder, daniel, dexter, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ipa: Don't break strict aliasing rule ...................................................................... ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 25 insertions(+), 1 deletion(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/4 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: write_queue: Enable updating max_length field

by fixeria

Attention is currently required from: arehbein, dexter, pespin. fixeria has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email ) Change subject: write_queue: Enable updating max_length field ...................................................................... Patch Set 4: Code-Review+1 (1 comment) File src/core/write_queue.c: https://gerrit.osmocom.org/c/libosmocore/+/34444/comment/8710d00b_82692e84 PS4, Line 165: dropped_msgs++; > No need to increment the var N times, simply: […] It's not going to work if you do this after the while-loop, because the `queue->current_length` would always be less or equal to `len`. I see nothing wrong with incrementing the variable. -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 34444 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Sep 2023 17:21:36 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: Yes Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by pespin

Attention is currently required from: arehbein, daniel, dexter, fixeria, pespin. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule ...................................................................... Patch Set 3: (1 comment) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/6ae8140c_85bea39a PS3, Line 29: } __attribute__ ((packed)); Can you try the unnamed struct version inside the macro which I mention? I'd prefer that one if that works. -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Sep 2023 17:13:34 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

Attention is currently required from: daniel, dexter, fixeria, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email ) Change subject: ipa: Don't break strict aliasing rule ...................................................................... Patch Set 2: (2 comments) File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/817e0602_645e0b44 PS2, Line 26: #warning "OSMO_IPA_MSGB_CB breaks the strict aliasing rule. Don't use unless -fno-strict-aliasing flag is enabled!" > I just tried to build libosmo-netif completely and I don't see any warning nor error. I'm not sure if getting no warning from gcc is always equivalent with gcc not making use of, say strict aliasing optimizations. I wouldn't trust gcc that far. I have used the second solution you suggested above. File include/osmocom/netif/ipa.h: https://gerrit.osmocom.org/c/libosmo-netif/+/34445/comment/e47f3910_a116c0ab PS1, Line 21: osmo_ipa_msgb_cb > Is this warning going to show up when compiling any files including this header and not necessarily […] (not a problem anymore, since the newest patch version is aliasing with a union in a legal way) -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 2 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Sep 2023 17:13:23 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: arehbein <arehbein(a)sysmocom.de> Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Comment-In-Reply-To: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[S] Change in libosmo-netif[master]: ipa: Don't break strict aliasing rule

by arehbein

Attention is currently required from: daniel, dexter, fixeria. Hello Jenkins Builder, daniel, dexter, fixeria, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email to look at the new patch set (#3). The following approvals got outdated and were removed: Verified+1 by Jenkins Builder Change subject: ipa: Don't break strict aliasing rule ...................................................................... ipa: Don't break strict aliasing rule Somehow gcc doesn't always warn about this rule being broken. We are breaking the strict aliasing rule here and libosmo-netif currently does not make use of the '-fno-strict-aliasing' flag. It's possible that this has also been causing nondeterministic timestamps in libosmo-netif stream tests every once in a while. Related: OS#6164, OS#5753 Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 --- M include/osmocom/netif/ipa.h 1 file changed, 24 insertions(+), 2 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmo-netif refs/changes/45/34445/3 -- To view, visit https://gerrit.osmocom.org/c/libosmo-netif/+/34445?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmo-netif Gerrit-Branch: master Gerrit-Change-Id: Ibed543cdfcdda8c0256ce7d8818ff96d6d46e9b0 Gerrit-Change-Number: 34445 Gerrit-PatchSet: 3 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: daniel <dwillmann(a)sysmocom.de> Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-CC: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: daniel <dwillmann(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: write_queue: Enable updating max_length field

by pespin

Attention is currently required from: dexter, fixeria. pespin has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email ) Change subject: write_queue: Enable updating max_length field ...................................................................... Patch Set 4: (3 comments) File src/core/write_queue.c: https://gerrit.osmocom.org/c/libosmocore/+/34444/comment/1375ee89_5241c1c9 PS4, Line 153: * \returns Number of messages dropped. I'd return an int, so we can add error codes later on. "ssize_t" maybe, so add possibility of a bigger count. https://gerrit.osmocom.org/c/libosmocore/+/34444/comment/d53f9bd1_38d2bfdf PS4, Line 157: size_t osmo_wqueue_update_maxlen(struct osmo_wqueue *queue, size_t len) Let's call this "osmo_wqueue_set_maxlen()". queue->max_length is a unsigned int iirc, so why using size_t len above? https://gerrit.osmocom.org/c/libosmocore/+/34444/comment/c1a4393b_6779c349 PS4, Line 165: dropped_msgs++; No need to increment the var N times, simply: if (queue->current_length > len) return queue->current_length - len; else return 0; -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 34444 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Sep 2023 15:56:14 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: write_queue: Enable updating max_length field

by arehbein

Attention is currently required from: dexter, fixeria, pespin. arehbein has posted comments on this change. ( https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email ) Change subject: write_queue: Enable updating max_length field ...................................................................... Patch Set 4: (2 comments) File src/core/write_queue.c: https://gerrit.osmocom.org/c/libosmocore/+/34444/comment/612963d2_25e0991b PS3, Line 161: queue->current_length > queue->max_length > This condition can never be true because you're updating the `queue->max_length` after the loop, not […] Done File tests/write_queue/wqueue_test.c: https://gerrit.osmocom.org/c/libosmocore/+/34444/comment/3dca4dd2_33cd74ca PS3, Line 98: OSMO_ASSERT > Somehow this `assert()` does not assert at all, no matter how I change the expected value. […] Ah heck, I fixed it locally for the previous test code I added before uploading and somehow managed to recode this error right again *facepalms*. Thanks -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 34444 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-Comment-Date: Mon, 18 Sep 2023 15:53:13 +0000 Gerrit-HasComments: Yes Gerrit-Has-Labels: No Comment-In-Reply-To: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-MessageType: comment

1 year, 9 months

1
0
0 0

[M] Change in libosmocore[master]: write_queue: Enable updating max_length field

by arehbein

Attention is currently required from: arehbein, dexter, fixeria, pespin. Hello Jenkins Builder, dexter, fixeria, pespin, I'd like you to reexamine a change. Please visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email to look at the new patch set (#4). The following approvals got outdated and were removed: Code-Review-1 by fixeria, Verified+1 by Jenkins Builder Change subject: write_queue: Enable updating max_length field ...................................................................... write_queue: Enable updating max_length field Dequeue and free any excess messages, in case the new queue length is shorter than the old. Related: OS#5774 Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 --- M include/osmocom/core/write_queue.h M src/core/libosmocore.map M src/core/write_queue.c M tests/write_queue/wqueue_test.c 4 files changed, 87 insertions(+), 0 deletions(-) git pull ssh://gerrit.osmocom.org:29418/libosmocore refs/changes/44/34444/4 -- To view, visit https://gerrit.osmocom.org/c/libosmocore/+/34444?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: libosmocore Gerrit-Branch: master Gerrit-Change-Id: Ibfe51a2faf29f8ae160a9c330c9af0d09b5a9002 Gerrit-Change-Number: 34444 Gerrit-PatchSet: 4 Gerrit-Owner: arehbein <arehbein(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: dexter <pmaier(a)sysmocom.de> Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-Attention: arehbein <arehbein(a)sysmocom.de> Gerrit-Attention: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Attention: pespin <pespin(a)sysmocom.de> Gerrit-Attention: dexter <pmaier(a)sysmocom.de> Gerrit-MessageType: newpatchset

1 year, 9 months

1
0
0 0

[M] Change in osmo-bts[master]: oml: refactor generation of Get Attribute Response

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34432?usp=email ) Change subject: oml: refactor generation of Get Attribute Response ...................................................................... oml: refactor generation of Get Attribute Response Change-Id: I531e88e789d09f8828a53813e3b2863faf0cc572 Related: OS#4505 --- M src/common/oml.c 1 file changed, 64 insertions(+), 116 deletions(-) Approvals: pespin: Looks good to me, but someone else must approve osmith: Looks good to me, approved Jenkins Builder: Verified diff --git a/src/common/oml.c b/src/common/oml.c index d1b7e5d..7aefe08 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -164,9 +164,9 @@ return oml_send_msg(msg, 0); } -static inline void add_bts_attrs(struct msgb *msg, const struct gsm_bts *bts) +/* Put NM_ATT_SW_CONFIG as per 9.4.61 "SW Configuration" */ +static int add_att_sw_config(struct msgb *msg, const struct gsm_abis_mo *mo) { - uint16_t total_len = 0; uint8_t *len; /* Put NM_ATT_SW_CONFIG as per 9.4.61 "SW Configuration". */ @@ -175,17 +175,39 @@ /* We don't know the length yet, so we update it later. */ len = msgb_put(msg, 2); - total_len += abis_nm_put_sw_file(msg, "osmobts", PACKAGE_VERSION, true); - total_len += abis_nm_put_sw_file(msg, btsatttr2str(BTS_TYPE_VARIANT), - btsvariant2str(bts->variant), true); + switch (mo->obj_class) { + case NM_OC_BTS: + { + const struct gsm_bts *bts = mo->bts; - if (strlen(bts->sub_model)) { - total_len += abis_nm_put_sw_file(msg, btsatttr2str(BTS_SUB_MODEL), - bts->sub_model, true); + abis_nm_put_sw_file(msg, "osmobts", PACKAGE_VERSION, true); + abis_nm_put_sw_file(msg, btsatttr2str(BTS_TYPE_VARIANT), + btsvariant2str(bts->variant), true); + if (strlen(bts->sub_model)) { + abis_nm_put_sw_file(msg, btsatttr2str(BTS_SUB_MODEL), + bts->sub_model, true); + } + break; + } + case NM_OC_BASEB_TRANSC: + { + const struct gsm_bts_trx *trx = container_of(mo, struct gsm_bts_trx, bb_transc.mo); + const struct phy_instance *pinst = trx->pinst; + const char *phy_version; + + phy_version = pinst && strlen(pinst->version) ? pinst->version : "Unknown"; + abis_nm_put_sw_file(msg, btsatttr2str(TRX_PHY_VERSION), phy_version, true); + break; + } + default: + msgb_get(msg, 1 + 2); /* TL16 */ + return -ENOTSUP; } /* Finally, update the length */ - osmo_store16be(total_len, len); + osmo_store16be((uint16_t)(msg->tail - (len + 2)), len); + + return 0; } /* Add BTS features as 3GPP TS 52.021 §9.4.30 Manufacturer Id */ @@ -195,125 +217,41 @@ msgb_tl16v_put(msg, NM_ATT_MANUF_ID, len, bts->features->data); } -static inline void add_trx_attr(struct msgb *msg, const struct gsm_bts_trx *trx) -{ - const struct phy_instance *pinst = trx_phy_instance(trx); - const char *phy_version; - uint16_t total_len; - uint8_t *len; - - /* Put NM_ATT_SW_CONFIG as per 9.4.61 "SW Configuration". */ - msgb_v_put(msg, NM_ATT_SW_CONFIG); - - /* We don't know the length yet, so we update it later. */ - len = msgb_put(msg, 2); - - phy_version = pinst && strlen(pinst->version) ? pinst->version : "Unknown"; - total_len = abis_nm_put_sw_file(msg, btsatttr2str(TRX_PHY_VERSION), phy_version, true); - - /* Finally, update the length */ - osmo_store16be(total_len, len); -} - -/* Handle a list of attributes requested by the BSC, compose - * TRX-specific Get Attribute Response IE as per 9.4.64. */ -static inline int handle_attrs_trx(struct msgb *out_msg, - const struct gsm_abis_mo *mo, - const uint8_t *attr, uint16_t attr_len) -{ - const struct gsm_bts_trx *trx = container_of(mo, struct gsm_bts_trx, bb_transc.mo); - uint8_t num_unsupported = 0; - uint8_t *buf; - int i; - - for (i = 0; i < attr_len; i++) { - switch (attr[i]) { - case NM_ATT_SW_CONFIG: - add_trx_attr(out_msg, trx); - break; - default: - LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes [%u], %s is unsupported by TRX\n", - gsm_trx_name(trx), i, get_value_string(abis_nm_att_names, attr[i])); - /* Push this tag to the list of unsupported attributes */ - buf = msgb_push(out_msg, 1); - *buf = attr[i]; - num_unsupported++; - } - } - - /* Push the amount of unsupported attributes */ - buf = msgb_push(out_msg, 1); - *buf = num_unsupported; - - return 0; -} - -/* Handle a list of attributes requested by the BSC, compose - * BTS-specific Get Attribute Response IE as per 9.4.64. */ -static inline int handle_attrs_bts(struct msgb *out_msg, - const struct gsm_abis_mo *mo, - const uint8_t *attr, uint16_t attr_len) -{ - const struct gsm_bts *bts = container_of(mo, struct gsm_bts, mo); - uint8_t num_unsupported = 0; - uint8_t *buf; - int i; - - for (i = 0; i < attr_len; i++) { - switch (attr[i]) { - case NM_ATT_SW_CONFIG: - add_bts_attrs(out_msg, bts); - break; - case NM_ATT_MANUF_ID: - add_bts_feat(out_msg, bts); - break; - default: - LOGP(DOML, LOGL_ERROR, "O&M Get Attributes [%u], %s is unsupported by BTS\n", i, - get_value_string(abis_nm_att_names, attr[i])); - /* Push this tag to the list of unsupported attributes */ - buf = msgb_push(out_msg, 1); - *buf = attr[i]; - num_unsupported++; - } - } - - /* Push the amount of unsupported attributes */ - buf = msgb_push(out_msg, 1); - *buf = num_unsupported; - - return 0; -} - /* send 3GPP TS 52.021 §8.11.2 Get Attribute Response */ static int oml_tx_attr_resp(const struct gsm_abis_mo *mo, const uint8_t *attr, uint16_t attr_len) { struct msgb *nmsg = oml_msgb_alloc(); - const char *mo_name = gsm_abis_mo_name(mo); + unsigned int num_unsupported = 0; int rc; if (!nmsg) return -NM_NACK_CANT_PERFORM; - switch (mo->obj_class) { - case NM_OC_BTS: - rc = handle_attrs_bts(nmsg, mo, attr, attr_len); - break; - case NM_OC_BASEB_TRANSC: - rc = handle_attrs_trx(nmsg, mo, attr, attr_len); - break; - default: - LOGP(DOML, LOGL_ERROR, "%s: Unsupported MO class in Get Attribute Response\n", - mo_name); - rc = -NM_NACK_OBJCLASS_NOTSUPP; + for (unsigned int i = 0; i < attr_len; i++) { + switch (attr[i]) { + case NM_ATT_SW_CONFIG: + if (add_att_sw_config(nmsg, mo) != 0) + goto unsupported; + break; + case NM_ATT_MANUF_ID: + if (mo->obj_class == NM_OC_BTS) + add_bts_feat(nmsg, mo->bts); + else + goto unsupported; + break; + default: +unsupported: + LOGP(DOML, LOGL_ERROR, "%s: O&M Get Attributes [%u], %s is unsupported\n", + gsm_abis_mo_name(mo), i, get_value_string(abis_nm_att_names, attr[i])); + /* Push this tag to the list of unsupported attributes */ + msgb_push_u8(nmsg, attr[i]); + num_unsupported++; + } } - if (rc < 0) { - LOGP(DOML, LOGL_ERROR, "%s: Tx Get Attribute Response FAILED with rc=%d\n", - mo_name, rc); - msgb_free(nmsg); - return rc; - } + /* Push the amount of unsupported attributes */ + msgb_push_u8(nmsg, num_unsupported); /* Push Get Attribute Response Info TL (actually TV where V is L) */ msgb_tv16_push(nmsg, NM_ATT_GET_ARI, msgb_length(nmsg)); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34432?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I531e88e789d09f8828a53813e3b2863faf0cc572 Gerrit-Change-Number: 34432 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 year, 9 months

1
0
0 0

[S] Change in osmo-bts[master]: osmo-bts-{oc2g,lc15}: signal CBCH support to BSC

by fixeria

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmo-bts/+/34430?usp=email ) Change subject: osmo-bts-{oc2g,lc15}: signal CBCH support to BSC ...................................................................... osmo-bts-{oc2g,lc15}: signal CBCH support to BSC The model specific code seems to have everything needed for CBCH. Change-Id: I6b4d82223dc0bdcd94cd1269bfb02047cbebe480 --- M src/osmo-bts-lc15/main.c M src/osmo-bts-oc2g/main.c 2 files changed, 13 insertions(+), 0 deletions(-) Approvals: osmith: Looks good to me, approved pespin: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/osmo-bts-lc15/main.c b/src/osmo-bts-lc15/main.c index 6c0e73d..bcd526a 100644 --- a/src/osmo-bts-lc15/main.c +++ b/src/osmo-bts-lc15/main.c @@ -102,6 +102,7 @@ /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP); + osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS); diff --git a/src/osmo-bts-oc2g/main.c b/src/osmo-bts-oc2g/main.c index 9918795..e184814 100644 --- a/src/osmo-bts-oc2g/main.c +++ b/src/osmo-bts-oc2g/main.c @@ -103,6 +103,7 @@ /* order alphabetically */ osmo_bts_set_feature(bts->features, BTS_FEAT_AGCH_PCH_PROP); + osmo_bts_set_feature(bts->features, BTS_FEAT_CBCH); osmo_bts_set_feature(bts->features, BTS_FEAT_EGPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_GPRS); osmo_bts_set_feature(bts->features, BTS_FEAT_OML_ALERTS); -- To view, visit https://gerrit.osmocom.org/c/osmo-bts/+/34430?usp=email To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmo-bts Gerrit-Branch: master Gerrit-Change-Id: I6b4d82223dc0bdcd94cd1269bfb02047cbebe480 Gerrit-Change-Number: 34430 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 year, 9 months

1
0
0 0

2025

2024

2023

2022

gerrit-log September 2023