<p>Pau Espin Pedrol has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/13221">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move msc related code from gsm_data to bsc_msc<br><br>This way ipaccess utils can be built without requiring libosmo-sigtran.<br><br>Change-Id: I508188896be58ddc3bd4e9c3c661c258c06866f4<br>---<br>M include/osmocom/bsc/bsc_msc_data.h<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/osmo_bsc_msc.c<br>M tests/handover/Makefile.am<br>5 files changed, 19 insertions(+), 19 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/21/13221/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/bsc/bsc_msc_data.h b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>index 9f2d7d8..5202174 100644</span><br><span>--- a/include/osmocom/bsc/bsc_msc_data.h</span><br><span>+++ b/include/osmocom/bsc/bsc_msc_data.h</span><br><span>@@ -161,6 +161,9 @@</span><br><span> struct bsc_msc_data *osmo_msc_data_find(struct gsm_network *, int);</span><br><span> struct bsc_msc_data *osmo_msc_data_alloc(struct gsm_network *, int);</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> /* Helper function to calculate the port number for a given</span><br><span>  * timeslot/multiplex. This functionality is needed to support</span><br><span>  * the sccp-lite scenario where the MGW is handled externally */</span><br><span>diff --git a/include/osmocom/bsc/gsm_data.h b/include/osmocom/bsc/gsm_data.h</span><br><span>index c4315c0..47ca5e8 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -1687,6 +1687,4 @@</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(0, 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(0, 100%, 40%);">-</span><br><span> #endif /* _GSM_DATA_H */</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 0198fcf..a128216 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -38,7 +38,6 @@</span><br><span> </span><br><span> #include <osmocom/bsc/gsm_data.h></span><br><span> #include <osmocom/bsc/osmo_bsc_lcls.h></span><br><span style="color: hsl(0, 100%, 40%);">-#include <osmocom/bsc/bsc_msc_data.h></span><br><span> #include <osmocom/bsc/abis_nm.h></span><br><span> #include <osmocom/bsc/handover_cfg.h></span><br><span> #include <osmocom/bsc/gsm_timers.h></span><br><span>@@ -1694,19 +1693,3 @@</span><br><span>      OSMO_VALUE_STRING(FOR_VTY),</span><br><span>  {}</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 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(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>diff --git a/src/osmo-bsc/osmo_bsc_msc.c b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>index 71931e6..4df1ce4 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_msc.c</span><br><span>@@ -119,3 +119,18 @@</span><br><span>    return msc_data;</span><br><span> }</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 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>diff --git a/tests/handover/Makefile.am b/tests/handover/Makefile.am</span><br><span>index 5e9af04..5e4440c 100644</span><br><span>--- a/tests/handover/Makefile.am</span><br><span>+++ b/tests/handover/Makefile.am</span><br><span>@@ -69,6 +69,7 @@</span><br><span>         $(top_builddir)/src/osmo-bsc/neighbor_ident.o \</span><br><span>      $(top_builddir)/src/osmo-bsc/net_init.o \</span><br><span>    $(top_builddir)/src/osmo-bsc/osmo_bsc_lcls.o \</span><br><span style="color: hsl(120, 100%, 40%);">+        $(top_builddir)/src/osmo-bsc/osmo_bsc_msc.o \</span><br><span>        $(top_builddir)/src/osmo-bsc/paging.o \</span><br><span>      $(top_builddir)/src/osmo-bsc/pcu_sock.o \</span><br><span>    $(top_builddir)/src/osmo-bsc/penalty_timers.o \</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/13221">change 13221</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/13221"/><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: newchange </div>
<div style="display:none"> Gerrit-Change-Id: I508188896be58ddc3bd4e9c3c661c258c06866f4 </div>
<div style="display:none"> Gerrit-Change-Number: 13221 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Pau Espin Pedrol <pespin@sysmocom.de> </div>