<p>dexter has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bts/+/24513">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">allow to configure multiple oml remote-ip addresses<br><br>At the moment we can only configure a single BSC in the BTS<br>configuration. This also means that if this single BSC fails for some<br>reason the BTS has no alternate BSC to connect to. Lets extend the<br>remote-ip parameter so that it can be used multiple times so that an<br>operater can configure any number of BSCs that are tried one after<br>another during BTS startup.<br><br>Change-Id: I205f68a3a7f35fee4c38a7cfba2b014237df2727<br>Related: SYS#4971<br>---<br>M include/osmo-bts/bts.h<br>M src/common/abis.c<br>M src/common/bts.c<br>M src/common/main.c<br>M src/common/vty.c<br>5 files changed, 62 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bts refs/changes/13/24513/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmo-bts/bts.h b/include/osmo-bts/bts.h</span><br><span>index 978a548..70683ca 100644</span><br><span>--- a/include/osmo-bts/bts.h</span><br><span>+++ b/include/osmo-bts/bts.h</span><br><span>@@ -131,6 +131,12 @@</span><br><span> struct gsm_abis_mo mo;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/* Struct that holds one OML-Address (Address of the BSC) */</span><br><span style="color: hsl(120, 100%, 40%);">+struct bsc_oml_host {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head list;</span><br><span style="color: hsl(120, 100%, 40%);">+ char *addr;</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* One BTS */</span><br><span> struct gsm_bts {</span><br><span> /* list header in net->bts_list */</span><br><span>@@ -291,7 +297,7 @@</span><br><span> } etws;</span><br><span> </span><br><span> struct paging_state *paging_state;</span><br><span style="color: hsl(0, 100%, 40%);">- char *bsc_oml_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct llist_head bsc_oml_hosts;</span><br><span> struct llist_head oml_queue;</span><br><span> unsigned int rtp_jitter_buf_ms;</span><br><span> bool rtp_jitter_adaptive;</span><br><span>diff --git a/src/common/abis.c b/src/common/abis.c</span><br><span>index 17a244c..e6a6f61 100644</span><br><span>--- a/src/common/abis.c</span><br><span>+++ b/src/common/abis.c</span><br><span>@@ -249,6 +249,7 @@</span><br><span> .ipa = {</span><br><span> .role = E1INP_LINE_R_BTS,</span><br><span> .dev = &bts_dev_info,</span><br><span style="color: hsl(120, 100%, 40%);">+ .timeout_msec = -1, /* infinite (until OS detects error) */</span><br><span> },</span><br><span> },</span><br><span> .sign_link_up = sign_link_up,</span><br><span>diff --git a/src/common/bts.c b/src/common/bts.c</span><br><span>index bf29113..640c0cc 100644</span><br><span>--- a/src/common/bts.c</span><br><span>+++ b/src/common/bts.c</span><br><span>@@ -398,6 +398,7 @@</span><br><span> bts->smscb_queue_hyst = 2;</span><br><span> </span><br><span> INIT_LLIST_HEAD(&bts->oml_queue);</span><br><span style="color: hsl(120, 100%, 40%);">+ INIT_LLIST_HEAD(&bts->bsc_oml_hosts);</span><br><span> </span><br><span> /* register DTX DL FSM */</span><br><span> rc = osmo_fsm_register(&dtx_dl_amr_fsm);</span><br><span>diff --git a/src/common/main.c b/src/common/main.c</span><br><span>index 0b7d3fb..bfa7874 100644</span><br><span>--- a/src/common/main.c</span><br><span>+++ b/src/common/main.c</span><br><span>@@ -271,6 +271,7 @@</span><br><span> </span><br><span> int bts_main(int argc, char **argv)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_oml_host *bsc_oml_host;</span><br><span> struct gsm_bts_trx *trx;</span><br><span> struct e1inp_line *line;</span><br><span> int rc;</span><br><span>@@ -397,14 +398,25 @@</span><br><span> signal(SIGUSR2, &signal_handler);</span><br><span> osmo_init_ignore_signals();</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!g_bts->bsc_oml_host) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "Cannot start BTS without knowing BSC OML IP\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (llist_count(&g_bts->bsc_oml_hosts) == 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_FATAL, "Cannot start BTS without knowing BSC OML IP\n");</span><br><span> exit(1);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- line = abis_open(g_bts, g_bts->bsc_oml_host, "osmo-bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bsc_oml_host, &g_bts->bsc_oml_hosts, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ line = abis_open(g_bts, bsc_oml_host->addr, "osmo-bts");</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!line) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_NOTICE, "unable to connect to BSC (%s)\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_oml_host->addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_NOTICE, "connection to BSC (%s) successful\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_oml_host->addr);</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 style="color: hsl(120, 100%, 40%);">+</span><br><span> if (!line) {</span><br><span style="color: hsl(0, 100%, 40%);">- fprintf(stderr, "unable to connect to BSC\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DABIS, LOGL_FATAL, "BSC connection failed!\n");</span><br><span> exit(2);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/common/vty.c b/src/common/vty.c</span><br><span>index d4e2902..961252b 100644</span><br><span>--- a/src/common/vty.c</span><br><span>+++ b/src/common/vty.c</span><br><span>@@ -282,6 +282,7 @@</span><br><span> const struct gsm_bts_trx *trx;</span><br><span> const char *sapi_buf;</span><br><span> int i;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_oml_host *bsc_oml_host;</span><br><span> </span><br><span> vty_out(vty, "bts %u%s", bts->nr, VTY_NEWLINE);</span><br><span> if (bts->description)</span><br><span>@@ -291,7 +292,8 @@</span><br><span> vty_out(vty, " auto-band%s", VTY_NEWLINE);</span><br><span> vty_out(vty, " ipa unit-id %u %u%s",</span><br><span> bts->ip_access.site_id, bts->ip_access.bts_id, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " oml remote-ip %s%s", bts->bsc_oml_host, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bsc_oml_host, &bts->bsc_oml_hosts, list)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " oml remote-ip %s%s", bsc_oml_host->addr, VTY_NEWLINE);</span><br><span> vty_out(vty, " rtp jitter-buffer %u", bts->rtp_jitter_buf_ms);</span><br><span> if (bts->rtp_jitter_adaptive)</span><br><span> vty_out(vty, " adaptive");</span><br><span>@@ -507,11 +509,41 @@</span><br><span> "OML Parameters\n" "OML IP Address\n" "OML IP Address\n")</span><br><span> {</span><br><span> struct gsm_bts *bts = vty->index;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_oml_host *bsc_oml_host;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (bts->bsc_oml_host)</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(bts->bsc_oml_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Silently stop when the address is already in the list */</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bsc_oml_host, &bts->bsc_oml_hosts, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], bsc_oml_host->addr) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ return CMD_SUCCESS;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- bts->bsc_oml_host = talloc_strdup(bts, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_oml_host = talloc_zero(bts, struct bsc_oml_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bsc_oml_host);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_oml_host->addr = talloc_strdup(bsc_oml_host, argv[0]);</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_ASSERT(bsc_oml_host->addr);</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_add_tail(&bsc_oml_host->list, &bts->bsc_oml_hosts);</span><br><span style="color: hsl(120, 100%, 40%);">+</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%);">+DEFUN(cfg_bts_no_oml_ip,</span><br><span style="color: hsl(120, 100%, 40%);">+ cfg_bts_no_oml_ip_cmd,</span><br><span style="color: hsl(120, 100%, 40%);">+ "no oml remote-ip A.B.C.D",</span><br><span style="color: hsl(120, 100%, 40%);">+ NO_STR "OML Parameters\n" "OML IP Address\n" "OML IP Address\n")</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 bsc_oml_host *bsc_oml_host;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_oml_host *bsc_oml_host_del = NULL;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bsc_oml_host, &bts->bsc_oml_hosts, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (strcmp(argv[0], bsc_oml_host->addr) == 0)</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_oml_host_del = bsc_oml_host;</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 (bsc_oml_host_del) {</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_del(&bsc_oml_host_del->list);</span><br><span style="color: hsl(120, 100%, 40%);">+ talloc_free(bsc_oml_host_del);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> </span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span>@@ -2325,6 +2357,7 @@</span><br><span> install_element(CONFIG_NODE, &cfg_vty_telnet_port_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_unit_id_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_oml_ip_cmd);</span><br><span style="color: hsl(120, 100%, 40%);">+ install_element(BTS_NODE, &cfg_bts_no_oml_ip_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_bind_ip_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_jitbuf_cmd);</span><br><span> install_element(BTS_NODE, &cfg_bts_rtp_port_range_cmd);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bts/+/24513">change 24513</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-bts/+/24513"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bts </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I205f68a3a7f35fee4c38a7cfba2b014237df2727 </div>
<div style="display:none"> Gerrit-Change-Number: 24513 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>