<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23360">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">fix/refactor neighbor config<br><br>The neighbor configuration storage is fundamentally broken: it requires<br>all local cells to be configured before being able to list them as<br>neighbors of each other. Upon config write-back, the neighbor config<br>however is placed back inline with the other config, and hence a<br>written-out neighbor config no longer works on program restart.<br><br>The cause of this problem is that the config is stored as explicit<br>pointers between local cells (struct gsm_bts), which of course requires<br>the pointer to exist before being able to reference it.<br><br>Instead, store the actual configuration that the user entered as-is,<br>without pointers or references to objects that need to be ready. Resolve<br>the neighbors every time a neighbor is needed.<br><br>Hence the user may enter any config at any place in the config file,<br>even non-working config (like a BTS number that doesn't exist), and the<br>relation to actual local or remote neighbor cells is made at runtime.<br><br>Related: OS#5018<br>Change-Id: I9ed992f8bfff888b3933733c0576f92d50f2625b<br>---<br>M include/osmocom/bsc/bts.h<br>M include/osmocom/bsc/gsm_data.h<br>M include/osmocom/bsc/handover.h<br>M include/osmocom/bsc/neighbor_ident.h<br>M src/osmo-bsc/bsc_init.c<br>M src/osmo-bsc/bsc_vty.c<br>M src/osmo-bsc/bts.c<br>M src/osmo-bsc/handover_decision.c<br>M src/osmo-bsc/handover_decision_2.c<br>M src/osmo-bsc/handover_fsm.c<br>M src/osmo-bsc/handover_logic.c<br>M src/osmo-bsc/neighbor_ident.c<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M src/osmo-bsc/system_information.c<br>M tests/bsc/bsc_test.c<br>M tests/gsm0408/gsm0408_test.c<br>M tests/neighbor_ident.vty<br>17 files changed, 852 insertions(+), 1,024 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/60/23360/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bts.h b/include/osmocom/bsc/bts.h</span><br><span>index 3e3c73e..5dda44a 100644</span><br><span>--- a/include/osmocom/bsc/bts.h</span><br><span>+++ b/include/osmocom/bsc/bts.h</span><br><span>@@ -494,10 +494,13 @@</span><br><span> </span><br><span> struct handover_cfg *ho;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* A list of struct gsm_bts_ref, indicating neighbors of this BTS.</span><br><span style="color: hsl(0, 100%, 40%);">- * When the si_common neigh_list is in automatic mode, it is populated from this list as well as</span><br><span style="color: hsl(0, 100%, 40%);">- * gsm_network->neighbor_bss_cells. */</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head local_neighbors;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Local and remote neighbor configuration: a list of neighbors as written in the VTY config, not resolved to</span><br><span style="color: hsl(120, 100%, 40%);">+ * actual cells. Entries may point at non-existing BTS numbers, or yet unconfigured ARFCN+BSIC. The point of</span><br><span style="color: hsl(120, 100%, 40%);">+ * this list is to keep the config as the user entered it: a) to write it back exactly as entered, and b) to</span><br><span style="color: hsl(120, 100%, 40%);">+ * allow adding neighbor cells that will only be configured further down in the config file.</span><br><span style="color: hsl(120, 100%, 40%);">+ * An actual neighbor cell object (local or remote-BSS) is resolved "at runtime" whenever a neighbor is being</span><br><span style="color: hsl(120, 100%, 40%);">+ * looked up. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head neighbors;</span><br><span> </span><br><span> /* BTS-specific overrides for timer values from struct gsm_network. */</span><br><span> uint8_t T3122; /* ASSIGNMENT REJECT wait indication */</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 1bf21ae..2a9da26 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -31,7 +31,6 @@</span><br><span> #include <osmocom/abis/e1_input.h></span><br><span> #include <osmocom/bsc/meas_rep.h></span><br><span> #include <osmocom/bsc/acc.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/neighbor_ident.h></span><br><span> #include <osmocom/bsc/osmux.h></span><br><span> </span><br><span> #define GSM_T3122_DEFAULT 10</span><br><span>@@ -174,10 +173,16 @@</span><br><span> inline static const char *handover_scope_name(enum handover_scope val)</span><br><span> { return get_value_string(handover_scope_names, val); }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Cell ARFCN + BSIC. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct cell_ab {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint16_t arfcn;</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bsic;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct handover_out_req {</span><br><span> enum hodec_id from_hodec_id;</span><br><span> struct gsm_lchan *old_lchan;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key target_nik;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab target_cell_ab;</span><br><span> enum gsm_chan_t new_lchan_type; /*< leave GSM_LCHAN_NONE to use same as old_lchan */</span><br><span> };</span><br><span> </span><br><span>@@ -205,7 +210,7 @@</span><br><span> enum hodec_id from_hodec_id;</span><br><span> enum handover_scope scope;</span><br><span> enum gsm_chan_t new_lchan_type;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key target_cell;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab target_cell_ab;</span><br><span> </span><br><span> /* For inter-BSC handover, this may reflect more than one Cell ID. Must also be set for intra-BSC handover,</span><br><span> * because it is used as key for penalty timers (e.g. in handover decision 2). */</span><br><span>@@ -850,12 +855,6 @@</span><br><span> unsigned int used;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Useful to track N-N relations between BTS, for example neighbors. */</span><br><span style="color: hsl(0, 100%, 40%);">-struct gsm_bts_ref {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head entry;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* A single Page of a SMSCB message */</span><br><span> struct bts_smscb_page {</span><br><span> /* SMSCB message we're part of */</span><br><span>@@ -1219,8 +1218,6 @@</span><br><span> struct osmo_tdef *tdefs;</span><br><span> } mgw;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Remote BSS Cell Identifier Lists */</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_list *neighbor_bss_cells;</span><br><span> /* Remote BSS resolution sevice (CTRL iface) */</span><br><span> struct {</span><br><span> char *addr;</span><br><span>diff --git a/include/osmocom/bsc/handover.h b/include/osmocom/bsc/handover.h</span><br><span>index a71bb98..f671491 100644</span><br><span>--- a/include/osmocom/bsc/handover.h</span><br><span>+++ b/include/osmocom/bsc/handover.h</span><br><span>@@ -82,8 +82,9 @@</span><br><span> void bsc_tx_bssmap_ho_failure(struct gsm_subscriber_connection *conn);</span><br><span> </span><br><span> int find_handover_target_cell(struct gsm_bts **local_target_cell_p,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 **remote_target_cell_p,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 *remote_target_cells,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cell_ab *search_for,</span><br><span> bool log_errors);</span><br><span> </span><br><span> void handover_parse_inter_bsc_mt(struct gsm_subscriber_connection *conn,</span><br><span>diff --git a/include/osmocom/bsc/neighbor_ident.h b/include/osmocom/bsc/neighbor_ident.h</span><br><span>index cab7f9e..48c44d3 100644</span><br><span>--- a/include/osmocom/bsc/neighbor_ident.h</span><br><span>+++ b/include/osmocom/bsc/neighbor_ident.h</span><br><span>@@ -7,62 +7,81 @@</span><br><span> #include <osmocom/core/linuxlist.h></span><br><span> #include <osmocom/ctrl/control_cmd.h></span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/gsm_data.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct vty;</span><br><span> struct gsm_network;</span><br><span> struct gsm_bts;</span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_list;</span><br><span> struct gsm0808_cell_id_list2;</span><br><span> </span><br><span> #define NEIGHBOR_IDENT_KEY_ANY_BTS -1</span><br><span> </span><br><span> #define BSIC_ANY 0xff</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_key {</span><br><span style="color: hsl(0, 100%, 40%);">- int from_bts; /*< BTS nr 0..255 or NEIGHBOR_IDENT_KEY_ANY_BTS */</span><br><span style="color: hsl(0, 100%, 40%);">- uint16_t arfcn;</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t bsic;</span><br><span style="color: hsl(120, 100%, 40%);">+enum neighbor_type {</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_TYPE_UNSET = 0,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_TYPE_BTS_NR = 1,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_TYPE_CELL_ID = 2,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const char *neighbor_ident_key_name(const struct neighbor_ident_key *ni_key);</span><br><span style="color: hsl(120, 100%, 40%);">+/* One line of VTY neighbor configuration as entered by the user.</span><br><span style="color: hsl(120, 100%, 40%);">+ * One of three variants:</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * - just the local-BSS neighbor BTS nr:</span><br><span style="color: hsl(120, 100%, 40%);">+ * neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * - a neighbor cell identifier *without* ARFCN+BSIC:</span><br><span style="color: hsl(120, 100%, 40%);">+ * neighbor (lac|lac-ci|cgi|cgi-ps) 1 2 3...</span><br><span style="color: hsl(120, 100%, 40%);">+ * This is an elaborate / BTS-nr-agnostic way of indicating a local-BSS neighbor cell.</span><br><span style="color: hsl(120, 100%, 40%);">+ *</span><br><span style="color: hsl(120, 100%, 40%);">+ * - a neighbor cell identifier *with* ARFCN+BSIC:</span><br><span style="color: hsl(120, 100%, 40%);">+ * neighbor (lac|lac-ci|cgi|cgi-ps) 1 2 3... arfcn 456 bsic (23|any)</span><br><span style="color: hsl(120, 100%, 40%);">+ * This can either be</span><br><span style="color: hsl(120, 100%, 40%);">+ * - a remote-BSS neighbor cell, or</span><br><span style="color: hsl(120, 100%, 40%);">+ * - a super elaborate way of indicating a local-BSS neighbor, if this cell id exists in the local BSS.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct neighbor {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head entry;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_list *neighbor_ident_init(void *talloc_ctx);</span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_free(struct neighbor_ident_list *nil);</span><br><span style="color: hsl(120, 100%, 40%);">+ enum neighbor_type type;</span><br><span style="color: hsl(120, 100%, 40%);">+ union {</span><br><span style="color: hsl(120, 100%, 40%);">+ uint8_t bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id id;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool ab_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ } cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_key_match(const struct neighbor_ident_key *entry,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *search_for,</span><br><span style="color: hsl(0, 100%, 40%);">- bool exact_match);</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_bts *resolve_local_neighbor(struct gsm_bts *from_bts, const struct neighbor *neighbor);</span><br><span style="color: hsl(120, 100%, 40%);">+int resolve_remote_neighbors(struct gsm_bts *from_bts, const struct cell_ab *target_ab);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int neighbor_ident_add(struct neighbor_ident_list *nil, const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val);</span><br><span style="color: hsl(0, 100%, 40%);">-const struct gsm0808_cell_id_list2 *neighbor_ident_get(const struct neighbor_ident_list *nil,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *key);</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_del(struct neighbor_ident_list *nil, const struct neighbor_ident_key *key);</span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_clear(struct neighbor_ident_list *nil);</span><br><span style="color: hsl(120, 100%, 40%);">+int cell_ab_to_str_buf(char *buf, size_t buflen, const struct cell_ab *cell);</span><br><span style="color: hsl(120, 100%, 40%);">+char *cell_ab_to_str_c(void *ctx, const struct cell_ab *cell);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_iter(const struct neighbor_ident_list *nil,</span><br><span style="color: hsl(0, 100%, 40%);">- bool (* iter_cb )(const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val,</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data),</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data);</span><br><span style="color: hsl(120, 100%, 40%);">+bool cell_ab_match(const struct cell_ab *entry, const struct cell_ab *search_for, bool exact_match);</span><br><span style="color: hsl(120, 100%, 40%);">+bool cell_ab_valid(const struct cell_ab *cell);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+int neighbor_to_str_buf(char *buf, size_t buflen, const struct neighbor *n);</span><br><span style="color: hsl(120, 100%, 40%);">+char *neighbor_to_str_c(void *ctx, const struct neighbor *n);</span><br><span style="color: hsl(120, 100%, 40%);">+bool neighbor_same(const struct neighbor *a, const struct neighbor *b, bool check_cell_ab);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil);</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_cell_ab(struct cell_ab *arfcn_bsic, const struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int resolve_neighbors(struct gsm_bts **local_neighbor_p, struct gsm0808_cell_id_list2 *remote_neighbors,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *from_bts, const struct cell_ab *target_ab, bool log_errors);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+void neighbor_ident_vty_init();</span><br><span> void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts);</span><br><span> void neighbor_ident_vty_write_network(struct vty *vty, const char *indent);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_bts_entry_exists(uint8_t from_bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define NEIGHBOR_IDENT_VTY_KEY_PARAMS "arfcn <0-1023> bsic (<0-63>|any)"</span><br><span style="color: hsl(0, 100%, 40%);">-#define NEIGHBOR_IDENT_VTY_KEY_DOC \</span><br><span style="color: hsl(120, 100%, 40%);">+#define CELL_AB_VTY_PARAMS "arfcn <0-1023> bsic (<0-63>|any)"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CELL_AB_VTY_DOC \</span><br><span> "ARFCN of neighbor cell\n" "ARFCN value\n" \</span><br><span> "BSIC of neighbor cell\n" "BSIC value\n" \</span><br><span> "for all BSICs / use any BSIC in this ARFCN\n"</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_vty_parse_key_params(struct vty *vty, const char **argv,</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key *key);</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_bts_parse_key_params(struct vty *vty, struct gsm_bts *bts, const char **argv,</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key *key);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+void neighbor_ident_vty_parse_arfcn_bsic(struct cell_ab *ab, const char **argv);</span><br><span> </span><br><span> struct ctrl_handle *neighbor_controlif_setup(struct gsm_network *net);</span><br><span> int neighbor_ctrl_cmds_install(struct gsm_network *net);</span><br><span>diff --git a/src/osmo-bsc/bsc_init.c b/src/osmo-bsc/bsc_init.c</span><br><span>index b959c9f..b572f27 100644</span><br><span>--- a/src/osmo-bsc/bsc_init.c</span><br><span>+++ b/src/osmo-bsc/bsc_init.c</span><br><span>@@ -100,7 +100,6 @@</span><br><span> </span><br><span> net->ho = ho_cfg_init(net, NULL);</span><br><span> net->hodec2.congestion_check_interval_s = HO_CFG_CONGESTION_CHECK_DEFAULT;</span><br><span style="color: hsl(0, 100%, 40%);">- net->neighbor_bss_cells = neighbor_ident_init(net);</span><br><span> </span><br><span> /* init statistics */</span><br><span> net->bsc_ctrs = rate_ctr_group_alloc(net, &bsc_ctrg_desc, 0);</span><br><span>diff --git a/src/osmo-bsc/bsc_vty.c b/src/osmo-bsc/bsc_vty.c</span><br><span>index c8dfa8d..280fe9f 100644</span><br><span>--- a/src/osmo-bsc/bsc_vty.c</span><br><span>+++ b/src/osmo-bsc/bsc_vty.c</span><br><span>@@ -1881,8 +1881,8 @@</span><br><span> struct handover_out_req req = {</span><br><span> .from_hodec_id = HODEC_USER,</span><br><span> .old_lchan = from_lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- .target_nik = *bts_ident_key(to_bts),</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cell_ab(&req.target_cell_ab, to_bts);</span><br><span> handover_request(&req);</span><br><span> }</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -2075,14 +2075,15 @@</span><br><span> }</span><br><span> </span><br><span> DEFUN(handover_any_to_arfcn_bsic, handover_any_to_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "handover any to " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ "handover any to " CELL_AB_VTY_PARAMS,</span><br><span> MANUAL_HANDOVER_STR</span><br><span> "Pick any actively used TCH/F or TCH/H lchan to handover to another cell."</span><br><span> " This is likely to fail outside of a lab setup where you are certain that"</span><br><span> " all MS are able to see the target cell.\n"</span><br><span> "'to'\n"</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab = {};</span><br><span> struct handover_out_req req;</span><br><span> struct gsm_lchan *from_lchan;</span><br><span> </span><br><span>@@ -2095,12 +2096,8 @@</span><br><span> .old_lchan = from_lchan,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_bts_parse_key_params(vty, from_lchan->ts->trx->bts,</span><br><span style="color: hsl(0, 100%, 40%);">- argv, &req.target_nik)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% BTS %u does not know about this neighbor%s",</span><br><span style="color: hsl(0, 100%, 40%);">- from_lchan->ts->trx->bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&ab, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ req.target_cell_ab = ab;</span><br><span> </span><br><span> handover_request(&req);</span><br><span> return CMD_SUCCESS;</span><br><span>@@ -7775,7 +7772,7 @@</span><br><span> install_element(BTS_NODE, &cfg_bts_rep_no_ul_dl_sacch_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rep_rxqual_cmd);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_vty_init(network, network->neighbor_bss_cells);</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_init();</span><br><span> /* See also handover commands added on bts level from handover_vty.c */</span><br><span> </span><br><span> install_element(BTS_NODE, &cfg_bts_power_ctrl_cmd);</span><br><span>diff --git a/src/osmo-bsc/bts.c b/src/osmo-bsc/bts.c</span><br><span>index 3bb4f8a..5381a4e 100644</span><br><span>--- a/src/osmo-bsc/bts.c</span><br><span>+++ b/src/osmo-bsc/bts.c</span><br><span>@@ -273,7 +273,7 @@</span><br><span> </span><br><span> INIT_LLIST_HEAD(&bts->abis_queue);</span><br><span> INIT_LLIST_HEAD(&bts->loc_list);</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&bts->local_neighbors);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&bts->neighbors);</span><br><span> INIT_LLIST_HEAD(&bts->oml_fail_rep);</span><br><span> INIT_LLIST_HEAD(&bts->chan_rqd_queue);</span><br><span> </span><br><span>@@ -442,59 +442,6 @@</span><br><span> OSMO_ASSERT(rc > 0);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_bts_ref *gsm_bts_ref_find(const struct llist_head *list, const struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *ref;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(ref, list, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (ref->bts == bts)</span><br><span style="color: hsl(0, 100%, 40%);">- return ref;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Add a BTS reference to the local_neighbors list.</span><br><span style="color: hsl(0, 100%, 40%);">- * Return 1 if added, 0 if such an entry already existed, and negative on errors. */</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_bts_local_neighbor_add(struct gsm_bts *bts, struct gsm_bts *neighbor)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *ref;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts || !neighbor)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (bts == neighbor)</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Already got this entry? */</span><br><span style="color: hsl(0, 100%, 40%);">- ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor);</span><br><span style="color: hsl(0, 100%, 40%);">- if (ref)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ref = talloc_zero(bts, struct gsm_bts_ref);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ref)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">- ref->bts = neighbor;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&ref->entry, &bts->local_neighbors);</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Remove a BTS reference from the local_neighbors list.</span><br><span style="color: hsl(0, 100%, 40%);">- * Return 1 if removed, 0 if no such entry existed, and negative on errors. */</span><br><span style="color: hsl(0, 100%, 40%);">-int gsm_bts_local_neighbor_del(struct gsm_bts *bts, const struct gsm_bts *neighbor)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *ref;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts || !neighbor)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ref = gsm_bts_ref_find(&bts->local_neighbors, neighbor);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ref)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&ref->entry);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ref);</span><br><span style="color: hsl(0, 100%, 40%);">- return 1;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* return the gsm_lchan for the CBCH (if it exists at all) */</span><br><span> struct gsm_lchan *gsm_bts_get_cbch(struct gsm_bts *bts)</span><br><span> {</span><br><span>diff --git a/src/osmo-bsc/handover_decision.c b/src/osmo-bsc/handover_decision.c</span><br><span>index 7eb8f31..1eeb277 100644</span><br><span>--- a/src/osmo-bsc/handover_decision.c</span><br><span>+++ b/src/osmo-bsc/handover_decision.c</span><br><span>@@ -201,8 +201,7 @@</span><br><span> req = (struct handover_out_req){</span><br><span> .from_hodec_id = HODEC1,</span><br><span> .old_lchan = mr->lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- .target_nik = {</span><br><span style="color: hsl(0, 100%, 40%);">- .from_bts = bts->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ .target_cell_ab = {</span><br><span> .arfcn = best_cell->arfcn,</span><br><span> .bsic = best_cell->bsic,</span><br><span> },</span><br><span>diff --git a/src/osmo-bsc/handover_decision_2.c b/src/osmo-bsc/handover_decision_2.c</span><br><span>index 0d0391c..b397a9a 100644</span><br><span>--- a/src/osmo-bsc/handover_decision_2.c</span><br><span>+++ b/src/osmo-bsc/handover_decision_2.c</span><br><span>@@ -83,8 +83,8 @@</span><br><span> #define LOGPHOCAND(candidate, level, fmt, args...) do {\</span><br><span> if ((candidate)->target.bts) \</span><br><span> LOGPHOLCHANTOBTS((candidate)->current.lchan, (candidate)->target.bts, level, fmt, ## args); \</span><br><span style="color: hsl(0, 100%, 40%);">- else if ((candidate)->target.cil) \</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPHOLCHANTOREMOTE((candidate)->current.lchan, (candidate)->target.cil, level, fmt, ## args); \</span><br><span style="color: hsl(120, 100%, 40%);">+ else if ((candidate)->target.cell_ids.id_list_len) \</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPHOLCHANTOREMOTE((candidate)->current.lchan, &(candidate)->target.cell_ids, level, fmt, ## args); \</span><br><span> } while(0)</span><br><span> </span><br><span> </span><br><span>@@ -120,8 +120,8 @@</span><br><span> int lchan_frees_tchh;</span><br><span> } current;</span><br><span> struct {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key nik; /* neighbor ARFCN+BSIC */</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *cil; /* target cells in remote BSS */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab; /* neighbor ARFCN+BSIC */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 cell_ids; /* target cells in remote BSS */</span><br><span> struct gsm_bts *bts;</span><br><span> int rxlev;</span><br><span> int rxlev_afs_bias;</span><br><span>@@ -747,9 +747,9 @@</span><br><span> /* Requirement A */</span><br><span> </span><br><span> /* the handover penalty timer must not run for this bts */</span><br><span style="color: hsl(0, 100%, 40%);">- penalty_time = penalty_timers_remaining_list(&c->current.lchan->conn->hodec2.penalty_timers, c->target.cil);</span><br><span style="color: hsl(120, 100%, 40%);">+ penalty_time = penalty_timers_remaining_list(&c->current.lchan->conn->hodec2.penalty_timers, &c->target.cell_ids);</span><br><span> if (penalty_time) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPHOLCHANTOREMOTE(c->current.lchan, c->target.cil, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPHOLCHANTOREMOTE(c->current.lchan, &c->target.cell_ids, LOGL_DEBUG,</span><br><span> "not a candidate, target BSS still in penalty time"</span><br><span> " (%u seconds left)\n", penalty_time);</span><br><span> return;</span><br><span>@@ -879,9 +879,9 @@</span><br><span> req = (struct handover_out_req){</span><br><span> .from_hodec_id = HODEC2,</span><br><span> .old_lchan = c->current.lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- .target_nik = *bts_ident_key(c->target.bts),</span><br><span> .new_lchan_type = full_rate? GSM_LCHAN_TCH_F : GSM_LCHAN_TCH_H,</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cell_ab(&req.target_cell_ab, c->target.bts);</span><br><span> handover_request(&req);</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -890,14 +890,14 @@</span><br><span> {</span><br><span> struct handover_out_req req;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGPHOLCHANTOREMOTE(c->current.lchan, c->target.cil, LOGL_INFO,</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPHOLCHANTOREMOTE(c->current.lchan, &c->target.cell_ids, LOGL_INFO,</span><br><span> "Triggering inter-BSC handover, due to %s\n",</span><br><span> ho_reason_name(global_ho_reason));</span><br><span> </span><br><span> req = (struct handover_out_req){</span><br><span> .from_hodec_id = HODEC2,</span><br><span> .old_lchan = c->current.lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- .target_nik = c->target.nik,</span><br><span style="color: hsl(120, 100%, 40%);">+ .target_cell_ab = c->target.ab,</span><br><span> };</span><br><span> handover_request(&req);</span><br><span> return 0;</span><br><span>@@ -933,13 +933,13 @@</span><br><span> candidate->target.free_tch##tchx, candidate->target.min_free_tch##tchx, \</span><br><span> REQUIREMENTS_ARGS(candidate->requirements, TCHX)</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!candidate->target.bts && !candidate->target.cil)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!candidate->target.bts && !candidate->target.cell_ids.id_list_len)</span><br><span> LOGPHOLCHAN(candidate->current.lchan, LOGL_DEBUG, "Empty candidate\n");</span><br><span style="color: hsl(0, 100%, 40%);">- if (candidate->target.bts && candidate->target.cil)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (candidate->target.bts && candidate->target.cell_ids.id_list_len)</span><br><span> LOGPHOLCHAN(candidate->current.lchan, LOGL_ERROR, "Invalid candidate: both local- and remote-BSS target\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (candidate->target.cil)</span><br><span style="color: hsl(0, 100%, 40%);">- LOGPHOLCHANTOREMOTE(candidate->current.lchan, candidate->target.cil, LOGL_DEBUG,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (candidate->target.cell_ids.id_list_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPHOLCHANTOREMOTE(candidate->current.lchan, &candidate->target.cell_ids, LOGL_DEBUG,</span><br><span> "RX level %d dBm -> %d dBm\n",</span><br><span> rxlev2dbm(candidate->current.rxlev), rxlev2dbm(candidate->target.rxlev));</span><br><span> </span><br><span>@@ -1052,9 +1052,8 @@</span><br><span> {</span><br><span> struct gsm_bts *bts = lchan->ts->trx->bts;</span><br><span> struct gsm_bts *neighbor_bts;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *neighbor_cil;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key ni = {</span><br><span style="color: hsl(0, 100%, 40%);">- .from_bts = bts->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 neighbor_cil;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab target_ab = {</span><br><span> .arfcn = nmp->arfcn,</span><br><span> .bsic = nmp->bsic,</span><br><span> };</span><br><span>@@ -1078,9 +1077,9 @@</span><br><span> }</span><br><span> </span><br><span> find_handover_target_cell(&neighbor_bts, &neighbor_cil,</span><br><span style="color: hsl(0, 100%, 40%);">- lchan->conn, &ni, false);</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan->conn, &target_ab, false);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_bts && !neighbor_cil) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!neighbor_bts && !neighbor_cil.id_list_len) {</span><br><span> LOGPHOBTS(bts, LOGL_DEBUG, "no neighbor ARFCN %u BSIC %u configured for this cell\n",</span><br><span> nmp->arfcn, nmp->bsic);</span><br><span> return;</span><br><span>@@ -1103,9 +1102,9 @@</span><br><span> .rxlev = rxlev_current,</span><br><span> },</span><br><span> .target = {</span><br><span style="color: hsl(0, 100%, 40%);">- .nik = ni,</span><br><span style="color: hsl(120, 100%, 40%);">+ .ab = target_ab,</span><br><span> .bts = neighbor_bts,</span><br><span style="color: hsl(0, 100%, 40%);">- .cil = neighbor_cil,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cell_ids = neighbor_cil,</span><br><span> .rxlev = neigh_meas_avg(nmp, ho_get_hodec2_rxlev_neigh_avg_win(bts->ho)),</span><br><span> },</span><br><span> };</span><br><span>diff --git a/src/osmo-bsc/handover_fsm.c b/src/osmo-bsc/handover_fsm.c</span><br><span>index 5270152..70e479f 100644</span><br><span>--- a/src/osmo-bsc/handover_fsm.c</span><br><span>+++ b/src/osmo-bsc/handover_fsm.c</span><br><span>@@ -146,7 +146,7 @@</span><br><span> snprintf(buf, sizeof(buf),</span><br><span> "("LOG_FMT_FROM_LCHAN") --HO-> (%s) " LOG_FMT_HO_SCOPE,</span><br><span> LOG_ARGS_FROM_LCHAN(conn->lchan),</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(&ho->target_cell),</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, &ho->target_cell_ab),</span><br><span> LOG_ARGS_HO_SCOPE(conn));</span><br><span> </span><br><span> else if (ho->scope & HO_INTER_BSC_IN) {</span><br><span>@@ -227,9 +227,6 @@</span><br><span> conn = req->old_lchan->conn;</span><br><span> OSMO_ASSERT(conn && conn->fi);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Make sure the handover target neighbor_ident_key contains the correct source bts nr */</span><br><span style="color: hsl(0, 100%, 40%);">- req->target_nik.from_bts = req->old_lchan->ts->trx->bts->nr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* To make sure we're allowed to start a handover, go through a gscon event dispatch. If that is accepted, the</span><br><span> * same req is passed to handover_start(). */</span><br><span> osmo_fsm_inst_dispatch(conn->fi, GSCON_EV_HANDOVER_START, req);</span><br><span>@@ -315,10 +312,10 @@</span><br><span> </span><br><span> OSMO_ASSERT(req && req->old_lchan && req->old_lchan->conn);</span><br><span> struct gsm_subscriber_connection *conn = req->old_lchan->conn;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *search_for = &req->target_nik;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cell_ab *search_for = &req->target_cell_ab;</span><br><span> struct handover *ho = &conn->ho;</span><br><span> struct gsm_bts *local_target_cell = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *remote_target_cell = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 remote_target_cells = {};</span><br><span> </span><br><span> if (conn->ho.fi) {</span><br><span> LOG_HO(conn, LOGL_ERROR, "Handover requested while another handover is ongoing; Ignore\n");</span><br><span>@@ -335,9 +332,9 @@</span><br><span> ho->from_hodec_id = req->from_hodec_id;</span><br><span> ho->new_lchan_type = req->new_lchan_type == GSM_LCHAN_NONE ?</span><br><span> req->old_lchan->type : req->new_lchan_type;</span><br><span style="color: hsl(0, 100%, 40%);">- ho->target_cell = req->target_nik;</span><br><span style="color: hsl(120, 100%, 40%);">+ ho->target_cell_ab = req->target_cell_ab;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (find_handover_target_cell(&local_target_cell, &remote_target_cell,</span><br><span style="color: hsl(120, 100%, 40%);">+ if (find_handover_target_cell(&local_target_cell, &remote_target_cells,</span><br><span> conn, search_for, true)) {</span><br><span> handover_end(conn, HO_RESULT_ERROR);</span><br><span> return;</span><br><span>@@ -349,8 +346,8 @@</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (remote_target_cell) {</span><br><span style="color: hsl(0, 100%, 40%);">- handover_start_inter_bsc_out(conn, remote_target_cell);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_target_cells.id_list_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ handover_start_inter_bsc_out(conn, &remote_target_cells);</span><br><span> return;</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/osmo-bsc/handover_logic.c b/src/osmo-bsc/handover_logic.c</span><br><span>index b0d175a..c0ed10d 100644</span><br><span>--- a/src/osmo-bsc/handover_logic.c</span><br><span>+++ b/src/osmo-bsc/handover_logic.c</span><br><span>@@ -126,7 +126,7 @@</span><br><span> return count;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/* Find out a handover target cell for the given neighbor_ident_key,</span><br><span style="color: hsl(120, 100%, 40%);">+/* Find out a handover target cell for the given arfcn_bsic,</span><br><span> * and make sure there are no ambiguous matches.</span><br><span> * Given a source BTS and a target ARFCN+BSIC, find which cell is the right handover target.</span><br><span> * ARFCN+BSIC may be re-used within and/or across BSS, so make sure that only those cells that are explicitly</span><br><span>@@ -138,22 +138,20 @@</span><br><span> * to be found.</span><br><span> */</span><br><span> int find_handover_target_cell(struct gsm_bts **local_target_cell_p,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 **remote_target_cell_p,</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_subscriber_connection *conn, const struct neighbor_ident_key *search_for,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 *remote_target_cells,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_subscriber_connection *conn,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cell_ab *search_for,</span><br><span> bool log_errors)</span><br><span> {</span><br><span> struct gsm_network *net = conn->network;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *from_bts;</span><br><span> struct gsm_bts *local_target_cell = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *remote_target_cell = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh;</span><br><span> bool ho_active;</span><br><span> bool as_active;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *from_bts = conn->lchan->ts->trx->bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ *remote_target_cells = (struct gsm0808_cell_id_list2){};</span><br><span> </span><br><span> if (local_target_cell_p)</span><br><span> *local_target_cell_p = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- if (remote_target_cell_p)</span><br><span style="color: hsl(0, 100%, 40%);">- *remote_target_cell_p = NULL;</span><br><span> </span><br><span> if (!search_for) {</span><br><span> if (log_errors)</span><br><span>@@ -161,7 +159,6 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- from_bts = gsm_bts_num(net, search_for->from_bts);</span><br><span> if (!from_bts) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR, "Handover without source cell\n");</span><br><span>@@ -174,12 +171,11 @@</span><br><span> if (!ho_active && !as_active) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR, "Cannot start Handover: Handover and Assignment disabled for this source cell (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (llist_empty(&from_bts->local_neighbors)</span><br><span style="color: hsl(0, 100%, 40%);">- && !neighbor_ident_bts_entry_exists(from_bts->nr)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&from_bts->neighbors)) {</span><br><span> /* No explicit neighbor entries exist for this BTS. Hence apply the legacy default behavior that all</span><br><span> * local cells are neighbors. */</span><br><span> struct gsm_bts *bts;</span><br><span>@@ -192,15 +188,16 @@</span><br><span> for (i = 0; i < 2; i++) {</span><br><span> bool exact_match = !i;</span><br><span> llist_for_each_entry(bts, &net->bts_list, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key bts_key = *bts_ident_key(bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (neighbor_ident_key_match(&bts_key, search_for, exact_match)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab bts_ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cell_ab(&bts_ab, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cell_ab_match(&bts_ab, search_for, exact_match)) {</span><br><span> if (local_target_cell) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR,</span><br><span> "NEIGHBOR CONFIGURATION ERROR: Multiple local cells match %s"</span><br><span> " (BTS %d and BTS %d)."</span><br><span> " Aborting Handover because of ambiguous network topology.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for),</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, search_for),</span><br><span> local_target_cell->nr, bts->nr);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span>@@ -214,7 +211,7 @@</span><br><span> if (!local_target_cell) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR, "Cannot Handover, no cell matches %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -222,14 +219,14 @@</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR,</span><br><span> "Cannot start re-assignment, Assignment disabled for this cell (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> if (local_target_cell != from_bts && !ho_active) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR,</span><br><span> "Cannot start Handover, Handover disabled for this cell (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span>@@ -243,81 +240,60 @@</span><br><span> </span><br><span> LOG_HO(conn, LOGL_DEBUG, "There are explicit neighbors configured for this cell\n");</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Iterate explicit local neighbor cells */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(neigh, &from_bts->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *neigh_bts = neigh->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key neigh_bts_key = *bts_ident_key(neigh_bts);</span><br><span style="color: hsl(0, 100%, 40%);">- neigh_bts_key.from_bts = from_bts->nr;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_HO(conn, LOGL_DEBUG, "Local neighbor %s\n", neighbor_ident_key_name(&neigh_bts_key));</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_match(&neigh_bts_key, search_for, true)) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_HO(conn, LOGL_DEBUG, "Doesn't match %s\n", neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (local_target_cell) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (log_errors)</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_HO(conn, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "NEIGHBOR CONFIGURATION ERROR: Multiple BTS match %s (BTS %d and BTS %d)."</span><br><span style="color: hsl(0, 100%, 40%);">- " Aborting Handover because of ambiguous network topology.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for), local_target_cell->nr, neigh_bts->nr);</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- local_target_cell = neigh_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (resolve_neighbors(&local_target_cell, remote_target_cells, from_bts, search_for, log_errors)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_HO(conn, LOGL_ERROR, "Cannot handover BTS %u -> %s: neighbor unknown\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->nr, cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Any matching remote-BSS neighbor cell? */</span><br><span style="color: hsl(0, 100%, 40%);">- remote_target_cell = neighbor_ident_get(net->neighbor_bss_cells, search_for);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* We have found possibly a local_target_cell (when != NULL), and / or remote_target_cells (when .id_list_len ></span><br><span style="color: hsl(120, 100%, 40%);">+ * 0). Figure out what to do with them. */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (remote_target_cell)</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_HO(conn, LOGL_DEBUG, "Found remote target cell %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_cell_id_list_name(remote_target_cell));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_target_cells->id_list_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_HO(conn, LOGL_DEBUG, "Found remote target cell(s) %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_list_name_c(OTC_SELECT, remote_target_cells));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (local_target_cell && remote_target_cell) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (local_target_cell && remote_target_cells->id_list_len) {</span><br><span> if (log_errors)</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_HO(conn, LOGL_ERROR, "NEIGHBOR CONFIGURATION ERROR: Both a local and a remote-BSS cell match %s"</span><br><span style="color: hsl(0, 100%, 40%);">- " (BTS %d and remote %s)."</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_HO(conn, LOGL_ERROR, "NEIGHBOR CONFIGURATION ERROR: Both a local and a remote-BSS cell"</span><br><span style="color: hsl(120, 100%, 40%);">+ " match BTS %u -> %s (BTS %d and remote %s)."</span><br><span> " Aborting Handover because of ambiguous network topology.\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for), local_target_cell->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_cell_id_list_name(remote_target_cell));</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->nr, cell_ab_to_str_c(OTC_SELECT, search_for), local_target_cell->bts_nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_list_name_c(OTC_SELECT, remote_target_cells));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> if (local_target_cell == from_bts && !as_active) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot start re-assignment, Assignment disabled for this cell (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot start re-assignment, Assignment disabled for this cell (BTS %u)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->nr);</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span> if (((local_target_cell && local_target_cell != from_bts)</span><br><span style="color: hsl(0, 100%, 40%);">- || remote_target_cell)</span><br><span style="color: hsl(120, 100%, 40%);">+ || remote_target_cells->id_list_len)</span><br><span> && !ho_active) {</span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Cannot start Handover, Handover disabled for this cell (%s)\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ "Cannot start Handover, Handover disabled for this cell (BTS %u -> %s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->bts_nr, cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /* Return the result. After above checks, only one of local or remote cell has been found. */</span><br><span> if (local_target_cell) {</span><br><span> if (local_target_cell_p)</span><br><span> *local_target_cell_p = local_target_cell;</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (remote_target_cell) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (remote_target_cell_p)</span><br><span style="color: hsl(0, 100%, 40%);">- *remote_target_cell_p = remote_target_cell;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_target_cells->id_list_len)</span><br><span> return 0;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> </span><br><span> if (log_errors)</span><br><span> LOG_HO(conn, LOGL_ERROR, "Cannot handover %s: neighbor unknown\n",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(search_for));</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, search_for));</span><br><span> </span><br><span> return -ENODEV;</span><br><span> }</span><br><span>diff --git a/src/osmo-bsc/neighbor_ident.c b/src/osmo-bsc/neighbor_ident.c</span><br><span>index 3235508..b7ac7c9 100644</span><br><span>--- a/src/osmo-bsc/neighbor_ident.c</span><br><span>+++ b/src/osmo-bsc/neighbor_ident.c</span><br><span>@@ -40,88 +40,232 @@</span><br><span> #include <osmocom/bsc/bts.h></span><br><span> #include <osmocom/bsc/debug.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_list {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head list;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident {</span><br><span style="color: hsl(0, 100%, 40%);">- struct llist_head entry;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key key;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm0808_cell_id_list2 val;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define APPEND_THING(func, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- int remain = buflen - (pos - buf); \</span><br><span style="color: hsl(0, 100%, 40%);">- int l = func(pos, remain, ##args); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (l < 0 || l > remain) \</span><br><span style="color: hsl(0, 100%, 40%);">- pos = buf + buflen; \</span><br><span style="color: hsl(0, 100%, 40%);">- else \</span><br><span style="color: hsl(0, 100%, 40%);">- pos += l; \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(0, 100%, 40%);">-#define APPEND_STR(fmt, args...) APPEND_THING(snprintf, fmt, ##args)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-const char *_neighbor_ident_key_name(char *buf, size_t buflen, const struct neighbor_ident_key *ni_key)</span><br><span style="color: hsl(120, 100%, 40%);">+void bts_cell_ab(struct cell_ab *arfcn_bsic, const struct gsm_bts *bts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- char *pos = buf;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR("BTS ");</span><br><span style="color: hsl(0, 100%, 40%);">- if (ni_key->from_bts == NEIGHBOR_IDENT_KEY_ANY_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR("*");</span><br><span style="color: hsl(0, 100%, 40%);">- else if (ni_key->from_bts >= 0 && ni_key->from_bts <= 255)</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR("%d", ni_key->from_bts);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR("invalid(%d)", ni_key->from_bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR(" to ");</span><br><span style="color: hsl(0, 100%, 40%);">- if (ni_key->bsic == BSIC_ANY)</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR("ARFCN %u (any BSIC)", ni_key->arfcn);</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- APPEND_STR("ARFCN %u BSIC %u", ni_key->arfcn, ni_key->bsic & 0x3f);</span><br><span style="color: hsl(0, 100%, 40%);">- return buf;</span><br><span style="color: hsl(120, 100%, 40%);">+ *arfcn_bsic = (struct cell_ab){</span><br><span style="color: hsl(120, 100%, 40%);">+ .arfcn = bts->c0->arfcn,</span><br><span style="color: hsl(120, 100%, 40%);">+ .bsic = bts->bsic,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-const char *neighbor_ident_key_name(const struct neighbor_ident_key *ni_key)</span><br><span style="color: hsl(120, 100%, 40%);">+/* Find the local gsm_bts pointer that a specific other BTS' neighbor config refers to. Return NULL if there is no such</span><br><span style="color: hsl(120, 100%, 40%);">+ * local cell in this BSS.</span><br><span style="color: hsl(120, 100%, 40%);">+ */</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_bts *resolve_local_neighbor(struct gsm_bts *from_bts, const struct neighbor *neighbor)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static char buf[64];</span><br><span style="color: hsl(0, 100%, 40%);">- return _neighbor_ident_key_name(buf, sizeof(buf), ni_key);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts_exact = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts_wildcard = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (neighbor->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_BTS_NR:</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = gsm_bts_num(bsc_gsmnet, neighbor->bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ goto check_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_CELL_ID:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Find cell id below */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* NEIGHBOR_TYPE_CELL_ID */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bts, &bsc_gsmnet->bts_list, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm_bts_cell_id(&cell_id, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm0808_cell_ids_match(&cell_id, &neighbor->cell_id.id, true)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts_exact) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHO, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "NEIGHBOR CONFIG ERROR: Multiple BTS match %s (BTS %d and BTS %d)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_name_c(OTC_SELECT, &neighbor->cell_id.id),</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_exact->nr, bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_exact = bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts_wildcard && gsm0808_cell_ids_match(&cell_id, &neighbor->cell_id.id, false))</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_wildcard = bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = (bts_exact ? : bts_wildcard);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+check_bts:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A cell cannot be its own neighbor */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bts == from_bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHO, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "NEIGHBOR CONFIG ERROR: BTS %u -> %s: this cell is configured as its own neighbor\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->nr, neighbor_to_str_c(OTC_SELECT, neighbor));</span><br><span style="color: hsl(120, 100%, 40%);">+ bts = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Double check whether ARFCN + BSIC config matches, if present. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor->cell_id.ab_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab cell_ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cell_ab(&cell_ab, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell_ab_match(&cell_ab, &neighbor->cell_id.ab, false)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHO, LOGL_ERROR, "NEIGHBOR CONFIG ERROR: Local BTS %d matches %s, but not ARFCN+BSIC %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, gsm0808_cell_id_name_c(OTC_SELECT, &neighbor->cell_id.id),</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, &cell_ab));</span><br><span style="color: hsl(120, 100%, 40%);">+ return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return bts;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_list *neighbor_ident_init(void *talloc_ctx)</span><br><span style="color: hsl(120, 100%, 40%);">+int resolve_neighbors(struct gsm_bts **local_neighbor_p, struct gsm0808_cell_id_list2 *remote_neighbors,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *from_bts, const struct cell_ab *target_ab, bool log_errors)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_list *nil = talloc_zero(talloc_ctx, struct neighbor_ident_list);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(nil);</span><br><span style="color: hsl(0, 100%, 40%);">- INIT_LLIST_HEAD(&nil->list);</span><br><span style="color: hsl(0, 100%, 40%);">- return nil;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *n;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *local_neighbor = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 remotes = {};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(n, &from_bts->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *neigh_bts = resolve_local_neighbor(from_bts, n);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neigh_bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This neighbor entry is a local cell neighbor. Do ARFCN and BSIC match? */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cell_ab(&ab, neigh_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell_ab_match(&ab, target_ab, false))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Found a local cell neighbor that matches the target_ab */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If we already found one, these are ambiguous local neighbors */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (local_neighbor) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (log_errors)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHO, LOGL_ERROR, "NEIGHBOR CONFIG ERROR:"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Local BTS %d -> %s resolves to local neighbor BTSes %u *and* %u\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->nr, cell_ab_to_str_c(OTC_SELECT, target_ab), local_neighbor->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ neigh_bts->nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOTSUP;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ local_neighbor = neigh_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (n->type == NEIGHBOR_TYPE_CELL_ID && n->cell_id.ab_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* This neighbor entry is a remote-BSS neighbor. There may be multiple remote neighbors,</span><br><span style="color: hsl(120, 100%, 40%);">+ * collect those in a gsm0808_cell_id_list2 (remote_target_cells). A limitation is that all of</span><br><span style="color: hsl(120, 100%, 40%);">+ * them need to be of the same cell id type. */</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 add_item;</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell_ab_match(&n->cell_id.ab, target_ab, false))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Convert the gsm0808_cell_id to a list, so that we can use gsm0808_cell_id_list_add(). */</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_to_list(&add_item, &n->cell_id.id);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = gsm0808_cell_id_list_add(&remotes, &add_item);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (log_errors)</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHO, LOGL_ERROR, "NEIGHBOR CONFIG ERROR:"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Local BTS %d -> %s resolves to remote-BSS neighbor %s;"</span><br><span style="color: hsl(120, 100%, 40%);">+ " Could not store this in neighbors list %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ from_bts->nr, cell_ab_to_str_c(OTC_SELECT, target_ab),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_name_c(OTC_SELECT, &n->cell_id.id),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_list_name_c(OTC_SELECT, &remotes));</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* else: neighbor entry that does not resolve to anything. */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (local_neighbor_p)</span><br><span style="color: hsl(120, 100%, 40%);">+ *local_neighbor_p = local_neighbor;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_neighbors)</span><br><span style="color: hsl(120, 100%, 40%);">+ *remote_neighbors = remotes;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!local_neighbor && !remotes.id_list_len)</span><br><span style="color: hsl(120, 100%, 40%);">+ return -ENOENT;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_free(struct neighbor_ident_list *nil)</span><br><span style="color: hsl(120, 100%, 40%);">+int cell_ab_to_str_buf(char *buf, size_t buflen, const struct cell_ab *cell)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nil)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(nil);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "ARFCN-BSIC:%u", cell->arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cell->bsic == BSIC_ANY)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "-any");</span><br><span style="color: hsl(120, 100%, 40%);">+ else {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "-%u", cell->bsic);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cell->bsic > 0x3f)</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "[ERANGE>63]");</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+char *cell_ab_to_str_c(void *ctx, const struct cell_ab *cell)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 64, "ERROR", cell_ab_to_str_buf, cell)</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int neighbor_to_str_buf(char *buf, size_t buflen, const struct neighbor *n)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_strbuf sb = { .buf = buf, .len = buflen };</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (n->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_BTS_NR:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "BTS %u", n->bts_nr);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_CELL_ID:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND_NOLEN(sb, gsm0808_cell_id_name_buf, &n->cell_id.id);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n->cell_id.ab_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, " ");</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_APPEND(sb, cell_ab_to_str_buf, &n->cell_id.ab);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_UNSET:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "UNSET");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_STRBUF_PRINTF(sb, "INVALID");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return sb.chars_needed;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+char *neighbor_to_str_c(void *ctx, const struct neighbor *n)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_NAME_C_IMPL(ctx, 64, "ERROR", neighbor_to_str_buf, n);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+bool neighbor_same(const struct neighbor *a, const struct neighbor *b, bool check_cell_ab)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a == b)</span><br><span style="color: hsl(120, 100%, 40%);">+ return true;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (a->type != b->type)</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (a->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_BTS_NR:</span><br><span style="color: hsl(120, 100%, 40%);">+ return a->bts_nr == b->bts_nr;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_CELL_ID:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (check_cell_ab</span><br><span style="color: hsl(120, 100%, 40%);">+ && (a->cell_id.ab_present != b->cell_id.ab_present</span><br><span style="color: hsl(120, 100%, 40%);">+ || !cell_ab_match(&a->cell_id.ab, &b->cell_id.ab, true)))</span><br><span style="color: hsl(120, 100%, 40%);">+ return false;</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm0808_cell_ids_match(&a->cell_id.id, &b->cell_id.id, true);</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ return a->type == b->type;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* Return true when the entry matches the search_for requirements.</span><br><span> * If exact_match is false, a BSIC_ANY entry acts as wildcard to match any search_for on that ARFCN,</span><br><span style="color: hsl(0, 100%, 40%);">- * and a BSIC_ANY in search_for likewise returns any one entry that matches the ARFCN;</span><br><span style="color: hsl(0, 100%, 40%);">- * also a from_bts == NEIGHBOR_IDENT_KEY_ANY_BTS in either entry or search_for will match.</span><br><span style="color: hsl(0, 100%, 40%);">- * If exact_match is true, only identical bsic values and identical from_bts values return a match.</span><br><span style="color: hsl(120, 100%, 40%);">+ * and a BSIC_ANY in search_for likewise returns any one entry that matches the ARFCN.</span><br><span style="color: hsl(120, 100%, 40%);">+ * If exact_match is true, only identical bsic values return a match.</span><br><span> * Note, typically wildcard BSICs are only in entry, e.g. the user configured list, and search_for</span><br><span> * contains a specific BSIC, e.g. as received from a Measurement Report. */</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_key_match(const struct neighbor_ident_key *entry,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *search_for,</span><br><span style="color: hsl(0, 100%, 40%);">- bool exact_match)</span><br><span style="color: hsl(120, 100%, 40%);">+bool cell_ab_match(const struct cell_ab *entry,</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct cell_ab *search_for,</span><br><span style="color: hsl(120, 100%, 40%);">+ bool exact_match)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (exact_match</span><br><span style="color: hsl(0, 100%, 40%);">- && entry->from_bts != search_for->from_bts)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (search_for->from_bts != NEIGHBOR_IDENT_KEY_ANY_BTS</span><br><span style="color: hsl(0, 100%, 40%);">- && entry->from_bts != NEIGHBOR_IDENT_KEY_ANY_BTS</span><br><span style="color: hsl(0, 100%, 40%);">- && entry->from_bts != search_for->from_bts)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> if (entry->arfcn != search_for->arfcn)</span><br><span> return false;</span><br><span> </span><br><span>@@ -134,144 +278,13 @@</span><br><span> return entry->bsic == search_for->bsic;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct neighbor_ident *_neighbor_ident_get(const struct neighbor_ident_list *nil,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- bool exact_match)</span><br><span style="color: hsl(120, 100%, 40%);">+bool cell_ab_valid(const struct cell_ab *cell)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *ni;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *wildcard_match = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Do both exact-bsic and wildcard matching in the same iteration:</span><br><span style="color: hsl(0, 100%, 40%);">- * Any exact match returns immediately, while for a wildcard match we still go through all</span><br><span style="color: hsl(0, 100%, 40%);">- * remaining items in case an exact match exists. */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(ni, &nil->list, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (neighbor_ident_key_match(&ni->key, key, true))</span><br><span style="color: hsl(0, 100%, 40%);">- return ni;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!exact_match) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (neighbor_ident_key_match(&ni->key, key, false))</span><br><span style="color: hsl(0, 100%, 40%);">- wildcard_match = ni;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return wildcard_match;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static void _neighbor_ident_free(struct neighbor_ident *ni)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- llist_del(&ni->entry);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(ni);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_key_valid(const struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (key->from_bts != NEIGHBOR_IDENT_KEY_ANY_BTS</span><br><span style="color: hsl(0, 100%, 40%);">- && (key->from_bts < 0 || key->from_bts > 255))</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (key->bsic != BSIC_ANY && key->bsic > 0x3f)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (cell->bsic != BSIC_ANY && cell->bsic > 0x3f)</span><br><span> return false;</span><br><span> return true;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*! Add Cell Identifiers to an ARFCN+BSIC entry.</span><br><span style="color: hsl(0, 100%, 40%);">- * Exactly one kind of identifier is allowed per ARFCN+BSIC entry, and any number of entries of that kind</span><br><span style="color: hsl(0, 100%, 40%);">- * may be added up to the capacity of gsm0808_cell_id_list2, by one or more calls to this function. To</span><br><span style="color: hsl(0, 100%, 40%);">- * replace an existing entry, first call neighbor_ident_del(nil, key).</span><br><span style="color: hsl(0, 100%, 40%);">- * \returns number of entries in the resulting identifier list, or negative on error:</span><br><span style="color: hsl(0, 100%, 40%);">- * see gsm0808_cell_id_list_add() for the meaning of returned error codes;</span><br><span style="color: hsl(0, 100%, 40%);">- * return -ENOMEM when the list is not initialized, -ERANGE when the BSIC value is too large. */</span><br><span style="color: hsl(0, 100%, 40%);">-int neighbor_ident_add(struct neighbor_ident_list *nil, const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *ni;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nil)</span><br><span style="color: hsl(0, 100%, 40%);">- return -ENOMEM;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_valid(key))</span><br><span style="color: hsl(0, 100%, 40%);">- return -ERANGE;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ni = _neighbor_ident_get(nil, key, true);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ni) {</span><br><span style="color: hsl(0, 100%, 40%);">- ni = talloc_zero(nil, struct neighbor_ident);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(ni);</span><br><span style="color: hsl(0, 100%, 40%);">- *ni = (struct neighbor_ident){</span><br><span style="color: hsl(0, 100%, 40%);">- .key = *key,</span><br><span style="color: hsl(0, 100%, 40%);">- .val = *val,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- llist_add_tail(&ni->entry, &nil->list);</span><br><span style="color: hsl(0, 100%, 40%);">- return ni->val.id_list_len;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm0808_cell_id_list_add(&ni->val, val);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- return rc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return ni->val.id_list_len;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! Find cell identity for given BTS, ARFCN and BSIC, as previously added by neighbor_ident_add().</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-const struct gsm0808_cell_id_list2 *neighbor_ident_get(const struct neighbor_ident_list *nil,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *ni;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nil)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- ni = _neighbor_ident_get(nil, key, false);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ni)</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- return &ni->val;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_del(struct neighbor_ident_list *nil, const struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *ni;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nil)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- ni = _neighbor_ident_get(nil, key, true);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!ni)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- _neighbor_ident_free(ni);</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_clear(struct neighbor_ident_list *nil)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *ni;</span><br><span style="color: hsl(0, 100%, 40%);">- while ((ni = llist_first_entry_or_null(&nil->list, struct neighbor_ident, entry)))</span><br><span style="color: hsl(0, 100%, 40%);">- _neighbor_ident_free(ni);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*! Iterate all neighbor_ident_list entries and call iter_cb for each.</span><br><span style="color: hsl(0, 100%, 40%);">- * If iter_cb returns false, the iteration is stopped. */</span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_iter(const struct neighbor_ident_list *nil,</span><br><span style="color: hsl(0, 100%, 40%);">- bool (* iter_cb )(const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val,</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data),</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident *ni, *ni_next;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!nil)</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry_safe(ni, ni_next, &nil->list, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!iter_cb(&ni->key, &ni->val, cb_data))</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct neighbor_ident_key *bts_ident_key(const struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- static struct neighbor_ident_key key;</span><br><span style="color: hsl(0, 100%, 40%);">- key = (struct neighbor_ident_key){</span><br><span style="color: hsl(0, 100%, 40%);">- .from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS,</span><br><span style="color: hsl(0, 100%, 40%);">- .arfcn = bts->c0->arfcn,</span><br><span style="color: hsl(0, 100%, 40%);">- .bsic = bts->bsic,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- return &key;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /* Neighbor Resolution CTRL iface */</span><br><span> </span><br><span> CTRL_CMD_DEFINE_RO(neighbor_resolve_cgi_ps_from_lac_ci, "neighbor_resolve_cgi_ps_from_lac_ci");</span><br><span>@@ -293,13 +306,12 @@</span><br><span> {</span><br><span> struct gsm_network *net = (struct gsm_network *)data;</span><br><span> struct gsm_bts *bts_tmp, *bts_found = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *tgt_cell_li = NULL;</span><br><span> char *tmp = NULL, *tok, *saveptr;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key ni;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab;</span><br><span> unsigned lac, cell_id;</span><br><span> struct osmo_cell_global_id_ps local_cgi_ps;</span><br><span> const struct osmo_cell_global_id_ps *cgi_ps = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *neigh;</span><br><span> </span><br><span> if (!cmd->variable)</span><br><span> goto fmt_err;</span><br><span>@@ -324,13 +336,11 @@</span><br><span> </span><br><span> if (!(tok = strtok_r(NULL, ".", &saveptr)))</span><br><span> goto fmt_err;</span><br><span style="color: hsl(0, 100%, 40%);">- ni.arfcn = atoi(tok);</span><br><span style="color: hsl(120, 100%, 40%);">+ ab.arfcn = atoi(tok);</span><br><span> </span><br><span> if (!(tok = strtok_r(NULL, "\0", &saveptr)))</span><br><span> goto fmt_err;</span><br><span style="color: hsl(0, 100%, 40%);">- ni.bsic = atoi(tok);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- ni.from_bts = NEIGHBOR_IDENT_KEY_ANY_BTS;</span><br><span style="color: hsl(120, 100%, 40%);">+ ab.bsic = atoi(tok);</span><br><span> </span><br><span> llist_for_each_entry(bts_tmp, &net->bts_list, list) {</span><br><span> if (bts_tmp->location_area_code != lac)</span><br><span>@@ -338,38 +348,37 @@</span><br><span> if (bts_tmp->cell_identity != cell_id)</span><br><span> continue;</span><br><span> bts_found = bts_tmp;</span><br><span style="color: hsl(0, 100%, 40%);">- ni.from_bts = bts_tmp->nr;</span><br><span> break;</span><br><span> }</span><br><span> </span><br><span> if (!bts_found)</span><br><span> goto notfound_err;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOG_BTS(bts_found, DLINP, LOGL_DEBUG, "Resolving neigbhor arfcn=%u bsic=%u\n", ni.arfcn, ni.bsic);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_BTS(bts_found, DLINP, LOGL_DEBUG, "Resolving neigbhor %s\n", cell_ab_to_str_c(OTC_SELECT, &ab));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_valid(&ni))</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell_ab_valid(&ab))</span><br><span> goto fmt_err;</span><br><span> </span><br><span> /* Is there a local BTS that matches the key? */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(neigh, &bts_found->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *neigh_bts = neigh->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key *neigh_bts_key = bts_ident_key(neigh_bts);</span><br><span style="color: hsl(0, 100%, 40%);">- neigh_bts_key->from_bts = ni.from_bts;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_match(neigh_bts_key, &ni, true))</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- if (gsm_bts_get_cgi_ps(neigh->bts, &local_cgi_ps) < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- continue; /* Not supporting GPRS */</span><br><span style="color: hsl(0, 100%, 40%);">- cgi_ps = &local_cgi_ps;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(neigh, &bts_found->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *neigh_bts = resolve_local_neighbor(bts_found, neigh);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neigh_bts) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A local neighbor */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm_bts_get_cgi_ps(neigh_bts, &local_cgi_ps) < 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue; /* Not supporting GPRS */</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi_ps = &local_cgi_ps;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ } else if (neigh->type == NEIGHBOR_TYPE_CELL_ID</span><br><span style="color: hsl(120, 100%, 40%);">+ && neigh->cell_id.id.id_discr == CELL_IDENT_WHOLE_GLOBAL_PS) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* A remote PS neighbor */</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi_ps = &neigh->cell_id.id.id.global_ps;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* No local neighbor found, looking for remote neighbors */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cgi_ps) {</span><br><span style="color: hsl(0, 100%, 40%);">- tgt_cell_li = neighbor_ident_get(net->neighbor_bss_cells, &ni);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!tgt_cell_li || tgt_cell_li->id_discr != CELL_IDENT_WHOLE_GLOBAL_PS || tgt_cell_li->id_list_len < 1)</span><br><span style="color: hsl(0, 100%, 40%);">- goto notfound_err;</span><br><span style="color: hsl(0, 100%, 40%);">- cgi_ps = &tgt_cell_li->id_list[0].global_ps;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* No neighbor found */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cgi_ps)</span><br><span style="color: hsl(120, 100%, 40%);">+ goto notfound_err;</span><br><span> </span><br><span> ctrl_cmd_reply_printf(cmd, "%s", osmo_cgi_ps_name(cgi_ps));</span><br><span> talloc_free(tmp);</span><br><span>diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>index 72c11b0..90c8790 100644</span><br><span>--- a/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>+++ b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>@@ -35,43 +35,6 @@</span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/bts.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_network *g_net = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-static struct neighbor_ident_list *g_neighbor_cells = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* Parse VTY parameters matching NEIGHBOR_IDENT_VTY_KEY_PARAMS. Pass a pointer so that argv[0] is the</span><br><span style="color: hsl(0, 100%, 40%);">- * ARFCN value followed by the BSIC keyword and value. vty *must* reference a BTS_NODE. */</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_vty_parse_key_params(struct vty *vty, const char **argv,</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(vty->node == BTS_NODE);</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return neighbor_ident_bts_parse_key_params(vty, bts, argv, key);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/* same as neighbor_ident_vty_parse_key_params() but pass an explicit bts, so it works on any node. */</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_bts_parse_key_params(struct vty *vty, struct gsm_bts *bts, const char **argv,</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- const char *arfcn_str = argv[0];</span><br><span style="color: hsl(0, 100%, 40%);">- const char *bsic_str = argv[1];</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- *key = (struct neighbor_ident_key){</span><br><span style="color: hsl(0, 100%, 40%);">- .from_bts = bts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- .arfcn = atoi(arfcn_str),</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!strcmp(bsic_str, "any"))</span><br><span style="color: hsl(0, 100%, 40%);">- key->bsic = BSIC_ANY;</span><br><span style="color: hsl(0, 100%, 40%);">- else</span><br><span style="color: hsl(0, 100%, 40%);">- key->bsic = atoi(bsic_str);</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #define NEIGHBOR_ADD_CMD "neighbor "</span><br><span> #define NEIGHBOR_DEL_CMD "no neighbor "</span><br><span> #define NEIGHBOR_DOC "Manage local and remote-BSS neighbor cells\n"</span><br><span>@@ -79,67 +42,51 @@</span><br><span> #define NEIGHBOR_DEL_DOC NO_STR "Remove local or remote-BSS neighbor cell\n"</span><br><span> </span><br><span> #define LAC_PARAMS "lac <0-65535>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_ARGC 1</span><br><span> #define LAC_DOC "Neighbor cell by LAC\n" "LAC\n"</span><br><span> </span><br><span> #define LAC_CI_PARAMS "lac-ci <0-65535> <0-65535>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define LAC_CI_ARGC 2</span><br><span> #define LAC_CI_DOC "Neighbor cell by LAC and CI\n" "LAC\n" "CI\n"</span><br><span> </span><br><span> #define CGI_PARAMS "cgi <0-999> <0-999> <0-65535> <0-65535>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CGI_ARGC 4</span><br><span> #define CGI_DOC "Neighbor cell by cgi\n" "MCC\n" "MNC\n" "LAC\n" "CI\n"</span><br><span> </span><br><span> #define CGI_PS_PARAMS "cgi-ps <0-999> <0-999> <0-65535> <0-255> <0-65535>"</span><br><span style="color: hsl(120, 100%, 40%);">+#define CGI_PS_ARGC 5</span><br><span> #define CGI_PS_DOC "Neighbor cell by cgi (Packet Switched, with RAC)\n" "MCC\n" "MNC\n" "LAC\n" "RAC\n" "CI\n"</span><br><span> </span><br><span> #define LOCAL_BTS_PARAMS "bts <0-255>"</span><br><span> #define LOCAL_BTS_DOC "Neighbor cell by local BTS number\n" "BTS number\n"</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_bts *neighbor_ident_vty_parse_bts_nr(struct vty *vty, const char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+static int neighbor_ident_vty_parse_lac(struct vty *vty, struct gsm0808_cell_id *cell_id, const char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *bts_nr_str = argv[0];</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = gsm_bts_num(g_net, atoi(bts_nr_str));</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No such BTS: nr = %s%s\n", bts_nr_str, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return bts;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm_bts *bts_by_cell_id(struct vty *vty, struct gsm0808_cell_id *cell_id)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = gsm_bts_by_cell_id(g_net, cell_id, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No such BTS: %s%s\n", gsm0808_cell_id_name(cell_id), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return bts;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm0808_cell_id *neighbor_ident_vty_parse_lac(struct vty *vty, const char **argv)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- static struct gsm0808_cell_id cell_id;</span><br><span style="color: hsl(0, 100%, 40%);">- cell_id = (struct gsm0808_cell_id){</span><br><span style="color: hsl(120, 100%, 40%);">+ *cell_id = (struct gsm0808_cell_id){</span><br><span> .id_discr = CELL_IDENT_LAC,</span><br><span> .id.lac = atoi(argv[0]),</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- return &cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm0808_cell_id *neighbor_ident_vty_parse_lac_ci(struct vty *vty, const char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+static int neighbor_ident_vty_parse_lac_ci(struct vty *vty, struct gsm0808_cell_id *cell_id, const char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static struct gsm0808_cell_id cell_id;</span><br><span style="color: hsl(0, 100%, 40%);">- cell_id = (struct gsm0808_cell_id){</span><br><span style="color: hsl(120, 100%, 40%);">+ *cell_id = (struct gsm0808_cell_id){</span><br><span> .id_discr = CELL_IDENT_LAC_AND_CI,</span><br><span> .id.lac_and_ci = {</span><br><span> .lac = atoi(argv[0]),</span><br><span> .ci = atoi(argv[1]),</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- return &cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm0808_cell_id *neighbor_ident_vty_parse_cgi(struct vty *vty, const char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+static int neighbor_ident_vty_parse_cgi(struct vty *vty, struct gsm0808_cell_id *cell_id, const char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static struct gsm0808_cell_id cell_id;</span><br><span style="color: hsl(0, 100%, 40%);">- cell_id = (struct gsm0808_cell_id){</span><br><span style="color: hsl(120, 100%, 40%);">+ *cell_id = (struct gsm0808_cell_id){</span><br><span> .id_discr = CELL_IDENT_WHOLE_GLOBAL,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_cell_global_id *cgi = &cell_id.id.global;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_cell_global_id *cgi = &cell_id->id.global;</span><br><span> const char *mcc = argv[0];</span><br><span> const char *mnc = argv[1];</span><br><span> const char *lac = argv[2];</span><br><span>@@ -147,25 +94,25 @@</span><br><span> </span><br><span> if (osmo_mcc_from_str(mcc, &cgi->lai.plmn.mcc)) {</span><br><span> vty_out(vty, "%% Error decoding MCC: %s%s", mcc, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> if (osmo_mnc_from_str(mnc, &cgi->lai.plmn.mnc, &cgi->lai.plmn.mnc_3_digits)) {</span><br><span> vty_out(vty, "%% Error decoding MNC: %s%s", mnc, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> cgi->lai.lac = atoi(lac);</span><br><span> cgi->cell_identity = atoi(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- return &cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct gsm0808_cell_id *neighbor_ident_vty_parse_cgi_ps(struct vty *vty, const char **argv)</span><br><span style="color: hsl(120, 100%, 40%);">+static int neighbor_ident_vty_parse_cgi_ps(struct vty *vty, struct gsm0808_cell_id *cell_id, const char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- static struct gsm0808_cell_id cell_id = {</span><br><span style="color: hsl(120, 100%, 40%);">+ *cell_id = (struct gsm0808_cell_id){</span><br><span> .id_discr = CELL_IDENT_WHOLE_GLOBAL_PS,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_cell_global_id_ps *cgi_ps = &cell_id.id.global_ps;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_cell_global_id_ps *cgi_ps = &cell_id->id.global_ps;</span><br><span> const char *mcc = argv[0];</span><br><span> const char *mnc = argv[1];</span><br><span> const char *lac = argv[2];</span><br><span>@@ -174,400 +121,351 @@</span><br><span> </span><br><span> if (osmo_mcc_from_str(mcc, &cgi_ps->rai.lac.plmn.mcc)) {</span><br><span> vty_out(vty, "%% Error decoding MCC: %s%s", mcc, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> if (osmo_mnc_from_str(mnc, &cgi_ps->rai.lac.plmn.mnc, &cgi_ps->rai.lac.plmn.mnc_3_digits)) {</span><br><span> vty_out(vty, "%% Error decoding MNC: %s%s", mnc, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span> </span><br><span> cgi_ps->rai.lac.lac = atoi(lac);</span><br><span> cgi_ps->rai.rac = atoi(rac);</span><br><span> cgi_ps->cell_identity = atoi(ci);</span><br><span style="color: hsl(0, 100%, 40%);">- return &cell_id;</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int add_local_bts(struct vty *vty, struct gsm_bts *neigh)</span><br><span style="color: hsl(120, 100%, 40%);">+void neighbor_ident_vty_parse_arfcn_bsic(struct cell_ab *ab, const char **argv)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *arfcn_str = argv[0];</span><br><span style="color: hsl(120, 100%, 40%);">+ const char *bsic_str = argv[1];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ *ab = (struct cell_ab){</span><br><span style="color: hsl(120, 100%, 40%);">+ .arfcn = atoi(arfcn_str),</span><br><span style="color: hsl(120, 100%, 40%);">+ .bsic = (!strcmp(bsic_str, "any")) ? BSIC_ANY : atoi(bsic_str),</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int add_neighbor(struct vty *vty, struct neighbor *n)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- if (vty->node != BTS_NODE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot add local BTS neighbor, not on BTS node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *neighbor;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT((vty->node == BTS_NODE) && bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(neighbor, &bts->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Check against duplicates */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_same(neighbor, n, false)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Found a match on Cell ID or BTS number, without ARFCN+BSIC. If they are fully identical, ignore the</span><br><span style="color: hsl(120, 100%, 40%);">+ * duplicate. If the ARFCN+BSIC part differs, it's an error. */</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS %u already had neighbor %s%s", bts->nr, neighbor_to_str_c(OTC_SELECT, neighbor),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!neighbor_same(neighbor, n, true)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_to_str_c(OTC_SELECT, n), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Exact same neighbor again, just ignore. */</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Allow only one cell ID per remote-BSS neighbor, see OS#3656 */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n->type == NEIGHBOR_TYPE_CELL_ID</span><br><span style="color: hsl(120, 100%, 40%);">+ && n->cell_id.ab_present && neighbor->cell_id.ab_present</span><br><span style="color: hsl(120, 100%, 40%);">+ && cell_ab_match(&n->cell_id.ab, &neighbor->cell_id.ab, true)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: only one Cell Identifier entry is allowed per remote neighbor."</span><br><span style="color: hsl(120, 100%, 40%);">+ " Already have: BTS %u -> %s%s", bts->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_to_str_c(OTC_SELECT, neighbor), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot add local BTS neighbor, no BTS on this node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neigh) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot add local BTS neighbor to BTS %u, no such neighbor BTS%s"</span><br><span style="color: hsl(0, 100%, 40%);">- "%% (To add remote-BSS neighbors, pass full ARFCN and BSIC as well)%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, VTY_NEWLINE, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm_bts_local_neighbor_add(bts, neigh);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot add local BTS %u as neighbor to BTS %u: %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neigh->nr, bts->nr, strerror(-rc), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- } else</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% BTS %u %s local neighbor BTS %u with LAC %u CI %u and ARFCN %u BSIC %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, rc? "now has" : "already had",</span><br><span style="color: hsl(0, 100%, 40%);">- neigh->nr, neigh->location_area_code, neigh->cell_identity,</span><br><span style="color: hsl(0, 100%, 40%);">- neigh->c0->arfcn, neigh->bsic, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor = talloc_zero(bts, struct neighbor);</span><br><span style="color: hsl(120, 100%, 40%);">+ *neighbor = *n;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&neighbor->entry, &bts->neighbors);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int del_local_bts(struct vty *vty, struct gsm_bts *neigh)</span><br><span style="color: hsl(120, 100%, 40%);">+static int del_neighbor(struct vty *vty, struct neighbor *n)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- if (vty->node != BTS_NODE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot remove local BTS neighbor, not on BTS node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *neighbor;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT((vty->node == BTS_NODE) && bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(neighbor, &bts->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor->type != n->type)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (n->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_BTS_NR:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor->bts_nr == n->bts_nr)</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_CELL_ID:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (gsm0808_cell_ids_match(&neighbor->cell_id.id, &n->cell_id.id, true))</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&neighbor->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(neighbor);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot remove local BTS neighbor, no BTS on this node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error: no such neighbor on BTS %d: %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, neighbor_to_str_c(OTC_SELECT, n), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+static int del_neighbor_by_cell_ab(struct vty *vty, const struct cell_ab *cell_ab)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *neighbor, *safe;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *neighbor_bts;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab neighbor_ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ int count = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT((vty->node == BTS_NODE) && bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry_safe(neighbor, safe, &bts->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (neighbor->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_BTS_NR:</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_bts = resolve_local_neighbor(bts, neighbor);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!neighbor_bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ bts_cell_ab(&neighbor_ab, neighbor_bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell_ab_match(&neighbor_ab, cell_ab, false))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_CELL_ID:</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!neighbor->cell_id.ab_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!cell_ab_match(&neighbor->cell_id.ab, cell_ab, false))</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&neighbor->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(neighbor);</span><br><span style="color: hsl(120, 100%, 40%);">+ count++;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neigh) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot remove local BTS neighbor from BTS %u, no such neighbor BTS%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm_bts_local_neighbor_del(bts, neigh);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot remove local BTS %u neighbor from BTS %u: %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neigh->nr, bts->nr, strerror(-rc), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc == 0)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% BTS %u is no neighbor of BTS %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neigh->nr, bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (count)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Cannot remove: no such neighbor on BTS %u: %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, cell_ab_to_str_c(OTC_SELECT, cell_ab), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_bts_nr, cfg_neighbor_add_bts_nr_cmd,</span><br><span> NEIGHBOR_ADD_CMD LOCAL_BTS_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC LOCAL_BTS_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return add_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_BTS_NR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .bts_nr = atoi(argv[0]),</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac, cfg_neighbor_add_lac_cmd,</span><br><span> NEIGHBOR_ADD_CMD LAC_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC LAC_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac(vty, argv)));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_lac(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac_ci, cfg_neighbor_add_lac_ci_cmd,</span><br><span> NEIGHBOR_ADD_CMD LAC_CI_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC LAC_CI_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_lac_ci(vty, argv)));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_lac_ci(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_cgi, cfg_neighbor_add_cgi_cmd,</span><br><span> NEIGHBOR_ADD_CMD CGI_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC CGI_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_cgi(vty, argv)));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_cgi(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_cgi_ps, cfg_neighbor_add_cgi_ps_cmd,</span><br><span> NEIGHBOR_ADD_CMD CGI_PS_PARAMS,</span><br><span> NEIGHBOR_ADD_DOC CGI_PS_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return add_local_bts(vty, bts_by_cell_id(vty, neighbor_ident_vty_parse_cgi_ps(vty, argv)));</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_key_matches_bts(const struct neighbor_ident_key *key, struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts || !key)</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- return key->arfcn == bts->c0->arfcn</span><br><span style="color: hsl(0, 100%, 40%);">- && (key->bsic == BSIC_ANY || key->bsic == bts->bsic);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int add_remote_or_local_bts(struct vty *vty, const struct gsm0808_cell_id *cell_id,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *local_neigh;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *exists;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm0808_cell_id_list2 cil;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (vty->node != BTS_NODE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot add BTS neighbor, not on BTS node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot add BTS neighbor, no BTS on this node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Is there a local BTS that matches the cell_id? */</span><br><span style="color: hsl(0, 100%, 40%);">- local_neigh = gsm_bts_by_cell_id(g_net, cell_id, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (local_neigh) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* But do the advertised ARFCN and BSIC match as intended?</span><br><span style="color: hsl(0, 100%, 40%);">- * The user may omit ARFCN and BSIC for local cells, but if they are provided,</span><br><span style="color: hsl(0, 100%, 40%);">- * they need to match. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_matches_bts(key, local_neigh)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: bts %u: neighbor cell id %s indicates local BTS %u,"</span><br><span style="color: hsl(0, 100%, 40%);">- " but it does not match ARFCN+BSIC %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, gsm0808_cell_id_name(cell_id), local_neigh->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(key), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- /* TODO: error out fatally for non-interactive VTY? */</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return add_local_bts(vty, local_neigh);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Allow only one cell ID per remote-BSS neighbor, see OS#3656 */</span><br><span style="color: hsl(0, 100%, 40%);">- exists = neighbor_ident_get(g_neighbor_cells, key);</span><br><span style="color: hsl(0, 100%, 40%);">- if (exists) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: only one Cell Identifier entry is allowed per remote neighbor."</span><br><span style="color: hsl(0, 100%, 40%);">- " Already have: %s -> %s%s", neighbor_ident_key_name(key),</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_cell_id_list_name(exists), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* The cell_id is not known in this BSS, so it must be a remote cell. */</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_cell_id_to_list(&cil, cell_id);</span><br><span style="color: hsl(0, 100%, 40%);">- rc = neighbor_ident_add(g_neighbor_cells, key, &cil);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- const char *reason;</span><br><span style="color: hsl(0, 100%, 40%);">- switch (rc) {</span><br><span style="color: hsl(0, 100%, 40%);">- case -EINVAL:</span><br><span style="color: hsl(0, 100%, 40%);">- reason = ": mismatching type between current and newly added cell identifier";</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case -ENOSPC:</span><br><span style="color: hsl(0, 100%, 40%);">- reason = ": list is full";</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- reason = "";</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error adding neighbor-BSS Cell Identifier %s%s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- gsm0808_cell_id_name(cell_id), reason, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% %s now has %d remote BSS Cell Identifier List %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(key), rc, rc == 1? "entry" : "entries", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static int del_by_key(struct vty *vty, const struct neighbor_ident_key *key)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- int removed = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh, *safe;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (vty->node != BTS_NODE) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot remove BTS neighbor, not on BTS node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- if (!bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error: cannot remove BTS neighbor, no BTS on this node%s",</span><br><span style="color: hsl(0, 100%, 40%);">- VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Is there a local BTS that matches the key? */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry_safe(neigh, safe, &bts->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *neigh_bts = neigh->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_matches_bts(key, neigh->bts))</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm_bts_local_neighbor_del(bts, neigh->bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Removed local neighbor bts %u to bts %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, neigh_bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- removed += rc;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (neighbor_ident_del(g_neighbor_cells, key)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Removed remote BSS neighbor %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(key), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- removed ++;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!removed) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Cannot remove, no such neighbor: %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(key), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_SUCCESS;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct nil_match_bts_data {</span><br><span style="color: hsl(0, 100%, 40%);">- int bts_nr;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct neighbor_ident_key *found;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static bool nil_match_bts(const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val,</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct nil_match_bts_data *d = cb_data;</span><br><span style="color: hsl(0, 100%, 40%);">- if (key->from_bts == d->bts_nr) {</span><br><span style="color: hsl(0, 100%, 40%);">- d->found = key;</span><br><span style="color: hsl(0, 100%, 40%);">- return false;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-bool neighbor_ident_bts_entry_exists(uint8_t from_bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct nil_match_bts_data d = {</span><br><span style="color: hsl(0, 100%, 40%);">- .bts_nr = from_bts,</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_iter(g_neighbor_cells, nil_match_bts, &d);</span><br><span style="color: hsl(0, 100%, 40%);">- return (bool)d.found;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_cgi_ps(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> static int neighbor_del_all(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- int removed = 0;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *n;</span><br><span> OSMO_ASSERT((vty->node == BTS_NODE) && bts);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Remove all local neighbors and print to VTY for the user to know what changed */</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh = llist_first_entry_or_null(&bts->local_neighbors, struct gsm_bts_ref, entry);</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *neigh_bts;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neigh)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- neigh_bts = neigh->bts;</span><br><span style="color: hsl(0, 100%, 40%);">- OSMO_ASSERT(neigh_bts);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* It would be more efficient to just llist_del() the gsm_bts_ref directly, but for the sake of</span><br><span style="color: hsl(0, 100%, 40%);">- * safe/sane API use and against code dup, rather invoke the central gsm_bts_local_neighbor_del()</span><br><span style="color: hsl(0, 100%, 40%);">- * function intended for this task. */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = gsm_bts_local_neighbor_del(bts, neigh_bts);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc > 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Removed local neighbor bts %u to bts %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, neigh_bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- removed += rc;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error while removing local neighbor bts %u to bts %u, aborted%s",</span><br><span style="color: hsl(0, 100%, 40%);">- bts->nr, neigh_bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Remove all remote-BSS neighbors */</span><br><span style="color: hsl(0, 100%, 40%);">- while (1) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key k;</span><br><span style="color: hsl(0, 100%, 40%);">- struct nil_match_bts_data d = {</span><br><span style="color: hsl(0, 100%, 40%);">- .bts_nr = bts->nr,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_iter(g_neighbor_cells, nil_match_bts, &d);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!d.found)</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- k = *d.found;</span><br><span style="color: hsl(0, 100%, 40%);">- if (neighbor_ident_del(g_neighbor_cells, &k)) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Removed remote BSS neighbor %s%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(&k), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- removed++;</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Error while removing remote BSS neighbor %s, aborted%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(&k), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!removed)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&bts->neighbors)) {</span><br><span> vty_out(vty, "%% No neighbors configured%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Remove all local neighbors and print to VTY for the user to know what changed */</span><br><span style="color: hsl(120, 100%, 40%);">+ while ((n = llist_first_entry_or_null(&bts->neighbors, struct neighbor, entry))) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Removed neighbor: BTS %u to %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, neighbor_to_str_c(OTC_SELECT, n), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&n->entry);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(n);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac_arfcn_bsic, cfg_neighbor_add_lac_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_CMD LAC_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_DOC LAC_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_CMD LAC_PARAMS " " CELL_AB_VTY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_DOC LAC_DOC CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key nik;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac(vty, argv);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cell_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cell_id.ab_present = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_lac(vty, &n.cell_id.id, argv))</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_vty_parse_key_params(vty, argv + 1, &nik))</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- return add_remote_or_local_bts(vty, cell_id, &nik);</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + LAC_ARGC);</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_lac_ci_arfcn_bsic, cfg_neighbor_add_lac_ci_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_DOC LAC_CI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_CMD LAC_CI_PARAMS " " CELL_AB_VTY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_DOC LAC_CI_DOC CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key nik;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_lac_ci(vty, argv);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cell_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cell_id.ab_present = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_lac_ci(vty, &n.cell_id.id, argv))</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_vty_parse_key_params(vty, argv + 2, &nik))</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- return add_remote_or_local_bts(vty, cell_id, &nik);</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + LAC_CI_ARGC);</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_cgi_arfcn_bsic, cfg_neighbor_add_cgi_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_CMD CGI_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_DOC CGI_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_CMD CGI_PARAMS " " CELL_AB_VTY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_DOC CGI_DOC CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key nik;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_cgi(vty, argv);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cell_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cell_id.ab_present = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_cgi(vty, &n.cell_id.id, argv))</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_vty_parse_key_params(vty, argv + 4, &nik))</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- return add_remote_or_local_bts(vty, cell_id, &nik);</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + CGI_ARGC);</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_add_cgi_ps_arfcn_bsic, cfg_neighbor_add_cgi_ps_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_CMD CGI_PS_PARAMS " " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_ADD_DOC CGI_PS_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_CMD CGI_PS_PARAMS " " CELL_AB_VTY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_ADD_DOC CGI_PS_DOC CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key nik;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm0808_cell_id *cell_id = neighbor_ident_vty_parse_cgi_ps(vty, argv);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!cell_id)</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ .cell_id.ab_present = true,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_cgi_ps(vty, &n.cell_id.id, argv))</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_vty_parse_key_params(vty, argv + 5, &nik))</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">- return add_remote_or_local_bts(vty, cell_id, &nik);</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&n.cell_id.ab, argv + CGI_PS_ARGC);</span><br><span style="color: hsl(120, 100%, 40%);">+ return add_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_del_bts_nr, cfg_neighbor_del_bts_nr_cmd,</span><br><span> NEIGHBOR_DEL_CMD LOCAL_BTS_PARAMS,</span><br><span> NEIGHBOR_DEL_DOC LOCAL_BTS_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- return del_local_bts(vty, neighbor_ident_vty_parse_bts_nr(vty, argv));</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_BTS_NR,</span><br><span style="color: hsl(120, 100%, 40%);">+ .bts_nr = atoi(argv[0]),</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_neighbor(vty, &n);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_neighbor_del_lac, cfg_neighbor_del_lac_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_CMD LAC_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_DOC LAC_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_lac(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_neighbor(vty, &n);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_neighbor_del_lac_ci, cfg_neighbor_del_lac_ci_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_CMD LAC_CI_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_DOC LAC_CI_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_lac_ci(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_neighbor(vty, &n);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_neighbor_del_cgi, cfg_neighbor_del_cgi_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_CMD CGI_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_DOC CGI_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_cgi(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_neighbor(vty, &n);</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+DEFUN(cfg_neighbor_del_cgi_ps, cfg_neighbor_del_cgi_ps_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_CMD CGI_PS_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_DOC CGI_PS_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor n = {</span><br><span style="color: hsl(120, 100%, 40%);">+ .type = NEIGHBOR_TYPE_CELL_ID,</span><br><span style="color: hsl(120, 100%, 40%);">+ };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neighbor_ident_vty_parse_cgi_ps(vty, &n.cell_id.id, argv))</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_neighbor(vty, &n);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_del_arfcn_bsic, cfg_neighbor_del_arfcn_bsic_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_DEL_CMD NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_DEL_DOC NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_CMD CELL_AB_VTY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ NEIGHBOR_DEL_DOC CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key key;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_vty_parse_key_params(vty, argv, &key))</span><br><span style="color: hsl(0, 100%, 40%);">- return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return del_by_key(vty, &key);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&ab, argv);</span><br><span style="color: hsl(120, 100%, 40%);">+ return del_neighbor_by_cell_ab(vty, &ab);</span><br><span> }</span><br><span> </span><br><span> DEFUN(cfg_neighbor_del_all, cfg_neighbor_del_all_cmd,</span><br><span>@@ -584,133 +482,98 @@</span><br><span> NEIGHBOR_DOC "Bind Neighbor Resolution Service (CTRL interface) to given ip and port\n"</span><br><span> IP_STR IPV6_STR "Port to bind the service to [defaults to 4248 if not provided]\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_talloc_replace_string(g_net, &g_net->neigh_ctrl.addr, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_talloc_replace_string(bsc_gsmnet, &bsc_gsmnet->neigh_ctrl.addr, argv[0]);</span><br><span> if (argc > 1)</span><br><span style="color: hsl(0, 100%, 40%);">- g_net->neigh_ctrl.port = atoi(argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet->neigh_ctrl.port = atoi(argv[1]);</span><br><span> else</span><br><span style="color: hsl(0, 100%, 40%);">- g_net->neigh_ctrl.port = OSMO_CTRL_PORT_BSC_NEIGH;</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet->neigh_ctrl.port = OSMO_CTRL_PORT_BSC_NEIGH;</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span> void neighbor_ident_vty_write_network(struct vty *vty, const char *indent)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (g_net->neigh_ctrl.addr)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%sneighbor-resolution bind %s %" PRIu16 "%s", indent, g_net->neigh_ctrl.addr,</span><br><span style="color: hsl(0, 100%, 40%);">- g_net->neigh_ctrl.port, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc_gsmnet->neigh_ctrl.addr)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%sneighbor-resolution bind %s %" PRIu16 "%s", indent, bsc_gsmnet->neigh_ctrl.addr,</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet->neigh_ctrl.port, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-struct write_neighbor_ident_entry_data {</span><br><span style="color: hsl(0, 100%, 40%);">- struct vty *vty;</span><br><span style="color: hsl(0, 100%, 40%);">- const char *indent;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static bool write_neighbor_ident_list(const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val,</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data)</span><br><span style="color: hsl(120, 100%, 40%);">+static int vty_write_cell_id_u(struct vty *vty, enum CELL_IDENT id_discr, const union gsm0808_cell_id_u *cell_id_u)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct write_neighbor_ident_entry_data *d = cb_data;</span><br><span style="color: hsl(0, 100%, 40%);">- struct vty *vty = d->vty;</span><br><span style="color: hsl(0, 100%, 40%);">- int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_cell_global_id *cgi;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct osmo_cell_global_id_ps *cgi_ps;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (d->bts) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (d->bts->nr != key->from_bts)</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">- } else if (key->from_bts != NEIGHBOR_IDENT_KEY_ANY_BTS)</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-#define NEIGH_BSS_WRITE(fmt, args...) do { \</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%sneighbor " fmt " arfcn %u ", d->indent, ## args, key->arfcn); \</span><br><span style="color: hsl(0, 100%, 40%);">- if (key->bsic == BSIC_ANY) \</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "bsic any"); \</span><br><span style="color: hsl(0, 100%, 40%);">- else \</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "bsic %u", key->bsic & 0x3f); \</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%s", VTY_NEWLINE); \</span><br><span style="color: hsl(0, 100%, 40%);">- } while(0)</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (val->id_discr) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (id_discr) {</span><br><span> case CELL_IDENT_LAC:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < val->id_list_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGH_BSS_WRITE("lac %u", val->id_list[i].lac);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "lac %u", cell_id_u->lac);</span><br><span> break;</span><br><span> case CELL_IDENT_LAC_AND_CI:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < val->id_list_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGH_BSS_WRITE("lac-ci %u %u",</span><br><span style="color: hsl(0, 100%, 40%);">- val->id_list[i].lac_and_ci.lac,</span><br><span style="color: hsl(0, 100%, 40%);">- val->id_list[i].lac_and_ci.ci);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "lac-ci %u %u", cell_id_u->lac_and_ci.lac, cell_id_u->lac_and_ci.ci);</span><br><span> break;</span><br><span> case CELL_IDENT_WHOLE_GLOBAL:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < val->id_list_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_cell_global_id *cgi = &val->id_list[i].global;</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGH_BSS_WRITE("cgi %s %s %u %u",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mcc_name(cgi->lai.plmn.mcc),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mnc_name(cgi->lai.plmn.mnc, cgi->lai.plmn.mnc_3_digits),</span><br><span style="color: hsl(0, 100%, 40%);">- cgi->lai.lac, cgi->cell_identity);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi = &cell_id_u->global;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "cgi %s %s %u %u",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mcc_name(cgi->lai.plmn.mcc),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mnc_name(cgi->lai.plmn.mnc, cgi->lai.plmn.mnc_3_digits),</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi->lai.lac, cgi->cell_identity);</span><br><span> break;</span><br><span> case CELL_IDENT_WHOLE_GLOBAL_PS:</span><br><span style="color: hsl(0, 100%, 40%);">- for (i = 0; i < val->id_list_len; i++) {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_cell_global_id_ps *cgi_ps = &val->id_list[i].global_ps;</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGH_BSS_WRITE("cgi-ps %s %s %u %u %u",</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mcc_name(cgi_ps->rai.lac.plmn.mcc),</span><br><span style="color: hsl(0, 100%, 40%);">- osmo_mnc_name(cgi_ps->rai.lac.plmn.mnc, cgi_ps->rai.lac.plmn.mnc_3_digits),</span><br><span style="color: hsl(0, 100%, 40%);">- cgi_ps->rai.lac.lac, cgi_ps->rai.rac,</span><br><span style="color: hsl(0, 100%, 40%);">- cgi_ps->cell_identity);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi_ps = &cell_id_u->global_ps;</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "cgi-ps %s %s %u %u %u",</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mcc_name(cgi_ps->rai.lac.plmn.mcc),</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_mnc_name(cgi_ps->rai.lac.plmn.mnc, cgi_ps->rai.lac.plmn.mnc_3_digits),</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi_ps->rai.lac.lac, cgi_ps->rai.rac,</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi_ps->cell_identity);</span><br><span> break;</span><br><span> default:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% Unsupported Cell Identity%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return -1;</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-#undef NEIGH_BSS_WRITE</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_vty_write_remote_bss(struct vty *vty, const char *indent, struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct write_neighbor_ident_entry_data d = {</span><br><span style="color: hsl(0, 100%, 40%);">- .vty = vty,</span><br><span style="color: hsl(0, 100%, 40%);">- .indent = indent,</span><br><span style="color: hsl(0, 100%, 40%);">- .bts = bts,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_iter(g_neighbor_cells, write_neighbor_ident_list, &d);</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_vty_write_local_neighbors(struct vty *vty, const char *indent, struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(neigh, &bts->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%sneighbor bts %u%s", indent, neigh->bts->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span> }</span><br><span> </span><br><span> void neighbor_ident_vty_write_bts(struct vty *vty, const char *indent, struct gsm_bts *bts)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_vty_write_local_neighbors(vty, indent, bts);</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_vty_write_remote_bss(vty, indent, bts);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *n;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(n, &bts->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (n->type) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_BTS_NR:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%sneighbor bts %u%s", indent, n->bts_nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ case NEIGHBOR_TYPE_CELL_ID:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%sneighbor ", indent);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty_write_cell_id_u(vty, n->cell_id.id.id_discr, &n->cell_id.id.id)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "[Unsupported Cell Identity]%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ continue;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n->cell_id.ab_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " arfcn %u ", n->cell_id.ab.arfcn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n->cell_id.ab.bsic == BSIC_ANY)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "bsic any");</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "bsic %u", n->cell_id.ab.bsic & 0x3f);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Ignore anything invalid */</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> DEFUN(show_bts_neighbor, show_bts_neighbor_cmd,</span><br><span style="color: hsl(0, 100%, 40%);">- "show bts <0-255> neighbor " NEIGHBOR_IDENT_VTY_KEY_PARAMS,</span><br><span style="color: hsl(120, 100%, 40%);">+ "show bts <0-255> neighbor " CELL_AB_VTY_PARAMS,</span><br><span> SHOW_STR "Display information about a BTS\n" "BTS number\n"</span><br><span> "Query which cell would be the target for this neighbor ARFCN+BSIC\n"</span><br><span style="color: hsl(0, 100%, 40%);">- NEIGHBOR_IDENT_VTY_KEY_DOC)</span><br><span style="color: hsl(120, 100%, 40%);">+ CELL_AB_VTY_DOC)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- int found = 0;</span><br><span style="color: hsl(0, 100%, 40%);">- struct neighbor_ident_key key;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh;</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *res;</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts = gsm_bts_num(g_net, atoi(argv[0]));</span><br><span style="color: hsl(0, 100%, 40%);">- struct write_neighbor_ident_entry_data d = {</span><br><span style="color: hsl(0, 100%, 40%);">- .vty = vty,</span><br><span style="color: hsl(0, 100%, 40%);">- .indent = "% ",</span><br><span style="color: hsl(0, 100%, 40%);">- .bts = bts,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(120, 100%, 40%);">+ struct cell_ab ab;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *local_neighbor;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm0808_cell_id_list2 remote_neighbors;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *bts = gsm_bts_num(bsc_gsmnet, atoi(argv[0]));</span><br><span> </span><br><span> if (!bts) {</span><br><span> vty_out(vty, "%% Error: cannot find BTS '%s'%s", argv[0],</span><br><span>@@ -718,35 +581,41 @@</span><br><span> return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_bts_parse_key_params(vty, bts, &argv[1], &key))</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor_ident_vty_parse_arfcn_bsic(&ab, &argv[1]);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (resolve_neighbors(&local_neighbor, &remote_neighbors, bts, &ab, true)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case 0:</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case -ENOENT:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% No entry for BTS %u -> %s%s", bts->nr, cell_ab_to_str_c(OTC_SELECT, &ab), VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Is there a local BTS that matches the key? */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(neigh, &bts->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!neighbor_ident_key_matches_bts(&key, neigh->bts))</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% %s resolves to local BTS %u lac-ci %u %u%s",</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_key_name(&key), neigh->bts->nr, neigh->bts->location_area_code,</span><br><span style="color: hsl(0, 100%, 40%);">- neigh->bts->cell_identity, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- found++;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% Error while resolving neighbors BTS %u -> %s%s", bts->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_ab_to_str_c(OTC_SELECT, &ab), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_WARNING;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- res = neighbor_ident_get(g_neighbor_cells, &key);</span><br><span style="color: hsl(0, 100%, 40%);">- if (res) {</span><br><span style="color: hsl(0, 100%, 40%);">- write_neighbor_ident_list(&key, res, &d);</span><br><span style="color: hsl(0, 100%, 40%);">- found++;</span><br><span style="color: hsl(120, 100%, 40%);">+ /* From successful rc == 0, there is exactly either a local_neighbor or a nonempty remote_neighbors list. */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, "%% BTS %u -> %s resolves to", bts->nr, cell_ab_to_str_c(OTC_SELECT, &ab));</span><br><span style="color: hsl(120, 100%, 40%);">+ if (local_neighbor) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " local BTS %u lac-ci %u %u%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ local_neighbor->nr,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_neighbor->location_area_code,</span><br><span style="color: hsl(120, 100%, 40%);">+ local_neighbor->cell_identity, VTY_NEWLINE);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!found)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, "%% No entry for %s%s", neighbor_ident_key_name(&key), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (remote_neighbors.id_list_len) {</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " remote-BSS neighbors: %s%s",</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_list_name_c(OTC_SELECT, &remote_neighbors),</span><br><span style="color: hsl(120, 100%, 40%);">+ VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void neighbor_ident_vty_init(struct gsm_network *net, struct neighbor_ident_list *nil)</span><br><span style="color: hsl(120, 100%, 40%);">+void neighbor_ident_vty_init()</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- g_net = net;</span><br><span style="color: hsl(0, 100%, 40%);">- g_neighbor_cells = nil;</span><br><span> install_element(GSMNET_NODE, &cfg_neighbor_bind_cmd);</span><br><span> </span><br><span> install_element(BTS_NODE, &cfg_neighbor_add_bts_nr_cmd);</span><br><span>@@ -759,6 +628,10 @@</span><br><span> install_element(BTS_NODE, &cfg_neighbor_add_cgi_arfcn_bsic_cmd);</span><br><span> install_element(BTS_NODE, &cfg_neighbor_add_cgi_ps_arfcn_bsic_cmd);</span><br><span> install_element(BTS_NODE, &cfg_neighbor_del_bts_nr_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_neighbor_del_lac_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_neighbor_del_lac_ci_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_neighbor_del_cgi_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_neighbor_del_cgi_ps_cmd);</span><br><span> install_element(BTS_NODE, &cfg_neighbor_del_arfcn_bsic_cmd);</span><br><span> install_element(BTS_NODE, &cfg_neighbor_del_all_cmd);</span><br><span> install_element_ve(&show_bts_neighbor_cmd);</span><br><span>diff --git a/src/osmo-bsc/system_information.c b/src/osmo-bsc/system_information.c</span><br><span>index fae1355..20d033d 100644</span><br><span>--- a/src/osmo-bsc/system_information.c</span><br><span>+++ b/src/osmo-bsc/system_information.c</span><br><span>@@ -602,25 +602,6 @@</span><br><span> return bitvec2freq_list(chan_list, bv, bts, false, false);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-struct generate_bcch_chan_list__ni_iter_data {</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts *bts;</span><br><span style="color: hsl(0, 100%, 40%);">- struct bitvec *bv;</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-static bool generate_bcch_chan_list__ni_iter_cb(const struct neighbor_ident_key *key,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct gsm0808_cell_id_list2 *val,</span><br><span style="color: hsl(0, 100%, 40%);">- void *cb_data)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct generate_bcch_chan_list__ni_iter_data *data = cb_data;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- if (key->from_bts != NEIGHBOR_IDENT_KEY_ANY_BTS</span><br><span style="color: hsl(0, 100%, 40%);">- && key->from_bts != data->bts->nr)</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit_pos(data->bv, key->arfcn, 1);</span><br><span style="color: hsl(0, 100%, 40%);">- return true;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /*! generate a cell channel list as per Section 10.5.2.22 of 04.08</span><br><span> * \param[out] chan_list caller-provided output buffer</span><br><span> * \param[in] bts BTS descriptor used for input data</span><br><span>@@ -646,7 +627,7 @@</span><br><span> /* Zero-initialize the bit-vector */</span><br><span> memset(bv->data, 0, bv->data_len);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (llist_empty(&bts->local_neighbors)) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_empty(&bts->neighbors)) {</span><br><span> /* There are no explicit neighbors, assume all BTS are. */</span><br><span> llist_for_each_entry(cur_bts, &bts->network->bts_list, list) {</span><br><span> if (cur_bts == bts)</span><br><span>@@ -655,21 +636,21 @@</span><br><span> }</span><br><span> } else {</span><br><span> /* Only add explicit neighbor cells */</span><br><span style="color: hsl(0, 100%, 40%);">- struct gsm_bts_ref *neigh;</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(neigh, &bts->local_neighbors, entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- bitvec_set_bit_pos(bv, neigh->bts->c0->arfcn, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ struct neighbor *n;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(n, &bts->neighbors, entry) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (n->type == NEIGHBOR_TYPE_CELL_ID && n->cell_id.ab_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit_pos(bv, n->cell_id.ab.arfcn, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct gsm_bts *neigh_bts = resolve_local_neighbor(bts, n);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (neigh_bts)</span><br><span style="color: hsl(120, 100%, 40%);">+ bitvec_set_bit_pos(bv, n->cell_id.ab.arfcn, 1);</span><br><span style="color: hsl(120, 100%, 40%);">+ else</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHO, LOGL_ERROR,</span><br><span style="color: hsl(120, 100%, 40%);">+ "Neither local nor remote neighbor: BTS %u -> %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bts->nr, neighbor_to_str_c(OTC_SELECT, n));</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* Also add neighboring BSS cells' ARFCNs */</span><br><span style="color: hsl(0, 100%, 40%);">- {</span><br><span style="color: hsl(0, 100%, 40%);">- struct generate_bcch_chan_list__ni_iter_data data = {</span><br><span style="color: hsl(0, 100%, 40%);">- .bv = bv,</span><br><span style="color: hsl(0, 100%, 40%);">- .bts = bts,</span><br><span style="color: hsl(0, 100%, 40%);">- };</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor_ident_iter(bts->network->neighbor_bss_cells,</span><br><span style="color: hsl(0, 100%, 40%);">- generate_bcch_chan_list__ni_iter_cb, &data);</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span> }</span><br><span> </span><br><span> /* then we generate a GSM 04.08 frequency list from the bitvec */</span><br><span>diff --git a/tests/bsc/bsc_test.c b/tests/bsc/bsc_test.c</span><br><span>index 0ed504b..dbb547e 100644</span><br><span>--- a/tests/bsc/bsc_test.c</span><br><span>+++ b/tests/bsc/bsc_test.c</span><br><span>@@ -39,6 +39,7 @@</span><br><span> #include <search.h></span><br><span> </span><br><span> void *ctx = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_network *bsc_gsmnet = NULL;</span><br><span> </span><br><span> enum test {</span><br><span> TEST_SCAN_TO_BTS,</span><br><span>@@ -125,6 +126,7 @@</span><br><span> struct gsm_network *net = gsm_network_init(ctx);</span><br><span> struct gsm_subscriber_connection *conn = talloc_zero(net, struct gsm_subscriber_connection);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet = net;</span><br><span> conn->network = net;</span><br><span> </span><br><span> /* start testing with proper messages */</span><br><span>@@ -176,6 +178,7 @@</span><br><span> }</span><br><span> </span><br><span> talloc_free(net);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet = NULL;</span><br><span> }</span><br><span> </span><br><span> static const struct log_info_cat log_categories[] = {</span><br><span>diff --git a/tests/gsm0408/gsm0408_test.c b/tests/gsm0408/gsm0408_test.c</span><br><span>index c23b262..7545381 100644</span><br><span>--- a/tests/gsm0408/gsm0408_test.c</span><br><span>+++ b/tests/gsm0408/gsm0408_test.c</span><br><span>@@ -59,6 +59,7 @@</span><br><span> }</span><br><span> </span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct gsm_network *bsc_gsmnet = NULL;</span><br><span> </span><br><span> static inline void gen(struct gsm_bts *bts, const char *s)</span><br><span> {</span><br><span>@@ -899,6 +900,7 @@</span><br><span> printf("Network init failure.\n");</span><br><span> return EXIT_FAILURE;</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_gsmnet = net;</span><br><span> </span><br><span> test_si_range_helpers();</span><br><span> test_arfcn_filter();</span><br><span>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 93571b7..b1429d8 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -94,6 +94,10 @@</span><br><span> neighbor cgi <0-999> <0-999> <0-65535> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span> neighbor cgi-ps <0-999> <0-999> <0-65535> <0-255> <0-65535> arfcn <0-1023> bsic (<0-63>|any)</span><br><span> no neighbor bts <0-255></span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbor lac <0-65535></span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbor lac-ci <0-65535> <0-65535></span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbor cgi <0-999> <0-999> <0-65535> <0-65535></span><br><span style="color: hsl(120, 100%, 40%);">+ no neighbor cgi-ps <0-999> <0-999> <0-65535> <0-255> <0-65535></span><br><span> no neighbor arfcn <0-1023> bsic (<0-63>|any)</span><br><span> no neighbors</span><br><span> ...</span><br><span>@@ -173,8 +177,12 @@</span><br><span> neighbor Remove local or remote-BSS neighbor cell</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor ?</span><br><span style="color: hsl(0, 100%, 40%);">- bts Neighbor cell by local BTS number</span><br><span style="color: hsl(0, 100%, 40%);">- arfcn ARFCN of neighbor cell</span><br><span style="color: hsl(120, 100%, 40%);">+ bts Neighbor cell by local BTS number</span><br><span style="color: hsl(120, 100%, 40%);">+ lac Neighbor cell by LAC</span><br><span style="color: hsl(120, 100%, 40%);">+ lac-ci Neighbor cell by LAC and CI</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi Neighbor cell by cgi</span><br><span style="color: hsl(120, 100%, 40%);">+ cgi-ps Neighbor cell by cgi (Packet Switched, with RAC)</span><br><span style="color: hsl(120, 100%, 40%);">+ arfcn ARFCN of neighbor cell</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor bts ?</span><br><span> <0-255> BTS number</span><br><span>@@ -199,52 +207,64 @@</span><br><span> % Unknown command.</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor bts 0</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: cannot add local BTS 0 as neighbor to BTS 0: Invalid argument</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor bts 0</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor bts 1</span><br><span style="color: hsl(120, 100%, 40%);">+% Error: no such neighbor on BTS 0: BTS 1</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# ### Add non-existing BTS nr -- is allowed, checking plausibility at runtime</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# ### A neighbor by LAC and by BTS number are two distinct neighbor entries, resolved at runtime</span><br><span> OsmoBSC(config-net-bts)# neighbor lac 22</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12</span><br><span> OsmoBSC(config-net-bts)# no neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+% Error: no such neighbor on BTS 0: BTS 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor lac 22</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# ### adding the same entry again results in no change</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor lac-ci 21 31</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5}</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5}</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5}</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 already had neighbor BTS 123</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor cgi 23 042 423 6 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5}</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 already had neighbor LAC-CI:21-31 ARFCN-BSIC:41-11</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor lac-ci 21 31 arfcn 22 bsic 32</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 already had neighbor LAC-CI:21-31 ARFCN-BSIC:41-11</span><br><span style="color: hsl(120, 100%, 40%);">+% ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: LAC-CI:21-31 ARFCN-BSIC:22-32</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# show running-config</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+...</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 already had neighbor CGI:023-42-423-5 ARFCN-BSIC:23-42</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor cgi 23 042 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(120, 100%, 40%);">+% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 -> CGI:023-42-423-5 ARFCN-BSIC:23-42</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 6 arfcn 23 bsic 42</span><br><span style="color: hsl(120, 100%, 40%);">+% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 -> CGI:023-42-423-5 ARFCN-BSIC:23-42</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# neighbor cgi 23 42 423 6 arfcn 42 bsic 1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# neighbor cgi 23 042 234 56 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 23 BSIC 42 -> CGI[1]:{023-42-423-5}</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 423 BSIC 63 -> LAC-CI[1]:{789-10}</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 already had neighbor LAC-CI:789-10 ARFCN-BSIC:423-any</span><br><span style="color: hsl(120, 100%, 40%);">+% ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: LAC-CI:789-10 ARFCN-BSIC:423-63</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span style="color: hsl(0, 100%, 40%);">-% Error: only one Cell Identifier entry is allowed per remote neighbor. Already have: BTS 0 to ARFCN 423 BSIC 1 -> LAC-CI[1]:{789-10}</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 already had neighbor LAC-CI:789-10 ARFCN-BSIC:423-any</span><br><span style="color: hsl(120, 100%, 40%);">+% ERROR: duplicate Cell ID in neighbor config, with differing ARFCN+BSIC: LAC-CI:789-10 ARFCN-BSIC:423-1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ...</span><br><span>@@ -252,119 +272,125 @@</span><br><span> ... !neighbor </span><br><span> bts 0</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span> neighbor cgi 023 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> neighbor lac 456 arfcn 123 bsic 45</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 99 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% No entry for BTS 0 to ARFCN 99 (any BSIC)</span><br><span style="color: hsl(120, 100%, 40%);">+% No entry for BTS 0 -> ARFCN-BSIC:99-any</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 41 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 41 (any BSIC) resolves to local BTS 1 lac-ci 21 31</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 -> ARFCN-BSIC:41-any resolves to local BTS 1 lac-ci 21 31</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 1</span><br><span style="color: hsl(0, 100%, 40%);">-% neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 -> ARFCN-BSIC:423-1 resolves to remote-BSS neighbors: LAC-CI[1]:{789-10}</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# do show bts 0 neighbor arfcn 423 bsic 23</span><br><span style="color: hsl(0, 100%, 40%);">-% neighbor lac-ci 789 10 arfcn 423 bsic 23</span><br><span style="color: hsl(120, 100%, 40%);">+% BTS 0 -> ARFCN-BSIC:423-23 resolves to remote-BSS neighbors: LAC-CI[1]:{789-10}</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 99 bsic 7</span><br><span style="color: hsl(0, 100%, 40%);">-% Cannot remove, no such neighbor: BTS 0 to ARFCN 99 BSIC 7</span><br><span style="color: hsl(120, 100%, 40%);">+% Cannot remove: no such neighbor on BTS 0: ARFCN-BSIC:99-7</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> neighbor lac 456 arfcn 123 bsic 45</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC)</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 63</span><br><span style="color: hsl(0, 100%, 40%);">-% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 63</span><br><span style="color: hsl(120, 100%, 40%);">+% Cannot remove: no such neighbor on BTS 0: ARFCN-BSIC:423-63</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic 1</span><br><span style="color: hsl(0, 100%, 40%);">-% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 1</span><br><span style="color: hsl(120, 100%, 40%);">+% Cannot remove: no such neighbor on BTS 0: ARFCN-BSIC:423-1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor lac-ci 21 31 arfcn 41 bsic 11</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed local neighbor bts 0 to bts 1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 41 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% Cannot remove, no such neighbor: BTS 0 to ARFCN 41 (any BSIC)</span><br><span style="color: hsl(120, 100%, 40%);">+% Cannot remove: no such neighbor on BTS 0: ARFCN-BSIC:41-any</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span style="color: hsl(0, 100%, 40%);">- neighbor bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor cgi 023 42 423 6 arfcn 42 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 12</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed local neighbor bts 0 to bts 2</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor bts 123</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor cgi 901 70 22 65535</span><br><span style="color: hsl(120, 100%, 40%);">+OsmoBSC(config-net-bts)# no neighbor arfcn 42 bsic 1</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor bts 1</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 now has local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11</span><br><span> OsmoBSC(config-net-bts)# neighbor bts 2</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 now has local neighbor BTS 2 with LAC 22 CI 65535 and ARFCN 42 BSIC 12</span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 023 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 23 BSIC 42 now has 1 remote BSS Cell Identifier List entry</span><br><span> OsmoBSC(config-net-bts)# neighbor lac 456 arfcn 123 bsic 45</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry</span><br><span> OsmoBSC(config-net-bts)# neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 423 (any BSIC) now has 1 remote BSS Cell Identifier List entry</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> OsmoBSC(config-net-bts)# neighbor cgi-ps 23 42 423 2 5 arfcn 23 bsic 32</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 23 BSIC 32 now has 1 remote BSS Cell Identifier List entry</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbors</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed local neighbor bts 0 to bts 1</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed local neighbor bts 0 to bts 2</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 42</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 123 BSIC 45</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 423 (any BSIC)</span><br><span style="color: hsl(0, 100%, 40%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 23 BSIC 32</span><br><span style="color: hsl(120, 100%, 40%);">+% Removed neighbor: BTS 0 to BTS 1</span><br><span style="color: hsl(120, 100%, 40%);">+% Removed neighbor: BTS 0 to BTS 2</span><br><span style="color: hsl(120, 100%, 40%);">+% Removed neighbor: BTS 0 to CGI:023-42-423-5 ARFCN-BSIC:23-42</span><br><span style="color: hsl(120, 100%, 40%);">+% Removed neighbor: BTS 0 to LAC:456 ARFCN-BSIC:123-45</span><br><span style="color: hsl(120, 100%, 40%);">+% Removed neighbor: BTS 0 to LAC-CI:789-10 ARFCN-BSIC:423-any</span><br><span style="color: hsl(120, 100%, 40%);">+% Removed neighbor: BTS 0 to CGI-PS:023-42-423-2-5 ARFCN-BSIC:23-32</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/23360">change 23360</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/osmo-bsc/+/23360"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I9ed992f8bfff888b3933733c0576f92d50f2625b </div>
<div style="display:none"> Gerrit-Change-Number: 23360 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>