<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26349">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, but someone else must approve
osmith: Looks good to me, but someone else must approve
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">hnbap: Improve rx path and implement HnbRegisterReject<br><br>The process is shut down if we receive such a message.<br><br>Change-Id: Id4656140b7f51b07860dcbeed449ed68c3a9f85a<br>---<br>M src/osmo-hnodeb/hnbap.c<br>1 file changed, 78 insertions(+), 12 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo-hnodeb/hnbap.c b/src/osmo-hnodeb/hnbap.c</span><br><span>index 585354b..3287eeb 100644</span><br><span>--- a/src/osmo-hnodeb/hnbap.c</span><br><span>+++ b/src/osmo-hnodeb/hnbap.c</span><br><span>@@ -33,6 +33,7 @@</span><br><span> #include <osmocom/hnodeb/hnbap.h></span><br><span> #include <osmocom/hnodeb/hnodeb.h></span><br><span> #include <osmocom/hnodeb/iuh.h></span><br><span style="color: hsl(120, 100%, 40%);">+#include <osmocom/hnodeb/hnb_shutdown_fsm.h></span><br><span> </span><br><span> static int hnb_rx_hnb_register_acc(struct hnb *hnb, ANY_t *in)</span><br><span> {</span><br><span>@@ -44,12 +45,31 @@</span><br><span> }</span><br><span> </span><br><span> hnb->rnc_id = accept.rnc_id;</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DHNBAP, LOGL_INFO, "HNB Register accept with RNC ID %u\n", hnb->rnc_id);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_INFO, "Rx HNB Register accept with RNC ID %u\n", hnb->rnc_id);</span><br><span> </span><br><span> hnbap_free_hnbregisteraccepties(&accept);</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int hnb_rx_hnb_register_rej(struct hnb *hnb, ANY_t *in)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+ HNBAP_HNBRegisterRejectIEs_t reject;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnbap_decode_hnbregisterrejecties(&reject, in);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (rc < 0) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_NOTICE, "Rx HNB Register Reject: parse failure\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ return -EINVAL;</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%);">+ LOGP(DHNBAP, LOGL_NOTICE, "Rx HNB Register Reject with cause %s\n",</span><br><span style="color: hsl(120, 100%, 40%);">+ hnbap_cause_str(&reject.cause));</span><br><span style="color: hsl(120, 100%, 40%);">+ hnbap_free_hnbregisterrejecties(&reject);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_shutdown(hnb, "Rx HNB Register Reject", false);</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int hnb_rx_ue_register_acc(struct hnb *hnb, ANY_t *in)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -79,6 +99,53 @@</span><br><span> return 0;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+static int hnb_hnbap_rx_initiating(struct hnb *hnb, struct HNBAP_InitiatingMessage *init)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (init->procedureCode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_ERROR, "Rx HNBAP initiatingMessage %ld unsupported\n", init->procedureCode);</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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%);">+static int hnb_hnbap_rx_successful(struct hnb *hnb, struct HNBAP_SuccessfulOutcome *succ)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (succ->procedureCode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_ProcedureCode_id_HNBRegister:</span><br><span style="color: hsl(120, 100%, 40%);">+ /* Get HNB id and send UE Register request */</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_rx_hnb_register_acc(hnb, &succ->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_ProcedureCode_id_UERegister:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_rx_ue_register_acc(hnb, &succ->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</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%);">+static int hnb_hnbap_rx_unsuccessful(struct hnb *hnb, struct HNBAP_UnsuccessfulOutcome *unsucc)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ int rc;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (unsucc->procedureCode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_ProcedureCode_id_HNBRegister:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_rx_hnb_register_rej(hnb, &unsucc->value);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ default:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = -ENOSPC;</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ }</span><br><span style="color: hsl(120, 100%, 40%);">+ return rc;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> int hnb_hnbap_rx(struct hnb *hnb, struct msgb *msg)</span><br><span> {</span><br><span> HNBAP_HNBAP_PDU_t _pdu, *pdu = &_pdu;</span><br><span>@@ -93,21 +160,20 @@</span><br><span> return -EINVAL;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (pdu->present != HNBAP_HNBAP_PDU_PR_successfulOutcome) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DHNBAP, LOGL_ERROR, "Unexpected HNBAP message received\n");</span><br><span style="color: hsl(0, 100%, 40%);">- }</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- switch (pdu->choice.successfulOutcome.procedureCode) {</span><br><span style="color: hsl(0, 100%, 40%);">- case HNBAP_ProcedureCode_id_HNBRegister:</span><br><span style="color: hsl(0, 100%, 40%);">- /* Get HNB id and send UE Register request */</span><br><span style="color: hsl(0, 100%, 40%);">- rc = hnb_rx_hnb_register_acc(hnb, &pdu->choice.successfulOutcome.value);</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pdu->present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_HNBAP_PDU_PR_initiatingMessage:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_hnbap_rx_initiating(hnb, &pdu->choice.initiatingMessage);</span><br><span> break;</span><br><span style="color: hsl(0, 100%, 40%);">- case HNBAP_ProcedureCode_id_UERegister:</span><br><span style="color: hsl(0, 100%, 40%);">- rc = hnb_rx_ue_register_acc(hnb, &pdu->choice.successfulOutcome.value);</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_HNBAP_PDU_PR_successfulOutcome:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_hnbap_rx_successful(hnb, &pdu->choice.successfulOutcome);</span><br><span> break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_HNBAP_PDU_PR_unsuccessfulOutcome:</span><br><span style="color: hsl(120, 100%, 40%);">+ rc = hnb_hnbap_rx_unsuccessful(hnb, &pdu->choice.unsuccessfulOutcome);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case HNBAP_HNBAP_PDU_PR_NOTHING: /* No components present */</span><br><span> default:</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DHNBAP, LOGL_ERROR, "Unexpected HNBAP message received\n");</span><br><span> rc = -ENOSPC;</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span> }</span><br><span> </span><br><span> return rc;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/26349">change 26349</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-hnodeb/+/26349"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-hnodeb </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: Id4656140b7f51b07860dcbeed449ed68c3a9f85a </div>
<div style="display:none"> Gerrit-Change-Number: 26349 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: daniel <dwillmann@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: osmith <osmith@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>