<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9644">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc-nat: show running-config now prints bsc nodes<br><br>Fixes: OS#3335<br>Change-Id: I847e84d5cc50619059cbae7a2c6471c60609aec6<br>---<br>M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c<br>1 file changed, 41 insertions(+), 39 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/44/9644/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>index e51de53..057d9ab 100644</span><br><span>--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c</span><br><span>@@ -87,6 +87,46 @@</span><br><span> dump_lac(vty, &pgroup->lists);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static void config_write_bsc_single(struct vty *vty, struct bsc_config *bsc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bsc %u%s", bsc->nr, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " token %s%s", bsc->token, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->key_present)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " auth-key %s%s", osmo_hexdump(bsc->key, 16), VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ dump_lac(vty, &bsc->lac_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->description)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " description %s%s", bsc->description, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->acc_lst_name)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " access-list-name %s%s", bsc->acc_lst_name, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " max-endpoints %d%s", bsc->max_endpoints, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->paging_group != -1)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " paging group %d%s", bsc->paging_group, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " paging forbidden %d%s", bsc->forbid_paging, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (bsc->osmux) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMUX_USAGE_ON:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux on%s", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case OSMUX_USAGE_ONLY:</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " osmux only%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%);">+ if (bsc->bts_use_jibuf_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->bts_jitter_delay_min_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (bsc->bts_jitter_delay_max_override)</span><br><span style="color: hsl(120, 100%, 40%);">+ vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE);</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 config_write_bsc(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_config *bsc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(bsc, &_nat->bsc_configs, entry)</span><br><span style="color: hsl(120, 100%, 40%);">+ config_write_bsc_single(vty, bsc);</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> static int config_write_nat(struct vty *vty)</span><br><span> {</span><br><span> struct bsc_msg_acc_lst *lst;</span><br><span>@@ -148,46 +188,8 @@</span><br><span> vty_out(vty, " %ssdp-ensure-amr-mode-set%s",</span><br><span> _nat->sdp_ensure_amr_mode_set ? "" : "no ", VTY_NEWLINE);</span><br><span> </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(120, 100%, 40%);">+ config_write_bsc(vty);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static void config_write_bsc_single(struct vty *vty, struct bsc_config *bsc)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " bsc %u%s", bsc->nr, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " token %s%s", bsc->token, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc->key_present)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " auth-key %s%s", osmo_hexdump(bsc->key, 16), VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- dump_lac(vty, &bsc->lac_list);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc->description)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " description %s%s", bsc->description, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc->acc_lst_name)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " access-list-name %s%s", bsc->acc_lst_name, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " max-endpoints %d%s", bsc->max_endpoints, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc->paging_group != -1)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " paging group %d%s", bsc->paging_group, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " paging forbidden %d%s", bsc->forbid_paging, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- switch (bsc->osmux) {</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMUX_USAGE_ON:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux on%s", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case OSMUX_USAGE_ONLY:</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " osmux only%s", VTY_NEWLINE);</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%);">- if (bsc->bts_use_jibuf_override)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? "" : "no ", VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc->bts_jitter_delay_min_override)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s", bsc->bts_jitter_delay_min, VTY_NEWLINE);</span><br><span style="color: hsl(0, 100%, 40%);">- if (bsc->bts_jitter_delay_max_override)</span><br><span style="color: hsl(0, 100%, 40%);">- vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s", bsc->bts_jitter_delay_max, VTY_NEWLINE);</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 config_write_bsc(struct vty *vty)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_config *bsc;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(bsc, &_nat->bsc_configs, entry)</span><br><span style="color: hsl(0, 100%, 40%);">- config_write_bsc_single(vty, bsc);</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9644">change 9644</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/9644"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: openbsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I847e84d5cc50619059cbae7a2c6471c60609aec6 </div>
<div style="display:none"> Gerrit-Change-Number: 9644 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>