<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/9773">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc_vty: Write access list entries when storing bsc config<br><br>Back-port from osmo-bsc.git d99182c01037f4dd14fb72b2b06497e0c1bebb49.<br><br>Change-Id: I0b951a9c3dbe245c3813fc91ceb9118a0de779b8<br>---<br>M openbsc/include/openbsc/bsc_msg_filter.h<br>M openbsc/src/libfilter/bsc_msg_vty.c<br>M openbsc/src/osmo-bsc/osmo_bsc_vty.c<br>M openbsc/src/osmo-bsc_nat/bsc_nat_vty.c<br>4 files changed, 14 insertions(+), 5 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/openbsc refs/changes/73/9773/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/openbsc/include/openbsc/bsc_msg_filter.h b/openbsc/include/openbsc/bsc_msg_filter.h</span><br><span>index dc971a4..22b8447 100644</span><br><span>--- a/openbsc/include/openbsc/bsc_msg_filter.h</span><br><span>+++ b/openbsc/include/openbsc/bsc_msg_filter.h</span><br><span>@@ -104,4 +104,4 @@</span><br><span> int bsc_msg_acc_lst_check_allow(struct bsc_msg_acc_lst *lst, const char *imsi);</span><br><span> </span><br><span> void bsc_msg_acc_lst_vty_init(void *ctx, struct llist_head *lst, int node);</span><br><span style="color: hsl(0, 100%, 40%);">-void bsc_msg_acc_lst_write(struct vty *vty, struct bsc_msg_acc_lst *lst);</span><br><span style="color: hsl(120, 100%, 40%);">+void bsc_msg_acc_lst_write(struct vty *vty);</span><br><span>diff --git a/openbsc/src/libfilter/bsc_msg_vty.c b/openbsc/src/libfilter/bsc_msg_vty.c</span><br><span>index 06f3876..668e399 100644</span><br><span>--- a/openbsc/src/libfilter/bsc_msg_vty.c</span><br><span>+++ b/openbsc/src/libfilter/bsc_msg_vty.c</span><br><span>@@ -111,7 +111,7 @@</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void bsc_msg_acc_lst_write(struct vty *vty, struct bsc_msg_acc_lst *lst)</span><br><span style="color: hsl(120, 100%, 40%);">+static void bsc_msg_acc_lst_write_one(struct vty *vty, struct bsc_msg_acc_lst *lst)</span><br><span> {</span><br><span> struct bsc_msg_acc_lst_entry *entry;</span><br><span> </span><br><span>@@ -127,6 +127,14 @@</span><br><span> }</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+void bsc_msg_acc_lst_write(struct vty *vty)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ struct bsc_msg_acc_lst *lst;</span><br><span style="color: hsl(120, 100%, 40%);">+ llist_for_each_entry(lst, _acc_lst, list) {</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_msg_acc_lst_write_one(vty, lst);</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> void bsc_msg_acc_lst_vty_init(void *ctx, struct llist_head *lst, int node)</span><br><span> {</span><br><span> _ctx = ctx;</span><br><span>diff --git a/openbsc/src/osmo-bsc/osmo_bsc_vty.c b/openbsc/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>index e124b31..66e59bd 100644</span><br><span>--- a/openbsc/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>+++ b/openbsc/src/osmo-bsc/osmo_bsc_vty.c</span><br><span>@@ -221,6 +221,8 @@</span><br><span> if (bsc->acc_lst_name)</span><br><span> vty_out(vty, " access-list-name %s%s", bsc->acc_lst_name, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_msg_acc_lst_write(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> return CMD_SUCCESS;</span><br><span> }</span><br><span> </span><br><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 7ddcb57..eba968a 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>@@ -129,7 +129,6 @@</span><br><span> </span><br><span> static int config_write_nat(struct vty *vty)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_msg_acc_lst *lst;</span><br><span> struct bsc_nat_paging_group *pgroup;</span><br><span> </span><br><span> vty_out(vty, "nat%s", VTY_NEWLINE);</span><br><span>@@ -179,8 +178,8 @@</span><br><span> vty_out(vty, " prefix-tree %s%s",</span><br><span> _nat->num_rewr_trie_name, VTY_NEWLINE);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(lst, &_nat->access_lists, list)</span><br><span style="color: hsl(0, 100%, 40%);">- bsc_msg_acc_lst_write(vty, lst);</span><br><span style="color: hsl(120, 100%, 40%);">+ bsc_msg_acc_lst_write(vty);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> llist_for_each_entry(pgroup, &_nat->paging_groups, entry)</span><br><span> write_pgroup_lst(vty, pgroup);</span><br><span> if (_nat->mgcp_ipa)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9773">change 9773</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/9773"/><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: I0b951a9c3dbe245c3813fc91ceb9118a0de779b8 </div>
<div style="display:none"> Gerrit-Change-Number: 9773 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>