Pau Espin Pedrol has uploaded this change for review. (
https://gerrit.osmocom.org/9644
Change subject: bsc-nat: show running-config now prints bsc nodes
......................................................................
bsc-nat: show running-config now prints bsc nodes
Fixes: OS#3335
Change-Id: I847e84d5cc50619059cbae7a2c6471c60609aec6
---
M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
1 file changed, 41 insertions(+), 39 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/44/9644/1
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index e51de53..057d9ab 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -87,6 +87,46 @@
dump_lac(vty, &pgroup->lists);
}
+static void config_write_bsc_single(struct vty *vty, struct bsc_config *bsc)
+{
+ vty_out(vty, " bsc %u%s", bsc->nr, VTY_NEWLINE);
+ vty_out(vty, " token %s%s", bsc->token, VTY_NEWLINE);
+ if (bsc->key_present)
+ vty_out(vty, " auth-key %s%s", osmo_hexdump(bsc->key, 16),
VTY_NEWLINE);
+ dump_lac(vty, &bsc->lac_list);
+ if (bsc->description)
+ vty_out(vty, " description %s%s", bsc->description,
VTY_NEWLINE);
+ if (bsc->acc_lst_name)
+ vty_out(vty, " access-list-name %s%s", bsc->acc_lst_name,
VTY_NEWLINE);
+ vty_out(vty, " max-endpoints %d%s", bsc->max_endpoints, VTY_NEWLINE);
+ if (bsc->paging_group != -1)
+ vty_out(vty, " paging group %d%s", bsc->paging_group,
VTY_NEWLINE);
+ vty_out(vty, " paging forbidden %d%s", bsc->forbid_paging,
VTY_NEWLINE);
+ switch (bsc->osmux) {
+ case OSMUX_USAGE_ON:
+ vty_out(vty, " osmux on%s", VTY_NEWLINE);
+ break;
+ case OSMUX_USAGE_ONLY:
+ vty_out(vty, " osmux only%s", VTY_NEWLINE);
+ break;
+ }
+ if (bsc->bts_use_jibuf_override)
+ vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? ""
: "no ", VTY_NEWLINE);
+ if (bsc->bts_jitter_delay_min_override)
+ vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s",
bsc->bts_jitter_delay_min, VTY_NEWLINE);
+ if (bsc->bts_jitter_delay_max_override)
+ vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s",
bsc->bts_jitter_delay_max, VTY_NEWLINE);
+}
+
+static int config_write_bsc(struct vty *vty)
+{
+ struct bsc_config *bsc;
+
+ llist_for_each_entry(bsc, &_nat->bsc_configs, entry)
+ config_write_bsc_single(vty, bsc);
+ return CMD_SUCCESS;
+}
+
static int config_write_nat(struct vty *vty)
{
struct bsc_msg_acc_lst *lst;
@@ -148,46 +188,8 @@
vty_out(vty, " %ssdp-ensure-amr-mode-set%s",
_nat->sdp_ensure_amr_mode_set ? "" : "no ", VTY_NEWLINE);
- return CMD_SUCCESS;
-}
+ config_write_bsc(vty);
-static void config_write_bsc_single(struct vty *vty, struct bsc_config *bsc)
-{
- vty_out(vty, " bsc %u%s", bsc->nr, VTY_NEWLINE);
- vty_out(vty, " token %s%s", bsc->token, VTY_NEWLINE);
- if (bsc->key_present)
- vty_out(vty, " auth-key %s%s", osmo_hexdump(bsc->key, 16),
VTY_NEWLINE);
- dump_lac(vty, &bsc->lac_list);
- if (bsc->description)
- vty_out(vty, " description %s%s", bsc->description,
VTY_NEWLINE);
- if (bsc->acc_lst_name)
- vty_out(vty, " access-list-name %s%s", bsc->acc_lst_name,
VTY_NEWLINE);
- vty_out(vty, " max-endpoints %d%s", bsc->max_endpoints, VTY_NEWLINE);
- if (bsc->paging_group != -1)
- vty_out(vty, " paging group %d%s", bsc->paging_group,
VTY_NEWLINE);
- vty_out(vty, " paging forbidden %d%s", bsc->forbid_paging,
VTY_NEWLINE);
- switch (bsc->osmux) {
- case OSMUX_USAGE_ON:
- vty_out(vty, " osmux on%s", VTY_NEWLINE);
- break;
- case OSMUX_USAGE_ONLY:
- vty_out(vty, " osmux only%s", VTY_NEWLINE);
- break;
- }
- if (bsc->bts_use_jibuf_override)
- vty_out(vty, " %sbts-jitter-buffer%s", bsc->bts_use_jibuf? ""
: "no ", VTY_NEWLINE);
- if (bsc->bts_jitter_delay_min_override)
- vty_out(vty, " bts-jitter-delay-min %"PRIu32"%s",
bsc->bts_jitter_delay_min, VTY_NEWLINE);
- if (bsc->bts_jitter_delay_max_override)
- vty_out(vty, " bts-jitter-delay-max %"PRIu32"%s",
bsc->bts_jitter_delay_max, VTY_NEWLINE);
-}
-
-static int config_write_bsc(struct vty *vty)
-{
- struct bsc_config *bsc;
-
- llist_for_each_entry(bsc, &_nat->bsc_configs, entry)
- config_write_bsc_single(vty, bsc);
return CMD_SUCCESS;
}
--
To view, visit https://gerrit.osmocom.org/9644
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: newchange
Gerrit-Change-Id: I847e84d5cc50619059cbae7a2c6471c60609aec6
Gerrit-Change-Number: 9644
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <[email protected]>
