<p>Harald Welte <strong>merged</strong> this change.</p><p><a href="https://gerrit.osmocom.org/12353">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Harald Welte: Looks good to me, approved
Neels Hofmeyr: Looks good to me, approved
Max: Looks good to me, but someone else must approve
Vadim Yanitskiy: Looks good to me, approved
Jenkins Builder: Verified
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">use vty->type instead of local variable<br><br>We can check if we're parsing the config file by checking<br>whether vty->type equals VTY_FILE. This avoids the use of<br>an extra local variable to track the parsing state.<br><br>Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75<br>Fixes: 1051c4208834c22d344dd92d25addfd8e5d95993<br>Related: OS#3355<br>---<br>M include/osmocom/msc/vty.h<br>M src/libmsc/msc_vty.c<br>M src/osmo-msc/msc_main.c<br>3 files changed, 1 insertion(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/osmocom/msc/vty.h b/include/osmocom/msc/vty.h</span><br><span>index 60a36d7..6a55df7 100644</span><br><span>--- a/include/osmocom/msc/vty.h</span><br><span>+++ b/include/osmocom/msc/vty.h</span><br><span>@@ -31,6 +31,4 @@</span><br><span> </span><br><span> struct gsm_network *gsmnet_from_vty(struct vty *vty);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-extern bool msc_parsing_config_file;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> #endif</span><br><span>diff --git a/src/libmsc/msc_vty.c b/src/libmsc/msc_vty.c</span><br><span>index c5d2832..7745e5d 100644</span><br><span>--- a/src/libmsc/msc_vty.c</span><br><span>+++ b/src/libmsc/msc_vty.c</span><br><span>@@ -466,7 +466,7 @@</span><br><span> "This name is used for GSUP routing and must be set if more than one MSC is connected to the HLR. "</span><br><span> "The default is 'MSC-00-00-00-00-00-00'.\n")</span><br><span> {</span><br><span style="color: hsl(0, 100%, 40%);">- if (!msc_parsing_config_file) {</span><br><span style="color: hsl(120, 100%, 40%);">+ if (vty->type != VTY_FILE) {</span><br><span> vty_out(vty, "The IPA name cannot be changed at run-time; "</span><br><span> "It can only be set in the configuraton file.%s", VTY_NEWLINE);</span><br><span> return CMD_WARNING;</span><br><span>diff --git a/src/osmo-msc/msc_main.c b/src/osmo-msc/msc_main.c</span><br><span>index 4dce2b8..6eecf46 100644</span><br><span>--- a/src/osmo-msc/msc_main.c</span><br><span>+++ b/src/osmo-msc/msc_main.c</span><br><span>@@ -515,8 +515,6 @@</span><br><span> extern void *tall_call_ctx;</span><br><span> extern void *tall_trans_ctx;</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-bool msc_parsing_config_file = false;</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> int main(int argc, char **argv)</span><br><span> {</span><br><span> int rc;</span><br><span>@@ -569,9 +567,7 @@</span><br><span> return -1;</span><br><span> #endif</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">- msc_parsing_config_file = true;</span><br><span> rc = vty_read_config_file(msc_cmdline_config.config_file, NULL);</span><br><span style="color: hsl(0, 100%, 40%);">- msc_parsing_config_file = false;</span><br><span> if (rc < 0) {</span><br><span> LOGP(DMSC, LOGL_FATAL, "Failed to parse the config file: '%s'\n",</span><br><span> msc_cmdline_config.config_file);</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.osmocom.org/12353">change 12353</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/12353"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: osmo-msc </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I85161575e025f7c389832427a434bd8e2d6ecc75 </div>
<div style="display:none"> Gerrit-Change-Number: 12353 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: Stefan Sperling <stsp@stsp.name> </div>
<div style="display:none"> Gerrit-Reviewer: Harald Welte <laforge@gnumonks.org> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins Builder (1000002) </div>
<div style="display:none"> Gerrit-Reviewer: Max <msuraev@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Neels Hofmeyr <nhofmeyr@sysmocom.de> </div>
<div style="display:none"> Gerrit-Reviewer: Vadim Yanitskiy <axilirator@gmail.com> </div>