laforge submitted this change.

View Change

Approvals: Jenkins Builder: Verified daniel: Looks good to me, but someone else must approve laforge: Looks good to me, approved
sccp_user: do not force the role ASP when configured differently

The current implementation of osmo_sccp_simple_client forces the ASP to
run in ASP role. Even then when the user has configured it differently
via VTY. The osmo_sccp_simple_client should respect the VTY
configuration.

Change-Id: Ib57c513407747d36e503a4fb01c50c69dea0cb85
Related: SYS#5796
---
M src/sccp_user.c
1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/sccp_user.c b/src/sccp_user.c
index ade9487..839ef64 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -633,7 +633,11 @@

/* Ensure that the ASP we use is set to client mode. */
asp->cfg.is_server = false;
- asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
+
+ /* Make sure that the role of this ASP is set to ASP unless the user
+ * made a concious decision about the role via the VTY */
+ if (!asp->cfg.role_set_by_vty)
+ asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;

/* Restart ASP */
if (prot != OSMO_SS7_ASP_PROT_IPA)

To view, visit change 26992. To unsubscribe, or for help writing mail filters, visit settings.

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Ib57c513407747d36e503a4fb01c50c69dea0cb85
Gerrit-Change-Number: 26992
Gerrit-PatchSet: 1
Gerrit-Owner: dexter <pmaier@sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: daniel <dwillmann@sysmocom.de>
Gerrit-Reviewer: laforge <laforge@osmocom.org>
Gerrit-Reviewer: neels <nhofmeyr@sysmocom.de>
Gerrit-MessageType: merged