cellular-infrastructure
/
osmo-bts
mirror of https://gerrit.osmocom.org/osmo-bts
9
0
Fork 0
Code Issues Releases Wiki Activity

oml: ensure that IPA RSL Connect ACK/NACK contains all IEs 

All IEs in the BSC originated message are optional, so we assume
default values for them.  Let's reflect them all in the ACK/NACK.

Change-Id: I5c73e83daad0cea07b9cb674c393e0bfc6268a61
Related: OS#3791
This commit is contained in:
Vadim Yanitskiy 2021-02-06 17:03:30 +01:00 committed by laforge
parent 522a33fe82
commit dabe5d0327
1 changed files with 14 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/common/oml.c
View File

@ -442,14 +442,15 @@ int oml_fom_ack_nack(struct msgb *msg, uint8_t cause)
foh->msg_type += 2; /* nack */
/* add cause */
msgb_tv_put(msg, NM_ATT_NACK_CAUSES, cause);
/* update the length as we just made the message larger */
struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg);
omh->length = msgb_l3len(msg);
} else {
LOGPFOH(DOML, LOGL_DEBUG, foh, "Sending FOM ACK.\n");
foh->msg_type++; /* ack */
}
/* ensure that the message length is up to date */
struct abis_om_hdr *omh = (struct abis_om_hdr *) msgb_l2(msg);
omh->length = msgb_l3len(msg);
/* we cannot use oml_send_msg() as we already have the OML header */
if (abis_oml_sendmsg(msg) != 0)
LOGPFOH(DOML, LOGL_ERROR, foh, "Failed to send ACK/NACK\n");
@ -1406,6 +1407,16 @@ static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg,
trx->rsl_tei = stream_id;
rc = e1inp_ipa_bts_rsl_connect_n(oml_link->ts->line, inet_ntoa(in), port, trx->nr);
}
/* The ACK/NACK is expected to contain all IEs */
if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) /* TV32 */
msgb_tv_fixed_put(msg, NM_ATT_IPACC_DST_IP, sizeof(in),
(const uint8_t *) &in);
if (!TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) /* TV16 */
msgb_tv16_put(msg, NM_ATT_IPACC_DST_IP_PORT, port);
if (!TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) /* TV */
msgb_tv_put(msg, NM_ATT_IPACC_STREAM_ID, stream_id);
if (rc < 0) {
LOGP(DOML, LOGL_ERROR, "%s: Error in abis_open(RSL): %d\n", trx_name, rc);
return oml_fom_ack_nack(msg, NM_NACK_CANT_PERFORM);