neels has submitted this change. (
https://gerrit.osmocom.org/c/osmo-bsc/+/18504 )
Change subject: create only one SCCP user per SCCP instance
......................................................................
create only one SCCP user per SCCP instance
Depends: I9ecbab16b45268f626950303d6ff8296dd6acda0 (libosmo-sccp)
Change-Id: I6a2710edeb9ba047ae70e6b49d4c2e5f06d41a4e
---
M src/osmo-bsc/osmo_bsc_sigtran.c
1 file changed, 6 insertions(+), 2 deletions(-)
Approvals:
neels: Looks good to me, approved
pespin: Looks good to me, but someone else must approve
laforge: Looks good to me, but someone else must approve
Jenkins Builder: Verified
diff --git a/src/osmo-bsc/osmo_bsc_sigtran.c b/src/osmo-bsc/osmo_bsc_sigtran.c
index cbf0fec..f5489e4 100644
--- a/src/osmo-bsc/osmo_bsc_sigtran.c
+++ b/src/osmo-bsc/osmo_bsc_sigtran.c
@@ -547,8 +547,12 @@
LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: remote (MSC) SCCP
address: %s\n",
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);
+ /* Bind SCCP user. Bind only one user per sccp_instance. */
+ msc->a.sccp_user = osmo_sccp_user_find(msc->a.sccp,
msc->a.bsc_addr.ssn, msc->a.bsc_addr.pc);
+ LOGP(DMSC, LOGL_NOTICE, "(%s) A-interface: %s\n", msc_name,
+ msc->a.sccp_user ? "user already bound for this SCCP
instance" : "binding SCCP user");
+ if (!msc->a.sccp_user)
+ msc->a.sccp_user = osmo_sccp_user_bind(msc->a.sccp,
msc_name, sccp_sap_up, msc->a.bsc_addr.ssn);
if (!msc->a.sccp_user)
return -EINVAL;
--
To view, visit https://gerrit.osmocom.org/c/osmo-bsc/+/18504
To unsubscribe, or for help writing mail filters, visit
https://gerrit.osmocom.org/settings
Gerrit-Project: osmo-bsc
Gerrit-Branch: master
Gerrit-Change-Id: I6a2710edeb9ba047ae70e6b49d4c2e5f06d41a4e
Gerrit-Change-Number: 18504
Gerrit-PatchSet: 4
Gerrit-Owner: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: laforge <lafo...@osmocom.org>
Gerrit-Reviewer: neels <nhofm...@sysmocom.de>
Gerrit-Reviewer: pespin <pes...@sysmocom.de>
Gerrit-MessageType: merged
