laforge has uploaded this change for review.
abis_nm: Only osmo-bts re-purposes the MANUF_ID for BTS feature flags
The Manufacturer ID IE is normally used to indicate the [name of] the
manufacturer. In case of ip.access nanoBTS it is, for example, "com.ipaccess".
Osmocom decided to re-pupose this IE to indicate bts-specific feature
flags. Stop interpreting the string "com.ipaccess" as feature bitmap.
Change-Id: I76cee190dc1f074464df570cdfc3d38559f04846
Closes: O#5959
---
M src/osmo-bsc/abis_nm.c
1 file changed, 24 insertions(+), 9 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/70/32070/1
diff --git a/src/osmo-bsc/abis_nm.c b/src/osmo-bsc/abis_nm.c
index 938f45d..0f589af 100644
--- a/src/osmo-bsc/abis_nm.c
+++ b/src/osmo-bsc/abis_nm.c
@@ -573,7 +573,7 @@
struct abis_nm_sw_desc sw_descr[MAX_BTS_ATTR];
/* Parse Attribute Response Info content for 3GPP TS 52.021 ยง9.4.30 Manufacturer Id */
- if (TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) {
+ if (bts->type == GSM_BTS_TYPE_OSMOBTS && TLVP_PRES_LEN(tp, NM_ATT_MANUF_ID, 2)) {
len = TLVP_LEN(tp, NM_ATT_MANUF_ID);
/* log potential BTS feature vector overflow */
@@ -606,17 +606,16 @@
" supported\n", osmo_bts_features_name(i));
}
+ } else if (bts->type == GSM_BTS_TYPE_NANOBTS) {
/* Add features from the BTS model: nanobts may support more
* features than it reports, since we extend the enum of
* features for osmo-bts. */
- if (bts->type == GSM_BTS_TYPE_NANOBTS) {
- for (i = 0; i < _NUM_BTS_FEAT; i++) {
- if (osmo_bts_has_feature(&bts->model->features, i) /* intentional check against bts model */
- && !osmo_bts_has_feature(&bts->features, i)) {
- LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature '%s' is"
- " assumed to be supported\n", osmo_bts_features_name(i));
- osmo_bts_set_feature(&bts->features, i);
- }
+ for (i = 0; i < _NUM_BTS_FEAT; i++) {
+ if (osmo_bts_has_feature(&bts->model->features, i) /* intentional check against bts model */
+ && !osmo_bts_has_feature(&bts->features, i)) {
+ LOGPMO(&bts->mo, DNM, LOGL_NOTICE, "Get Attributes Response: feature '%s' is"
+ " assumed to be supported\n", osmo_bts_features_name(i));
+ osmo_bts_set_feature(&bts->features, i);
}
}
}
To view, visit change 32070. To unsubscribe, or for help writing mail filters, visit settings.