<p>Neels Hofmeyr has uploaded this change for <strong>review</strong>.</p><p><a href="https://gerrit.osmocom.org/11118">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">cosmetic: allocate ss7->sccp in one common function<br><br>Instead of allocating ss7->sccp in various places, unify that in one common<br>function. We shouldn't spread the decision what to pass as priv pointer around<br>everywhere. There is no functional difference.<br><br>This is preparation for a patch where the sccp_instance gets allocated from the<br>telnet VTY: I would prefer to hide all allocation details from that code; which<br>also makes sense for the other callers of osmo_sccp_instance_create().<br><br>Change-Id: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7.c<br>M src/sccp_user.c<br>3 files changed, 20 insertions(+), 8 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://gerrit.osmocom.org:29418/libosmo-sccp refs/changes/18/11118/1</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 a93c663..34d5408 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -111,6 +111,8 @@</span><br><span> int osmo_ss7_instance_bind(struct osmo_ss7_instance *inst);</span><br><span> int osmo_ss7_bind_all_instances();</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst);</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * MTP Users (Users of MTP, such as SCCP or ISUP)</span><br><span> ***********************************************************************/</span><br><span>diff --git a/src/osmo_ss7.c b/src/osmo_ss7.c</span><br><span>index 025c21c..9805b3b 100644</span><br><span>--- a/src/osmo_ss7.c</span><br><span>+++ b/src/osmo_ss7.c</span><br><span>@@ -460,6 +460,18 @@</span><br><span> return rc;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+/*! Allocate an SCCP instance, if not present yet.</span><br><span style="color: hsl(120, 100%, 40%);">+ * \returns inst->sccp. */</span><br><span style="color: hsl(120, 100%, 40%);">+struct osmo_sccp_instance *osmo_ss7_ensure_sccp(struct osmo_ss7_instance *inst)</span><br><span style="color: hsl(120, 100%, 40%);">+{</span><br><span style="color: hsl(120, 100%, 40%);">+ if (inst->sccp)</span><br><span style="color: hsl(120, 100%, 40%);">+ return inst->sccp;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span style="color: hsl(120, 100%, 40%);">+ LOGSS7(inst, LOGL_NOTICE, "Creating SCCP instance\n");</span><br><span style="color: hsl(120, 100%, 40%);">+ inst->sccp = osmo_sccp_instance_create(inst, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ return inst->sccp;</span><br><span style="color: hsl(120, 100%, 40%);">+}</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /***********************************************************************</span><br><span> * MTP Users (Users of MTP, such as SCCP or ISUP)</span><br><span> ***********************************************************************/</span><br><span>@@ -1169,8 +1181,8 @@</span><br><span> llist_add_tail(&asp->list, &inst->asp_list);</span><br><span> </span><br><span> /* The SUA code internally needs SCCP to work */</span><br><span style="color: hsl(0, 100%, 40%);">- if (proto == OSMO_SS7_ASP_PROT_SUA && !inst->sccp)</span><br><span style="color: hsl(0, 100%, 40%);">- inst->sccp = osmo_sccp_instance_create(inst, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proto == OSMO_SS7_ASP_PROT_SUA)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_ensure_sccp(inst);</span><br><span> </span><br><span> }</span><br><span> return asp;</span><br><span>@@ -1817,8 +1829,8 @@</span><br><span> llist_add_tail(&oxs->list, &inst->xua_servers);</span><br><span> </span><br><span> /* The SUA code internally needs SCCP to work */</span><br><span style="color: hsl(0, 100%, 40%);">- if (proto == OSMO_SS7_ASP_PROT_SUA && !inst->sccp)</span><br><span style="color: hsl(0, 100%, 40%);">- inst->sccp = osmo_sccp_instance_create(inst, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ if (proto == OSMO_SS7_ASP_PROT_SUA)</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_ensure_sccp(inst);</span><br><span> </span><br><span> return oxs;</span><br><span> }</span><br><span>diff --git a/src/sccp_user.c b/src/sccp_user.c</span><br><span>index 99ed96e..020166d 100644</span><br><span>--- a/src/sccp_user.c</span><br><span>+++ b/src/sccp_user.c</span><br><span>@@ -480,9 +480,7 @@</span><br><span> LOGP(DLSCCP, LOGL_NOTICE, "%s: Using ASP instance %s\n", name,</span><br><span> asp->cfg.name);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- /* Allocate SCCP instance */</span><br><span style="color: hsl(0, 100%, 40%);">- LOGP(DLSCCP, LOGL_NOTICE, "%s: Creating SCCP instance\n", name);</span><br><span style="color: hsl(0, 100%, 40%);">- ss7->sccp = osmo_sccp_instance_create(ss7, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_ensure_sccp(ss7);</span><br><span> if (!ss7->sccp)</span><br><span> goto out_asp;</span><br><span> </span><br><span>@@ -562,7 +560,7 @@</span><br><span> goto out_xs;</span><br><span> </span><br><span> /* Allocate SCCP stack */</span><br><span style="color: hsl(0, 100%, 40%);">- ss7->sccp = osmo_sccp_instance_create(ss7, NULL);</span><br><span style="color: hsl(120, 100%, 40%);">+ osmo_ss7_ensure_sccp(ss7);</span><br><span> if (!ss7->sccp)</span><br><span> goto out_xs;</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11118">change 11118</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/11118"/><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-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ie912898c66d31ce4ac8eeeea5a6ddc3f821c06f7 </div>
<div style="display:none"> Gerrit-Change-Number: 11118 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>