Osmocom Open Build Service

osmo-bsc_1.13.1.dsc -> osmo-bsc_1.13.2.dsc Changed

osmo-bsc_1.13.1.tar.xz/.tarball-version -> osmo-bsc_1.13.2.tar.xz/.tarball-version Changed

osmo-bsc_1.13.1.tar.xz/debian/changelog -> osmo-bsc_1.13.2.tar.xz/debian/changelog Changed

osmo-bsc_1.13.1.tar.xz/include/osmocom/bsc/bts.h -> osmo-bsc_1.13.2.tar.xz/include/osmocom/bsc/bts.h Changed

osmo-bsc_1.13.1.tar.xz/src/osmo-bsc/bts.c -> osmo-bsc_1.13.2.tar.xz/src/osmo-bsc/bts.c Changed

@@ -758,6 +758,30 @@
 	return 0;
 }
 
+void gsm_bts_set_lac(struct gsm_bts *bts, uint16_t lac)
+{
+	bts->location_area_code = lac;
+
+	hash_del(&bts->node_by_lac);
+	hash_del(&bts->node_by_lac_ci);
+	hash_add(bts->network->bts_by_lac, &bts->node_by_lac, bts->location_area_code);
+	hash_add(bts->network->bts_by_lac_ci, &bts->node_by_lac_ci,
+		 LAC_CI_HASHTABLE_KEY(bts->location_area_code, bts->cell_identity));
+}
+
+void gsm_bts_set_ci(struct gsm_bts *bts, uint16_t ci)
+{
+	bts->cell_identity = ci;
+
+	hash_del(&bts->node_by_ci);
+	hash_add(bts->network->bts_by_ci, &bts->node_by_ci, bts->cell_identity);
+	if (bts->location_area_code != GSM_LAC_RESERVED_DETACHED) {
+		hash_del(&bts->node_by_lac_ci);
+		hash_add(bts->network->bts_by_lac_ci, &bts->node_by_lac_ci,
+			 LAC_CI_HASHTABLE_KEY(bts->location_area_code, bts->cell_identity));
+	}
+}
+
 int bts_gprs_mode_is_compat(struct gsm_bts *bts, enum bts_gprs_mode mode)
 {
 	if (mode != BTS_GPRS_NONE &&
@@ -908,7 +932,7 @@
 static struct bts_depends_on_entry *bts_depend_find_entry(const struct gsm_bts *bts, gsm_bts_nr_t dep)
 {
 	struct bts_depends_on_entry *entry;
-	llist_for_each_entry(entry, &bts->trx_list, list) {
+	llist_for_each_entry(entry, &bts->depends_on, list) {
 		if (entry->bts_nr == dep)
 			return entry;
 	}

osmo-bsc_1.13.1.tar.xz/src/osmo-bsc/bts_ctrl.c -> osmo-bsc_1.13.2.tar.xz/src/osmo-bsc/bts_ctrl.c Changed

@@ -21,6 +21,7 @@
 
 #include <errno.h>
 #include <time.h>
+#include <inttypes.h>
 
 #include <osmocom/ctrl/control_cmd.h>
 
@@ -244,9 +245,76 @@
 	return 1;
 }
 
+static int get_bts_lac(struct ctrl_cmd *cmd, void *data)
+{
+	struct gsm_bts *bts = cmd->node;
+	cmd->reply = talloc_asprintf(cmd, "%" PRIu16, bts->location_area_code);
+	if (!cmd->reply) {
+		cmd->reply = "OOM";
+		return CTRL_CMD_ERROR;
+	}
+	return CTRL_CMD_REPLY;
+}
+
+static int set_bts_lac(struct ctrl_cmd *cmd, void *data)
+{
+	struct gsm_bts *bts = cmd->node;
+	int lac;
+
+	osmo_str_to_int(&lac, cmd->value, 0, 0, 0xffff);
+	gsm_bts_set_lac(bts, lac);
+	return get_bts_lac(cmd, data);
+}
+
+static int verify_bts_lac(struct ctrl_cmd *cmd, const char *value, void *data)
+{
+	int lac;
+
+	if (osmo_str_to_int(&lac, cmd->value, 0, 0, 0xffff) < 0) {
+		cmd->reply = "Input not within the range";
+		return -1;
+	}
+	if (lac == GSM_LAC_RESERVED_DETACHED || lac == GSM_LAC_RESERVED_ALL_BTS) {
+		cmd->reply = talloc_asprintf(cmd, "LAC %d is reserved by GSM 04.08", lac);
+		return -1;
+	}
+	return 0;
+}
+
+static int get_bts_ci(struct ctrl_cmd *cmd, void *data)
+{
+	struct gsm_bts *bts = cmd->node;
+	cmd->reply = talloc_asprintf(cmd, "%" PRIu16, bts->cell_identity);
+	if (!cmd->reply) {
+		cmd->reply = "OOM";
+		return CTRL_CMD_ERROR;
+	}
+	return CTRL_CMD_REPLY;
+}
+
+static int set_bts_ci(struct ctrl_cmd *cmd, void *data)
+{
+	struct gsm_bts *bts = cmd->node;
+	int ci;
+
+	osmo_str_to_int(&ci, cmd->value, 0, 0, 0xffff);
+	gsm_bts_set_ci(bts, ci);
+	return get_bts_ci(cmd, data);
+}
+
+static int verify_bts_ci(struct ctrl_cmd *cmd, const char *value, void *data)
+{
+	int ci;
+
+	if (osmo_str_to_int(&ci, cmd->value, 0, 0, 0xffff) < 0) {
+		cmd->reply = "Input not within the range";
+		return -1;
+	}
+	return 0;
+}
 /* BTS related commands below */
-CTRL_CMD_DEFINE_RANGE(bts_lac, "location-area-code", struct gsm_bts, location_area_code, 0, 65535);
-CTRL_CMD_DEFINE_RANGE(bts_ci, "cell-identity", struct gsm_bts, cell_identity, 0, 65535);
+CTRL_CMD_DEFINE(bts_lac, "location-area-code");
+CTRL_CMD_DEFINE(bts_ci, "cell-identity");
 CTRL_CMD_DEFINE_RANGE(bts_bsic, "bsic", struct gsm_bts, bsic, 0, 63);
 CTRL_CMD_DEFINE_RANGE(bts_rach_max_delay, "rach-max-delay", struct gsm_bts, rach_max_delay, 1, 127);
 CTRL_CMD_DEFINE_RANGE(bts_rach_expiry_timeout, "rach-expiry-timeout", struct gsm_bts, rach_expiry_timeout, 4, 64);

osmo-bsc_1.13.1.tar.xz/src/osmo-bsc/bts_vty.c -> osmo-bsc_1.13.2.tar.xz/src/osmo-bsc/bts_vty.c Changed

Changes of Revision 14