osmocom
/
libosmocore
mirror of https://gerrit.osmocom.org/libosmocore
11
0
Fork 0
Code Issues Releases Wiki Activity

gsm0808: use new gsm0808_enc_speech_codec[_list]2() API 

The motivation behind adding and using the new API is explained in
the preceeding change [1].  Whenever any of the encoding functions
fails to encode either a Speech Codec or a Codec List IE, free()
the msgb and return NULL.

Change-Id: I28219b61b9347f0652f9fd0c717f6cdf3c63e8f9
Related: [1] I199ffa0ba4a64813238519178155dfc767aa3975
Related: SYS#6229
This commit is contained in:
Vadim Yanitskiy 2022-12-14 00:45:25 +07:00
parent 5a51331729
commit 6db830f316
2 changed files with 89 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
src/gsm/gsm0808.c
View File

@ -100,13 +100,19 @@ struct msgb *gsm0808_create_layer3_2(const struct msgb *msg_l3, const struct osm
msgb_l3len(msg_l3), msg_l3->l3h);
/* AoIP: add Codec List (BSS Supported) 3.2.2.103 */
if (scl)
gsm0808_enc_speech_codec_list(msg, scl);
if (scl) {
if (gsm0808_enc_speech_codec_list2(msg, scl) < 0)
goto exit_free;
}
/* push the bssmap header */
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create "Complete L3 Info" for A, legacy implementation.
@ -530,8 +536,10 @@ struct msgb *gsm0808_create_ass2(const struct gsm0808_channel_type *ct,
}
/* AoIP: Codec List (MSC Preferred) 3.2.2.103 */
if (scl)
gsm0808_enc_speech_codec_list(msg, scl);
if (scl) {
if (gsm0808_enc_speech_codec_list2(msg, scl) < 0)
goto exit_free;
}
/* AoIP: Call Identifier 3.2.2.105 */
if (ci) {
@ -552,6 +560,10 @@ struct msgb *gsm0808_create_ass2(const struct gsm0808_channel_type *ct,
msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP Assignment Request message, 3GPP TS 48.008 §3.2.1.1.
@ -616,12 +628,16 @@ struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel,
gsm0808_enc_aoip_trasp_addr(msg, ss);
/* AoIP: Speech Codec (Chosen) 3.2.2.104 */
if (sc)
gsm0808_enc_speech_codec(msg, sc);
if (sc) {
if (gsm0808_enc_speech_codec2(msg, sc) < 0)
goto exit_free;
}
/* AoIP: add Codec List (BSS Supported) 3.2.2.103 */
if (scl)
gsm0808_enc_speech_codec_list(msg, scl);
if (scl) {
if (gsm0808_enc_speech_codec_list2(msg, scl) < 0)
goto exit_free;
}
/* FIXME: write LSA identifier 3.2.2.15 - see 3GPP TS 43.073 */
@ -632,6 +648,10 @@ struct msgb *gsm0808_create_ass_compl2(uint8_t rr_cause, uint8_t chosen_channel,
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP Assignment Completed message
@ -693,13 +713,19 @@ struct msgb *gsm0808_create_ass_fail(uint8_t cause, const uint8_t *rr_cause,
/* Circuit pool list 3.2.2.46 */
/* AoIP: add Codec List (BSS Supported) 3.2.2.103 */
if (scl)
gsm0808_enc_speech_codec_list(msg, scl);
if (scl) {
if (gsm0808_enc_speech_codec_list2(msg, scl) < 0)
goto exit_free;
}
/* update the size */
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP Assignment Failure message
@ -992,8 +1018,10 @@ struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_reque
if (params->aoip_transport_layer)
gsm0808_enc_aoip_trasp_addr(msg, params->aoip_transport_layer);
if (params->codec_list_msc_preferred)
gsm0808_enc_speech_codec_list(msg, params->codec_list_msc_preferred);
if (params->codec_list_msc_preferred) {
if (gsm0808_enc_speech_codec_list2(msg, params->codec_list_msc_preferred) < 0)
goto exit_free;
}
if (params->call_id_present) {
uint8_t val[4];
@ -1013,6 +1041,10 @@ struct msgb *gsm0808_create_handover_request(const struct gsm0808_handover_reque
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP HANDOVER REQUEST ACKNOWLEDGE message, 3GPP TS 48.008 3.2.1.10.
@ -1048,17 +1080,25 @@ struct msgb *gsm0808_create_handover_request_ack2(const struct gsm0808_handover_
/* AoIP: add Codec List (BSS Supported) 3.2.2.103.
* (codec_list_bss_supported was added to struct gsm0808_handover_request_ack later than speech_codec_chosen
* below, but it needs to come before it in the message coding). */
if (params->more_items && params->codec_list_bss_supported.len)
gsm0808_enc_speech_codec_list(msg, &params->codec_list_bss_supported);
if (params->more_items && params->codec_list_bss_supported.len) {
if (gsm0808_enc_speech_codec_list2(msg, &params->codec_list_bss_supported) < 0)
goto exit_free;
}
/* AoIP: Speech Codec (Chosen) 3.2.2.104 */
if (params->speech_codec_chosen_present)
gsm0808_enc_speech_codec(msg, &params->speech_codec_chosen);
if (params->speech_codec_chosen_present) {
if (gsm0808_enc_speech_codec2(msg, &params->speech_codec_chosen) < 0)
goto exit_free;
}
/* prepend header with final length */
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Same as gsm0808_create_handover_request_ack2() but with less parameters.
@ -1164,12 +1204,16 @@ struct msgb *gsm0808_create_handover_complete(const struct gsm0808_handover_comp
msgb_tlv_put(msg, GSM0808_IE_RR_CAUSE, 1, &params->rr_cause);
/* AoIP: Speech Codec (Chosen) 3.2.2.104 */
if (params->speech_codec_chosen_present)
gsm0808_enc_speech_codec(msg, &params->speech_codec_chosen);
if (params->speech_codec_chosen_present) {
if (gsm0808_enc_speech_codec2(msg, &params->speech_codec_chosen) < 0)
goto exit_free;
}
/* AoIP: add Codec List (BSS Supported) 3.2.2.103 */
if (params->codec_list_bss_supported.len)
gsm0808_enc_speech_codec_list(msg, &params->codec_list_bss_supported);
if (params->codec_list_bss_supported.len) {
if (gsm0808_enc_speech_codec_list2(msg, &params->codec_list_bss_supported) < 0)
goto exit_free;
}
/* Chosen Encryption Algorithm 3.2.2.44 */
if (params->chosen_encr_alg_present && params->chosen_encr_alg > 0)
@ -1183,6 +1227,10 @@ struct msgb *gsm0808_create_handover_complete(const struct gsm0808_handover_comp
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP HANDOVER FAILURE message, 3GPP TS 48.008 3.2.1.16.
@ -1206,13 +1254,19 @@ struct msgb *gsm0808_create_handover_failure(const struct gsm0808_handover_failu
msgb_tlv_put(msg, GSM0808_IE_RR_CAUSE, 1, &params->rr_cause);
/* AoIP: add Codec List (BSS Supported) 3.2.2.103 */
if (params->codec_list_bss_supported.len)
gsm0808_enc_speech_codec_list(msg, &params->codec_list_bss_supported);
if (params->codec_list_bss_supported.len) {
if (gsm0808_enc_speech_codec_list2(msg, &params->codec_list_bss_supported) < 0)
goto exit_free;
}
/* prepend header with final length */
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP HANDOVER PERFORMED message, 3GPP TS 48.008 3.2.1.25.
@ -1248,8 +1302,10 @@ struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_per
msgb_tv_put(msg, GSM0808_IE_SPEECH_VERSION, params->speech_version_chosen);
/* AoIP: Speech Codec (chosen) 3.2.2.104 */
if (params->speech_codec_chosen_present)
gsm0808_enc_speech_codec(msg, &params->speech_codec_chosen);
if (params->speech_codec_chosen_present) {
if (gsm0808_enc_speech_codec2(msg, &params->speech_codec_chosen) < 0)
goto exit_free;
}
/* LCLS-BSS-Status 3.2.2.119 */
if (params->lcls_bss_status_present)
@ -1259,6 +1315,10 @@ struct msgb *gsm0808_create_handover_performed(const struct gsm0808_handover_per
msg->l3h = msgb_tv_push(msg, BSSAP_MSG_BSS_MANAGEMENT, msgb_length(msg));
return msg;
exit_free:
msgb_free(msg);
return NULL;
}
/*! Create BSSMAP COMMON ID message, 3GPP TS 48.008 3.2.1.68.

10
tests/gsm0808/gsm0808_test.c
View File

@ -959,7 +959,7 @@ static void test_gsm0808_enc_dec_speech_codec(void)
int rc_dec;
msg = msgb_alloc(1024, "output buffer");
rc_enc = gsm0808_enc_speech_codec(msg, &enc_sc);
rc_enc = gsm0808_enc_speech_codec2(msg, &enc_sc);
OSMO_ASSERT(rc_enc == 3);
rc_dec = gsm0808_dec_speech_codec(&dec_sc, msg->data + 2, msg->len - 2);
@ -985,7 +985,7 @@ static void test_gsm0808_enc_dec_speech_codec_with_cfg(void)
int rc_dec;
msg = msgb_alloc(1024, "output buffer");
rc_enc = gsm0808_enc_speech_codec(msg, &enc_sc);
rc_enc = gsm0808_enc_speech_codec2(msg, &enc_sc);
OSMO_ASSERT(rc_enc == 5);
rc_dec = gsm0808_dec_speech_codec(&dec_sc, msg->data + 2, msg->len - 2);
@ -1010,7 +1010,7 @@ static void test_gsm0808_enc_dec_speech_codec_ext_with_cfg(void)
int rc_dec;
msg = msgb_alloc(1024, "output buffer");
rc_enc = gsm0808_enc_speech_codec(msg, &enc_sc);
rc_enc = gsm0808_enc_speech_codec2(msg, &enc_sc);
OSMO_ASSERT(rc_enc == 5);
rc_dec = gsm0808_dec_speech_codec(&dec_sc, msg->data + 2, msg->len - 2);
@ -1053,7 +1053,7 @@ static void test_gsm0808_enc_dec_speech_codec_list(void)
int rc_dec;
msg = msgb_alloc(1024, "output buffer");
rc_enc = gsm0808_enc_speech_codec_list(msg, &enc_scl);
rc_enc = gsm0808_enc_speech_codec_list2(msg, &enc_scl);
OSMO_ASSERT(rc_enc == 9);
rc_dec = gsm0808_dec_speech_codec_list(&dec_scl, msg->data + 2, msg->len - 2);
@ -1075,7 +1075,7 @@ static void test_gsm0808_enc_dec_empty_speech_codec_list(void)
int rc_dec;
msg = msgb_alloc(1024, "output buffer");
rc_enc = gsm0808_enc_speech_codec_list(msg, &enc_scl);
rc_enc = gsm0808_enc_speech_codec_list2(msg, &enc_scl);
OSMO_ASSERT(rc_enc == 2);
rc_dec = gsm0808_dec_speech_codec_list(&dec_scl, msg->data + 2, msg->len - 2);