<p>Pau Espin Pedrol <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12252">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_main: filter_fn: Compare imsi values instead of subscr pointers<br><br>Since we actually want to match by IMSI as specified by filter in VTY.<br>It will allow to match based on other information later.<br><br>Change-Id: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f<br>---<br>M src/osmo-bsc/osmo_bsc_main.c<br>1 file changed, 5 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-bsc/osmo_bsc_main.c b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>index 67fccd3..08bb40d 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_main.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_main.c</span><br><span>@@ -35,6 +35,7 @@</span><br><span> #include <osmocom/bsc/lchan_fsm.h></span><br><span> #include <osmocom/bsc/mgw_endpoint_fsm.h></span><br><span> #include <osmocom/bsc/bsc_subscr_conn_fsm.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/bsc/bsc_subscriber.h></span><br><span> #include <osmocom/bsc/assignment_fsm.h></span><br><span> #include <osmocom/bsc/handover_fsm.h></span><br><span> </span><br><span>@@ -767,10 +768,12 @@</span><br><span> </span><br><span> static int filter_fn(const struct log_context *ctx, struct log_target *tar)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- const struct bsc_subscr *bsub = ctx->ctx[LOG_CTX_BSC_SUBSCR];</span><br><span style="color: hsl(120, 100%, 40%);">+      const struct bsc_subscr *bsub_ctx = ctx->ctx[LOG_CTX_BSC_SUBSCR];</span><br><span style="color: hsl(120, 100%, 40%);">+  const struct bsc_subscr *bsub_filter = tar->filter_data[LOG_FLT_BSC_SUBSCR];</span><br><span> </span><br><span>  if ((tar->filter_map & (1 << LOG_FLT_BSC_SUBSCR)) != 0</span><br><span style="color: hsl(0, 100%, 40%);">-         && bsub && bsub == tar->filter_data[LOG_FLT_BSC_SUBSCR])</span><br><span style="color: hsl(120, 100%, 40%);">+           && bsub_ctx && bsub_filter</span><br><span style="color: hsl(120, 100%, 40%);">+            && strncmp(bsub_ctx->imsi, bsub_filter->imsi, sizeof(bsub_ctx->imsi)) == 0)</span><br><span>             return 1;</span><br><span> </span><br><span>        return 0;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12252">change 12252</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/12252"/><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: Ia73fd2f38e42396db8f6d2cc6b2c163aa8f67f3f </div>
<div style="display:none"> Gerrit-Change-Number: 12252 </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 (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>