<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11371">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">remote-BSS neighbors: allow only one cell ID<br><br>I believe I have initially misinterpreted the idea behind sending a Cell<br>Identifier List in BSSMAP Handover Required messages. Instead of associating N<br>Cell Identifiers with one ARFCN+BSIC, the idea is to add up N separate<br>ARFCN+BSIC's Cell Identifiers into a list. To keep the door open for future<br>code simplification, make sure to allow only one Cell Identifier per remote<br>ARFCN+BSIC on the VTY UI.<br><br>Related: OS#3656<br>Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8<br>---<br>M src/osmo-bsc/neighbor_ident_vty.c<br>M tests/neighbor_ident.vty<br>2 files changed, 112 insertions(+), 21 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/71/11371/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/neighbor_ident_vty.c b/src/osmo-bsc/neighbor_ident_vty.c</span><br><span>index 409153b..203b150 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>@@ -258,6 +258,7 @@</span><br><span> {</span><br><span> int rc;</span><br><span> struct gsm_bts *local_neigh;</span><br><span style="color: hsl(120, 100%, 40%);">+ const struct gsm0808_cell_id_list2 *exists;</span><br><span> struct gsm0808_cell_id_list2 cil;</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span> </span><br><span>@@ -289,6 +290,15 @@</span><br><span> return add_local_bts(vty, local_neigh);</span><br><span> }</span><br><span> </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%);">+ exists = neighbor_ident_get(g_neighbor_cells, key);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (exists) {</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: %s -> %s%s", neighbor_ident_key_name(key),</span><br><span style="color: hsl(120, 100%, 40%);">+ gsm0808_cell_id_list_name(exists), 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> /* The cell_id is not known in this BSS, so it must be a remote cell. */</span><br><span> gsm0808_cell_id_to_list(&cil, cell_id);</span><br><span> rc = neighbor_ident_add(g_neighbor_cells, key, &cil);</span><br><span>diff --git a/tests/neighbor_ident.vty b/tests/neighbor_ident.vty</span><br><span>index 4f86383..2ce2231 100644</span><br><span>--- a/tests/neighbor_ident.vty</span><br><span>+++ b/tests/neighbor_ident.vty</span><br><span>@@ -211,29 +211,29 @@</span><br><span> OsmoBSC(config-net-bts)# neighbor lac-ci 21 31</span><br><span> % BTS 0 already had local neighbor BTS 1 with LAC 21 CI 31 and ARFCN 41 BSIC 11</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 style="color: hsl(120, 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> 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 style="color: hsl(120, 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> 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 style="color: hsl(120, 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 cgi 23 042 423 6 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 23 BSIC 42 now has 2 remote BSS Cell Identifier List entries</span><br><span style="color: hsl(120, 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 456 arfcn 123 bsic 45</span><br><span> % BTS 0 to ARFCN 123 BSIC 45 now has 1 remote BSS Cell Identifier List entry</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# neighbor cgi 23 042 234 56 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">-% BTS 0 to ARFCN 23 BSIC 42 now has 3 remote BSS Cell Identifier List entries</span><br><span style="color: hsl(120, 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> % 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%);">-% BTS 0 to ARFCN 423 BSIC 63 now has 1 remote BSS Cell Identifier List entry</span><br><span style="color: hsl(120, 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> </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%);">-% BTS 0 to ARFCN 423 BSIC 1 now has 1 remote BSS Cell Identifier List entry</span><br><span style="color: hsl(120, 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> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ...</span><br><span>@@ -244,12 +244,8 @@</span><br><span> neighbor bts 1</span><br><span> neighbor bts 2</span><br><span> neighbor cgi 023 42 423 5 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor cgi 023 042 423 6 arfcn 23 bsic 42</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor cgi 023 042 234 56 arfcn 23 bsic 42</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 style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 1</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>@@ -271,13 +267,103 @@</span><br><span> % 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 style="color: hsl(0, 100%, 40%);">-... !neighbor </span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+Current configuration:</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%);">+log stderr</span><br><span style="color: hsl(120, 100%, 40%);">+ logging filter all 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging color 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print category 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging timestamp 0</span><br><span style="color: hsl(120, 100%, 40%);">+ logging print file 1</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rll notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level mm notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rr notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level rsl notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level nm info</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level pag notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level meas notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level msc notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ho notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level hodec notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ref notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level nat notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ctrl notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level filter debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level pcu debug</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lcls notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level chan notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ts notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level as notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lglobal notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level llapd notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level linp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmux notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmi notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmib notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsms notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lctrl notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lgtp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lstats notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lgsup notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level loap notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lss7 notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsccp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lsua notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lm3ua notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level lmgcp notice</span><br><span style="color: hsl(120, 100%, 40%);">+ logging level ljibuf notice</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+stats interval 5</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+line vty</span><br><span style="color: hsl(120, 100%, 40%);">+ no login</span><br><span style="color: hsl(120, 100%, 40%);">+!</span><br><span style="color: hsl(120, 100%, 40%);">+e1_input</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line 0 driver ipa</span><br><span style="color: hsl(120, 100%, 40%);">+ e1_line 0 port 0</span><br><span style="color: hsl(120, 100%, 40%);">+ no e1_line 0 keepalive</span><br><span style="color: hsl(120, 100%, 40%);">+cs7 instance 0</span><br><span style="color: hsl(120, 100%, 40%);">+ point-code 0.23.3</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-msc-0 2905 0 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ as as-clnt-msc-0 m3ua</span><br><span style="color: hsl(120, 100%, 40%);">+ asp asp-clnt-msc-0</span><br><span style="color: hsl(120, 100%, 40%);">+ routing-key 0 0.23.3</span><br><span style="color: hsl(120, 100%, 40%);">+network</span><br><span style="color: hsl(120, 100%, 40%);">+ network country code 901</span><br><span style="color: hsl(120, 100%, 40%);">+ mobile network code 70</span><br><span style="color: hsl(120, 100%, 40%);">+ encryption a5 1 3</span><br><span style="color: hsl(120, 100%, 40%);">+ neci 0</span><br><span style="color: hsl(120, 100%, 40%);">+ paging any use tch 0</span><br><span style="color: hsl(120, 100%, 40%);">+ bts 0</span><br><span style="color: hsl(120, 100%, 40%);">+ type sysmobts</span><br><span style="color: hsl(120, 100%, 40%);">+ band DCS1800</span><br><span style="color: hsl(120, 100%, 40%);">+ cell_identity 30</span><br><span style="color: hsl(120, 100%, 40%);">+ location_area_code 20</span><br><span style="color: hsl(120, 100%, 40%);">+ base_station_id_code 10</span><br><span style="color: hsl(120, 100%, 40%);">+ ms max power 15</span><br><span style="color: hsl(120, 100%, 40%);">+ cell reselection hysteresis 4</span><br><span style="color: hsl(120, 100%, 40%);">+ rxlev access min 0</span><br><span style="color: hsl(120, 100%, 40%);">+ radio-link-timeout 32</span><br><span style="color: hsl(120, 100%, 40%);">+ channel allocator ascending</span><br><span style="color: hsl(120, 100%, 40%);">+ rach tx integer 9</span><br><span style="color: hsl(120, 100%, 40%);">+ rach max transmission 7</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-descrption attach 1</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-descrption bs-pa-mfrms 5</span><br><span style="color: hsl(120, 100%, 40%);">+ channel-descrption bs-ag-blks-res 1</span><br><span style="color: hsl(120, 100%, 40%);">+ no access-control-class-ramping</span><br><span style="color: hsl(120, 100%, 40%);">+ access-control-class-ramping-step-interval dynamic</span><br><span style="color: hsl(120, 100%, 40%);">+ access-control-class-ramping-step-size 1</span><br><span style="color: hsl(120, 100%, 40%);">+ early-classmark-sending forbidden</span><br><span style="color: hsl(120, 100%, 40%);">+ early-classmark-sending-3g allowed</span><br><span style="color: hsl(120, 100%, 40%);">+ ip.access unit_id 1800 0</span><br><span style="color: hsl(120, 100%, 40%);">+ oml ip.access stream_id 255 line 0</span><br><span style="color: hsl(120, 100%, 40%);">+ neighbor-list mode automatic</span><br><span> neighbor bts 1</span><br><span> neighbor bts 2</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 style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 123 bsic 45</span><br><span>@@ -288,8 +374,6 @@</span><br><span> neighbor bts 1</span><br><span> neighbor bts 2</span><br><span> neighbor lac-ci 789 10 arfcn 423 bsic any</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 1</span><br><span> ... !neighbor </span><br><span> </span><br><span> OsmoBSC(config-net-bts)# no neighbor arfcn 423 bsic any</span><br><span>@@ -299,22 +383,19 @@</span><br><span> ... !neighbor </span><br><span> neighbor bts 1</span><br><span> neighbor bts 2</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 bsic 63</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 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%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 63</span><br><span style="color: hsl(120, 100%, 40%);">+% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 63</span><br><span> </span><br><span> OsmoBSC(config-net-bts)# show running-config</span><br><span> ... !neighbor </span><br><span> neighbor bts 1</span><br><span> neighbor bts 2</span><br><span style="color: hsl(0, 100%, 40%);">- neighbor lac-ci 789 10 arfcn 423 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%);">-% Removed remote BSS neighbor BTS 0 to ARFCN 423 BSIC 1</span><br><span style="color: hsl(120, 100%, 40%);">+% Cannot remove, no such neighbor: BTS 0 to ARFCN 423 BSIC 1</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/11371">change 11371</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/11371"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ifb9212fede2333ad68db94188b5cda4fcabe02f8 </div>
<div style="display:none"> Gerrit-Change-Number: 11371 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>