<!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][17426] </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=17426">17426</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2010-04-27 16:52:40 -0500 (Tue, 27 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add callee id to events and add global param verbose-channel-events and fsctl verbose_events [on|off] to globally configure verbose events</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunkconfautoload_configsswitchconfxml">freeswitch/trunk/conf/autoload_configs/switch.conf.xml</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.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_callerc">freeswitch/trunk/src/switch_caller.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.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="freeswitchtrunkconfautoload_configsswitchconfxml"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/conf/autoload_configs/switch.conf.xml (17425 => 17426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/conf/autoload_configs/switch.conf.xml 2010-04-28 14:18:58 UTC (rev 17425)
+++ freeswitch/trunk/conf/autoload_configs/switch.conf.xml 2010-04-27 21:52:40 UTC (rev 17426)
</span><span class="lines">@@ -72,6 +72,8 @@
</span><span class="cx"> <param name="mailer-app" value="sendmail"/>
</span><span class="cx"> <param name="mailer-app-args" value="-t"/>
</span><span class="cx"> <param name="dump-cores" value="yes"/>
</span><ins>+ <!-- enable verbose-channel-events to dump every detail about a channel on every event -->
+ <!--<param name="verbose-channel-events" value="no"/>-->
</ins><span class="cx"> <!--RTP port range -->
</span><span class="cx"> <!--<param name="rtp-start-port" value="16384"/>-->
</span><span class="cx"> <!--<param name="rtp-end-port" value="32768"/>-->
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (17425 => 17426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2010-04-28 14:18:58 UTC (rev 17425)
+++ freeswitch/trunk/src/include/switch_types.h 2010-04-27 21:52:40 UTC (rev 17426)
</span><span class="lines">@@ -248,7 +248,8 @@
</span><span class="cx"> SCF_EARLY_HANGUP = (1 << 7),
</span><span class="cx"> SCF_CALIBRATE_CLOCK = (1 << 8),
</span><span class="cx"> SCF_USE_HEAVY_TIMING = (1 << 9),
</span><del>- SCF_USE_CLOCK_RT = (1 << 10)
</del><ins>+ SCF_USE_CLOCK_RT = (1 << 10),
+ SCF_VERBOSE_EVENTS = (1 << 11)
</ins><span class="cx"> } switch_core_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_core_flag_t;
</span><span class="cx">
</span><span class="lines">@@ -1494,7 +1495,8 @@
</span><span class="cx"> SCSC_CALIBRATE_CLOCK,
</span><span class="cx"> SCSC_SAVE_HISTORY,
</span><span class="cx"> SCSC_CRASH,
</span><del>- SCSC_MIN_IDLE_CPU
</del><ins>+ SCSC_MIN_IDLE_CPU,
+ SCSC_VERBOSE_EVENTS
</ins><span class="cx"> } switch_session_ctl_t;
</span><span class="cx">
</span><span class="cx"> typedef enum {
</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 (17425 => 17426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-28 14:18:58 UTC (rev 17425)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2010-04-27 21:52:40 UTC (rev 17426)
</span><span class="lines">@@ -1500,6 +1500,16 @@
</span><span class="cx"> } else if (!strcasecmp(argv[0], "crash")) {
</span><span class="cx"> switch_core_session_ctl(SCSC_CRASH, NULL);
</span><span class="cx"> stream->write_function(stream, "+OK\n");
</span><ins>+ } else if (!strcasecmp(argv[0], "verbose_events")) {
+ arg = -1;
+ if (argv[1]) {
+ arg = switch_true(argv[1]);
+ }
+
+ switch_core_session_ctl(SCSC_VERBOSE_EVENTS, &arg);
+
+ stream->write_function(stream, "+OK verbose_events is %s \n", arg ? "on" : "off");
+
</ins><span class="cx"> } else if (!strcasecmp(argv[0], "save_history")) {
</span><span class="cx"> switch_core_session_ctl(SCSC_SAVE_HISTORY, NULL);
</span><span class="cx"> stream->write_function(stream, "+OK\n");
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_callerc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_caller.c (17425 => 17426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_caller.c 2010-04-28 14:18:58 UTC (rev 17425)
+++ freeswitch/trunk/src/switch_caller.c 2010-04-27 21:52:40 UTC (rev 17426)
</span><span class="lines">@@ -271,6 +271,14 @@
</span><span class="cx"> switch_snprintf(header_name, sizeof(header_name), "%s-Caller-ID-Number", prefix);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->caller_id_number);
</span><span class="cx"> }
</span><ins>+ if (!zstr(caller_profile->callee_id_name)) {
+ switch_snprintf(header_name, sizeof(header_name), "%s-Callee-ID-Name", prefix);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->callee_id_name);
+ }
+ if (!zstr(caller_profile->callee_id_number)) {
+ switch_snprintf(header_name, sizeof(header_name), "%s-Callee-ID-Number", prefix);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->callee_id_number);
+ }
</ins><span class="cx"> if (!zstr(caller_profile->network_addr)) {
</span><span class="cx"> switch_snprintf(header_name, sizeof(header_name), "%s-Network-Addr", prefix);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, header_name, caller_profile->network_addr);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (17425 => 17426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2010-04-28 14:18:58 UTC (rev 17425)
+++ freeswitch/trunk/src/switch_channel.c 2010-04-27 21:52:40 UTC (rev 17426)
</span><span class="lines">@@ -1677,11 +1677,13 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_channel_event_set_extended_data(switch_channel_t *channel, switch_event_t *event)
</span><span class="cx"> {
</span><span class="cx"> switch_event_header_t *hi;
</span><del>- int x;
</del><ins>+ int x, global_verbos_events = 0;
</ins><span class="cx">
</span><span class="cx"> switch_mutex_lock(channel->profile_mutex);
</span><span class="cx">
</span><del>- if (switch_channel_test_flag(channel, CF_VERBOSE_EVENTS) ||
</del><ins>+ switch_core_session_ctl(SCSC_VERBOSE_EVENTS, &global_verbos_events);
+
+ if (global_verbos_events || switch_channel_test_flag(channel, CF_VERBOSE_EVENTS) ||
</ins><span class="cx"> event->event_id == SWITCH_EVENT_CHANNEL_CREATE ||
</span><span class="cx"> event->event_id == SWITCH_EVENT_CHANNEL_ORIGINATE ||
</span><span class="cx"> event->event_id == SWITCH_EVENT_CHANNEL_UUID ||
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (17425 => 17426)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2010-04-28 14:18:58 UTC (rev 17425)
+++ freeswitch/trunk/src/switch_core.c 2010-04-27 21:52:40 UTC (rev 17426)
</span><span class="lines">@@ -1448,6 +1448,13 @@
</span><span class="cx"> switch_time_set_matrix(switch_true(var));
</span><span class="cx"> } else if (!strcasecmp(var, "max-sessions") && !zstr(val)) {
</span><span class="cx"> switch_core_session_limit(atoi(val));
</span><ins>+ } else if (!strcasecmp(var, "verbose-channel-events") && !zstr(val)) {
+ int v = switch_true(val);
+ if (v) {
+ switch_set_flag((&runtime), SCF_VERBOSE_EVENTS);
+ } else {
+ switch_clear_flag((&runtime), SCF_VERBOSE_EVENTS);
+ }
</ins><span class="cx"> } else if (!strcasecmp(var, "min-idle-cpu") && !zstr(val)) {
</span><span class="cx"> switch_core_min_idle_cpu(atof(val));
</span><span class="cx"> } else if (!strcasecmp(var, "tipping-point") && !zstr(val)) {
</span><span class="lines">@@ -1639,12 +1646,29 @@
</span><span class="cx"> SWITCH_DECLARE(int32_t) switch_core_session_ctl(switch_session_ctl_t cmd, void *val)
</span><span class="cx"> {
</span><span class="cx"> int *intval = (int *) val;
</span><ins>+ int oldintval = 0, newintval = 0;
+
+ if (intval) {
+ oldintval = *intval;
+ }
</ins><span class="cx">
</span><span class="cx"> if (switch_test_flag((&runtime), SCF_SHUTTING_DOWN)) {
</span><span class="cx"> return -1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch (cmd) {
</span><ins>+ case SCSC_VERBOSE_EVENTS:
+ if (intval) {
+ if (oldintval > -1) {
+ if (oldintval) {
+ switch_set_flag((&runtime), SCF_VERBOSE_EVENTS);
+ } else {
+ switch_clear_flag((&runtime), SCF_VERBOSE_EVENTS);
+ }
+ }
+ newintval = switch_test_flag((&runtime), SCF_VERBOSE_EVENTS);
+ }
+ break;
</ins><span class="cx"> case SCSC_CALIBRATE_CLOCK:
</span><span class="cx"> switch_time_calibrate_clock();
</span><span class="cx"> break;
</span><span class="lines">@@ -1656,10 +1680,10 @@
</span><span class="cx"> break;
</span><span class="cx"> case SCSC_SYNC_CLOCK:
</span><span class="cx"> switch_time_sync();
</span><del>- *intval = 0;
</del><ins>+ newintval = 0;
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_PAUSE_INBOUND:
</span><del>- if (*intval) {
</del><ins>+ if (oldintval) {
</ins><span class="cx"> switch_set_flag((&runtime), SCF_NO_NEW_SESSIONS);
</span><span class="cx"> } else {
</span><span class="cx"> switch_clear_flag((&runtime), SCF_NO_NEW_SESSIONS);
</span><span class="lines">@@ -1710,7 +1734,7 @@
</span><span class="cx"> win_shutdown();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (*intval) {
</del><ins>+ if (oldintval) {
</ins><span class="cx"> switch_set_flag((&runtime), SCF_RESTART);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Restarting\n");
</span><span class="cx"> } else {
</span><span class="lines">@@ -1732,7 +1756,7 @@
</span><span class="cx"> win_shutdown();
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (*intval) {
</del><ins>+ if (oldintval) {
</ins><span class="cx"> switch_set_flag((&runtime), SCF_RESTART);
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Restarting\n");
</span><span class="cx"> } else {
</span><span class="lines">@@ -1744,63 +1768,70 @@
</span><span class="cx"> runtime.running = 0;
</span><span class="cx"> break;
</span><span class="cx"> case SCSC_CHECK_RUNNING:
</span><del>- *intval = runtime.running;
</del><ins>+ newintval = runtime.running;
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_LOGLEVEL:
</span><del>- if (*intval > -1) {
- runtime.hard_log_level = *intval;
</del><ins>+ if (oldintval > -1) {
+ runtime.hard_log_level = oldintval;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (runtime.hard_log_level > SWITCH_LOG_DEBUG) {
</span><span class="cx"> runtime.hard_log_level = SWITCH_LOG_DEBUG;
</span><span class="cx"> }
</span><del>- *intval = runtime.hard_log_level;
</del><ins>+ newintval = runtime.hard_log_level;
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_DEBUG_LEVEL:
</span><del>- if (*intval > -1) {
- if (*intval > 10)
- *intval = 10;
- runtime.debug_level = *intval;
</del><ins>+ if (oldintval > -1) {
+ if (oldintval > 10)
+ newintval = 10;
+ runtime.debug_level = oldintval;
</ins><span class="cx"> }
</span><del>- *intval = runtime.debug_level;
</del><ins>+ newintval = runtime.debug_level;
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_MIN_IDLE_CPU:
</span><span class="cx"> {
</span><span class="cx"> double *dval = (double *) val;
</span><del>- *dval = switch_core_min_idle_cpu(*dval);
</del><ins>+ if (dval) {
+ *dval = switch_core_min_idle_cpu(*dval);
+ }
+ intval = NULL;
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case SCSC_MAX_SESSIONS:
</span><del>- *intval = switch_core_session_limit(*intval);
</del><ins>+ newintval = switch_core_session_limit(oldintval);
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_LAST_SPS:
</span><del>- *intval = runtime.sps_last;
</del><ins>+ newintval = runtime.sps_last;
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_MAX_DTMF_DURATION:
</span><del>- *intval = switch_core_max_dtmf_duration(*intval);
</del><ins>+ newintval = switch_core_max_dtmf_duration(oldintval);
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_MIN_DTMF_DURATION:
</span><del>- *intval = switch_core_min_dtmf_duration(*intval);
</del><ins>+ newintval = switch_core_min_dtmf_duration(oldintval);
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_DEFAULT_DTMF_DURATION:
</span><del>- *intval = switch_core_default_dtmf_duration(*intval);
</del><ins>+ newintval = switch_core_default_dtmf_duration(oldintval);
</ins><span class="cx"> break;
</span><span class="cx"> case SCSC_SPS:
</span><span class="cx"> switch_mutex_lock(runtime.throttle_mutex);
</span><del>- if (*intval > 0) {
- runtime.sps_total = *intval;
</del><ins>+ if (oldintval > 0) {
+ runtime.sps_total = oldintval;
</ins><span class="cx"> }
</span><del>- *intval = runtime.sps_total;
</del><ins>+ newintval = runtime.sps_total;
</ins><span class="cx"> switch_mutex_unlock(runtime.throttle_mutex);
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case SCSC_RECLAIM:
</span><span class="cx"> switch_core_memory_reclaim_all();
</span><del>- *intval = 0;
</del><ins>+ newintval = 0;
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if (intval) {
+ *intval = newintval;
+ }
</ins><span class="cx">
</span><ins>+
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>