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

fix extraneous newlines in ho_fail() invocations 

The ho_fail() macro includes a newline, so the callers should not add
one. Fix these cases where the extra '\n' fragments the logged message.

Related: SYS#5839
Change-Id: Ifdbce98be70c1aa127ae008d7a77b9795fd250d3
This commit is contained in:
Neels Hofmeyr 2022-03-03 23:55:36 +01:00
parent 770674a5e0
commit 59d020a3ed
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/osmo-bsc/handover_fsm.c
View File

@ -664,7 +664,7 @@ void handover_start_inter_bsc_in(struct gsm_subscriber_connection *conn,
ho_fsm_update_id(fi, "interBSCin");
if (!parse_ho_request(conn, ho_request_msg, req)) {
ho_fail(HO_RESULT_ERROR, "Invalid Handover Request message from MSC\n");
ho_fail(HO_RESULT_ERROR, "Invalid Handover Request message from MSC");
return;
}
@ -740,7 +740,7 @@ void handover_start_inter_bsc_in(struct gsm_subscriber_connection *conn,
chosen_a5_n = select_best_cipher(req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask);
if (chosen_a5_n < 0) {
ho_fail(HO_RESULT_FAIL_RR_HO_FAIL,
"There is no A5 encryption mode that both BSC and MSC permit: MSC 0x%x & BSC 0x%x = 0\n",
"There is no A5 encryption mode that both BSC and MSC permit: MSC 0x%x & BSC 0x%x = 0",
req->ei_as_bitmask, bsc_gsmnet->a5_encryption_mask);
return;
}
@ -759,7 +759,7 @@ void handover_start_inter_bsc_in(struct gsm_subscriber_connection *conn,
info.encr.alg_id = ALG_A5_NR_TO_RSL(chosen_a5_n);
if (chosen_a5_n > 0) {
if (req->ei.key_len > sizeof(info.encr.key)) {
ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u\n",
ho_fail(HO_RESULT_ERROR, "Encryption Information IE key length is too large: %u",
req->ei.key_len);
return;
}