<p>neels has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24350">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">assignment_fsm: send BSSMAP response only after Assignment Request<br><br>So far, only the MSC asked for Assignment via Assignment Request, which<br>we answer with a BSSMAP Assignment Complete or Assignment Failure when<br>done.<br><br>When Assignment is triggered for any other reason (congestion<br>resolution, VAMOS, VTY), we will not send any such messages to the MSC.<br><br>Additional enum values will be added in subsequent commits:<br>Id56a890106b93fcee67ac9401b890e7b63bba421 ASSIGN_FOR_CONGESTION_RESOLUTION<br>If006f5caaf83b07675f57e5665cfa79328da55e6 ASSIGN_FOR_VTY<br><br>Change-Id: Ie0cddbdb00abcec78e153f4ae6d04ce75080a111<br>---<br>M include/osmocom/bsc/gsm_data.h<br>M src/osmo-bsc/assignment_fsm.c<br>M src/osmo-bsc/gsm_data.c<br>M src/osmo-bsc/osmo_bsc_bssap.c<br>4 files changed, 42 insertions(+), 16 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/50/24350/1</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 5a202bf..4b175a4 100644</span><br><span>--- a/include/osmocom/bsc/gsm_data.h</span><br><span>+++ b/include/osmocom/bsc/gsm_data.h</span><br><span>@@ -111,10 +111,21 @@</span><br><span> uint16_t s15_s0;</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum assign_for {</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSIGN_FOR_NONE,</span><br><span style="color: hsl(120, 100%, 40%);">+ ASSIGN_FOR_BSSMAP_REQ,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string assign_for_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+static inline const char *assign_for_name(enum assign_for assign_for)</span><br><span style="color: hsl(120, 100%, 40%);">+{ return get_value_string(assign_for_names, assign_for); }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* Information retrieved during an Assignment Request from the MSC. This is storage of the Assignment instructions</span><br><span> * parsed from the Assignment Request message, to pass on until the gscon and assignment FSMs have decided whether an</span><br><span> * Assignment is actually going to be carried out. Should remain unchanged after initial decoding. */</span><br><span> struct assignment_request {</span><br><span style="color: hsl(120, 100%, 40%);">+ enum assign_for assign_for;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> bool aoip;</span><br><span> </span><br><span> uint16_t msc_assigned_cic;</span><br><span>diff --git a/src/osmo-bsc/assignment_fsm.c b/src/osmo-bsc/assignment_fsm.c</span><br><span>index cf3c50e..bfb4043 100644</span><br><span>--- a/src/osmo-bsc/assignment_fsm.c</span><br><span>+++ b/src/osmo-bsc/assignment_fsm.c</span><br><span>@@ -134,13 +134,17 @@</span><br><span> </span><br><span> static void on_assignment_failure(struct gsm_subscriber_connection *conn)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- struct msgb *resp = gsm0808_create_assignment_failure(conn->assignment.failure_cause, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Send Assignment Failure to MSC only when the assignment was requested via BSSAP. Do not send anything to the</span><br><span style="color: hsl(120, 100%, 40%);">+ * MSC if re-assignment was requested for congestion resolution, for VAMOS multiplexing, or by VTY. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->assignment.req.assign_for == ASSIGN_FOR_BSSMAP_REQ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ struct msgb *resp = gsm0808_create_assignment_failure(conn->assignment.failure_cause, NULL);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (!resp) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOG_ASSIGNMENT(conn, LOGL_ERROR, "Unable to compose BSSMAP Assignment Failure message\n");</span><br><span style="color: hsl(0, 100%, 40%);">- } else {</span><br><span style="color: hsl(0, 100%, 40%);">- rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE]);</span><br><span style="color: hsl(0, 100%, 40%);">- gscon_sigtran_send(conn, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!resp) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOG_ASSIGNMENT(conn, LOGL_ERROR, "Unable to compose BSSMAP Assignment Failure message\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ } else {</span><br><span style="color: hsl(120, 100%, 40%);">+ rate_ctr_inc(&conn->sccp.msc->msc_ctrs->ctr[MSC_CTR_BSSMAP_TX_DT1_ASSIGMENT_FAILURE]);</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_sigtran_send(conn, resp);</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> /* If assignment failed as early as in assignment_fsm_start(), there may not be an fi yet. */</span><br><span>@@ -259,15 +263,17 @@</span><br><span> }</span><br><span> conn->assignment.new_lchan = NULL;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- send_assignment_complete(conn);</span><br><span style="color: hsl(0, 100%, 40%);">- /* If something went wrong during send_assignment_complete(), the fi will be gone from</span><br><span style="color: hsl(0, 100%, 40%);">- * error handling in there. Almost a success, but then again the whole thing failed. */</span><br><span style="color: hsl(0, 100%, 40%);">- if (!conn->assignment.fi) {</span><br><span style="color: hsl(0, 100%, 40%);">- /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan,</span><br><span style="color: hsl(0, 100%, 40%);">- * the conn will notice that its primary lchan is gone and should clean itself up. */</span><br><span style="color: hsl(0, 100%, 40%);">- lchan_release(conn->lchan, true, true, RSL_ERR_EQUIPMENT_FAIL,</span><br><span style="color: hsl(0, 100%, 40%);">- gscon_last_eutran_plmn(conn));</span><br><span style="color: hsl(0, 100%, 40%);">- return;</span><br><span style="color: hsl(120, 100%, 40%);">+ if (conn->assignment.req.assign_for == ASSIGN_FOR_BSSMAP_REQ) {</span><br><span style="color: hsl(120, 100%, 40%);">+ send_assignment_complete(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ /* If something went wrong during send_assignment_complete(), the fi will be gone from</span><br><span style="color: hsl(120, 100%, 40%);">+ * error handling in there. Almost a success, but then again the whole thing failed. */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (!conn->assignment.fi) {</span><br><span style="color: hsl(120, 100%, 40%);">+ /* The lchan was ready, and we failed to tell the MSC about it. By releasing this lchan,</span><br><span style="color: hsl(120, 100%, 40%);">+ * the conn will notice that its primary lchan is gone and should clean itself up. */</span><br><span style="color: hsl(120, 100%, 40%);">+ lchan_release(conn->lchan, true, true, RSL_ERR_EQUIPMENT_FAIL,</span><br><span style="color: hsl(120, 100%, 40%);">+ gscon_last_eutran_plmn(conn));</span><br><span style="color: hsl(120, 100%, 40%);">+ return;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span> }</span><br><span> </span><br><span> if (lchan_changed) {</span><br><span>@@ -486,7 +492,8 @@</span><br><span> gsm48_chan_mode_name(conn->lchan->ch_mode_rate.chan_mode),</span><br><span> gsm_lchan_name(conn->lchan));</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- send_assignment_complete(conn);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (req->assign_for == ASSIGN_FOR_BSSMAP_REQ)</span><br><span style="color: hsl(120, 100%, 40%);">+ send_assignment_complete(conn);</span><br><span> /* If something went wrong during send_assignment_complete(),</span><br><span> * the fi will be gone from error handling in there. */</span><br><span> if (conn->assignment.fi) {</span><br><span>diff --git a/src/osmo-bsc/gsm_data.c b/src/osmo-bsc/gsm_data.c</span><br><span>index 6c08229..781db7c 100644</span><br><span>--- a/src/osmo-bsc/gsm_data.c</span><br><span>+++ b/src/osmo-bsc/gsm_data.c</span><br><span>@@ -923,6 +923,12 @@</span><br><span> {}</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string assign_for_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ASSIGN_FOR_NONE),</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_VALUE_STRING(ASSIGN_FOR_BSSMAP_REQ),</span><br><span style="color: hsl(120, 100%, 40%);">+ {}</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /* This may be specific to RR Channel Release, and the mappings were chosen by pure naive guessing without a proper</span><br><span> * specification available. */</span><br><span> enum gsm48_rr_cause bsc_gsm48_rr_cause_from_gsm0808_cause(enum gsm0808_cause c)</span><br><span>diff --git a/src/osmo-bsc/osmo_bsc_bssap.c b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>index 7a7579b..fff5fbb 100644</span><br><span>--- a/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>+++ b/src/osmo-bsc/osmo_bsc_bssap.c</span><br><span>@@ -923,6 +923,7 @@</span><br><span> }</span><br><span> </span><br><span> req = (struct assignment_request){</span><br><span style="color: hsl(120, 100%, 40%);">+ .assign_for = ASSIGN_FOR_BSSMAP_REQ,</span><br><span> .aoip = aoip,</span><br><span> .msc_assigned_cic = cic,</span><br><span> .use_osmux = use_osmux,</span><br><span>@@ -951,6 +952,7 @@</span><br><span> break;</span><br><span> case GSM0808_CHAN_SIGN:</span><br><span> req = (struct assignment_request){</span><br><span style="color: hsl(120, 100%, 40%);">+ .assign_for = ASSIGN_FOR_BSSMAP_REQ,</span><br><span> .aoip = aoip,</span><br><span> };</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-bsc/+/24350">change 24350</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-bsc/+/24350"/><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-Change-Id: Ie0cddbdb00abcec78e153f4ae6d04ce75080a111 </div>
<div style="display:none"> Gerrit-Change-Number: 24350 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: neels <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>