<p>laforge <strong>submitted</strong> this change.</p><p><a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15809">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
laforge: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">Use LOGPAS / LOGPASP in favor of generic LOGSS7 where applicable<br><br>Change-Id: If3a88863d18941c10d34361b323412ad7e517334<br>---<br>M src/osmo_ss7.c<br>1 file changed, 9 insertions(+), 11 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 8519ced..8d188fc 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -985,7 +985,6 @@</span><br><span> return NULL;</span><br><span> </span><br><span> if (!as) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(inst, LOGL_INFO, "Creating AS %s\n", name);</span><br><span> as = talloc_zero(inst, struct osmo_ss7_as);</span><br><span> if (!as)</span><br><span> return NULL;</span><br><span>@@ -997,6 +996,7 @@</span><br><span> as->cfg.routing_key.l_rk_id = find_free_l_rk_id(inst);</span><br><span> as->fi = xua_as_fsm_start(as, LOGL_DEBUG);</span><br><span> llist_add_tail(&as->list, &inst->as_list);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAS(as, DLSS7, LOGL_INFO, "Created AS\n");</span><br><span> }</span><br><span> </span><br><span> return as;</span><br><span>@@ -1016,8 +1016,7 @@</span><br><span> if (!asp)</span><br><span> return -ENODEV;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(as->inst, LOGL_INFO, "Adding ASP %s to AS %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- asp->cfg.name, as->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAS(as, DLSS7, LOGL_INFO, "Adding ASP %s to AS\n", asp->cfg.name);</span><br><span> </span><br><span> if (osmo_ss7_as_has_asp(as, asp))</span><br><span> return 0;</span><br><span>@@ -1046,8 +1045,7 @@</span><br><span> if (!asp)</span><br><span> return -ENODEV;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(as->inst, LOGL_INFO, "Removing ASP %s from AS %s\n",</span><br><span style="color: hsl(0, 100%, 40%);">- asp->cfg.name, as->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAS(as, DLSS7, LOGL_INFO, "Removing ASP %s from AS\n", asp->cfg.name);</span><br><span> </span><br><span> for (i = 0; i < ARRAY_SIZE(as->cfg.asps); i++) {</span><br><span> if (as->cfg.asps[i] == asp) {</span><br><span>@@ -1066,7 +1064,7 @@</span><br><span> struct osmo_ss7_route *rt, *rt2;</span><br><span> </span><br><span> OSMO_ASSERT(ss7_initialized);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(as->inst, LOGL_INFO, "Destroying AS %s\n", as->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPAS(as, DLSS7, LOGL_INFO, "Destroying AS\n");</span><br><span> </span><br><span> if (as->fi)</span><br><span> osmo_fsm_inst_term(as->fi, OSMO_FSM_TERM_REQUEST, NULL);</span><br><span>@@ -1233,7 +1231,7 @@</span><br><span> struct osmo_ss7_as *as;</span><br><span> </span><br><span> OSMO_ASSERT(ss7_initialized);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(asp->inst, LOGL_INFO, "Destroying ASP %s\n", asp->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLSS7, LOGL_INFO, "Destroying ASP\n");</span><br><span> </span><br><span> if (asp->server)</span><br><span> osmo_stream_srv_destroy(asp->server);</span><br><span>@@ -1270,7 +1268,7 @@</span><br><span> enum xua_asp_role role;</span><br><span> </span><br><span> OSMO_ASSERT(ss7_initialized);</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(asp->inst, LOGL_INFO, "Restarting ASP %s\n", asp->cfg.name);</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLSS7, LOGL_INFO, "Restarting ASP\n");</span><br><span> </span><br><span> if (!asp->cfg.is_server) {</span><br><span> /* We are in client mode now */</span><br><span>@@ -1283,7 +1281,7 @@</span><br><span> if (!asp->client)</span><br><span> asp->client = osmo_stream_cli_create(asp);</span><br><span> if (!asp->client) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(asp->inst, LOGL_ERROR, "Unable to create stream"</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to create stream"</span><br><span> " client for ASP %s\n", asp->cfg.name);</span><br><span> return -1;</span><br><span> }</span><br><span>@@ -1302,7 +1300,7 @@</span><br><span> osmo_stream_cli_set_data(asp->client, asp);</span><br><span> rc = osmo_stream_cli_open(asp->client);</span><br><span> if (rc < 0) {</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(asp->inst, LOGL_ERROR, "Unable to open stream"</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGPASP(asp, DLSS7, LOGL_ERROR, "Unable to open stream"</span><br><span> " client for ASP %s\n", asp->cfg.name);</span><br><span> /* we don't return error in here because osmo_stream_cli_open()</span><br><span> will continue to retry (due to timeout being explicitly set with</span><br><span>@@ -1319,7 +1317,7 @@</span><br><span> asp->client = NULL;</span><br><span> }</span><br><span> /* FIXME: ensure we have a SCTP server */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGSS7(asp->inst, LOGL_NOTICE, "ASP Restart for server "</span><br><span style="color: hsl(120, 100%, 40%);">+ 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> role = XUA_ASPFSM_ROLE_SG;</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/c/libosmo-sccp/+/15809">change 15809</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/+/15809"/><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: If3a88863d18941c10d34361b323412ad7e517334 </div>
<div style="display:none"> Gerrit-Change-Number: 15809 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </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-MessageType: merged </div>