<p>pespin has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-msc/+/23915">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">WIP: Fill Last Used E-UTRAN PLMN Id when in CSFB<br><br>Since recently, osmo-bsc behaves strictly as per specs, meaning it will<br>only send the "Cell selection indicator after release of all TCH and SDCCH IE"<br>in RR Channel Release iff:<br>* "Last Used E-UTRAN PLMN Id" was received in the CommonID sent MSC->BSC<br>* "Last Used E-UTRAN PLMN Id" was received insider "old BSS to new BSS Information"<br> in the HandoverRequest sent MSC->BSC.<br>On the other hand, CSFB_Indicator from ClearCommand MSC->BSC is nw<br>ignored and not taken into account.<br><br>Hence, let's update osmo-msc to also behave correctly by sending the<br>Last Used E-UTRAN PLMN ID at CommonID tx time to avoid regressions in<br>CSFB support when running against newer osmo-bsc.<br><br>Let's keep sending the CSFB Indicator in ClearCommand as we used too, in<br>order to keep compatibility with older BSCs (as per spec).<br><br>Related: SYS#5337<br>Change-Id: Ic5f175b179973d0a50d94f00e15f5a3e332605fc<br>---<br>M include/osmocom/msc/ran_msg.h<br>M src/libmsc/gsm_04_08.c<br>M src/libmsc/msc_a.c<br>M src/libmsc/ran_msg_a.c<br>4 files changed, 15 insertions(+), 2 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/15/23915/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/ran_msg.h b/include/osmocom/msc/ran_msg.h</span><br><span>index 3b08b46..1303ba3 100644</span><br><span>--- a/include/osmocom/msc/ran_msg.h</span><br><span>+++ b/include/osmocom/msc/ran_msg.h</span><br><span>@@ -220,6 +220,8 @@</span><br><span> } cipher_mode_reject;</span><br><span> struct {</span><br><span> const char *imsi;</span><br><span style="color: hsl(120, 100%, 40%);">+ bool last_eutran_plmn_present;</span><br><span style="color: hsl(120, 100%, 40%);">+ struct osmo_plmn_id last_eutran_plmn;</span><br><span> } common_id;</span><br><span> struct {</span><br><span> enum gsm48_reject_value cause;</span><br><span>diff --git a/src/libmsc/gsm_04_08.c b/src/libmsc/gsm_04_08.c</span><br><span>index 6379059..8d3a71f 100644</span><br><span>--- a/src/libmsc/gsm_04_08.c</span><br><span>+++ b/src/libmsc/gsm_04_08.c</span><br><span>@@ -1372,8 +1372,12 @@</span><br><span> .msg_type = RAN_MSG_COMMON_ID,</span><br><span> .common_id = {</span><br><span> .imsi = msc_a_vsub(msc_a)->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ .last_eutran_plmn_present = false /*TODO*/,</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg.common_id.last_eutran_plmn_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*TODO: fill last_eutran_plmn_present */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return msc_a_ran_down(msc_a, MSC_ROLE_I, &msg);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libmsc/msc_a.c b/src/libmsc/msc_a.c</span><br><span>index 0645c54..fcde47c 100644</span><br><span>--- a/src/libmsc/msc_a.c</span><br><span>+++ b/src/libmsc/msc_a.c</span><br><span>@@ -1648,9 +1648,12 @@</span><br><span> .msg_type = RAN_MSG_COMMON_ID,</span><br><span> .common_id = {</span><br><span> .imsi = vsub->imsi,</span><br><span style="color: hsl(120, 100%, 40%);">+ .last_eutran_plmn_present = false /*TODO*/,</span><br><span> },</span><br><span> };</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(120, 100%, 40%);">+ if (msg.common_id.last_eutran_plmn_present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /*TODO: fill last_eutran_plmn_present */</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> return msc_a_ran_down(msc_a, to_role, &msg);</span><br><span> }</span><br><span> </span><br><span>diff --git a/src/libmsc/ran_msg_a.c b/src/libmsc/ran_msg_a.c</span><br><span>index 2890076..4cce289 100644</span><br><span>--- a/src/libmsc/ran_msg_a.c</span><br><span>+++ b/src/libmsc/ran_msg_a.c</span><br><span>@@ -1218,7 +1218,11 @@</span><br><span> return ran_a_make_assignment_command(caller_fi, &ran_enc_msg->assignment_command);</span><br><span> </span><br><span> case RAN_MSG_COMMON_ID:</span><br><span style="color: hsl(0, 100%, 40%);">- return gsm0808_create_common_id(ran_enc_msg->common_id.imsi, NULL, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return gsm0808_create_common_id(ran_enc_msg->common_id.imsi, NULL,</span><br><span style="color: hsl(120, 100%, 40%);">+ ran_enc_msg->common_id.last_eutran_plmn_present ?</span><br><span style="color: hsl(120, 100%, 40%);">+ &ran_enc_msg->common_id.last_eutran_plmn :</span><br><span style="color: hsl(120, 100%, 40%);">+ NULL</span><br><span style="color: hsl(120, 100%, 40%);">+ );</span><br><span> </span><br><span> case RAN_MSG_CIPHER_MODE_COMMAND:</span><br><span> return ran_a_make_cipher_mode_command(caller_fi, &ran_enc_msg->cipher_mode_command);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-msc/+/23915">change 23915</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/c/osmo-msc/+/23915"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Ic5f175b179973d0a50d94f00e15f5a3e332605fc </div>
<div style="display:none"> Gerrit-Change-Number: 23915 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>