pespin has uploaded this change for review. ( https://gerrit.osmocom.org/c/osmo-msc/+/39008?usp=email )
Change subject: vty: Avoid accessing gsupclient object fields directly ......................................................................
vty: Avoid accessing gsupclient object fields directly
Use new APIs recently added.
Change-Id: I7ead95bb86d1ab510090c29390255007923f895f Depends: osmo-hlr.git Change-Id I401af83232022f1c141eef1f428cbe206a8aaaa2 --- M src/libmsc/e_link.c M src/libmsc/gsup_client_mux.c 2 files changed, 13 insertions(+), 8 deletions(-)
git pull ssh://gerrit.osmocom.org:29418/osmo-msc refs/changes/08/39008/1
diff --git a/src/libmsc/e_link.c b/src/libmsc/e_link.c index 5107c22..9a1cde8 100644 --- a/src/libmsc/e_link.c +++ b/src/libmsc/e_link.c @@ -114,10 +114,13 @@ struct vlr_subscr *vsub; const char *local_msc_name = NULL;
- if (e->gcm && e->gcm->gsup_client && e->gcm->gsup_client->ipa_dev) { - local_msc_name = e->gcm->gsup_client->ipa_dev->serno; - if (!local_msc_name) - local_msc_name = e->gcm->gsup_client->ipa_dev->unit_name; + if (e->gcm && e->gcm->gsup_client) { + const struct ipaccess_unit *ipa_dev = osmo_gsup_client_get_ipaccess_unit(e->gcm->gsup_client); + if (ipa_dev) { + local_msc_name = ipa_dev->serno; + if (!local_msc_name) + local_msc_name = ipa_dev->unit_name; + } }
if (!local_msc_name) { diff --git a/src/libmsc/gsup_client_mux.c b/src/libmsc/gsup_client_mux.c index e27b664..2c4c7fd 100644 --- a/src/libmsc/gsup_client_mux.c +++ b/src/libmsc/gsup_client_mux.c @@ -55,7 +55,7 @@ /* Non-static for unit tests */ int gsup_client_mux_rx(struct osmo_gsup_client *gsup_client, struct msgb *msg) { - struct gsup_client_mux *gcm = gsup_client->data; + struct gsup_client_mux *gcm = osmo_gsup_client_get_data(gsup_client); struct osmo_gsup_message gsup; enum osmo_gsup_message_class message_class; int rc; @@ -112,7 +112,7 @@ &gsup_client_mux_rx, NULL); if (!gcm->gsup_client) return -ENOMEM; - gcm->gsup_client->data = gcm; + osmo_gsup_client_set_data(gcm->gsup_client, gcm); return 0; }
@@ -141,14 +141,16 @@ struct osmo_gsup_message *gsup_msg) { const char *local_msc_name; + const struct ipaccess_unit *ipa_dev;
if (!gcm) return; if (!gcm->gsup_client) return; - if (!gcm->gsup_client->ipa_dev) + ipa_dev = osmo_gsup_client_get_ipaccess_unit(gcm->gsup_client); + if (!ipa_dev) return; - local_msc_name = gcm->gsup_client->ipa_dev->serno; + local_msc_name = ipa_dev->serno; if (!local_msc_name) return; gsup_msg->source_name = (const uint8_t *) local_msc_name;
-
pespin