Use new libosmo-sccp APIs osmo_ss7_asp_get_{name,proto}()

Depends: libosmo-sccp.git Change-Id If9acfca1abc9ab7eb6d2388f548d7ee577b9c5ac
Change-Id: I0479f7bfb8337a6a955ba66c7b403db3565659d6
---
M TODO-RELEASE
M src/osmo-bsc/bsc_ctrl.c
M src/osmo-bsc/osmo_bsc_mgcp.c
M src/osmo-bsc/osmo_bsc_sigtran.c
4 files changed, 18 insertions(+), 6 deletions(-)

diff --git a/TODO-RELEASE b/TODO-RELEASE
index 4699dbd..2efa641 100644
--- a/TODO-RELEASE
+++ b/TODO-RELEASE
@@ -12,6 +12,6 @@
 		osmo-bsc CTRL,VTY	osmo_fsm instance IDs now use new dynamic timeslot names 'DYNAMIC_OSMOCOM' and 'DYNAMIC_IPACCESS'
 libosmogsm	>1.8.0		circuit switched data stuff (gsm0808_enc/dec_channel_type etc.)
 libosmo-abis	>1.4.0		osmo_ortp.h: add RTP_PT_CSDATA
-libosmo-sccp >1.7.0		osmo_sccp_{get,set}_priv()
+libosmo-sccp >1.7.0		osmo_sccp_{get,set}_priv(), osmo_ss7_asp_get_name(), osmo_ss7_asp_get_proto()
 libosmocore 	>1.8.0	GSM48_IE_CIP_MODE_SET_HO and GSM48_IE_SYNC_IND_HO
 libosmo-mgcp-client > 1.11.0	mgcp_client_pool_empty(), mgcp_client_conf_alloc()
\ No newline at end of file
diff --git a/src/osmo-bsc/bsc_ctrl.c b/src/osmo-bsc/bsc_ctrl.c
index 2df7aa3..38698e7 100644
--- a/src/osmo-bsc/bsc_ctrl.c
+++ b/src/osmo-bsc/bsc_ctrl.c
@@ -686,7 +686,7 @@
 	struct msgb *msg;
 
 	/* don't attempt to send CTRL on a non-SCCPlite ASP */
-	if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA)
+	if (osmo_ss7_asp_get_proto(asp) != OSMO_SS7_ASP_PROT_IPA)
 		return 0;
 
 	msg = ctrl_cmd_make(cmd);
diff --git a/src/osmo-bsc/osmo_bsc_mgcp.c b/src/osmo-bsc/osmo_bsc_mgcp.c
index 90a73e5..1b8e089 100644
--- a/src/osmo-bsc/osmo_bsc_mgcp.c
+++ b/src/osmo-bsc/osmo_bsc_mgcp.c
@@ -33,13 +33,14 @@
 static struct bsc_msc_data *msc_from_asp(struct osmo_ss7_asp *asp)
 {
 	int msc_nr;
+	const char *asp_name = osmo_ss7_asp_get_name(asp);
 	/* this is rather ugly, as we of course have MTP-level routing between
 	 * the local SCCP user (BSC) and the AS/ASPs.  However, for the most simple
 	 * SCCPlite case, there is a 1:1 mapping between ASP and AS, and using
 	 * the libosmo-sigtran "simple client", the names are "as[p]-clnt-msc-%u",
 	 * as set in osmo_bsc_sigtran_init() */
-	if (sscanf(asp->cfg.name, "asp-clnt-msc-%u", &msc_nr) != 1) {
-		LOGP(DMSC, LOGL_ERROR, "Cannot find to which MSC the ASP %s belongs\n", asp->cfg.name);
+	if (!asp_name || sscanf(asp_name, "asp-clnt-msc-%u", &msc_nr) != 1) {
+		LOGP(DMSC, LOGL_ERROR, "Cannot find to which MSC the ASP '%s' belongs\n", asp_name);
 		return NULL;
 	}
 	return osmo_msc_data_find(bsc_gsmnet, msc_nr);
@@ -51,7 +52,8 @@
 	struct bsc_msc_data *msc;
 	int rc;
 
-	LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n", asp->cfg.name, msg->l2h);
+	LOGP(DMSC, LOGL_NOTICE, "%s: Received IPA-encapsulated MGCP: %s\n",
+	     osmo_ss7_asp_get_name(asp), msg->l2h);
 	msc = msc_from_asp(asp);
 	if (msc) {
 		/* we don't have a write queue here as we simply expect the socket buffers
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 64bddf6..a4d0f2d 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -729,7 +729,7 @@
 	struct ipaccess_head *iph;
 	struct ipaccess_head_ext *iph_ext;
 
-	if (asp->cfg.proto != OSMO_SS7_ASP_PROT_IPA) {
+	if (osmo_ss7_asp_get_proto(asp) != OSMO_SS7_ASP_PROT_IPA) {
 		msgb_free(msg);
 		return 0;
 	}

