From 3953f41bbd7f1075f8585f6c306d35d095873474 Mon Sep 17 00:00:00 2001 From: Stefan Sperling Date: Tue, 28 Aug 2018 15:06:30 +0200 Subject: properly handle mandatory cli param of gsm0808_create_paging2 The cell identifier list parameter is mandatory. Document it as such, and tweak code which treated it like an optional parameter. No functional change. The existing code already asserts that a non-NULL value is passed for this parameter. Change-Id: I3716f9d5b210e0a7e6f45c9fe3fc34024e5234ad Related: OS#3021 --- src/gsm/gsm0808.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/src/gsm/gsm0808.c b/src/gsm/gsm0808.c index 8c2d1436..e3b10d0c 100644 --- a/src/gsm/gsm0808.c +++ b/src/gsm/gsm0808.c @@ -588,7 +588,7 @@ struct msgb *gsm0808_create_clear_rqst(uint8_t cause) /*! Create BSSMAP PAGING message * \param[in] imsi Mandatory paged IMSI in string representation * \param[in] tmsi Optional paged TMSI - * \param[in] cil Cell Identity List (where to page) + * \param[in] cil Mandatory Cell Identity List (where to page) * \param[in] chan_needed Channel Type needed * \returns callee-allocated msgb with BSSMAP PAGING message */ struct msgb *gsm0808_create_paging2(const char *imsi, const uint32_t *tmsi, @@ -615,7 +615,7 @@ struct msgb *gsm0808_create_paging2(const char *imsi, const uint32_t *tmsi, /* Message Type 3.2.2.1 */ msgb_v_put(msg, BSS_MAP_MSG_PAGING); - /* IMSI 3.2.2.6 */ + /* mandatory IMSI 3.2.2.6 */ mid_len = gsm48_generate_mid_from_imsi(mid_buf, imsi); msgb_tlv_put(msg, GSM0808_IE_IMSI, mid_len - 2, mid_buf + 2); @@ -626,9 +626,8 @@ struct msgb *gsm0808_create_paging2(const char *imsi, const uint32_t *tmsi, (uint8_t *) & tmsi_sw); } - /* Cell Identifier List 3.2.2.27 */ - if (cil) - gsm0808_enc_cell_id_list2(msg, cil); + /* mandatory Cell Identifier List 3.2.2.27 */ + gsm0808_enc_cell_id_list2(msg, cil); /* Channel Needed 3.2.2.36 */ if (chan_needed) { -- cgit v1.2.3