<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/11509">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Jenkins Builder: Verified
Harald Welte: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">skip simple-client default as/asp when saving VTY config<br><br>When saving the current VTY config to a configuration file,<br>do not write out AS/ASP configuration items which are generated<br>as a fallback by osmo_sccp_simple_client_on_ss7_id().<br><br>Since the user did not explicitly configure these configuration<br>items they should not be saved to the user's configuration file.<br><br>Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba<br>Related: OS#3616<br>---<br>M include/osmocom/sigtran/osmo_ss7.h<br>M src/osmo_ss7_vty.c<br>M src/sccp_user.c<br>3 files changed, 11 insertions(+), 4 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 34d5408..414606a 100644</span><br><span>--- a/include/osmocom/sigtran/osmo_ss7.h</span><br><span>+++ b/include/osmocom/sigtran/osmo_ss7.h</span><br><span>@@ -298,6 +298,9 @@</span><br><span> /*! Were we dynamically allocated by RKM? */</span><br><span> bool rkm_dyn_allocated;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Were we allocated by "simple client" support? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool simple_client_allocated;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> struct {</span><br><span> char *name;</span><br><span> char *description;</span><br><span>@@ -380,6 +383,9 @@</span><br><span> /*! Were we dynamically allocated */</span><br><span> bool dyn_allocated;</span><br><span> </span><br><span style="color: hsl(120, 100%, 40%);">+ /*! Were we allocated by "simple client" support? */</span><br><span style="color: hsl(120, 100%, 40%);">+ bool simple_client_allocated;</span><br><span style="color: hsl(120, 100%, 40%);">+</span><br><span> /*! Pending message for non-blocking IPA read */</span><br><span> struct msgb *pending_msg;</span><br><span> </span><br><span>diff --git a/src/osmo_ss7_vty.c b/src/osmo_ss7_vty.c</span><br><span>index 7ef58cf..1b7bcb9 100644</span><br><span>--- a/src/osmo_ss7_vty.c</span><br><span>+++ b/src/osmo_ss7_vty.c</span><br><span>@@ -679,9 +679,8 @@</span><br><span> </span><br><span> static void write_one_asp(struct vty *vty, struct osmo_ss7_asp *asp)</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- /* skip any dynamically created ASPs (auto-created at connect</span><br><span style="color: hsl(0, 100%, 40%);">- * time) */</span><br><span style="color: hsl(0, 100%, 40%);">- if (asp->dyn_allocated)</span><br><span style="color: hsl(120, 100%, 40%);">+ /* skip any dynamically created ASPs (e.g. auto-created at connect time) */</span><br><span style="color: hsl(120, 100%, 40%);">+ if (asp->dyn_allocated || asp->simple_client_allocated)</span><br><span> return;</span><br><span> </span><br><span> vty_out(vty, " asp %s %u %u %s%s",</span><br><span>@@ -939,7 +938,7 @@</span><br><span> unsigned int i;</span><br><span> </span><br><span> /* skip any dynamically allocated AS definitions */</span><br><span style="color: hsl(0, 100%, 40%);">- if (as->rkm_dyn_allocated)</span><br><span style="color: hsl(120, 100%, 40%);">+ if (as->rkm_dyn_allocated || as->simple_client_allocated)</span><br><span> return;</span><br><span> </span><br><span> vty_out(vty, " as %s %s%s", as->cfg.name,</span><br><span>diff --git a/src/sccp_user.c b/src/sccp_user.c</span><br><span>index 793e08c..8a98e46 100644</span><br><span>--- a/src/sccp_user.c</span><br><span>+++ b/src/sccp_user.c</span><br><span>@@ -409,6 +409,7 @@</span><br><span> goto out_ss7;</span><br><span> as_created = true;</span><br><span> as->cfg.routing_key.pc = ss7->cfg.primary_pc;</span><br><span style="color: hsl(120, 100%, 40%);">+ as->simple_client_allocated = true;</span><br><span> }</span><br><span> LOGP(DLSCCP, LOGL_NOTICE, "%s: Using AS instance %s\n", name,</span><br><span> as->cfg.name);</span><br><span>@@ -457,6 +458,7 @@</span><br><span> asp->cfg.remote.host =</span><br><span> talloc_strdup(asp, default_remote_ip);</span><br><span> }</span><br><span style="color: hsl(120, 100%, 40%);">+ asp->simple_client_allocated = true;</span><br><span> } else</span><br><span> talloc_free(asp_name);</span><br><span> </span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/11509">change 11509</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/11509"/><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: merged </div>
<div style="display:none"> Gerrit-Change-Id: Id8a3afc6dee29ae1ee9c862cbe404a61fe979dba </div>
<div style="display:none"> Gerrit-Change-Number: 11509 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <ssperling@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>