<p>pespin <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/osmo-hnodeb/+/25999">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
fixeria: Looks good to me, approved
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Move rua related code to rua.c/h<br><br>Change-Id: Ibefe952fe1b642cab5c4abe36383a7ebb05f39c3<br>---<br>M include/osmocom/hnodeb/rua.h<br>M src/osmo-hnodeb/main.c<br>M src/osmo-hnodeb/rua.c<br>3 files changed, 66 insertions(+), 64 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/hnodeb/rua.h b/include/osmocom/hnodeb/rua.h</span><br><span>index 28d0a1a..9d7cc12 100644</span><br><span>--- a/include/osmocom/hnodeb/rua.h</span><br><span>+++ b/include/osmocom/hnodeb/rua.h</span><br><span>@@ -23,5 +23,4 @@</span><br><span> </span><br><span> struct hnb;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_dt_handle(struct hnb *hnb, struct ANY *in);</span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_cl_handle(struct hnb *hnb, struct ANY *in);</span><br><span style="color: hsl(120, 100%, 40%);">+int hnb_rua_rx(struct hnb *hnb, struct msgb *msg);</span><br><span>diff --git a/src/osmo-hnodeb/main.c b/src/osmo-hnodeb/main.c</span><br><span>index a9c26bf..0fcb909 100644</span><br><span>--- a/src/osmo-hnodeb/main.c</span><br><span>+++ b/src/osmo-hnodeb/main.c</span><br><span>@@ -476,66 +476,6 @@</span><br><span> </span><br><span> extern void direct_transfer_nas_pdu_print(ANY_t *in);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int hnb_rua_rx(struct hnb *hnb, struct msgb *msg)</span><br><span style="color: hsl(0, 100%, 40%);">-{</span><br><span style="color: hsl(0, 100%, 40%);">- RUA_RUA_PDU_t _pdu, *pdu = &_pdu;</span><br><span style="color: hsl(0, 100%, 40%);">- asn_dec_rval_t dec_ret;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">- memset(pdu, 0, sizeof(*pdu));</span><br><span style="color: hsl(0, 100%, 40%);">- dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu,</span><br><span style="color: hsl(0, 100%, 40%);">- msg->data, msgb_length(msg), 0, 0);</span><br><span style="color: hsl(0, 100%, 40%);">- if (dec_ret.code != RC_OK) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\n");</span><br><span style="color: hsl(0, 100%, 40%);">- return -EINVAL;</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->present) {</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_RUA_PDU_PR_successfulOutcome:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_successfulOutcome\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_RUA_PDU_PR_initiatingMessage:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_initiatingMessage\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_RUA_PDU_PR_NOTHING:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_NOTHING\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_RUA_PDU_PR_unsuccessfulOutcome:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("Unexpected RUA message received\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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 RUA_ProcedureCode_id_ConnectionlessTransfer:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx Connectionless Transfer\n");</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_ProcedureCode_id_Connect:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx Connect\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_ProcedureCode_id_DirectTransfer:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx DirectTransfer\n");</span><br><span style="color: hsl(0, 100%, 40%);">- hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value);</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_ProcedureCode_id_Disconnect:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx Disconnect\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_ProcedureCode_id_ErrorIndication:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx ErrorIndication\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- case RUA_ProcedureCode_id_privateMessage:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx privateMessage\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</span><br><span style="color: hsl(0, 100%, 40%);">- default:</span><br><span style="color: hsl(0, 100%, 40%);">- printf("RUA rx unknown message\n");</span><br><span style="color: hsl(0, 100%, 40%);">- break;</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%);">- return 0;</span><br><span style="color: hsl(0, 100%, 40%);">-}</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static int hnb_read_cb(struct osmo_fd *fd)</span><br><span> {</span><br><span> struct hnb *hnb = fd->data;</span><br><span>diff --git a/src/osmo-hnodeb/rua.c b/src/osmo-hnodeb/rua.c</span><br><span>index 3db9de7..0839c0d 100644</span><br><span>--- a/src/osmo-hnodeb/rua.c</span><br><span>+++ b/src/osmo-hnodeb/rua.c</span><br><span>@@ -17,6 +17,9 @@</span><br><span> * along with this program. If not, see <http://www.gnu.org/lienses/>.</span><br><span> *</span><br><span> */</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+#include <errno.h></span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> #include <asn1c/ANY.h></span><br><span> </span><br><span> #include <osmocom/rua/rua_ies_defs.h></span><br><span>@@ -26,7 +29,7 @@</span><br><span> #include <osmocom/hnodeb/ranap.h></span><br><span> </span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in)</span><br><span style="color: hsl(120, 100%, 40%);">+static void hnb_rua_dt_handle(struct hnb *hnb, ANY_t *in)</span><br><span> {</span><br><span> RUA_DirectTransferIEs_t ies;</span><br><span> int rc;</span><br><span>@@ -43,7 +46,7 @@</span><br><span> rua_free_directtransferies(&ies);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-void hnb_rua_cl_handle(struct hnb *hnb, ANY_t *in)</span><br><span style="color: hsl(120, 100%, 40%);">+static void hnb_rua_cl_handle(struct hnb *hnb, ANY_t *in)</span><br><span> {</span><br><span> RUA_ConnectionlessTransferIEs_t ies;</span><br><span> int rc;</span><br><span>@@ -59,3 +62,63 @@</span><br><span> /* FIXME: what to do with the asn1c-allocated memory */</span><br><span> rua_free_connectionlesstransferies(&ies);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+int hnb_rua_rx(struct hnb *hnb, struct msgb *msg)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ RUA_RUA_PDU_t _pdu, *pdu = &_pdu;</span><br><span style="color: hsl(120, 100%, 40%);">+ asn_dec_rval_t dec_ret;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ memset(pdu, 0, sizeof(*pdu));</span><br><span style="color: hsl(120, 100%, 40%);">+ dec_ret = aper_decode(NULL, &asn_DEF_RUA_RUA_PDU, (void **) &pdu,</span><br><span style="color: hsl(120, 100%, 40%);">+ msg->data, msgb_length(msg), 0, 0);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (dec_ret.code != RC_OK) {</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGP(DMAIN, LOGL_ERROR, "Error in ASN.1 decode\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%);">+ switch (pdu->present) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_RUA_PDU_PR_successfulOutcome:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA_RUA_PDU_PR_successfulOutcome\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_RUA_PDU_PR_initiatingMessage:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA_RUA_PDU_PR_initiatingMessage\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_RUA_PDU_PR_NOTHING:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA_RUA_PDU_PR_NOTHING\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_RUA_PDU_PR_unsuccessfulOutcome:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA_RUA_PDU_PR_unsuccessfulOutcome\n");</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%);">+ printf("Unexpected RUA message received\n");</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ switch (pdu->choice.successfulOutcome.procedureCode) {</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_ProcedureCode_id_ConnectionlessTransfer:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA rx Connectionless Transfer\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_rua_cl_handle(hnb, &pdu->choice.successfulOutcome.value);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_ProcedureCode_id_Connect:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA rx Connect\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_ProcedureCode_id_DirectTransfer:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA rx DirectTransfer\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ hnb_rua_dt_handle(hnb, &pdu->choice.successfulOutcome.value);</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_ProcedureCode_id_Disconnect:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA rx Disconnect\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_ProcedureCode_id_ErrorIndication:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA rx ErrorIndication\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ break;</span><br><span style="color: hsl(120, 100%, 40%);">+ case RUA_ProcedureCode_id_privateMessage:</span><br><span style="color: hsl(120, 100%, 40%);">+ printf("RUA rx privateMessage\n");</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%);">+ printf("RUA rx unknown message\n");</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%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0;</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/c/osmo-hnodeb/+/25999">change 25999</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/+/25999"/><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: Ibefe952fe1b642cab5c4abe36383a7ebb05f39c3 </div>
<div style="display:none"> Gerrit-Change-Number: 25999 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </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: fixeria <vyanitskiy@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>