<p>George Joseph <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/15226">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  Joshua Colp: Looks good to me, but someone else must approve
  George Joseph: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">asterisk: Export additional manager functions<br><br>Rename check_manager_enabled() and check_webmanager_enabled() to begin<br>with ast_ so that the symbols are automatically exported by the<br>linker.<br><br>ASTERISK~29184<br><br>Change-Id: I85762b9a5d14500c15f6bad6507138c8858644c9<br>---<br>M include/asterisk/manager.h<br>M main/asterisk.c<br>M main/manager.c<br>3 files changed, 7 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/manager.h b/include/asterisk/manager.h</span><br><span>index 910eb5d..350772e 100644</span><br><span>--- a/include/asterisk/manager.h</span><br><span>+++ b/include/asterisk/manager.h</span><br><span>@@ -115,10 +115,10 @@</span><br><span> };</span><br><span> </span><br><span> /*! \brief Check if AMI is enabled */</span><br><span style="color: hsl(0, 100%, 40%);">-int check_manager_enabled(void);</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_manager_check_enabled(void);</span><br><span> </span><br><span> /*! \brief Check if AMI/HTTP is enabled */</span><br><span style="color: hsl(0, 100%, 40%);">-int check_webmanager_enabled(void);</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_webmanager_check_enabled(void);</span><br><span> </span><br><span> /*! Add a custom hook to be called when an event is fired</span><br><span>  \param hook struct manager_custom_hook object to add</span><br><span>diff --git a/main/asterisk.c b/main/asterisk.c</span><br><span>index 1061fd0..d903113 100644</span><br><span>--- a/main/asterisk.c</span><br><span>+++ b/main/asterisk.c</span><br><span>@@ -534,8 +534,8 @@</span><br><span> </span><br><span>      ast_cli(a->fd, "\n* Subsystems\n");</span><br><span>     ast_cli(a->fd, "  -------------\n");</span><br><span style="color: hsl(0, 100%, 40%);">-       ast_cli(a->fd, "  Manager (AMI):               %s\n", check_manager_enabled() ? "Enabled" : "Disabled");</span><br><span style="color: hsl(0, 100%, 40%);">-       ast_cli(a->fd, "  Web Manager (AMI/HTTP):      %s\n", check_webmanager_enabled() ? "Enabled" : "Disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+  ast_cli(a->fd, "  Manager (AMI):               %s\n", ast_manager_check_enabled() ? "Enabled" : "Disabled");</span><br><span style="color: hsl(120, 100%, 40%);">+ ast_cli(a->fd, "  Web Manager (AMI/HTTP):      %s\n", ast_webmanager_check_enabled() ? "Enabled" : "Disabled");</span><br><span>     ast_cli(a->fd, "  Call data records:           %s\n", ast_cdr_is_enabled() ? "Enabled" : "Disabled");</span><br><span>       ast_cli(a->fd, "  Realtime Architecture (ARA): %s\n", ast_realtime_enabled() ? "Enabled" : "Disabled");</span><br><span> </span><br><span>diff --git a/main/manager.c b/main/manager.c</span><br><span>index e97715d..f938b4e 100644</span><br><span>--- a/main/manager.c</span><br><span>+++ b/main/manager.c</span><br><span>@@ -1946,12 +1946,12 @@</span><br><span>  AST_RWLIST_UNLOCK(&manager_hooks);</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int check_manager_enabled(void)</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_manager_check_enabled(void)</span><br><span> {</span><br><span>     return manager_enabled;</span><br><span> }</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-int check_webmanager_enabled(void)</span><br><span style="color: hsl(120, 100%, 40%);">+int ast_webmanager_check_enabled(void)</span><br><span> {</span><br><span>      return (webmanager_enabled && manager_enabled);</span><br><span> }</span><br><span>@@ -6309,7 +6309,7 @@</span><br><span>                         ast_option_maxfiles,</span><br><span>                         AST_CLI_YESNO(ast_realtime_enabled()),</span><br><span>                       AST_CLI_YESNO(ast_cdr_is_enabled()),</span><br><span style="color: hsl(0, 100%, 40%);">-                    AST_CLI_YESNO(check_webmanager_enabled())</span><br><span style="color: hsl(120, 100%, 40%);">+                     AST_CLI_YESNO(ast_webmanager_check_enabled())</span><br><span>                        );</span><br><span>   return 0;</span><br><span> }</span><br><span></span><br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/15226">change 15226</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://gerrit.asterisk.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.asterisk.org/c/asterisk/+/15226"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I85762b9a5d14500c15f6bad6507138c8858644c9 </div>
<div style="display:none"> Gerrit-Change-Number: 15226 </div>
<div style="display:none"> Gerrit-PatchSet: 4 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean.bright@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>