Change in libosmo-sccp[master]: Revert "sccp_simple_client: only restart ASP if it was created"

[neels]

Hello dexter, pespin, laforge, Jenkins Builder,

I'd like you to do a code review. Please visit

    https://gerrit.osmocom.org/c/libosmo-sccp/+/19002

to review the following change.


Change subject: Revert "sccp_simple_client: only restart ASP if it was created"
......................................................................

Revert "sccp_simple_client: only restart ASP if it was created"

This reverts commit ec20a6164b046f9b6190dc886c3cc8a8e1445739.

Reason for revert: this patch makes specific variants of 'cs7'
config fail. In short, if AS and ASP are configured and connected,
the ASP is never started. See OS#4635 for elaborate details.

Change-Id: Id6e1fd69f312e5dc74e8718b2e2e678ad54bc16b
---
M src/sccp_user.c
1 file changed, 9 insertions(+), 9 deletions(-)



  git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/02/19002/1

diff --git a/src/sccp_user.c b/src/sccp_user.c
index 1278fae..d8a7357 100644
--- a/src/sccp_user.c
+++ b/src/sccp_user.c
@@ -597,16 +597,16 @@
 			talloc_free(asp_name);
 
 		osmo_ss7_as_add_asp(as, asp->cfg.name);
-
-		/* Ensure that the ASP we use is set to client mode. */
-		asp->cfg.is_server = false;
-		asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
-
-		/* Restart ASP */
-		if (prot != OSMO_SS7_ASP_PROT_IPA)
-			osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG);
-		osmo_ss7_asp_restart(asp);
 	}
+
+	/* Ensure that the ASP we use is set to client mode. */
+	asp->cfg.is_server = false;
+	asp->cfg.role = OSMO_SS7_ASP_ROLE_ASP;
+
+	/* Restart ASP */
+	if (prot != OSMO_SS7_ASP_PROT_IPA)
+		osmo_ss7_asp_use_default_lm(asp, LOGL_DEBUG);
+	osmo_ss7_asp_restart(asp);
 	LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name,
 	     asp->cfg.name);
 

-- 
To view, visit https://gerrit.osmocom.org/c/libosmo-sccp/+/19002
To unsubscribe, or for help writing mail filters, visit https://gerrit.osmocom.org/settings

Gerrit-Project: libosmo-sccp
Gerrit-Branch: master
Gerrit-Change-Id: Id6e1fd69f312e5dc74e8718b2e2e678ad54bc16b
Gerrit-Change-Number: 19002
Gerrit-PatchSet: 1
Gerrit-Owner: neels <nhofmeyr at sysmocom.de>
Gerrit-Reviewer: Jenkins Builder
Gerrit-Reviewer: dexter <pmaier at sysmocom.de>
Gerrit-Reviewer: laforge <laforge at osmocom.org>
Gerrit-Reviewer: pespin <pespin at sysmocom.de>
Gerrit-MessageType: newchange
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.osmocom.org/pipermail/gerrit-log/attachments/20200624/300260fd/attachment.htm>