Change in osmocom-bb[master]: mobile: rework writing BA to file, move to a function

fixeria has submitted this change. ( https://gerrit.osmocom.org/c/osmocom-bb/+/30614 ) Change subject: mobile: rework writing BA to file, move to a function ...................................................................... mobile: rework writing BA to file, move to a function Sometimes I am seeing error messages like this: DCS ERROR Failed to write BA list The problem is that there can be several BA entries which need to be written, and for each of them we're calling fwrite() twice. This function returns number of items written, so the final sum of returned values would be: len(BA list) * 2. Thus expecting it to be 2 regardless of len(BA list) is wrong. Fix this by checking the sum in each iteration, not at the end. Take a chance to refactor the code and move to a function. Change-Id: Id8bc216c146127d9c9995379c9e56450d328f46d --- M src/host/layer23/src/mobile/gsm322.c 1 file changed, 49 insertions(+), 31 deletions(-) Approvals: fixeria: Looks good to me, approved pespin: Looks good to me, but someone else must approve msuraev: Looks good to me, but someone else must approve Jenkins Builder: Verified diff --git a/src/host/layer23/src/mobile/gsm322.c b/src/host/layer23/src/mobile/gsm322.c index d288596..9b3806f 100644 --- a/src/host/layer23/src/mobile/gsm322.c +++ b/src/host/layer23/src/mobile/gsm322.c @@ -5123,17 +5123,60 @@ return 0; } +static void gsm322_write_ba(struct osmocom_ms *ms) +{ + const struct gsm322_ba_list *ba; + char *ba_filename; + FILE *fp; + + ba_filename = talloc_asprintf(ms, "%s/%s.ba", config_dir, ms->name); + OSMO_ASSERT(ba_filename != NULL); + + LOGP(DCS, LOGL_INFO, "Writing stored BA list to '%s'\n", ba_filename); + + fp = fopen(ba_filename, "w"); + talloc_free(ba_filename); + if (fp == NULL) { + LOGP(DCS, LOGL_ERROR, + "Failed to open '%s' for writing: %s\n", + ba_filename, strerror(errno)); + return; + } + + fputs(ba_version, fp); + + llist_for_each_entry(ba, &ms->cellsel.ba_list, entry) { + size_t rc = 0; + uint8_t buf[] = { + ba->mcc >> 8, ba->mcc & 0xff, + ba->mnc >> 8, ba->mnc & 0xff, + }; + + LOGP(DCS, LOGL_INFO, + "Writing stored BA list entry (mcc=%s mnc=%s %s, %s)\n", + gsm_print_mcc(ba->mcc), gsm_print_mnc(ba->mnc), + gsm_get_mcc(ba->mcc), gsm_get_mnc(ba->mcc, ba->mnc)); + + rc += fwrite(buf, sizeof(buf), 1, fp); + rc += fwrite(ba->freq, sizeof(ba->freq), 1, fp); + + /* fwrite() returns count of written items, should be 2 */ + if (rc != 2) { + LOGP(DCS, LOGL_ERROR, + "Writing stored BA list: fwrite() failed (rc=%zu)\n", rc); + break; + } + } + + fclose(fp); +} + int gsm322_exit(struct osmocom_ms *ms) { struct gsm322_plmn *plmn = &ms->plmn; struct gsm322_cellsel *cs = &ms->cellsel; struct llist_head *lh, *lh2; struct msgb *msg; - FILE *fp; - char *ba_filename; - struct gsm322_ba_list *ba; - uint8_t buf[4]; - int rc = 0; int i; LOGP(DPLMN, LOGL_INFO, "exit PLMN process\n"); @@ -5161,32 +5204,7 @@ cs->si = NULL; /* store BA list */ - ba_filename = talloc_asprintf(ms, "%s/%s.ba", config_dir, ms->name); - if (ba_filename) { - fp = fopen(ba_filename, "w"); - talloc_free(ba_filename); - if (fp) { - fputs(ba_version, fp); - llist_for_each_entry(ba, &cs->ba_list, entry) { - buf[0] = ba->mcc >> 8; - buf[1] = ba->mcc & 0xff; - buf[2] = ba->mnc >> 8; - buf[3] = ba->mnc & 0xff; - - LOGP(DCS, LOGL_INFO, "Write stored BA list (mcc=%s " - "mnc=%s %s, %s)\n", gsm_print_mcc(ba->mcc), - gsm_print_mnc(ba->mnc), gsm_get_mcc(ba->mcc), - gsm_get_mnc(ba->mcc, ba->mnc)); - - rc += fwrite(buf, 4, 1, fp); - rc += fwrite(ba->freq, sizeof(ba->freq), 1, fp); - } - fclose(fp); - } - } - - if (rc != 2) - LOGP(DCS, LOGL_ERROR, "Failed to write BA list\n"); + gsm322_write_ba(ms); /* free lists */ while ((msg = msgb_dequeue(&plmn->event_queue))) -- To view, visit https://gerrit.osmocom.org/c/osmocom-bb/+/30614 To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings Gerrit-Project: osmocom-bb Gerrit-Branch: master Gerrit-Change-Id: Id8bc216c146127d9c9995379c9e56450d328f46d Gerrit-Change-Number: 30614 Gerrit-PatchSet: 2 Gerrit-Owner: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: Jenkins Builder Gerrit-Reviewer: fixeria <vyanitskiy(a)sysmocom.de> Gerrit-Reviewer: msuraev <msuraev(a)sysmocom.de> Gerrit-Reviewer: pespin <pespin(a)sysmocom.de> Gerrit-MessageType: merged