<p>dexter <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11527">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Pau Espin Pedrol: Looks good to me, approved
  Jenkins Builder: Verified

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">gsm_data: make cgi_for_msc available for other modules<br><br>The function cgi_for_msc() provides an easy way to get a cell global id<br>for an msc/bts combination. This function is currently statically<br>defined in gsm_08_08.c. Lets move it to gsm_data.c and make it publicly<br>available.<br><br>Change-Id: I301fac6e83a429ae59b5c586aa283ad7ba54053d<br>Related: OS#3645<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/gsm_08_08.c<br>M src/osmo-bsc/gsm_data.c<br>3 files changed, 18 insertions(+), 16 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index 7897fea..1be9ae8 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1614,4 +1614,6 @@</span><br><span> </span><br><span> int bts_count_free_ts(struct gsm_bts *bts, enum gsm_phys_chan_config pchan);</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #endif /* _GSM_DATA_H */</span><br><span>diff --git a/src/osmo-bsc/gsm_08_08.c b/src/osmo-bsc/gsm_08_08.c</span><br><span>index 19c2598..062c878 100644</span><br><span>--- a/src/osmo-bsc/gsm_08_08.c</span><br><span>+++ b/src/osmo-bsc/gsm_08_08.c</span><br><span>@@ -58,22 +58,6 @@</span><br><span> static bool complete_layer3(struct gsm_subscriber_connection *conn,</span><br><span>                      struct msgb *msg, struct bsc_msc_data *msc);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">-      static struct osmo_cell_global_id cgi;</span><br><span style="color: hsl(0, 100%, 40%);">-  cgi.lai.plmn = msc->network->plmn;</span><br><span style="color: hsl(0, 100%, 40%);">-        if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID)</span><br><span style="color: hsl(0, 100%, 40%);">-               cgi.lai.plmn.mcc = msc->core_plmn.mcc;</span><br><span style="color: hsl(0, 100%, 40%);">-       if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) {</span><br><span style="color: hsl(0, 100%, 40%);">-             cgi.lai.plmn.mnc = msc->core_plmn.mnc;</span><br><span style="color: hsl(0, 100%, 40%);">-               cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits;</span><br><span style="color: hsl(0, 100%, 40%);">-     }</span><br><span style="color: hsl(0, 100%, 40%);">-       cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : bts->location_area_code;</span><br><span style="color: hsl(0, 100%, 40%);">- cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : bts->cell_identity;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-  return &cgi;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static void bsc_maybe_lu_reject(struct gsm_subscriber_connection *conn, int con_type, int cause)</span><br><span> {</span><br><span>   struct msgb *msg;</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 56eb24e..15853fb 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -1688,3 +1688,19 @@</span><br><span>  OSMO_VALUE_STRING(FOR_VTY),</span><br><span>  {}</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_cell_global_id *cgi_for_msc(struct bsc_msc_data *msc, struct gsm_bts *bts)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ static struct osmo_cell_global_id cgi;</span><br><span style="color: hsl(120, 100%, 40%);">+        cgi.lai.plmn = msc->network->plmn;</span><br><span style="color: hsl(120, 100%, 40%);">+      if (msc->core_plmn.mcc != GSM_MCC_MNC_INVALID)</span><br><span style="color: hsl(120, 100%, 40%);">+             cgi.lai.plmn.mcc = msc->core_plmn.mcc;</span><br><span style="color: hsl(120, 100%, 40%);">+     if (msc->core_plmn.mnc != GSM_MCC_MNC_INVALID) {</span><br><span style="color: hsl(120, 100%, 40%);">+           cgi.lai.plmn.mnc = msc->core_plmn.mnc;</span><br><span style="color: hsl(120, 100%, 40%);">+             cgi.lai.plmn.mnc_3_digits = msc->core_plmn.mnc_3_digits;</span><br><span style="color: hsl(120, 100%, 40%);">+   }</span><br><span style="color: hsl(120, 100%, 40%);">+     cgi.lai.lac = (msc->core_lac != -1) ? msc->core_lac : bts->location_area_code;</span><br><span style="color: hsl(120, 100%, 40%);">+       cgi.cell_identity = (msc->core_ci != -1) ? msc->core_ci : bts->cell_identity;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+      return &cgi;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11527">change 11527</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/11527"/><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: I301fac6e83a429ae59b5c586aa283ad7ba54053d </div>
<div style="display:none"> Gerrit-Change-Number: 11527 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: dexter <pmaier@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Pau Espin Pedrol <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: dexter <pmaier@sysmocom.de> </div>