<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15973">View Change</a></p><div style="white-space:pre-wrap">Approvals:
laforge: Looks good to me, approved; Verified
pespin: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">introduce public enum osmo_ss7_asp_role for ASP/SG/IPSP<br><br>This supersedes the library-internal enum xua_asp_role.<br><br>Change-Id: I28b0888b8f8206e9dd67ef64ce0f71ba9a7105ce<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7.c<br>M src/xua_asp_fsm.c<br>M src/xua_asp_fsm.h<br>4 files changed, 32 insertions(+), 30 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/sigtran/osmo_ss7.h b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>index 04058c2..87336a8 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -369,6 +369,14 @@</span><br><span> OSMO_SS7_ASP_ADM_S_ENABLED,</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+enum osmo_ss7_asp_role {</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SS7_ASP_ROLE_ASP,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SS7_ASP_ROLE_SG,</span><br><span style="color: hsl(120, 100%, 40%);">+ OSMO_SS7_ASP_ROLE_IPSP,</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+extern const struct value_string osmo_ss7_asp_role_names[];</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct osmo_ss7_asp {</span><br><span> /*! entry in \ref osmo_ss7_instance.asp_list */</span><br><span> struct llist_head list;</span><br><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 87f1245..7a5e35d 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -74,6 +74,13 @@</span><br><span> { 0, NULL }</span><br><span> };</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+const struct value_string osmo_ss7_asp_role_names[] = {</span><br><span style="color: hsl(120, 100%, 40%);">+ { OSMO_SS7_ASP_ROLE_ASP, "ASP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { OSMO_SS7_ASP_ROLE_SG, "SG" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { OSMO_SS7_ASP_ROLE_IPSP, "IPSP" },</span><br><span style="color: hsl(120, 100%, 40%);">+ { 0, NULL }</span><br><span style="color: hsl(120, 100%, 40%);">+};</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> static int asp_proto_to_ip_proto(enum osmo_ss7_asp_protocol proto)</span><br><span> {</span><br><span> switch (proto) {</span><br><span>@@ -1280,7 +1287,7 @@</span><br><span> int osmo_ss7_asp_restart(struct osmo_ss7_asp *asp)</span><br><span> {</span><br><span> int rc;</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role;</span><br><span> char bufloc[512], bufrem[512];</span><br><span> </span><br><span> OSMO_ASSERT(ss7_initialized);</span><br><span>@@ -1326,7 +1333,7 @@</span><br><span> osmo_stream_cli_set_reconnect_timeout() above) to connect so the error is transient */</span><br><span> }</span><br><span> /* TODO: make this configurable and not implicit */</span><br><span style="color: hsl(0, 100%, 40%);">- role = XUA_ASPFSM_ROLE_ASP;</span><br><span style="color: hsl(120, 100%, 40%);">+ role = OSMO_SS7_ASP_ROLE_ASP;</span><br><span> } else {</span><br><span> /* We are in server mode now */</span><br><span> if (asp->client) {</span><br><span>@@ -1339,7 +1346,7 @@</span><br><span> LOGPASP(asp, DLSS7, LOGL_NOTICE, "ASP Restart for server "</span><br><span> "not implemented yet!\n");</span><br><span> /* TODO: make this configurable and not implicit */</span><br><span style="color: hsl(0, 100%, 40%);">- role = XUA_ASPFSM_ROLE_SG;</span><br><span style="color: hsl(120, 100%, 40%);">+ role = OSMO_SS7_ASP_ROLE_SG;</span><br><span> }</span><br><span> </span><br><span> /* (re)start the ASP FSM */</span><br><span>diff --git a/src/xua_asp_fsm.c b/src/xua_asp_fsm.c</span><br><span>index 16c06d6..3f3d69a 100644</span><br><span>--- a/src/xua_asp_fsm.c</span><br><span>+++ b/src/xua_asp_fsm.c</span><br><span>@@ -47,13 +47,6 @@</span><br><span> #define SUA_T_IAS_SEC (7*60) /* SUA only */</span><br><span> #define SUA_T_IAR_SEC (15*60) /* SUA only */</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-static const struct value_string xua_asp_role_names[] = {</span><br><span style="color: hsl(0, 100%, 40%);">- { XUA_ASPFSM_ROLE_ASP, "ASP" },</span><br><span style="color: hsl(0, 100%, 40%);">- { XUA_ASPFSM_ROLE_SG, "SG" },</span><br><span style="color: hsl(0, 100%, 40%);">- { XUA_ASPFSM_ROLE_IPSP, "IPSP" },</span><br><span style="color: hsl(0, 100%, 40%);">- { 0, NULL }</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> static const struct value_string xua_asp_event_names[] = {</span><br><span> { XUA_ASP_E_M_ASP_UP_REQ, "M-ASP_UP.req" },</span><br><span> { XUA_ASP_E_M_ASP_ACTIVE_REQ, "M-ASP_ACTIVE.req" },</span><br><span>@@ -88,7 +81,7 @@</span><br><span> /* pointer back to ASP to which we belong */</span><br><span> struct osmo_ss7_asp *asp;</span><br><span> /* Role (ASP/SG/IPSP) */</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role;</span><br><span> </span><br><span> /* routing context[s]: list of 32bit integers */</span><br><span> /* ACTIVE: traffic mode type, tid label, drn label ? */</span><br><span>@@ -312,12 +305,12 @@</span><br><span> #define ENSURE_ASP_OR_IPSP(fi, event) \</span><br><span> do { \</span><br><span> struct xua_asp_fsm_priv *_xafp = fi->priv; \</span><br><span style="color: hsl(0, 100%, 40%);">- if (_xafp->role != XUA_ASPFSM_ROLE_ASP && \</span><br><span style="color: hsl(0, 100%, 40%);">- _xafp->role != XUA_ASPFSM_ROLE_IPSP) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (_xafp->role != OSMO_SS7_ASP_ROLE_ASP && \</span><br><span style="color: hsl(120, 100%, 40%);">+ _xafp->role != OSMO_SS7_ASP_ROLE_IPSP) { \</span><br><span> LOGPFSML(fi, LOGL_ERROR, "event %s not permitted " \</span><br><span> "in role %s\n", \</span><br><span> osmo_fsm_event_name(fi->fsm, event), \</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(xua_asp_role_names, _xafp->role));\</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_ss7_asp_role_names, _xafp->role));\</span><br><span> return; \</span><br><span> } \</span><br><span> } while(0)</span><br><span>@@ -325,12 +318,12 @@</span><br><span> #define ENSURE_SG_OR_IPSP(fi, event) \</span><br><span> do { \</span><br><span> struct xua_asp_fsm_priv *_xafp = fi->priv; \</span><br><span style="color: hsl(0, 100%, 40%);">- if (_xafp->role != XUA_ASPFSM_ROLE_SG && \</span><br><span style="color: hsl(0, 100%, 40%);">- _xafp->role != XUA_ASPFSM_ROLE_IPSP) { \</span><br><span style="color: hsl(120, 100%, 40%);">+ if (_xafp->role != OSMO_SS7_ASP_ROLE_SG && \</span><br><span style="color: hsl(120, 100%, 40%);">+ _xafp->role != OSMO_SS7_ASP_ROLE_IPSP) { \</span><br><span> LOGPFSML(fi, LOGL_ERROR, "event %s not permitted " \</span><br><span> "in role %s\n", \</span><br><span> osmo_fsm_event_name(fi->fsm, event), \</span><br><span style="color: hsl(0, 100%, 40%);">- get_value_string(xua_asp_role_names, _xafp->role));\</span><br><span style="color: hsl(120, 100%, 40%);">+ get_value_string(osmo_ss7_asp_role_names, _xafp->role));\</span><br><span> return; \</span><br><span> } \</span><br><span> } while(0)</span><br><span>@@ -709,7 +702,7 @@</span><br><span> };</span><br><span> </span><br><span> static struct osmo_fsm_inst *ipa_asp_fsm_start(struct osmo_ss7_asp *asp,</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role, int log_level);</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role, int log_level);</span><br><span> </span><br><span> /*! \brief Start a new ASP finite stae machine for given ASP</span><br><span> * \param[in] asp Application Server Process for which to start FSM</span><br><span>@@ -717,7 +710,7 @@</span><br><span> * \param[in] log_level Logging Level for ASP FSM logging</span><br><span> * \returns FSM instance on success; NULL on error */</span><br><span> struct osmo_fsm_inst *xua_asp_fsm_start(struct osmo_ss7_asp *asp,</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role, int log_level)</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role, int log_level)</span><br><span> {</span><br><span> struct osmo_fsm_inst *fi;</span><br><span> struct xua_asp_fsm_priv *xafp;</span><br><span>@@ -768,7 +761,7 @@</span><br><span> /* pointer back to ASP to which we belong */</span><br><span> struct osmo_ss7_asp *asp;</span><br><span> /* Role (ASP/SG/IPSP) */</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role;</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role;</span><br><span> </span><br><span> /* Structure holding parsed data of the IPA CCM ID exchange */</span><br><span> struct ipaccess_unit *ipa_unit;</span><br><span>@@ -807,7 +800,7 @@</span><br><span> switch (event) {</span><br><span> case XUA_ASP_E_M_ASP_UP_REQ:</span><br><span> case XUA_ASP_E_SCTP_EST_IND:</span><br><span style="color: hsl(0, 100%, 40%);">- if (iafp->role == XUA_ASPFSM_ROLE_SG) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (iafp->role == OSMO_SS7_ASP_ROLE_SG) {</span><br><span> /* Server: Transmit IPA ID GET + Wait for Response */</span><br><span> if (fd >= 0) {</span><br><span> ipa_ccm_send_id_req(fd);</span><br><span>@@ -1115,7 +1108,7 @@</span><br><span> * \param[in] log_level Logging Level for ASP FSM logging</span><br><span> * \returns FSM instance on success; NULL on error */</span><br><span> static struct osmo_fsm_inst *ipa_asp_fsm_start(struct osmo_ss7_asp *asp,</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role, int log_level)</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role, int log_level)</span><br><span> {</span><br><span> struct osmo_fsm_inst *fi;</span><br><span> struct ipa_asp_fsm_priv *iafp;</span><br><span>@@ -1137,7 +1130,7 @@</span><br><span> </span><br><span> fi->priv = iafp;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- if (role == XUA_ASPFSM_ROLE_ASP)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (role == OSMO_SS7_ASP_ROLE_ASP)</span><br><span> osmo_fsm_inst_dispatch(fi, XUA_ASP_E_M_ASP_UP_REQ, NULL);</span><br><span> </span><br><span> return fi;</span><br><span>diff --git a/src/xua_asp_fsm.h b/src/xua_asp_fsm.h</span><br><span>index 32749ec..2b36220 100644</span><br><span>--- a/src/xua_asp_fsm.h</span><br><span>+++ b/src/xua_asp_fsm.h</span><br><span>@@ -36,14 +36,8 @@</span><br><span> _NUM_XUA_ASP_E</span><br><span> };</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-enum xua_asp_role {</span><br><span style="color: hsl(0, 100%, 40%);">- XUA_ASPFSM_ROLE_ASP,</span><br><span style="color: hsl(0, 100%, 40%);">- XUA_ASPFSM_ROLE_SG,</span><br><span style="color: hsl(0, 100%, 40%);">- XUA_ASPFSM_ROLE_IPSP,</span><br><span style="color: hsl(0, 100%, 40%);">-};</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> extern struct osmo_fsm xua_asp_fsm;</span><br><span> extern struct osmo_fsm ipa_asp_fsm;</span><br><span> </span><br><span> struct osmo_fsm_inst *xua_asp_fsm_start(struct osmo_ss7_asp *asp,</span><br><span style="color: hsl(0, 100%, 40%);">- enum xua_asp_role role, int log_level);</span><br><span style="color: hsl(120, 100%, 40%);">+ enum osmo_ss7_asp_role role, int log_level);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15973">change 15973</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.osmocom.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15973"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: libosmo-sccp </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-Change-Id: I28b0888b8f8206e9dd67ef64ce0f71ba9a7105ce </div>
<div style="display:none"> Gerrit-Change-Number: 15973 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder </div>
<div style="display:none"> Gerrit-Reviewer: laforge <laforge@osmocom.org> </div>
<div style="display:none"> Gerrit-Reviewer: pespin <pespin@sysmocom.de> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>