Change in openbsc[master]: filter: vty: Print policy list in cmd show access-list

[Pau Espin Pedrol]

Pau Espin Pedrol has uploaded this change for review. ( https://gerrit.osmocom.org/9774


Change subject: filter: vty: Print policy list in cmd show access-list
......................................................................

filter: vty: Print policy list in cmd show access-list

Back-port from osmo-bsc.git 653bee7d02a1a1c827b54d235b644fec6a6f4683.

Change-Id: Id89febbd84beba8a0c083cbf83649bb4672684c4
---
M openbsc/src/libfilter/bsc_msg_vty.c
1 file changed, 17 insertions(+), 16 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/74/9774/1

diff --git a/openbsc/src/libfilter/bsc_msg_vty.c b/openbsc/src/libfilter/bsc_msg_vty.c
index 668e399..7106dea 100644
--- a/openbsc/src/libfilter/bsc_msg_vty.c
+++ b/openbsc/src/libfilter/bsc_msg_vty.c
@@ -26,6 +26,22 @@
 static struct llist_head *_acc_lst;
 static void *_ctx;
 
+static void bsc_msg_acc_lst_write_one(struct vty *vty, struct bsc_msg_acc_lst *lst)
+{
+	struct bsc_msg_acc_lst_entry *entry;
+
+	llist_for_each_entry(entry, &lst->fltr_list, list) {
+		if (entry->imsi_allow)
+			vty_out(vty, " access-list %s imsi-allow %s%s",
+				lst->name, entry->imsi_allow, VTY_NEWLINE);
+		if (entry->imsi_deny)
+			vty_out(vty, " access-list %s imsi-deny %s %d %d%s",
+				lst->name, entry->imsi_deny,
+				entry->cm_reject_cause, entry->lu_reject_cause,
+				VTY_NEWLINE);
+	}
+}
+
 DEFUN(cfg_lst_no,
       cfg_lst_no_cmd,
       "no access-list NAME",
@@ -52,6 +68,7 @@
 		return CMD_WARNING;
 
 	vty_out(vty, "access-list %s%s", acc->name, VTY_NEWLINE);
+	bsc_msg_acc_lst_write_one(vty, acc);
 	vty_out_rate_ctr_group(vty, " ", acc->stats);
 
 	return CMD_SUCCESS;
@@ -111,22 +128,6 @@
 	return CMD_SUCCESS;
 }
 
-static void bsc_msg_acc_lst_write_one(struct vty *vty, struct bsc_msg_acc_lst *lst)
-{
-	struct bsc_msg_acc_lst_entry *entry;
-
-	llist_for_each_entry(entry, &lst->fltr_list, list) {
-		if (entry->imsi_allow)
-			vty_out(vty, " access-list %s imsi-allow %s%s",
-				lst->name, entry->imsi_allow, VTY_NEWLINE);
-		if (entry->imsi_deny)
-			vty_out(vty, " access-list %s imsi-deny %s %d %d%s",
-				lst->name, entry->imsi_deny,
-				entry->cm_reject_cause, entry->lu_reject_cause,
-				VTY_NEWLINE);
-	}
-}
-
 void bsc_msg_acc_lst_write(struct vty *vty)
 {
 	struct bsc_msg_acc_lst *lst;

-- 
To view, visit https://gerrit.osmocom.org/9774
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: Id89febbd84beba8a0c083cbf83649bb4672684c4
Gerrit-Change-Number: 9774
Gerrit-PatchSet: 1
Gerrit-Owner: Pau Espin Pedrol <pespin at sysmocom.de>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20180628/3c822b76/attachment.htm>