From bb044952517686fef364969661b32f9ebd6f0462 Mon Sep 17 00:00:00 2001 From: Vadim Yanitskiy Date: Sat, 6 Feb 2021 16:11:04 +0100 Subject: [PATCH] oml: use regular TLVP_PRES() in rx_oml_ipa_rsl_connect() Both NM_ATT_IPACC_DST_IP and NM_ATT_IPACC_DST_IP_PORT are defined as TLV_TYPE_FIXED, and NM_ATT_IPACC_STREAM_ID is TLV_TYPE_TV, so the TLV parser already does check the length for us. Change-Id: I1e493e552bb22bb42bb196ce71214e28d23fd19e --- src/common/oml.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/common/oml.c b/src/common/oml.c index b1ae7b477..9886fe440 100644 --- a/src/common/oml.c +++ b/src/common/oml.c @@ -1390,14 +1390,14 @@ static int rx_oml_ipa_rsl_connect(struct gsm_bts_trx *trx, struct msgb *msg, uint8_t stream_id = 0; - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP, 4)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP)) in.s_addr = tlvp_val32_unal(tp, NM_ATT_IPACC_DST_IP); else in.s_addr = htonl(get_signlink_remote_ip(oml_link)); - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_DST_IP_PORT, 2)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_DST_IP_PORT)) port = ntohs(tlvp_val16_unal(tp, NM_ATT_IPACC_DST_IP_PORT)); - if (TLVP_PRES_LEN(tp, NM_ATT_IPACC_STREAM_ID, 1)) + if (TLVP_PRESENT(tp, NM_ATT_IPACC_STREAM_ID)) stream_id = *TLVP_VAL(tp, NM_ATT_IPACC_STREAM_ID); LOGP(DOML, LOGL_INFO, "%s: Rx IPA RSL CONNECT IP=%s PORT=%u STREAM=0x%02x\n",