[PATCH] osmo-bsc[master]: use osmo_sccp_inst_addr_name() instead of looking up ss7

[Neels Hofmeyr]

Review at  https://gerrit.osmocom.org/4728

use osmo_sccp_inst_addr_name() instead of looking up ss7

Depends: libosmo-sccp I70ec5c8b42682a23f11a5820431c7e34e225709b
Change-Id: Idb451597c724ac87a391121cebd0b0a927dd49d1
---
M src/osmo-bsc/osmo_bsc_sigtran.c
1 file changed, 4 insertions(+), 8 deletions(-)


  git pull ssh://gerrit.osmocom.org:29418/osmo-bsc refs/changes/28/4728/1

diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index 253f1e8..a18d4f3 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -516,8 +516,7 @@
                if (!osmo_sccp_check_addr(&msc->a.bsc_addr, 
OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) {
                        LOGP(DMSC, LOGL_ERROR,
                             "(%s) A-interface: invalid local (BSC) SCCP 
address: %s\n",
-                            msc_name,
-                            
osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), 
&msc->a.bsc_addr));
+                            msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, 
&msc->a.bsc_addr));
                        return -EINVAL;
                }
 
@@ -530,17 +529,14 @@
                if (!osmo_sccp_check_addr(&msc->a.msc_addr, 
OSMO_SCCP_ADDR_T_SSN | OSMO_SCCP_ADDR_T_PC)) {
                        LOGP(DMSC, LOGL_ERROR,
                             "(%s) A-interface: invalid remote (MSC) SCCP 
address: %s\n",
-                            msc_name,
-                            
osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), 
&msc->a.msc_addr));
+                            msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, 
&msc->a.msc_addr));
                        return -EINVAL;
                }
 
                LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: local (BSC) SCCP 
address: %s\n",
-                    msc_name,
-                    
osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), 
&msc->a.bsc_addr));
+                    msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, 
&msc->a.bsc_addr));
                LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: remote (MSC) SCCP 
address: %s\n",
-                    msc_name,
-                    
osmo_sccp_addr_name(osmo_ss7_instance_find(msc->a.cs7_instance), 
&msc->a.msc_addr));
+                    msc_name, osmo_sccp_inst_addr_name(msc->a.sccp, 
&msc->a.msc_addr));
 
                /* Bind SCCP user */
                msc->a.sccp_user = osmo_sccp_user_bind(msc->a.sccp, msc_name, 
sccp_sap_up, msc->a.bsc_addr.ssn);

-- 
To view, visit https://gerrit.osmocom.org/4728
To unsubscribe, visit https://gerrit.osmocom.org/settings

Gerrit-MessageType: newchange
Gerrit-Change-Id: Idb451597c724ac87a391121cebd0b0a927dd49d1
Gerrit-PatchSet: 1
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Owner: Neels Hofmeyr <nhofm...@sysmocom.de>