<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/9761">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">bsc-filter: Remove unused func barr_adapt and set barr_find static<br><br>bar_find is set as static because it's still being used internally by<br>other functions.<br><br>Change-Id: I2db8f0ba60cf01929ce2c63edd9859612724de48<br>---<br>M include/osmocom/bsc/bsc_msg_filter.h<br>M src/libfilter/bsc_msg_filter.c<br>2 files changed, 1 insertion(+), 68 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msg_filter.h b/include/osmocom/bsc/bsc_msg_filter.h</span><br><span>index a9dedf4..c9d86f4 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msg_filter.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msg_filter.h</span><br><span>@@ -79,10 +79,6 @@</span><br><span> int bsc_nr;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_filter_barr_adapt(void *ctx, struct rb_root *rbtree, const struct osmo_config_list *);</span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_filter_barr_find(struct rb_root *root, const char *imsi, int *cm, int *lu);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /**</span><br><span> * Content filtering.</span><br><span> */</span><br><span>diff --git a/src/libfilter/bsc_msg_filter.c b/src/libfilter/bsc_msg_filter.c</span><br><span>index 852067e..bcabc24 100644</span><br><span>--- a/src/libfilter/bsc_msg_filter.c</span><br><span>+++ b/src/libfilter/bsc_msg_filter.c</span><br><span>@@ -35,7 +35,7 @@</span><br><span> #include <osmocom/gsm/protocol/gsm_04_11.h></span><br><span> #include <osmocom/gsm/gsm48.h></span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int bsc_filter_barr_find(struct rb_root *root, const char *imsi, int *cm, int *lu)</span><br><span style="color: hsl(120, 100%, 40%);">+static int bsc_filter_barr_find(struct rb_root *root, const char *imsi, int *cm, int *lu)</span><br><span> {</span><br><span> struct bsc_filter_barr_entry *n;</span><br><span> n = rb_entry(root->rb_node, struct bsc_filter_barr_entry, node);</span><br><span>@@ -56,69 +56,6 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static int insert_barr_node(struct bsc_filter_barr_entry *entry, struct rb_root *root)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct rb_node **new = &root->rb_node, *parent = NULL;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- while (*new) {</span><br><span style="color: hsl(0, 100%, 40%);">- int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_filter_barr_entry *this;</span><br><span style="color: hsl(0, 100%, 40%);">- this = rb_entry(*new, struct bsc_filter_barr_entry, node);</span><br><span style="color: hsl(0, 100%, 40%);">- parent = *new;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rc = strcmp(entry->imsi, this->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- if (rc < 0)</span><br><span style="color: hsl(0, 100%, 40%);">- new = &((*new)->rb_left);</span><br><span style="color: hsl(0, 100%, 40%);">- else if (rc > 0)</span><br><span style="color: hsl(0, 100%, 40%);">- new = &((*new)->rb_right);</span><br><span style="color: hsl(0, 100%, 40%);">- else {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DFILTER, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Duplicate entry for IMSI(%s)\n", entry->imsi);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(entry);</span><br><span style="color: hsl(0, 100%, 40%);">- return -1;</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%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- rb_link_node(&entry->node, parent, new);</span><br><span style="color: hsl(0, 100%, 40%);">- rb_insert_color(&entry->node, root);</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</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%);">-int bsc_filter_barr_adapt(void *ctx, struct rb_root *root,</span><br><span style="color: hsl(0, 100%, 40%);">- const struct osmo_config_list *list)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- struct osmo_config_entry *cfg_entry;</span><br><span style="color: hsl(0, 100%, 40%);">- int err = 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* free the old data */</span><br><span style="color: hsl(0, 100%, 40%);">- while (!RB_EMPTY_ROOT(root)) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct rb_node *node = rb_first(root);</span><br><span style="color: hsl(0, 100%, 40%);">- rb_erase(node, root);</span><br><span style="color: hsl(0, 100%, 40%);">- talloc_free(node);</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%);">- if (!list)</span><br><span style="color: hsl(0, 100%, 40%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- /* now adapt the new list */</span><br><span style="color: hsl(0, 100%, 40%);">- llist_for_each_entry(cfg_entry, &list->entry, list) {</span><br><span style="color: hsl(0, 100%, 40%);">- struct bsc_filter_barr_entry *entry;</span><br><span style="color: hsl(0, 100%, 40%);">- entry = talloc_zero(ctx, struct bsc_filter_barr_entry);</span><br><span style="color: hsl(0, 100%, 40%);">- if (!entry) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DFILTER, LOGL_ERROR,</span><br><span style="color: hsl(0, 100%, 40%);">- "Allocation of the barr entry failed.\n");</span><br><span style="color: hsl(0, 100%, 40%);">- continue;</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%);">- entry->imsi = talloc_strdup(entry, cfg_entry->mcc);</span><br><span style="color: hsl(0, 100%, 40%);">- entry->cm_reject_cause = atoi(cfg_entry->mnc);</span><br><span style="color: hsl(0, 100%, 40%);">- entry->lu_reject_cause = atoi(cfg_entry->option);</span><br><span style="color: hsl(0, 100%, 40%);">- err |= insert_barr_node(entry, root);</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%);">- return err;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> </span><br><span> static int lst_check_deny(struct bsc_msg_acc_lst *lst, const char *mi_string,</span><br><span> int *cm_cause, int *lu_cause)</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/9761">change 9761</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/9761"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-bsc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2db8f0ba60cf01929ce2c63edd9859612724de48 </div>
<div style="display:none"> Gerrit-Change-Number: 9761 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>