From d22b5b84c0ac656da47d7bc83e9a4b954d766ed6 Mon Sep 17 00:00:00 2001 From: Max Date: Mon, 29 May 2017 16:23:02 +0200 Subject: Re-add version to phy_instance This is resubmission of 9eeb0b1a136fc8c24a86cb4d832c264674c10db0 with errorneous use of talloc_asprintf() removed which should fix OS#2316. Change-Id: I02ae6fffdc808c1ea14185dbb4a720d27a62d4bb Related: OS#1614 --- src/osmo-bts-octphy/l1_oml.c | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'src/osmo-bts-octphy/l1_oml.c') diff --git a/src/osmo-bts-octphy/l1_oml.c b/src/osmo-bts-octphy/l1_oml.c index 4652e103..ccef2314 100644 --- a/src/osmo-bts-octphy/l1_oml.c +++ b/src/osmo-bts-octphy/l1_oml.c @@ -1140,14 +1140,14 @@ int l1if_check_app_sys_version(struct gsm_bts_trx *trx) LOGP(DL1C, LOGL_INFO, "Tx APP-INFO-SYSTEM.req\n"); - return l1if_req_compl(fl1h, msg, app_info_sys_compl_cb, 0); + return l1if_req_compl(fl1h, msg, app_info_sys_compl_cb, pinst); } static int app_info_compl_cb(struct octphy_hdl *fl1h, struct msgb *resp, void *data) { char ver_hdr[32]; - + struct phy_instance *pinst = data; tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP *air = (tOCTVC1_MAIN_MSG_APPLICATION_INFO_RSP *) resp->l2h; @@ -1171,6 +1171,7 @@ static int app_info_compl_cb(struct octphy_hdl *fl1h, struct msgb *resp, talloc_replace(fl1h->info.app.name, fl1h, air->szName); talloc_replace(fl1h->info.app.description, fl1h, air->szDescription); talloc_replace(fl1h->info.app.version, fl1h, air->szVersion); + osmo_strlcpy(pinst->version, ver_hdr, sizeof(pinst->version)); /* in a completion call-back, we take msgb ownership and must * release it before returning */ -- cgit v1.2.3