<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[Freeswitch-trunk][16451] </title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<div id="header">FreeSWITCH Subversion</div>
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://fisheye.freeswitch.org/changelog/FreeSWITCH?cs=16451">16451</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-01-21 20:42:05 -0600 (Thu, 21 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>make banner an api command so you can fetch it over event socket</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (16450 => 16451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2010-01-22 02:18:15 UTC (rev 16450)
+++ freeswitch/trunk/src/include/switch_core.h 2010-01-22 02:42:05 UTC (rev 16451)
</span><span class="lines">@@ -2070,6 +2070,7 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_detach(void);
</span><span class="cx"> SWITCH_DECLARE(uint32_t) switch_core_debug_level(void);
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_flush_handles(void);
</span><ins>+SWITCH_DECLARE(const char *) switch_core_banner(void);
</ins><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (16450 => 16451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-01-22 02:18:15 UTC (rev 16450)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-01-22 02:42:05 UTC (rev 16451)
</span><span class="lines">@@ -45,11 +45,17 @@
</span><span class="cx"> SWITCH_MODULE_SHUTDOWN_FUNCTION(mod_commands_shutdown);
</span><span class="cx"> SWITCH_MODULE_DEFINITION(mod_commands, mod_commands_load, mod_commands_shutdown, NULL);
</span><span class="cx">
</span><ins>+SWITCH_STANDARD_API(banner_function)
+{
+ stream->write_function(stream, "%s", switch_core_banner());
+ return SWITCH_STATUS_SUCCESS;
+}
+
</ins><span class="cx"> SWITCH_STANDARD_API(hostname_api_function)
</span><span class="cx"> {
</span><span class="cx"> char hostname[256]="";
</span><span class="cx"> gethostname(hostname, sizeof(hostname));
</span><del>- stream->write_function(stream, "%s",hostname);
</del><ins>+ stream->write_function(stream, "%s", hostname);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4065,6 +4071,7 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "acl", "compare an ip to an acl list", acl_function, "<ip> <list_name>");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "alias", "Alias", alias_function, ALIAS_SYNTAX);
</span><ins>+ SWITCH_ADD_API(commands_api_interface, "banner", "Returns the system banner", banner_function, "");
</ins><span class="cx"> SWITCH_ADD_API(commands_api_interface, "bgapi", "Execute an api command in a thread", bgapi_function, "<command>[ <arg>]");
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "bg_system", "Execute a system command in the background", bg_system_function, SYSTEM_SYNTAX);
</span><span class="cx"> SWITCH_ADD_API(commands_api_interface, "break", "Break", break_function, BREAK_SYNTAX);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (16450 => 16451)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2010-01-22 02:18:15 UTC (rev 16450)
+++ freeswitch/trunk/src/switch_core.c 2010-01-22 02:42:05 UTC (rev 16451)
</span><span class="lines">@@ -1484,25 +1484,25 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>-static void print_banner(void)
</del><ins>+SWITCH_DECLARE(const char *) switch_core_banner(void)
</ins><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,
- "\n"
- " _____ ______ _____ _____ ____ _ _ \n"
- " | ___| __ ___ ___/ ___\\ \\ / /_ _|_ _/ ___| | | | \n"
- " | |_ | '__/ _ \\/ _ \\___ \\\\ \\ /\\ / / | | | || | | |_| | \n"
- " | _|| | | __/ __/___) |\\ V V / | | | || |___| _ | \n"
- " |_| |_| \\___|\\___|____/ \\_/\\_/ |___| |_| \\____|_| |_| \n"
- "\n"
- "************************************************************\n"
- "* Anthony Minessale II, Michael Jerris, Brian West, Others *\n"
- "* FreeSWITCH (http://www.freeswitch.org) *\n"
- "* Paypal Donations Appreciated: paypal@freeswitch.org *\n"
- "* Brought to you by ClueCon http://www.cluecon.com/ *\n"
- "************************************************************\n"
- "\n"
- );
</del><ins>+
+ return ("\n"
+ " _____ ______ _____ _____ ____ _ _ \n"
+ " | ___| __ ___ ___/ ___\\ \\ / /_ _|_ _/ ___| | | | \n"
+ " | |_ | '__/ _ \\/ _ \\___ \\\\ \\ /\\ / / | | | || | | |_| | \n"
+ " | _|| | | __/ __/___) |\\ V V / | | | || |___| _ | \n"
+ " |_| |_| \\___|\\___|____/ \\_/\\_/ |___| |_| \\____|_| |_| \n"
+ "\n"
+ "************************************************************\n"
+ "* Anthony Minessale II, Michael Jerris, Brian West, Others *\n"
+ "* FreeSWITCH (http://www.freeswitch.org) *\n"
+ "* Paypal Donations Appreciated: paypal@freeswitch.org *\n"
+ "* Brought to you by ClueCon http://www.cluecon.com/ *\n"
+ "************************************************************\n"
+ "\n"
+ );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1560,8 +1560,10 @@
</span><span class="cx"> switch_event_add_header(event, SWITCH_STACK_BOTTOM, "Event-Info", "System Ready");
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><del>- print_banner();
</del><span class="cx">
</span><ins>+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE, "%s", switch_core_banner());
+
+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,
</span><span class="cx"> "\nFreeSWITCH Version %s Started.\nMax Sessions[%u]\nSession Rate[%d]\nSQL [%s]\n", SWITCH_VERSION_FULL,
</span><span class="cx"> switch_core_session_limit(0),
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>