Change in openbsc[master]: bsc_vty: Write access list entries when storing bsc config

[Harald Welte]

Harald Welte has submitted this change and it was merged. ( https://gerrit.osmocom.org/9773 )

Change subject: bsc_vty: Write access list entries when storing bsc config
......................................................................

bsc_vty: Write access list entries when storing bsc config

Back-port from osmo-bsc.git d99182c01037f4dd14fb72b2b06497e0c1bebb49.

Change-Id: I0b951a9c3dbe245c3813fc91ceb9118a0de779b8
---
M openbsc/include/openbsc/bsc_msg_filter.h
M openbsc/src/libfilter/bsc_msg_vty.c
M openbsc/src/osmo-bsc/osmo_bsc_vty.c
M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
4 files changed, 14 insertions(+), 5 deletions(-)

Approvals:
  Jenkins Builder: Verified
  Harald Welte: Looks good to me, approved



diff --git a/openbsc/include/openbsc/bsc_msg_filter.h b/openbsc/include/openbsc/bsc_msg_filter.h
index dc971a4..22b8447 100644
--- a/openbsc/include/openbsc/bsc_msg_filter.h
+++ b/openbsc/include/openbsc/bsc_msg_filter.h
@@ -104,4 +104,4 @@
 int bsc_msg_acc_lst_check_allow(struct bsc_msg_acc_lst *lst, const char *imsi);
 
 void bsc_msg_acc_lst_vty_init(void *ctx, struct llist_head *lst, int node);
-void bsc_msg_acc_lst_write(struct vty *vty, struct bsc_msg_acc_lst *lst);
+void bsc_msg_acc_lst_write(struct vty *vty);
diff --git a/openbsc/src/libfilter/bsc_msg_vty.c b/openbsc/src/libfilter/bsc_msg_vty.c
index 06f3876..668e399 100644
--- a/openbsc/src/libfilter/bsc_msg_vty.c
+++ b/openbsc/src/libfilter/bsc_msg_vty.c
@@ -111,7 +111,7 @@
 	return CMD_SUCCESS;
 }
 
-void bsc_msg_acc_lst_write(struct vty *vty, struct bsc_msg_acc_lst *lst)
+static void bsc_msg_acc_lst_write_one(struct vty *vty, struct bsc_msg_acc_lst *lst)
 {
 	struct bsc_msg_acc_lst_entry *entry;
 
@@ -127,6 +127,14 @@
 	}
 }
 
+void bsc_msg_acc_lst_write(struct vty *vty)
+{
+	struct bsc_msg_acc_lst *lst;
+	llist_for_each_entry(lst, _acc_lst, list) {
+		bsc_msg_acc_lst_write_one(vty, lst);
+	}
+}
+
 void bsc_msg_acc_lst_vty_init(void *ctx, struct llist_head *lst, int node)
 {
 	_ctx = ctx;
diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
index e124b31..66e59bd 100644
--- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c
+++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c
@@ -221,6 +221,8 @@
 	if (bsc->acc_lst_name)
 		vty_out(vty, " access-list-name %s%s", bsc->acc_lst_name, VTY_NEWLINE);
 
+	bsc_msg_acc_lst_write(vty);
+
 	return CMD_SUCCESS;
 }
 
diff --git a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
index 7ddcb57..eba968a 100644
--- a/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
+++ b/openbsc/src/osmo-bsc_nat/bsc_nat_vty.c
@@ -129,7 +129,6 @@
 
 static int config_write_nat(struct vty *vty)
 {
-	struct bsc_msg_acc_lst *lst;
 	struct bsc_nat_paging_group *pgroup;
 
 	vty_out(vty, "nat%s", VTY_NEWLINE);
@@ -179,8 +178,8 @@
 		vty_out(vty, " prefix-tree %s%s",
 			_nat->num_rewr_trie_name, VTY_NEWLINE);
 
-	llist_for_each_entry(lst, &_nat->access_lists, list)
-		bsc_msg_acc_lst_write(vty, lst);
+	bsc_msg_acc_lst_write(vty);
+
 	llist_for_each_entry(pgroup, &_nat->paging_groups, entry)
 		write_pgroup_lst(vty, pgroup);
 	if (_nat->mgcp_ipa)

-- 
To view, visit https://gerrit.osmocom.org/9773
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: openbsc
Gerrit-Branch: master
Gerrit-MessageType: merged
Gerrit-Change-Id: I0b951a9c3dbe245c3813fc91ceb9118a0de779b8
Gerrit-Change-Number: 9773
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
Gerrit-Reviewer: Harald Welte <laforge at gnumonks.org>
Gerrit-Reviewer: Jenkins Builder
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180628/eb0c0b23/attachment.htm>