<!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][14509] </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=14509">14509</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-08-13 15:35:02 -0500 (Thu, 13 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Per-call logging, part one</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc">freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofia_regc">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c</a></li>
<li><a href="#freeswitchtrunksrcmodevent_handlersmod_event_socketmod_event_socketc">freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_channelc">freeswitch/trunk/src/switch_channel.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_codecc">freeswitch/trunk/src/switch_core_codec.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_ioc">freeswitch/trunk/src/switch_core_io.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_media_bugc">freeswitch/trunk/src/switch_core_media_bug.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_rwlockc">freeswitch/trunk/src/switch_core_rwlock.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_sessionc">freeswitch/trunk/src/switch_core_session.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_core_state_machinec">freeswitch/trunk/src/switch_core_state_machine.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_cppcpp">freeswitch/trunk/src/switch_cpp.cpp</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_asyncc">freeswitch/trunk/src/switch_ivr_async.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_menuc">freeswitch/trunk/src/switch_ivr_menu.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_play_sayc">freeswitch/trunk/src/switch_ivr_play_say.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_logc">freeswitch/trunk/src/switch_log.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_swigc">freeswitch/trunk/src/switch_swig.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/include/switch_types.h 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -784,7 +784,11 @@
</span><span class="cx">
</span><span class="cx"> #define SWITCH_CHANNEL_LOG SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__, NULL
</span><span class="cx"> #define SWITCH_CHANNEL_LOG_CLEAN SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __SWITCH_FUNC__, __LINE__, NULL
</span><ins>+#define SWITCH_CHANNEL_SESSION_LOG_CLEAN(x) SWITCH_CHANNEL_ID_LOG_CLEAN, __FILE__, __SWITCH_FUNC__, __LINE__, ((x) ? switch_core_session_get_uuid(x) : NULL)
</ins><span class="cx"> #define SWITCH_CHANNEL_EVENT SWITCH_CHANNEL_ID_EVENT, __FILE__, __SWITCH_FUNC__, __LINE__, NULL
</span><ins>+#define SWITCH_CHANNEL_SESSION_LOG(x) SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__, ((x) ? switch_core_session_get_uuid(x) : NULL)
+#define SWITCH_CHANNEL_CHANNEL_LOG(x) SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__, ((x) ? switch_channel_get_uuid(x) : NULL)
+#define SWITCH_CHANNEL_UUID_LOG(x) SWITCH_CHANNEL_ID_LOG, __FILE__, __SWITCH_FUNC__, __LINE__, x
</ins><span class="cx">
</span><span class="cx"> /*!
</span><span class="cx"> \enum switch_channel_state_t
</span></span></pre></div>
<a id="freeswitchtrunksrcmoddialplansmod_dialplan_xmlmod_dialplan_xmlc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_xml/mod_dialplan_xml.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -83,7 +83,7 @@
</span><span class="cx"> switch_safe_free(expression_expanded);
</span><span class="cx">
</span><span class="cx"> if (switch_xml_child(xcond, "condition")) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Nested conditions are not allowed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Nested conditions are not allowed!\n");
</ins><span class="cx"> proceed = 1;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -181,24 +181,24 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((proceed = switch_regex_perform(field_data, expression, &re, ovector, sizeof(ovector) / sizeof(ovector[0])))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Dialplan: %s Regex (PASS) [%s] %s(%s) =~ /%s/ break=%s\n",
</span><span class="cx"> switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false");
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Dialplan: %s Regex (FAIL) [%s] %s(%s) =~ /%s/ break=%s\n",
</span><span class="cx"> switch_channel_get_name(channel), exten_name, field, field_data, expression, do_break_a ? do_break_a : "on-false");
</span><span class="cx"> for (xaction = switch_xml_child(xcond, "anti-action"); xaction; xaction = xaction->next) {
</span><span class="cx"> char *application = (char *) switch_xml_attr_soft(xaction, "application");
</span><span class="cx"> char *data = (char *) switch_xml_attr_soft(xaction, "data");
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Dialplan: %s ANTI-Action %s(%s)\n",
</span><span class="cx"> switch_channel_get_name(channel), application, data);
</span><span class="cx">
</span><span class="cx"> if (!*extension) {
</span><span class="cx"> if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
</ins><span class="cx"> proceed = 0;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -216,7 +216,7 @@
</span><span class="cx"> }
</span><span class="cx"> assert(re != NULL);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Dialplan: %s Absolute Condition [%s]\n",
</span><span class="cx"> switch_channel_get_name(channel), exten_name);
</span><span class="cx"> }
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> if (field && strchr(expression, '(')) {
</span><span class="cx"> len = (uint32_t) (strlen(data) + strlen(field_data) + 10) * proceed;
</span><span class="cx"> if (!(substituted = malloc(len))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
</ins><span class="cx"> proceed = 0;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -250,13 +250,13 @@
</span><span class="cx">
</span><span class="cx"> if (!*extension) {
</span><span class="cx"> if ((*extension = switch_caller_extension_new(session, exten_name, caller_profile->destination_number)) == 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Memory Error!\n");
</ins><span class="cx"> proceed = 0;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Dialplan: %s Action %s(%s)\n",
</span><span class="cx"> switch_channel_get_name(channel), application, app_data);
</span><span class="cx">
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx">
</span><span class="cx"> if (!caller_profile) {
</span><span class="cx"> if (!(caller_profile = switch_channel_get_caller_profile(channel))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Obtaining Profile!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error Obtaining Profile!\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> caller_profile->context = "default";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Processing %s->%s in context %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Processing %s->%s in context %s\n",
</ins><span class="cx"> caller_profile->caller_id_name, caller_profile->destination_number, caller_profile->context);
</span><span class="cx">
</span><span class="cx"> /* get our handle to the "dialplan" section of the config */
</span><span class="lines">@@ -320,21 +320,21 @@
</span><span class="cx"> if (!switch_strlen_zero(alt_path)) {
</span><span class="cx"> switch_xml_t conf = NULL, tag = NULL;
</span><span class="cx"> if (!(alt_root = switch_xml_parse_file_simple(alt_path))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of [%s] failed\n", alt_path);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of [%s] failed\n", alt_path);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((conf = switch_xml_find_child(alt_root, "section", "name", "dialplan")) && (tag = switch_xml_find_child(conf, "dialplan", NULL, NULL))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Getting dialplan from alternate path: %s\n", alt_path);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Getting dialplan from alternate path: %s\n", alt_path);
</ins><span class="cx"> xml = alt_root;
</span><span class="cx"> cfg = tag;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of dialplan failed\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of dialplan failed\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (dialplan_xml_locate(session, caller_profile, &xml, &cfg) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of dialplan failed\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of dialplan failed\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> /* get a handle to the context tag */
</span><span class="cx"> if (!(xcontext = switch_xml_find_child(cfg, "context", "name", caller_profile->context))) {
</span><span class="cx"> if (!(xcontext = switch_xml_find_child(cfg, "context", "name", "global"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Context %s not found\n", caller_profile->context);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Context %s not found\n", caller_profile->context);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> exten_name = "UNKNOWN";
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Dialplan: %s parsing [%s->%s] continue=%s\n",
</span><span class="cx"> switch_channel_get_name(channel), caller_profile->context, exten_name, cont ? cont : "false");
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -80,7 +80,7 @@
</span><span class="cx"> tech_pvt->read_frame.buflen = SWITCH_RTP_MAX_BUF_LEN;
</span><span class="cx"> switch_mutex_lock(tech_pvt->sofia_mutex);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA INIT\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA INIT\n", switch_channel_get_name(channel));
</ins><span class="cx"> if (switch_channel_test_flag(channel, CF_PROXY_MODE) || switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
</span><span class="cx"> sofia_glue_tech_absorb_sdp(tech_pvt);
</span><span class="cx"> }
</span><span class="lines">@@ -127,7 +127,7 @@
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA ROUTING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA ROUTING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -142,7 +142,7 @@
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA RESET\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA RESET\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA HIBERNATE\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA HIBERNATE\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -170,7 +170,7 @@
</span><span class="cx"> if (!sofia_test_flag(tech_pvt, TFLAG_HOLD_LOCK)) {
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA EXECUTE\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA EXECUTE\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -252,7 +252,7 @@
</span><span class="cx"> private_object_t *tech_pvt = (private_object_t *) switch_core_session_get_private(session);
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SOFIA DESTROY\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s SOFIA DESTROY\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> if (tech_pvt) {
</span><span class="cx"> if (switch_core_codec_ready(&tech_pvt->read_codec)) {
</span><span class="lines">@@ -303,7 +303,7 @@
</span><span class="cx"> if (!switch_strlen_zero(ps_cause) && (!strncasecmp(ps_cause, "sip:", 4) || !strncasecmp(ps_cause, "sips:", 5))) {
</span><span class="cx"> int new_cause = atoi(sofia_glue_strip_proto(ps_cause));
</span><span class="cx"> if (new_cause) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Overriding SIP cause %d with %d from the other leg\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Overriding SIP cause %d with %d from the other leg\n",
</ins><span class="cx"> switch_channel_get_name(channel), sip_cause, new_cause);
</span><span class="cx"> sip_cause = new_cause;
</span><span class="cx"> }
</span><span class="lines">@@ -335,7 +335,7 @@
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_SIP_HOLD);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel %s hanging up, cause: %s\n",
</ins><span class="cx"> switch_channel_get_name(channel), switch_channel_cause2str(cause));
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->hash_key) {
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> if (!tech_pvt->got_bye) {
</span><span class="cx"> switch_channel_set_variable(channel, "sip_hangup_disposition", "send_bye");
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending BYE to %s\n", switch_channel_get_name(channel));
</ins><span class="cx"> if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
</span><span class="cx"> nua_bye(tech_pvt->nh,
</span><span class="cx"> SIPTAG_REASON_STR(reason),
</span><span class="lines">@@ -383,7 +383,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (switch_channel_test_flag(channel, CF_OUTBOUND)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Sending CANCEL to %s\n", switch_channel_get_name(channel));
</ins><span class="cx"> if (!tech_pvt->got_bye) {
</span><span class="cx"> switch_channel_set_variable(channel, "sip_hangup_disposition", "send_cancel");
</span><span class="cx"> }
</span><span class="lines">@@ -394,7 +394,7 @@
</span><span class="cx"> TAG_END());
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Responding to INVITE with: %d\n", sip_cause);
</ins><span class="cx"> if (!tech_pvt->got_bye) {
</span><span class="cx"> switch_channel_set_variable(channel, "sip_hangup_disposition", "send_refuse");
</span><span class="cx"> }
</span><span class="lines">@@ -427,13 +427,13 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t sofia_on_exchange_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SOFIA LOOPBACK\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t sofia_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SOFIA TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SOFIA TRANSMIT\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -479,7 +479,7 @@
</span><span class="cx"> TAG_IF(!switch_strlen_zero(extra_headers), SIPTAG_HEADER_STR(extra_headers)),
</span><span class="cx"> TAG_END());
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Sent a 200 OK, waiting for ACK\n");
</ins><span class="cx"> switch_safe_free(extra_headers);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -494,14 +494,14 @@
</span><span class="cx"> /* Regain lock on sofia */
</span><span class="cx"> switch_mutex_lock(tech_pvt->sofia_mutex);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Done waiting for ACK\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((is_proxy && !b_sdp) || sofia_test_flag(tech_pvt, TFLAG_LATE_NEGOTIATION) || !tech_pvt->iananame) {
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_LATE_NEGOTIATION);
</span><span class="cx">
</span><span class="cx"> if (is_proxy) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Disabling proxy mode due to call answer with no bridge\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Disabling proxy mode due to call answer with no bridge\n");
</ins><span class="cx"> switch_channel_clear_flag(channel, CF_PROXY_MEDIA);
</span><span class="cx"> switch_channel_clear_flag(channel, CF_PROXY_MODE);
</span><span class="cx"> }
</span><span class="lines">@@ -533,7 +533,7 @@
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->nh) {
</span><span class="cx"> if (tech_pvt->local_sdp_str) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Local SDP %s:\n%s\n", switch_channel_get_name(channel), tech_pvt->local_sdp_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Local SDP %s:\n%s\n", switch_channel_get_name(channel), tech_pvt->local_sdp_str);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx"> int rtp_hold_timeout_sec = 0;
</span><span class="cx">
</span><span class="cx"> if (codec_ms > 120) { /* yeah right */
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Your phone is trying to send timestamps that suggest an increment of %dms per packet\n"
</span><span class="cx"> "That seems hard to believe so I am going to go on ahead and um ignore that, mmkay?", (int)codec_ms);
</span><span class="cx"> tech_pvt->check_frames = MAX_CODEC_CHECK_FRAMES;
</span><span class="lines">@@ -795,7 +795,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tech_pvt->read_frame.datalen = 0;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "We were told to use ptime %d but what they meant to say was %d\n"
</span><span class="cx"> "This issue has so far been identified to happen on the following broken platforms/devices:\n"
</span><span class="cx"> "Linksys/Sipura aka Cisco\n"
</span><span class="lines">@@ -1019,7 +1019,7 @@
</span><span class="cx"> case DTMF_NONE:
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unhandled DTMF type!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unhandled DTMF type!\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1041,7 +1041,7 @@
</span><span class="cx"> switch (msg->message_id) {
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY:
</span><span class="cx"> if (tech_pvt->rtp_session && switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Pass 2833 mode may not work on a transcoded call.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Pass 2833 mode may not work on a transcoded call.\n");
</ins><span class="cx"> }
</span><span class="cx"> goto end;
</span><span class="cx">
</span><span class="lines">@@ -1052,7 +1052,7 @@
</span><span class="cx">
</span><span class="cx"> if (sofia_test_flag(tech_pvt, TFLAG_PASS_RFC2833) && switch_channel_test_flag_partner(channel, CF_FS_RTP)) {
</span><span class="cx"> switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s activate passthru 2833 mode.\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s activate passthru 2833 mode.\n", switch_channel_get_name(channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((val = switch_channel_get_variable(channel, "rtp_autoflush_during_bridge"))) {
</span><span class="lines">@@ -1074,7 +1074,7 @@
</span><span class="cx"> int ok = 0;
</span><span class="cx">
</span><span class="cx"> if (switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s deactivate passthru 2833 mode.\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s deactivate passthru 2833 mode.\n", switch_channel_get_name(channel));
</ins><span class="cx"> switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1186,7 +1186,7 @@
</span><span class="cx">
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT:
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Sending media re-direct:\n%s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Sending media re-direct:\n%s\n",
</ins><span class="cx"> switch_channel_get_name(channel), msg->string_arg);
</span><span class="cx"> sofia_glue_tech_set_local_sdp(tech_pvt, msg->string_arg, SWITCH_TRUE);
</span><span class="cx">
</span><span class="lines">@@ -1202,7 +1202,7 @@
</span><span class="cx">
</span><span class="cx"> sofia_glue_set_image_sdp(tech_pvt, t38_options);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Sending request for image media. %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Sending request for image media. %s\n",
</ins><span class="cx"> switch_channel_get_name(channel), tech_pvt->local_sdp_str);
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1298,11 +1298,11 @@
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_REDIRECT:
</span><span class="cx"> if (!switch_strlen_zero(msg->string_arg)) {
</span><span class="cx"> if (!switch_channel_test_flag(channel, CF_ANSWERED) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Redirecting to %s\n", msg->string_arg);
</ins><span class="cx"> nua_respond(tech_pvt->nh, SIP_302_MOVED_TEMPORARILY, SIPTAG_CONTACT_STR(msg->string_arg), TAG_END());
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_BYE);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Too late for redirecting to %s, already answered\n", msg->string_arg);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Too late for redirecting to %s, already answered\n", msg->string_arg);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> if (switch_strlen_zero(to_host)) {
</span><span class="cx"> to_host = switch_channel_get_variable(channel, "sip_to_host");
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Challenging call %s\n", to_uri);
</ins><span class="cx"> sofia_reg_auth_challenge(NULL, tech_pvt->profile, tech_pvt->nh, REG_INVITE, to_host, 0);
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_USER_CHALLENGE);
</span><span class="cx"> } else if (code == 484 && msg->numeric_arg) {
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_test_flag(channel, CF_ANSWERED) && !sofia_test_flag(tech_pvt, TFLAG_BYE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Overlap Dial with %d %s\n", code, reason);
</ins><span class="cx"> nua_respond(tech_pvt->nh, code, su_strdup(nua_handle_home(tech_pvt->nh), reason), TAG_IF(to_uri, SIPTAG_CONTACT_STR(to_uri)),
</span><span class="cx"> SIPTAG_SUPPORTED_STR(NULL), SIPTAG_ACCEPT_STR(NULL),
</span><span class="cx"> TAG_IF(!switch_strlen_zero(max_forwards), SIPTAG_MAX_FORWARDS_STR(max_forwards)), TAG_END());
</span><span class="lines">@@ -1408,7 +1408,7 @@
</span><span class="cx"> goto end_lock;
</span><span class="cx"> } else {
</span><span class="cx"> if (!sofia_test_flag(tech_pvt, TFLAG_BYE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Responding with %d [%s]\n", code, reason);
</ins><span class="cx"> if (!switch_strlen_zero(((char *) msg->pointer_arg))) {
</span><span class="cx"> sofia_glue_tech_set_local_sdp(tech_pvt, (char *) msg->pointer_arg, SWITCH_TRUE);
</span><span class="cx">
</span><span class="lines">@@ -1495,7 +1495,7 @@
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> }
</span><span class="cx"> if (tech_pvt->local_sdp_str) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Ring SDP:\n%s\n", tech_pvt->local_sdp_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Ring SDP:\n%s\n", tech_pvt->local_sdp_str);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> switch_channel_mark_pre_answered(channel);
</span><span class="lines">@@ -2599,7 +2599,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(tech_pvt = (struct private_object *) switch_core_session_alloc(nsession, sizeof(*tech_pvt)))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error Creating Session\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error Creating Session\n");
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> switch_mutex_init(&tech_pvt->flag_mutex, SWITCH_MUTEX_NESTED, switch_core_session_get_pool(nsession));
</span><span class="lines">@@ -2622,7 +2622,7 @@
</span><span class="cx"> sofia_gateway_t *gateway_ptr = NULL;
</span><span class="cx">
</span><span class="cx"> if (!(gw = strchr(profile_name, '/'))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid URL\n");
</ins><span class="cx"> cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="lines">@@ -2630,7 +2630,7 @@
</span><span class="cx"> *gw++ = '\0';
</span><span class="cx">
</span><span class="cx"> if (!(dest = strchr(gw, '/'))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid URL\n");
</ins><span class="cx"> cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="lines">@@ -2638,13 +2638,13 @@
</span><span class="cx"> *dest++ = '\0';
</span><span class="cx">
</span><span class="cx"> if (!(gateway_ptr = sofia_reg_find_gateway(gw))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Gateway\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Gateway\n");
</ins><span class="cx"> cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (gateway_ptr->status != SOFIA_GATEWAY_UP) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Gateway is down!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Gateway is down!\n");
</ins><span class="cx"> cause = SWITCH_CAUSE_NETWORK_OUT_OF_ORDER;
</span><span class="cx"> sofia_reg_release_gateway(gateway_ptr);
</span><span class="cx"> gateway_ptr = NULL;
</span><span class="lines">@@ -2676,7 +2676,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->transport != gateway_ptr->register_transport) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
</ins><span class="cx"> "You are trying to use a different transport type for this gateway (overriding the register-transport), this is unsupported!\n");
</span><span class="cx"> cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> goto error;
</span><span class="lines">@@ -2715,7 +2715,7 @@
</span><span class="cx"> if (gateway_ptr->ob_vars) {
</span><span class="cx"> switch_event_header_t *hp;
</span><span class="cx"> for(hp = gateway_ptr->ob_vars->headers; hp; hp = hp->next) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n",
</ins><span class="cx"> switch_channel_get_name(nchannel), hp->name, hp->value);
</span><span class="cx"> switch_channel_set_variable(nchannel, hp->name, hp->value);
</span><span class="cx"> }
</span><span class="lines">@@ -2723,14 +2723,14 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> if (!(dest = strchr(profile_name, '/'))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid URL\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid URL\n");
</ins><span class="cx"> cause = SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> *dest++ = '\0';
</span><span class="cx">
</span><span class="cx"> if (!(profile = sofia_glue_find_profile(profile_name))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Profile\n");
</ins><span class="cx"> cause = SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="lines">@@ -2750,7 +2750,7 @@
</span><span class="cx"> tech_pvt->dest = switch_core_session_strdup(nsession, buf);
</span><span class="cx"> tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, host);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, host);
</ins><span class="cx"> cause = SWITCH_CAUSE_USER_NOT_REGISTERED;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="lines">@@ -2762,7 +2762,7 @@
</span><span class="cx"> tech_pvt->local_url = switch_core_session_sprintf(nsession, "%s@%s", dest, profile_name);
</span><span class="cx"> host = profile_name;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot locate registered user %s@%s\n", dest, profile_name);
</ins><span class="cx"> cause = SWITCH_CAUSE_USER_NOT_REGISTERED;
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -215,21 +215,21 @@
</span><span class="cx">
</span><span class="cx"> if (!sofia_private || !sofia_private->gateway) {
</span><span class="cx"> if (profile->debug) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Gateway information missing Subscription Event: %s\n", sip->sip_event->o_type);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Gateway information missing Subscription Event: %s\n", sip->sip_event->o_type);
</ins><span class="cx"> }
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /* find the corresponding gateway subscription (if any) */
</span><span class="cx"> if (!(gw_sub_ptr = sofia_find_gateway_subscription(sofia_private->gateway, sip->sip_event->o_type))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Could not find gateway subscription. Gateway: %s. Subscription Event: %s\n",
</span><span class="cx"> sofia_private->gateway->name, sip->sip_event->o_type);
</span><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(gw_sub_ptr->state == SUB_STATE_SUBED || gw_sub_ptr->state == SUB_STATE_SUBSCRIBE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Ignoring notify due to subscription state: %d\n",
</span><span class="cx"> gw_sub_ptr->state);
</span><span class="cx"> goto error;
</span><span class="lines">@@ -246,9 +246,9 @@
</span><span class="cx"> switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "profile_uri", sofia_private->gateway->profile->url);
</span><span class="cx"> switch_event_add_header_string(s_event, SWITCH_STACK_BOTTOM, "gateway_name", sofia_private->gateway->name);
</span><span class="cx"> switch_event_fire(&s_event);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dispatched freeswitch event for message-summary NOTIFY\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "dispatched freeswitch event for message-summary NOTIFY\n");
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Failed to create event\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Failed to create event\n");
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -430,7 +430,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (channel && switch_channel_down(channel)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is already hungup.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel is already hungup.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -477,6 +477,7 @@
</span><span class="cx"> case nua_r_get_params:
</span><span class="cx"> case nua_i_fork:
</span><span class="cx"> case nua_r_info:
</span><ins>+ break;
</ins><span class="cx"> case nua_r_bye:
</span><span class="cx"> case nua_r_unregister:
</span><span class="cx"> case nua_r_unsubscribe:
</span><span class="lines">@@ -553,9 +554,9 @@
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> if (status > 100) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d: %03d %s\n", nua_event_name(event), event, status, phrase);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s: unknown event %d: %03d %s\n", nua_event_name(event), event, status, phrase);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s: unknown event %d\n", nua_event_name(event), event);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s: unknown event %d\n", nua_event_name(event), event);
</ins><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -2893,10 +2894,10 @@
</span><span class="cx"> }
</span><span class="cx"> gateway->status = SOFIA_GATEWAY_UP;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Ping failed %s\n", gateway->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Ping failed %s\n", gateway->name);
</ins><span class="cx"> gateway->status = SOFIA_GATEWAY_DOWN;
</span><span class="cx"> if (gateway->state == REG_STATE_REGED) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Unregister %s\n", gateway->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Unregister %s\n", gateway->name);
</ins><span class="cx"> gateway->state = REG_STATE_FAILED;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2906,7 +2907,7 @@
</span><span class="cx"> } else if (sofia_test_pflag(profile, PFLAG_UNREG_OPTIONS_FAIL) && status != 200 && sip && sip->sip_to) {
</span><span class="cx"> char *sql;
</span><span class="cx"> time_t now = switch_epoch_time_now(NULL);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Expire registration '%s@%s' due to options failure\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Expire registration '%s@%s' due to options failure\n",
</ins><span class="cx"> sip->sip_to->a_url->url_user, sip->sip_to->a_url->url_host);
</span><span class="cx">
</span><span class="cx"> sql = switch_mprintf("update sip_registrations set expires=%ld where sip_user='%s' and sip_host='%s'",
</span><span class="lines">@@ -2969,7 +2970,7 @@
</span><span class="cx"> sofia_glue_tech_proxy_remote_addr(tech_pvt);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Passing %d %s to other leg\n", status, phrase);
</ins><span class="cx">
</span><span class="cx"> msg.message_id = SWITCH_MESSAGE_INDICATE_RESPOND;
</span><span class="cx"> msg.from = __FILE__;
</span><span class="lines">@@ -2980,7 +2981,7 @@
</span><span class="cx"> msg.pointer_arg_size = strlen(r_sdp);
</span><span class="cx"> }
</span><span class="cx"> if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Other leg is not available\n");
</ins><span class="cx"> nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END());
</span><span class="cx"> }
</span><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="lines">@@ -3151,13 +3152,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sofia_test_pflag(profile, PFLAG_MANUAL_REDIRECT)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirect: Transfering to %s %s %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Redirect: Transfering to %s %s %s\n",
</ins><span class="cx"> p_contact->m_url->url_user, sip_redirect_dialplan, sip_redirect_context);
</span><span class="cx"> switch_ivr_session_transfer(a_session, p_contact->m_url->url_user, sip_redirect_dialplan, sip_redirect_context);
</span><span class="cx"> } else if ((!strcmp(profile->sipip, p_contact->m_url->url_host))
</span><span class="cx"> || (profile->extsipip && !strcmp(profile->extsipip, p_contact->m_url->url_host))
</span><span class="cx"> || (switch_xml_locate_domain(p_contact->m_url->url_host, NULL, &root, &domain) == SWITCH_STATUS_SUCCESS)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Redirect: Transfering to %s\n", p_contact->m_url->url_user);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Redirect: Transfering to %s\n", p_contact->m_url->url_user);
</ins><span class="cx"> switch_ivr_session_transfer(a_session, p_contact->m_url->url_user, NULL, NULL);
</span><span class="cx"> switch_xml_free(root);
</span><span class="cx"> } else {
</span><span class="lines">@@ -3296,14 +3297,14 @@
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel %s entering state [%s][%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel %s entering state [%s][%d]\n",
</ins><span class="cx"> switch_channel_get_name(channel), nua_callstate_name(ss_state), status);
</span><span class="cx">
</span><span class="cx"> if (r_sdp) {
</span><span class="cx"> sdp_parser_t *parser;
</span><span class="cx"> sdp_session_t *sdp;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Remote SDP:\n%s\n", r_sdp);
</ins><span class="cx"> tech_pvt->remote_sdp_str = switch_core_session_strdup(session, r_sdp);
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_R_SDP_VARIABLE, r_sdp);
</span><span class="cx">
</span><span class="lines">@@ -3472,7 +3473,7 @@
</span><span class="cx"> && (bnh = nua_handle_by_replaces(nua, replaces))) {
</span><span class="cx"> sofia_private_t *b_private;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Processing Replaces Attended Transfer\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Processing Replaces Attended Transfer\n");
</ins><span class="cx"> while (switch_channel_get_state(channel) < CS_EXECUTE) {
</span><span class="cx"> switch_yield(10000);
</span><span class="cx"> }
</span><span class="lines">@@ -3563,7 +3564,7 @@
</span><span class="cx"> const char *var;
</span><span class="cx">
</span><span class="cx"> if ((var = switch_channel_get_variable(channel, "sip_ignore_reinvites")) && switch_true(var)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring Re-invite\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Ignoring Re-invite\n");
</ins><span class="cx"> nua_respond(tech_pvt->nh, SIP_200_OK, TAG_END());
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -3618,7 +3619,7 @@
</span><span class="cx"> msg.message_id = SWITCH_MESSAGE_INDICATE_MEDIA_REDIRECT;
</span><span class="cx"> msg.from = __FILE__;
</span><span class="cx"> msg.string_arg = (char *) r_sdp;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Passing SDP to other leg.\n%s\n", r_sdp);
</ins><span class="cx">
</span><span class="cx"> if (sofia_test_flag(tech_pvt, TFLAG_SIP_HOLD)) {
</span><span class="cx"> if (!switch_stristr("sendonly", r_sdp)) {
</span><span class="lines">@@ -3632,12 +3633,12 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (switch_core_session_receive_message(other_session, &msg) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Other leg is not available\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Other leg is not available\n");
</ins><span class="cx"> nua_respond(tech_pvt->nh, 403, "Hangup in progress", TAG_END());
</span><span class="cx"> }
</span><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Re-INVITE to a no-media channel that is not in a bridge.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Re-INVITE to a no-media channel that is not in a bridge.\n");
</ins><span class="cx"> is_ok = 0;
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> }
</span><span class="lines">@@ -3658,13 +3659,13 @@
</span><span class="cx"> sofia_glue_set_local_sdp(tech_pvt, NULL, 0, NULL, 0);
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_REINVITE);
</span><span class="cx"> if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Reinvite RTP Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Reinvite RTP Error!\n");
</ins><span class="cx"> is_ok = 0;
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Processing Reinvite\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Processing Reinvite\n");
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Reinvite Codec Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Reinvite Codec Error!\n");
</ins><span class="cx"> is_ok = 0;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3707,7 +3708,7 @@
</span><span class="cx"> if (match) {
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_REINVITE);
</span><span class="cx"> if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "RTP Error!\n");
</ins><span class="cx"> switch_channel_set_variable(tech_pvt->channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "RTP ERROR");
</span><span class="cx"> is_ok = 0;
</span><span class="cx"> }
</span><span class="lines">@@ -3729,13 +3730,13 @@
</span><span class="cx"> switch_channel_clear_flag(channel, CF_REQ_MEDIA);
</span><span class="cx"> }
</span><span class="cx"> if (tech_pvt && nh == tech_pvt->nh2) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Cheater Reinvite!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Cheater Reinvite!\n");
</ins><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_REINVITE);
</span><span class="cx"> tech_pvt->nh = tech_pvt->nh2;
</span><span class="cx"> tech_pvt->nh2 = NULL;
</span><span class="cx"> if (sofia_glue_tech_choose_port(tech_pvt, 0) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (sofia_glue_activate_rtp(tech_pvt, 0) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cheater Reinvite RTP Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cheater Reinvite RTP Error!\n");
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3803,14 +3804,14 @@
</span><span class="cx"> if (sofia_glue_activate_rtp(tech_pvt, 0) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_channel_mark_answered(channel);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "RTP Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "RTP Error!\n");
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (sofia_test_flag(tech_pvt, TFLAG_3PCC)) {
</span><span class="cx"> /* Check if we are in 3PCC proxy mode, if so then set the flag to indicate we received the ack */
</span><span class="cx"> if (sofia_test_pflag(profile, PFLAG_3PCC_PROXY )) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "3PCC-PROXY, Got my ACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "3PCC-PROXY, Got my ACK\n");
</ins><span class="cx"> sofia_set_flag(tech_pvt, TFLAG_3PCC_HAS_ACK);
</span><span class="cx"> } else if (switch_channel_get_state(channel) == CS_HIBERNATE) {
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_READY);
</span><span class="lines">@@ -3974,7 +3975,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!sip->sip_cseq || !(etmp = switch_mprintf("refer;id=%u", sip->sip_cseq->cs_seq))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Memory Error!\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -3998,14 +3999,14 @@
</span><span class="cx"> exten = (char *) refer_to->r_url->url_user;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Process REFER to [%s@%s]\n", exten, (char *) refer_to->r_url->url_host);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Process REFER to [%s@%s]\n", exten, (char *) refer_to->r_url->url_host);
</ins><span class="cx">
</span><span class="cx"> if (refer_to->r_url->url_headers && (rep = (char *)switch_stristr("Replaces=", refer_to->r_url->url_headers))) {
</span><span class="cx"> sip_replaces_t *replaces;
</span><span class="cx"> nua_handle_t *bnh;
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(channel_a, CF_PROXY_MODE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Attended Transfer BYPASS MEDIA CALLS!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot Attended Transfer BYPASS MEDIA CALLS!\n");
</ins><span class="cx"> switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR");
</span><span class="cx"> nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END());
</span><span class="lines">@@ -4025,9 +4026,9 @@
</span><span class="cx">
</span><span class="cx"> if ((buf = switch_core_session_alloc(session, strlen(rep) + 1))) {
</span><span class="cx"> rep = url_unescape(buf, (const char *) rep);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Replaces: [%s]\n", rep);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Replaces: [%s]\n", rep);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Memory Error!\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4052,7 +4053,7 @@
</span><span class="cx"> if (br_a && br_b) {
</span><span class="cx"> switch_core_session_t *new_b_session = NULL, *a_session = NULL, *tmp = NULL;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Attended Transfer [%s][%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Attended Transfer [%s][%s]\n",
</ins><span class="cx"> switch_str_nil(br_a),
</span><span class="cx"> switch_str_nil(br_b));
</span><span class="cx">
</span><span class="lines">@@ -4085,7 +4086,7 @@
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> if (!br_a && !br_b) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Cannot transfer channels that are not in a bridge.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Cannot transfer channels that are not in a bridge.\n");
</ins><span class="cx"> nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> NUTAG_SUBSTATE(nua_substate_terminated),
</span><span class="cx"> SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END());
</span><span class="lines">@@ -4127,7 +4128,7 @@
</span><span class="cx"> switch_core_session_rwunlock(t_session);
</span><span class="cx"> switch_channel_hangup(hup_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session to transfer to not found.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session to transfer to not found.\n");
</ins><span class="cx"> nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> NUTAG_SUBSTATE(nua_substate_terminated),
</span><span class="cx"> SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END());
</span><span class="lines">@@ -4201,7 +4202,7 @@
</span><span class="cx"> switch_channel_set_variable(channel, SOFIA_REFER_TO_VARIABLE, full_ref_to);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Good Luck, you'll need it......\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Good Luck, you'll need it......\n");
</ins><span class="cx"> launch_nightmare_xfer(nightmare_xfer_helper);
</span><span class="cx">
</span><span class="cx"> switch_core_session_rwunlock(a_session);
</span><span class="lines">@@ -4212,7 +4213,7 @@
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> error:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Transfer! [%s]\n", br_a);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Transfer! [%s]\n", br_a);
</ins><span class="cx"> switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR");
</span><span class="cx"> nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp),
</span><span class="lines">@@ -4220,13 +4221,13 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot parse Replaces!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot parse Replaces!\n");
</ins><span class="cx"> }
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Refer-To\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Missing Refer-To\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4256,7 +4257,7 @@
</span><span class="cx"> NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END());
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Blind Transfer 1 Legged calls\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot Blind Transfer 1 Legged calls\n");
</ins><span class="cx"> switch_channel_set_variable(channel_a, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ATTENDED_TRANSFER_ERROR");
</span><span class="cx"> nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
</span><span class="cx"> NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END());
</span><span class="lines">@@ -4309,7 +4310,7 @@
</span><span class="cx"> dtmf.digit = switch_rfc2833_to_char(tmp);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Bad signal\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Bad signal\n");
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -4337,7 +4338,7 @@
</span><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="cx">
</span><span class="cx"> /* print debug info */
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "INFO DTMF(%c)\n", dtmf.digit);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "INFO DTMF(%c)\n", dtmf.digit);
</ins><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(channel, CF_PROXY_MODE)) {
</span><span class="cx"> const char *uuid;
</span><span class="lines">@@ -4364,7 +4365,7 @@
</span><span class="cx"> if ((clientcode_header = sofia_glue_get_unknown_header(sip, "x-clientcode"))) {
</span><span class="cx"> if (!switch_strlen_zero(clientcode_header)) {
</span><span class="cx"> switch_channel_set_variable(channel, "call_clientcode", clientcode_header);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Setting CMC to %s\n", clientcode_header);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Setting CMC to %s\n", clientcode_header);
</ins><span class="cx"> nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> }
</span><span class="cx"> goto end;
</span><span class="lines">@@ -4372,7 +4373,7 @@
</span><span class="cx">
</span><span class="cx"> if ((rec_header = sofia_glue_get_unknown_header(sip, "record"))) {
</span><span class="cx"> if (switch_strlen_zero(profile->record_template)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Record attempted but no template defined.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Record attempted but no template defined.\n");
</ins><span class="cx"> nua_respond(nh, 488, "Recording not enabled", NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> } else {
</span><span class="cx"> if (!strcasecmp(rec_header, "on")) {
</span><span class="lines">@@ -4381,7 +4382,7 @@
</span><span class="cx"> file = switch_channel_expand_variables(channel, profile->record_template);
</span><span class="cx"> switch_ivr_record_session(session, file, 0, NULL);
</span><span class="cx"> switch_channel_set_variable(channel, "sofia_record_file", file);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Recording %s to %s\n", switch_channel_get_name(channel), file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Recording %s to %s\n", switch_channel_get_name(channel), file);
</ins><span class="cx"> nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> if (file != profile->record_template) {
</span><span class="cx"> free(file);
</span><span class="lines">@@ -4391,7 +4392,7 @@
</span><span class="cx"> const char *file;
</span><span class="cx">
</span><span class="cx"> if ((file = switch_channel_get_variable(channel, "sofia_record_file"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Done recording %s to %s\n", switch_channel_get_name(channel), file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Done recording %s to %s\n", switch_channel_get_name(channel), file);
</ins><span class="cx"> switch_ivr_stop_record_session(session, file);
</span><span class="cx"> nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="cx"> } else {
</span><span class="lines">@@ -4458,7 +4459,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_event_fire(&event);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "dispatched freeswitch event for INFO\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "dispatched freeswitch event for INFO\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> nua_respond(nh, SIP_200_OK, NUTAG_WITH_THIS(nua), TAG_END());
</span><span class="lines">@@ -4676,7 +4677,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(tech_pvt = (private_object_t *) switch_core_session_alloc(session, sizeof(private_object_t)))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
</ins><span class="cx"> nua_respond(nh, SIP_503_SERVICE_UNAVAILABLE, TAG_END());
</span><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> goto fail;
</span><span class="lines">@@ -4695,9 +4696,9 @@
</span><span class="cx"> switch_channel_set_variable(channel, "acl_token", acl_token);
</span><span class="cx"> if (strchr(acl_token, '@')) {
</span><span class="cx"> if (switch_ivr_set_user(session, acl_token) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating user %s\n", acl_token);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Authenticating user %s\n", acl_token);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error Authenticating user %s\n", acl_token);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Error Authenticating user %s\n", acl_token);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -5078,7 +5079,7 @@
</span><span class="cx"> if (gateway->ib_vars) {
</span><span class="cx"> switch_event_header_t *hp;
</span><span class="cx"> for(hp = gateway->ib_vars->headers; hp; hp = hp->next) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s setting variable [%s]=[%s]\n",
</ins><span class="cx"> switch_channel_get_name(channel), hp->name, hp->value);
</span><span class="cx"> switch_channel_set_variable(channel, hp->name, hp->value);
</span><span class="cx"> }
</span><span class="lines">@@ -5310,7 +5311,7 @@
</span><span class="cx">
</span><span class="cx"> if (is_nat) {
</span><span class="cx"> sofia_set_flag(tech_pvt, TFLAG_NAT);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting NAT mode based on %s\n", is_nat);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setting NAT mode based on %s\n", is_nat);
</ins><span class="cx"> switch_channel_set_variable(channel, "sip_nat_detected", "true");
</span><span class="cx"> }
</span><span class="cx"> return;
</span><span class="lines">@@ -5319,8 +5320,8 @@
</span><span class="cx"> if (sess_count > 110) {
</span><span class="cx"> switch_mutex_lock(profile->flag_mutex);
</span><span class="cx"> switch_core_session_limit(sess_count - 10);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE: I'm hit, but not bad.\n");
- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "LUKE'S VOICE: Artoo, see what you can do with it. Hang on back there....\n"
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "LUKE: I'm hit, but not bad.\n");
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "LUKE'S VOICE: Artoo, see what you can do with it. Hang on back there....\n"
</ins><span class="cx"> "Green laserfire moves past the beeping little robot as his head turns. "
</span><span class="cx"> "After a few beeps and a twist of his mechanical arm,\n"
</span><span class="cx"> "Artoo reduces the max sessions to %d thus, saving the switch from certain doom.\n", sess_count - 10);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_gluec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_glue.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -657,7 +657,7 @@
</span><span class="cx"> tech_pvt->local_sdp_audio_ip = rtpip;
</span><span class="cx">
</span><span class="cx"> if (!(tech_pvt->local_sdp_audio_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP ports available!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx"> sdp_port = tech_pvt->local_sdp_audio_port;
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(tech_pvt->local_sdp_video_port = switch_rtp_request_port(tech_pvt->profile->rtpip))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP ports available!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_CRIT, "No RTP ports available!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx"> sdp_port = tech_pvt->local_sdp_video_port;
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(*rip && *rp)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "invalid SDP\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "invalid SDP\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1038,7 +1038,7 @@
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->remote_sdp_video_ip && tech_pvt->remote_sdp_video_port) {
</span><span class="cx"> if (!strcmp(tech_pvt->remote_sdp_video_ip, rip) && atoi(rvp) == tech_pvt->remote_sdp_video_port) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Remote video address:port [%s:%d] has not changed.\n",
</ins><span class="cx"> tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
</span><span class="cx"> } else {
</span><span class="cx"> sofia_set_flag_locked(tech_pvt, TFLAG_VIDEO);
</span><span class="lines">@@ -1047,9 +1047,9 @@
</span><span class="cx"> if (switch_rtp_set_remote_address(tech_pvt->video_rtp_session, tech_pvt->remote_sdp_video_ip,
</span><span class="cx"> tech_pvt->remote_sdp_video_port, SWITCH_TRUE, &err) !=
</span><span class="cx"> SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", err);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "VIDEO RTP CHANGING DEST TO: [%s:%d]\n",
</ins><span class="cx"> tech_pvt->remote_sdp_video_ip, tech_pvt->remote_sdp_video_port);
</span><span class="cx"> if (!sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_RTP_AUTOADJ) && !switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MODE) &&
</span><span class="cx"> !((val = switch_channel_get_variable(tech_pvt->channel, "disable_rtp_auto_adjust")) && switch_true(val))) {
</span><span class="lines">@@ -1066,16 +1066,16 @@
</span><span class="cx"> switch_port_t remote_port = switch_rtp_get_remote_port(tech_pvt->rtp_session);
</span><span class="cx">
</span><span class="cx"> if (remote_host && remote_port && !strcmp(remote_host, tech_pvt->remote_sdp_audio_ip) && remote_port == tech_pvt->remote_sdp_audio_port) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Remote address:port [%s:%d] has not changed.\n",
</ins><span class="cx"> tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip,
</span><span class="cx"> tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP CHANGING DEST TO: [%s:%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "AUDIO RTP CHANGING DEST TO: [%s:%d]\n",
</ins><span class="cx"> tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
</span><span class="cx"> if (!sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_RTP_AUTOADJ) &&
</span><span class="cx"> !((val = switch_channel_get_variable(tech_pvt->channel, "disable_rtp_auto_adjust")) && switch_true(val))) {
</span><span class="lines">@@ -1106,13 +1106,13 @@
</span><span class="cx"> len = strlen(tech_pvt->local_sdp_str) * 2;
</span><span class="cx">
</span><span class="cx"> if (switch_stristr("sendonly", tech_pvt->local_sdp_str) || switch_stristr("0.0.0.0", tech_pvt->local_sdp_str)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Skip patch on hold SDP\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(tech_pvt->adv_sdp_audio_ip) || !tech_pvt->adv_sdp_audio_port) {
</span><span class="cx"> if (sofia_glue_tech_choose_port(tech_pvt, 1) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s I/O Error\n", switch_channel_get_name(tech_pvt->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "%s I/O Error\n", switch_channel_get_name(tech_pvt->channel));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> tech_pvt->iananame = switch_core_session_strdup(tech_pvt->session, "PROXY");
</span><span class="lines">@@ -1275,19 +1275,19 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (switch_channel_down(tech_pvt->channel) || sofia_test_flag(tech_pvt, TFLAG_BYE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s too late.\n", switch_channel_get_name(tech_pvt->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "%s too late.\n", switch_channel_get_name(tech_pvt->channel));
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!has_ip && !has_audio) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "%s SDP has no audio in it.\n%s\n",
</ins><span class="cx"> switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Patched SDP\n---\n%s\n+++\n%s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "%s Patched SDP\n---\n%s\n+++\n%s\n",
</ins><span class="cx"> switch_channel_get_name(tech_pvt->channel), tech_pvt->local_sdp_str, new_sdp);
</span><span class="cx">
</span><span class="cx"> sofia_glue_tech_set_local_sdp(tech_pvt, new_sdp, SWITCH_FALSE);
</span><span class="lines">@@ -1445,7 +1445,7 @@
</span><span class="cx"> const char *from_display = switch_channel_get_variable(tech_pvt->channel, "sip_from_display");
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(tech_pvt->dest)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "URL Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "URL Error!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1511,7 +1511,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!sofia_test_pflag(tech_pvt->profile, PFLAG_TLS) && sofia_glue_transport_has_tls(tech_pvt->transport)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "TLS not supported by profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "TLS not supported by profile\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1720,7 +1720,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (route_uri) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "%s Setting proxy route to %s\n", route_uri, switch_channel_get_name(channel));
</ins><span class="cx"> tech_pvt->route_uri = switch_core_session_strdup(tech_pvt->session, route_uri);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1796,7 +1796,7 @@
</span><span class="cx"> SOATAG_ORDERED_USER(1),
</span><span class="cx"> SOATAG_RTP_SORT(SOA_RTP_SORT_REMOTE), SOATAG_RTP_SELECT(SOA_RTP_SELECT_ALL), TAG_IF(rep, SIPTAG_REPLACES_STR(rep)), TAG_END());
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Memory Error!\n");
</ins><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(tech_pvt->sofia_mutex);
</span><span class="cx"> }
</span><span class="lines">@@ -1925,18 +1925,18 @@
</span><span class="cx"> if (strcasecmp(tech_pvt->video_read_codec.implementation->iananame, tech_pvt->video_rm_encoding) ||
</span><span class="cx"> tech_pvt->video_read_codec.implementation->samples_per_second != tech_pvt->video_rm_rate) {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Changing Codec from %s to %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Changing Codec from %s to %s\n",
</ins><span class="cx"> tech_pvt->video_read_codec.implementation->iananame, tech_pvt->video_rm_encoding);
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->video_read_codec);
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->video_write_codec);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->video_read_codec.implementation->iananame);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->video_read_codec.implementation->iananame);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!tech_pvt->video_rm_encoding) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec with no name?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec with no name?\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1948,7 +1948,7 @@
</span><span class="cx"> 1,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
</span><span class="cx"> NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> } else {
</span><span class="cx"> if (switch_core_codec_init(&tech_pvt->video_write_codec,
</span><span class="lines">@@ -1959,13 +1959,13 @@
</span><span class="cx"> 1,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
</span><span class="cx"> NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> } else {
</span><span class="cx"> int ms;
</span><span class="cx"> tech_pvt->video_read_frame.rate = tech_pvt->video_rm_rate;
</span><span class="cx"> ms = tech_pvt->video_write_codec.implementation->microseconds_per_packet / 1000;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set VIDEO Codec %s %s/%ld %d ms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Set VIDEO Codec %s %s/%ld %d ms\n",
</ins><span class="cx"> switch_channel_get_name(tech_pvt->channel), tech_pvt->video_rm_encoding, tech_pvt->video_rm_rate, tech_pvt->video_codec_ms);
</span><span class="cx"> tech_pvt->video_read_frame.codec = &tech_pvt->video_read_codec;
</span><span class="cx">
</span><span class="lines">@@ -1987,7 +1987,7 @@
</span><span class="cx"> int resetting = 0;
</span><span class="cx">
</span><span class="cx"> if (!tech_pvt->iananame) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No audio codec available\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "No audio codec available\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1998,7 +1998,7 @@
</span><span class="cx"> if (strcasecmp(tech_pvt->read_codec.implementation->iananame, tech_pvt->iananame) ||
</span><span class="cx"> tech_pvt->read_codec.implementation->samples_per_second != tech_pvt->rm_rate) {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Changing Codec from %s to %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Changing Codec from %s to %s\n",
</ins><span class="cx"> tech_pvt->read_codec.implementation->iananame, tech_pvt->rm_encoding);
</span><span class="cx"> switch_core_session_lock_codec_write(tech_pvt->session);
</span><span class="cx"> switch_core_session_lock_codec_read(tech_pvt->session);
</span><span class="lines">@@ -2007,7 +2007,7 @@
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> switch_core_session_reset(tech_pvt->session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->read_codec.implementation->iananame);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Already using %s\n", tech_pvt->read_codec.implementation->iananame);
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_SUCCESS, end);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2020,7 +2020,7 @@
</span><span class="cx"> 1,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE | tech_pvt->profile->codec_flags,
</span><span class="cx"> NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2032,7 +2032,7 @@
</span><span class="cx"> 1,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE | tech_pvt->profile->codec_flags,
</span><span class="cx"> NULL, switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2052,11 +2052,11 @@
</span><span class="cx"> ms = tech_pvt->write_codec.implementation->microseconds_per_packet / 1000;
</span><span class="cx">
</span><span class="cx"> if (!switch_core_codec_ready(&tech_pvt->read_codec)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Can't load codec?\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Set Codec %s %s/%ld %d ms %d samples\n",
</ins><span class="cx"> switch_channel_get_name(tech_pvt->channel), tech_pvt->iananame, tech_pvt->rm_rate, tech_pvt->codec_ms,
</span><span class="cx"> tech_pvt->read_impl.samples_per_packet);
</span><span class="cx"> tech_pvt->read_frame.codec = &tech_pvt->read_codec;
</span><span class="lines">@@ -2116,7 +2116,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> tech_pvt->local_crypto_key = switch_core_session_sprintf(tech_pvt->session, "%d %s inline:%s", index, type_str, b64_key);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Local Key [%s]\n", tech_pvt->local_crypto_key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Set Local Key [%s]\n", tech_pvt->local_crypto_key);
</ins><span class="cx">
</span><span class="cx"> if (!sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_SRTP_AUTH) &&
</span><span class="cx"> !((val = switch_channel_get_variable(tech_pvt->channel, "NDLB_support_asterisk_missing_srtp_auth")) && switch_true(val))) {
</span><span class="lines">@@ -2151,7 +2151,7 @@
</span><span class="cx"> } else if (!strncasecmp(p, SWITCH_RTP_CRYPTO_KEY_80, strlen(SWITCH_RTP_CRYPTO_KEY_80))) {
</span><span class="cx"> type = AES_CM_128_HMAC_SHA1_80;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error near [%s]\n", p);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Parse Error near [%s]\n", p);
</ins><span class="cx"> goto bad;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx"> if (p && *p && *(p + 1)) {
</span><span class="cx"> p++;
</span><span class="cx"> if (strncasecmp(p, "inline:", 7)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error near [%s]\n", p);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Parse Error near [%s]\n", p);
</ins><span class="cx"> goto bad;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2180,7 +2180,7 @@
</span><span class="cx">
</span><span class="cx"> bad:
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Error!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -2280,17 +2280,17 @@
</span><span class="cx"> switch_port_t remote_port = switch_rtp_get_remote_port(tech_pvt->rtp_session);
</span><span class="cx">
</span><span class="cx"> if (remote_host && remote_port && !strcmp(remote_host, tech_pvt->remote_sdp_audio_ip) && remote_port == tech_pvt->remote_sdp_audio_port) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio params are unchanged for %s.\n", switch_channel_get_name(tech_pvt->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Audio params are unchanged for %s.\n", switch_channel_get_name(tech_pvt->channel));
</ins><span class="cx"> goto video;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio params changed for %s from %s:%d to %s:%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Audio params changed for %s from %s:%d to %s:%d\n",
</ins><span class="cx"> switch_channel_get_name(tech_pvt->channel),
</span><span class="cx"> remote_host, remote_port, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP [%s] %s port %d -> %s port %d codec: %u ms: %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "AUDIO RTP [%s] %s port %d -> %s port %d codec: %u ms: %d\n",
</ins><span class="cx"> switch_channel_get_name(tech_pvt->channel),
</span><span class="cx"> tech_pvt->local_sdp_audio_ip,
</span><span class="cx"> tech_pvt->local_sdp_audio_port,
</span><span class="lines">@@ -2307,9 +2307,9 @@
</span><span class="cx">
</span><span class="cx"> if (switch_rtp_set_remote_address(tech_pvt->rtp_session, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port, SWITCH_TRUE, &err) !=
</span><span class="cx"> SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", err);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP CHANGING DEST TO: [%s:%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "AUDIO RTP CHANGING DEST TO: [%s:%d]\n",
</ins><span class="cx"> tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
</span><span class="cx"> if (!sofia_test_pflag(tech_pvt->profile, PFLAG_DISABLE_RTP_AUTOADJ) &&
</span><span class="cx"> !((val = switch_channel_get_variable(tech_pvt->channel, "disable_rtp_auto_adjust")) && switch_true(val))) {
</span><span class="lines">@@ -2333,7 +2333,7 @@
</span><span class="cx"> }
</span><span class="cx"> timer_name = NULL;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "PROXY AUDIO RTP [%s] %s:%d->%s:%d codec: %u ms: %d\n",
</span><span class="cx"> switch_channel_get_name(tech_pvt->channel),
</span><span class="cx"> tech_pvt->local_sdp_audio_ip,
</span><span class="lines">@@ -2404,12 +2404,12 @@
</span><span class="cx"> if ((vad_in && inb) || (vad_out && !inb)) {
</span><span class="cx"> switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING);
</span><span class="cx"> sofia_set_flag(tech_pvt, TFLAG_VAD);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "AUDIO RTP Engage VAD for %s ( %s %s )\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "AUDIO RTP Engage VAD for %s ( %s %s )\n",
</ins><span class="cx"> switch_channel_get_name(switch_core_session_get_channel(tech_pvt->session)), vad_in ? "in" : "", vad_out ? "out" : "");
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (stun_ping) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting stun ping to %s:%d\n", tech_pvt->stun_ip, stun_ping);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Setting stun ping to %s:%d\n", tech_pvt->stun_ip, stun_ping);
</ins><span class="cx"> switch_rtp_activate_stun_ping(tech_pvt->rtp_session, tech_pvt->stun_ip, tech_pvt->stun_port,
</span><span class="cx"> stun_ping, (tech_pvt->stun_flags & STUN_FLAG_FUNNY) ? 1 : 0);
</span><span class="cx"> }
</span><span class="lines">@@ -2418,13 +2418,13 @@
</span><span class="cx"> int len = atoi(val);
</span><span class="cx">
</span><span class="cx"> if (len < 100 || len > 1000) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Jitterbuffer spec [%d] must be between 100 and 1000\n", len);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Invalid Jitterbuffer spec [%d] must be between 100 and 1000\n", len);
</ins><span class="cx"> } else {
</span><span class="cx"> int qlen;
</span><span class="cx">
</span><span class="cx"> qlen = len / (tech_pvt->read_impl.microseconds_per_packet / 1000);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting Jitterbuffer to %dms (%d frames)\n", len, qlen);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Setting Jitterbuffer to %dms (%d frames)\n", len, qlen);
</ins><span class="cx"> switch_rtp_activate_jitter_buffer(tech_pvt->rtp_session, qlen);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2469,7 +2469,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->cng_pt && !sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", tech_pvt->cng_pt);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", tech_pvt->cng_pt);
</ins><span class="cx"> switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2512,7 +2512,7 @@
</span><span class="cx"> tech_pvt->video_agreed_pt,
</span><span class="cx"> 1, 10000, (switch_rtp_flag_t) flags, NULL, &err, switch_core_session_get_pool(tech_pvt->session));
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%sVIDEO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "%sVIDEO RTP [%s] %s:%d->%s:%d codec: %u ms: %d [%s]\n",
</ins><span class="cx"> switch_channel_test_flag(tech_pvt->channel, CF_PROXY_MEDIA) ? "PROXY " : "",
</span><span class="cx"> switch_channel_get_name(tech_pvt->channel),
</span><span class="cx"> tech_pvt->local_sdp_audio_ip,
</span><span class="lines">@@ -2524,13 +2524,13 @@
</span><span class="cx"> if (switch_rtp_ready(tech_pvt->video_rtp_session)) {
</span><span class="cx"> switch_channel_set_flag(tech_pvt->channel, CF_VIDEO);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", switch_str_nil(err));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "VIDEO RTP REPORTS ERROR: [%s]\n", switch_str_nil(err));
</ins><span class="cx"> switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", switch_str_nil(err));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "AUDIO RTP REPORTS ERROR: [%s]\n", switch_str_nil(err));
</ins><span class="cx"> switch_channel_hangup(tech_pvt->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> sofia_clear_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -2609,7 +2609,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!connection) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2651,7 +2651,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!connection) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> for (i = 0; i < num_codecs; i++) {
</span><span class="lines">@@ -2838,14 +2838,14 @@
</span><span class="cx">
</span><span class="cx"> if (strstr(tech_pvt->origin, "CiscoSystemsSIP-GW-UserAgent")) {
</span><span class="cx"> tech_pvt->rtp_bugs |= RTP_BUG_CISCO_SKIP_MARK_BIT_2833;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Activate Buggy RFC2833 Mode!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Activate Buggy RFC2833 Mode!\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->profile->auto_rtp_bugs & RTP_BUG_SONUS_SEND_INVALID_TIMESTAMP_2833) {
</span><span class="cx"> if (strstr(tech_pvt->origin, "Sonus_UAC")) {
</span><span class="cx"> tech_pvt->rtp_bugs |= RTP_BUG_SONUS_SEND_INVALID_TIMESTAMP_2833;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Hello,\nI see you have a Sonus!\n"
</span><span class="cx"> "FYI, Sonus cannot follow the RFC on the proper way to send DTMF.\n"
</span><span class="cx"> "Sadly, my creator had to spend several hours figuring this out so I thought you'd like to know that!\n"
</span><span class="lines">@@ -2937,7 +2937,7 @@
</span><span class="cx"> int crypto_tag;
</span><span class="cx">
</span><span class="cx"> if (m->m_proto != sdp_proto_srtp) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "a=crypto in RTP/AVP, refer to rfc3711\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "a=crypto in RTP/AVP, refer to rfc3711\n");
</ins><span class="cx"> match = 0;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -2947,7 +2947,7 @@
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->remote_crypto_key && switch_rtp_ready(tech_pvt->rtp_session)) {
</span><span class="cx"> if (crypto_tag && crypto_tag == tech_pvt->crypto_tag) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Existing key is still valid.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Existing key is still valid.\n");
</ins><span class="cx"> } else {
</span><span class="cx"> const char *a = switch_stristr("AES", tech_pvt->remote_crypto_key);
</span><span class="cx"> const char *b = switch_stristr("AES", crypto);
</span><span class="lines">@@ -2964,11 +2964,11 @@
</span><span class="cx"> switch_rtp_add_crypto_key(tech_pvt->rtp_session, SWITCH_RTP_CRYPTO_SEND, atoi(crypto), tech_pvt->crypto_type,
</span><span class="cx"> tech_pvt->local_raw_key, SWITCH_RTP_KEY_LEN);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (a && b && !strncasecmp(a, b, 23)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Change Remote key to [%s]\n", crypto);
</ins><span class="cx"> tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto);
</span><span class="cx"> tech_pvt->crypto_tag = crypto_tag;
</span><span class="cx">
</span><span class="lines">@@ -2979,12 +2979,12 @@
</span><span class="cx"> }
</span><span class="cx"> got_crypto++;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ignoring unacceptable key\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Ignoring unacceptable key\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> } else if (!switch_rtp_ready(tech_pvt->rtp_session)) {
</span><span class="cx"> tech_pvt->remote_crypto_key = switch_core_session_strdup(tech_pvt->session, crypto);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Remote Key [%s]\n", tech_pvt->remote_crypto_key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set Remote Key [%s]\n", tech_pvt->remote_crypto_key);
</ins><span class="cx"> tech_pvt->crypto_tag = crypto_tag;
</span><span class="cx"> got_crypto++;
</span><span class="cx">
</span><span class="lines">@@ -2996,7 +2996,7 @@
</span><span class="cx"> switch_channel_set_variable(tech_pvt->channel, SOFIA_HAS_CRYPTO_VARIABLE, SWITCH_RTP_CRYPTO_KEY_80);
</span><span class="cx"> sofia_glue_build_crypto(tech_pvt, atoi(crypto), AES_CM_128_HMAC_SHA1_80, SWITCH_RTP_CRYPTO_SEND);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Crypto Setup Failed!.\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3014,7 +3014,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!connection) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</ins><span class="cx"> match = 0;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3032,7 +3032,7 @@
</span><span class="cx">
</span><span class="cx"> if (match && connection->c_address && tech_pvt->remote_sdp_audio_ip &&
</span><span class="cx"> !strcmp(connection->c_address, tech_pvt->remote_sdp_audio_ip) && m->m_port == tech_pvt->remote_sdp_audio_port) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Our existing sdp is still good [%s %s:%d], let's keep it.\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Our existing sdp is still good [%s %s:%d], let's keep it.\n",
</ins><span class="cx"> tech_pvt->rm_encoding, tech_pvt->remote_sdp_audio_ip, tech_pvt->remote_sdp_audio_port);
</span><span class="cx"> got_audio = 1;
</span><span class="cx"> break;
</span><span class="lines">@@ -3058,7 +3058,7 @@
</span><span class="cx">
</span><span class="cx"> if (!te && !strcasecmp(rm_encoding, "telephone-event")) {
</span><span class="cx"> te = tech_pvt->te = (switch_payload_t) map->rm_pt;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set 2833 dtmf payload to %u\n", te);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set 2833 dtmf payload to %u\n", te);
</ins><span class="cx"> if (tech_pvt->rtp_session) {
</span><span class="cx"> switch_rtp_set_telephony_event(tech_pvt->rtp_session, tech_pvt->te);
</span><span class="cx"> }
</span><span class="lines">@@ -3067,7 +3067,7 @@
</span><span class="cx"> if (!sofia_test_pflag(tech_pvt->profile, PFLAG_SUPPRESS_CNG) && !cng_pt && !strcasecmp(rm_encoding, "CN")) {
</span><span class="cx"> cng_pt = (switch_payload_t) map->rm_pt;
</span><span class="cx"> if (tech_pvt->rtp_session) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Set comfort noise payload to %u\n", cng_pt);
</ins><span class="cx"> switch_rtp_set_cng_pt(tech_pvt->rtp_session, tech_pvt->cng_pt);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -3098,7 +3098,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u:%d]/[%s:%d:%u:%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Audio Codec Compare [%s:%d:%u:%d]/[%s:%d:%u:%d]\n",
</ins><span class="cx"> rm_encoding, map->rm_pt, (int) map->rm_rate, ptime,
</span><span class="cx"> imp->iananame, imp->ianacode, codec_rate, imp->microseconds_per_packet / 1000);
</span><span class="cx"> if (map->rm_pt < 96) {
</span><span class="lines">@@ -3109,7 +3109,7 @@
</span><span class="cx">
</span><span class="cx"> if (match) {
</span><span class="cx"> if (scrooge) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Bah HUMBUG! Sticking with %s@%uh@%ui\n",
</span><span class="cx"> imp->iananame, imp->samples_per_second, imp->microseconds_per_packet / 1000);
</span><span class="cx"> } else {
</span><span class="lines">@@ -3146,7 +3146,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!maxptime || mimp->microseconds_per_packet / 1000 <= maxptime) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Substituting codec %s@%ui@%uh\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Substituting codec %s@%ui@%uh\n",
</ins><span class="cx"> mimp->iananame, mimp->microseconds_per_packet / 1000, mimp->samples_per_second);
</span><span class="cx"> match = 1;
</span><span class="cx"> } else {
</span><span class="lines">@@ -3210,7 +3210,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!connection) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot find a c= line in the sdp at media or session level!\n");
</ins><span class="cx"> match = 0;
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -3233,7 +3233,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Video Codec Compare [%s:%d]/[%s:%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Video Codec Compare [%s:%d]/[%s:%d]\n",
</ins><span class="cx"> rm_encoding, map->rm_pt, imp->iananame, imp->ianacode);
</span><span class="cx"> if (map->rm_pt < 96) {
</span><span class="cx"> vmatch = (map->rm_pt == imp->ianacode) ? 1 : 0;
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofia_regc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia_reg.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -1500,7 +1500,7 @@
</span><span class="cx"> private_object_t *tech_pvt;
</span><span class="cx">
</span><span class="cx"> if ((tech_pvt = switch_core_session_get_private(session)) && sofia_test_flag(tech_pvt, TFLAG_REFER)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Received reply from REFER\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Received reply from REFER\n");
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1513,7 +1513,7 @@
</span><span class="cx"> } else if (sip->sip_proxy_authenticate) {
</span><span class="cx"> authenticate = sip->sip_proxy_authenticate;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Missing Authenticate Header!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Missing Authenticate Header!\n");
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx"> scheme = (char const *) authenticate->au_scheme;
</span><span class="lines">@@ -1558,7 +1558,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!(scheme && realm)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No scheme and realm!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No scheme and realm!\n");
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1567,12 +1567,12 @@
</span><span class="cx"> } else if (gateway) {
</span><span class="cx"> switch_snprintf(authentication, sizeof(authentication), "%s:%s:%s:%s", scheme, realm, gateway->auth_username, gateway->register_password);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Matching gateway found\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No Matching gateway found\n");
</ins><span class="cx"> goto cancel;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (profile->debug) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Authenticating '%s' with '%s'.\n",
</ins><span class="cx"> (sip_auth_username && sip_auth_password) ? sip_auth_username : gateway->auth_username, authentication);
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodevent_handlersmod_event_socketmod_event_socketc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -879,12 +879,13 @@
</span><span class="cx"> switch_url_encode((char *) dnode->data, encode_buf, encode_len);
</span><span class="cx">
</span><span class="cx">
</span><del>- stream->write_function(stream, "<log log-level=\"%d\" text-channel=\"%d\" log-file=\"%s\" log-func=\"%s\" log-line=\"%d\">%s</log>\n",
</del><ins>+ stream->write_function(stream, "<log log-level=\"%d\" text-channel=\"%d\" log-file=\"%s\" log-func=\"%s\" log-line=\"%d\" user-data=\"%s\">%s</log>\n",
</ins><span class="cx"> dnode->level,
</span><span class="cx"> dnode->channel,
</span><span class="cx"> dnode->file,
</span><span class="cx"> dnode->func,
</span><span class="cx"> dnode->line,
</span><ins>+ switch_str_nil(dnode->userdata),
</ins><span class="cx"> encode_buf
</span><span class="cx"> );
</span><span class="cx"> free(encode_buf);
</span><span class="lines">@@ -1153,13 +1154,15 @@
</span><span class="cx"> "Log-File: %s\n"
</span><span class="cx"> "Log-Func: %s\n"
</span><span class="cx"> "Log-Line: %d\n"
</span><ins>+ "User-Data: %s\n"
</ins><span class="cx"> "\n",
</span><span class="cx"> strlen(dnode->data),
</span><span class="cx"> dnode->level,
</span><span class="cx"> dnode->channel,
</span><span class="cx"> dnode->file,
</span><span class="cx"> dnode->func,
</span><del>- dnode->line
</del><ins>+ dnode->line,
+ switch_str_nil(dnode->userdata)
</ins><span class="cx"> );
</span><span class="cx"> len = strlen(buf);
</span><span class="cx"> switch_socket_send(listener->sock, buf, &len);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_channelc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_channel.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_channel.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_channel.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -273,7 +273,7 @@
</span><span class="cx"> int x = 0;
</span><span class="cx">
</span><span class="cx"> if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</ins><span class="cx"> switch_channel_get_name(channel), new_dtmf.digit, new_dtmf.duration);
</span><span class="cx"> new_dtmf.duration = switch_core_max_dtmf_duration(0);
</span><span class="cx"> } else if (!new_dtmf.duration) {
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (dtmf.duration > switch_core_max_dtmf_duration(0)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "EXCESSIVE DTMF DIGIT LEN %c %d\n", dtmf.digit, dtmf.duration);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_WARNING, "EXCESSIVE DTMF DIGIT LEN %c %d\n", dtmf.digit, dtmf.duration);
</ins><span class="cx"> dtmf.duration = switch_core_max_dtmf_duration(0);
</span><span class="cx"> } else if (!dtmf.duration) {
</span><span class="cx"> dtmf.duration = switch_core_default_dtmf_duration(0);
</span><span class="lines">@@ -342,7 +342,7 @@
</span><span class="cx"> if (is_dtmf(*p)) {
</span><span class="cx"> dtmf.digit = *p;
</span><span class="cx"> if (switch_channel_queue_dtmf(channel, &dtmf) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Queue dtmf\ndigit=%c ms=%u samples=%u\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "%s Queue dtmf\ndigit=%c ms=%u samples=%u\n",
</ins><span class="cx"> switch_channel_get_name(channel), dtmf.digit, dur, dtmf.duration);
</span><span class="cx"> sent++;
</span><span class="cx"> }
</span><span class="lines">@@ -374,7 +374,7 @@
</span><span class="cx"> dt = NULL;
</span><span class="cx">
</span><span class="cx"> if (dtmf->duration > switch_core_max_dtmf_duration(0)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</ins><span class="cx"> switch_channel_get_name(channel), dtmf->digit, dtmf->duration);
</span><span class="cx"> dtmf->duration = switch_core_max_dtmf_duration(0);
</span><span class="cx"> } else if (!dtmf->duration) {
</span><span class="lines">@@ -597,9 +597,9 @@
</span><span class="cx"> channel->name = switch_core_session_strdup(channel->session, name);
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_CHANNEL_NAME_VARIABLE, name);
</span><span class="cx"> if (old) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Rename Channel %s->%s [%s]\n", old, name, uuid);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Rename Channel %s->%s [%s]\n", old, name, uuid);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Channel %s [%s]\n", name, uuid);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "New Channel %s [%s]\n", name, uuid);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -630,7 +630,7 @@
</span><span class="cx"> if (ok) {
</span><span class="cx"> switch_event_add_header_string(channel->variables, SWITCH_STACK_BOTTOM, varname, value);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_CRIT, "Invalid data (${%s} contains a variable)\n", varname);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1000,7 +1000,7 @@
</span><span class="cx"> {
</span><span class="cx"> int x;
</span><span class="cx"> switch_mutex_lock(channel->state_mutex);
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) Running State Change %s\n", channel->name, state_names[state]);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_DEBUG, "(%s) Running State Change %s\n", channel->name, state_names[state]);
</ins><span class="cx"> channel->running_state = state;
</span><span class="cx">
</span><span class="cx"> if (channel->state_flags[0]) {
</span><span class="lines">@@ -1246,7 +1246,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ok) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "(%s) State Change %s -> %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_DEBUG, "(%s) State Change %s -> %s\n",
</ins><span class="cx"> channel->name, state_names[last_state], state_names[state]);
</span><span class="cx">
</span><span class="cx"> channel->state = state;
</span><span class="lines">@@ -1259,7 +1259,7 @@
</span><span class="cx"> switch_core_session_signal_state_change(channel->session);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_WARNING,
</ins><span class="cx"> "(%s) Invalid State Change %s -> %s\n", channel->name, state_names[last_state], state_names[state]);
</span><span class="cx"> /* we won't tolerate an invalid state change so we can make sure we are as robust as a nice cup of dark coffee! */
</span><span class="cx"> /* not cool lets crash this bad boy and figure out wtf is going on */
</span><span class="lines">@@ -1671,7 +1671,7 @@
</span><span class="cx"> switch_mutex_unlock(channel->state_mutex);
</span><span class="cx">
</span><span class="cx"> channel->hangup_cause = hangup_cause;
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Hangup %s [%s] [%s]\n",
</ins><span class="cx"> channel->name, state_names[last_state], switch_channel_cause2str(channel->hangup_cause));
</span><span class="cx">
</span><span class="cx"> if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_HANGUP) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -1694,7 +1694,7 @@
</span><span class="cx"> switch_event_t *event;
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_test_flag(channel, CF_RING_READY)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring-Ready %s!\n", channel->name);
</ins><span class="cx"> switch_channel_set_flag(channel, CF_RING_READY);
</span><span class="cx"> if (channel->caller_profile && channel->caller_profile->times) {
</span><span class="cx"> switch_mutex_lock(channel->profile_mutex);
</span><span class="lines">@@ -1744,7 +1744,7 @@
</span><span class="cx"> const char *uuid;
</span><span class="cx"> switch_core_session_t *other_session;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Pre-Answer %s!\n", channel->name);
</ins><span class="cx"> switch_channel_set_flag(channel, CF_EARLY_MEDIA);
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "EARLY MEDIA");
</span><span class="cx"> if (switch_event_create(&event, SWITCH_EVENT_CHANNEL_PROGRESS_MEDIA) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -1844,7 +1844,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (status == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Ring Ready %s!\n", channel->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Ring Ready %s!\n", channel->name);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
</span><span class="cx"> }
</span><span class="lines">@@ -1911,20 +1911,20 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_ENDPOINT_DISPOSITION_VARIABLE, "ANSWER");
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_channel_get_uuid(channel), SWITCH_LOG_NOTICE, "Channel [%s] has been answered\n", channel->name);
</ins><span class="cx"> if ((var = switch_channel_get_variable(channel, SWITCH_CHANNEL_EXECUTE_ON_ANSWER_VARIABLE)) && !switch_strlen_zero(var)) {
</span><span class="cx"> char *arg = NULL;
</span><span class="cx">
</span><span class="cx"> app = switch_core_session_strdup(channel->session, var);
</span><span class="cx">
</span><span class="cx"> if ((arg = strchr(app, ':')) && *(arg+1) == ':') {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s execute on answer: %s (BROADCAST)\n", channel->name, app);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "%s execute on answer: %s (BROADCAST)\n", channel->name, app);
</ins><span class="cx"> switch_ivr_broadcast(switch_core_session_get_uuid(channel->session), app, SMF_NONE);
</span><span class="cx"> } else {
</span><span class="cx"> if ((arg = strchr(app, ' '))) {
</span><span class="cx"> *arg++ = '\0';
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s execute on answer: %s(%s)\n", channel->name, app, switch_str_nil(arg));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "%s execute on answer: %s(%s)\n", channel->name, app, switch_str_nil(arg));
</ins><span class="cx"> switch_core_session_execute_application(channel->session, app, arg);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2167,7 +2167,7 @@
</span><span class="cx"> switch_safe_free(expanded_vname);
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_CRIT, "Memory Error!\n");
</ins><span class="cx"> free(data);
</span><span class="cx"> free(indup);
</span><span class="cx"> return (char *) in;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_codecc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_codec.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_codec.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_core_codec.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -119,7 +119,7 @@
</span><span class="cx"> if (session->real_read_codec) {
</span><span class="cx"> session->read_codec = session->real_read_codec;
</span><span class="cx"> session->read_impl = *session->real_read_codec->implementation;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Restore original codec.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Restore original codec.\n");
</ins><span class="cx"> } else {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto end;
</span><span class="lines">@@ -227,7 +227,7 @@
</span><span class="cx"> session->write_impl = *session->real_write_codec->implementation;
</span><span class="cx"> session->real_write_codec = NULL;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> session->write_impl = *codec->implementation;
</span><span class="cx"> session->real_write_codec = NULL;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot double-set codec!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot double-set codec!\n");
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -307,7 +307,7 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -351,7 +351,7 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot set NULL codec!\n");
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_io.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_io.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_core_io.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> *frame = &runtime.dummy_cng_frame;
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has no read codec.\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -276,7 +276,7 @@
</span><span class="cx"> switch_mutex_unlock(session->resample_mutex);
</span><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to allocate resampler\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Unable to allocate resampler\n");
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> if (session->read_resampler) {
</span><span class="cx"> switch_mutex_lock(session->resample_mutex);
</span><span class="cx"> switch_resample_destroy(&session->read_resampler);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating read resampler\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Deactivating read resampler\n");
</ins><span class="cx"> switch_mutex_unlock(session->resample_mutex);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -319,10 +319,10 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_STATUS_NOT_INITALIZED:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec init error!\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", session->read_codec->codec_interface->interface_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec %s decoder error!\n", session->read_codec->codec_interface->interface_name);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -398,7 +398,7 @@
</span><span class="cx"> } else {
</span><span class="cx"> if (!session->raw_read_buffer) {
</span><span class="cx"> switch_size_t bytes = session->read_impl.decoded_bytes_per_packet;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engaging Read Buffer at %u bytes vs %u\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Engaging Read Buffer at %u bytes vs %u\n",
</ins><span class="cx"> (uint32_t) bytes, (uint32_t) (*frame)->datalen);
</span><span class="cx"> switch_buffer_create_dynamic(&session->raw_read_buffer, bytes * SWITCH_BUFFER_BLOCK_FRAMES, bytes * SWITCH_BUFFER_START_FRAMES, 0);
</span><span class="cx"> }
</span><span class="lines">@@ -436,7 +436,7 @@
</span><span class="cx">
</span><span class="cx"> switch (status) {
</span><span class="cx"> case SWITCH_STATUS_RESAMPLE:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fixme 1\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Fixme 1\n");
</ins><span class="cx"> case SWITCH_STATUS_SUCCESS:
</span><span class="cx"> session->enc_read_frame.samples = session->read_impl.decoded_bytes_per_packet / sizeof(int16_t);
</span><span class="cx"> if (perfect) {
</span><span class="lines">@@ -464,12 +464,12 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_STATUS_NOT_INITALIZED:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec init error!\n");
</ins><span class="cx"> *frame = NULL;
</span><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s encoder error!\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec %s encoder error!\n",
</ins><span class="cx"> session->read_codec->codec_interface->interface_name);
</span><span class="cx"> *frame = NULL;
</span><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="lines">@@ -580,7 +580,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(session->write_codec && switch_core_codec_ready(session->write_codec)) && !pass_cng) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s has no write codec.\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s has no write codec.\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -702,7 +702,7 @@
</span><span class="cx"> if (session->write_resampler) {
</span><span class="cx"> switch_mutex_lock(session->resample_mutex);
</span><span class="cx"> switch_resample_destroy(&session->write_resampler);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating write resampler\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Deactivating write resampler\n");
</ins><span class="cx"> switch_mutex_unlock(session->resample_mutex);
</span><span class="cx"> }
</span><span class="cx"> write_frame = frame;
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><span class="cx"> if (status == SWITCH_STATUS_NOT_INITALIZED) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec init error!\n");
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> if (ptime_mismatch) {
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS; goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s decoder error!\n", frame->codec->codec_interface->interface_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec %s decoder error!\n", frame->codec->codec_interface->interface_name);
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx"> switch (status) {
</span><span class="cx"> case SWITCH_STATUS_RESAMPLE:
</span><span class="cx"> resample++;
</span><del>- /* switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Fixme 2\n"); */
</del><ins>+ /* switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Fixme 2\n"); */
</ins><span class="cx"> case SWITCH_STATUS_SUCCESS:
</span><span class="cx"> session->enc_write_frame.codec = session->write_codec;
</span><span class="cx"> session->enc_write_frame.samples = enc_frame->datalen / sizeof(int16_t);
</span><span class="lines">@@ -867,11 +867,11 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_STATUS_NOT_INITALIZED:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec init error!\n");
</ins><span class="cx"> write_frame = NULL;
</span><span class="cx"> goto error;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s encoder error!\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec %s encoder error!\n",
</ins><span class="cx"> session->read_codec->codec_interface->interface_name);
</span><span class="cx"> write_frame = NULL;
</span><span class="cx"> goto error;
</span><span class="lines">@@ -889,19 +889,19 @@
</span><span class="cx">
</span><span class="cx"> if (!session->raw_write_buffer) {
</span><span class="cx"> switch_size_t bytes_per_packet = session->write_impl.decoded_bytes_per_packet;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Engaging Write Buffer at %u bytes to accommodate %u->%u\n",
</span><span class="cx"> (uint32_t) bytes_per_packet, write_frame->datalen, session->write_impl.decoded_bytes_per_packet);
</span><span class="cx"> if ((status = switch_buffer_create_dynamic(&session->raw_write_buffer,
</span><span class="cx"> bytes_per_packet * SWITCH_BUFFER_BLOCK_FRAMES,
</span><span class="cx"> bytes_per_packet * SWITCH_BUFFER_START_FRAMES, 0)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Write Buffer Failed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Write Buffer Failed!\n");
</ins><span class="cx"> goto error;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(switch_buffer_write(session->raw_write_buffer, write_frame->data, write_frame->datalen))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Write Buffer %u bytes Failed!\n", write_frame->datalen);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Write Buffer %u bytes Failed!\n", write_frame->datalen);
</ins><span class="cx"> status = SWITCH_STATUS_MEMERR; goto error;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -985,7 +985,7 @@
</span><span class="cx"> switch_mutex_lock(session->resample_mutex);
</span><span class="cx"> if (session->write_resampler) {
</span><span class="cx"> switch_resample_destroy(&session->write_resampler);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Deactivating write resampler\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Deactivating write resampler\n");
</ins><span class="cx"> }
</span><span class="cx"> switch_mutex_unlock(session->resample_mutex);
</span><span class="cx"> }
</span><span class="lines">@@ -998,11 +998,11 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_STATUS_NOT_INITALIZED:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec init error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec init error!\n");
</ins><span class="cx"> write_frame = NULL;
</span><span class="cx"> goto error;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec %s encoder error %d!\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec %s encoder error %d!\n",
</ins><span class="cx"> session->read_codec->codec_interface->interface_name, status);
</span><span class="cx"> write_frame = NULL;
</span><span class="cx"> goto error;
</span><span class="lines">@@ -1108,7 +1108,7 @@
</span><span class="cx"> new_dtmf = *dtmf;
</span><span class="cx">
</span><span class="cx"> if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), new_dtmf.digit, new_dtmf.duration);
</span><span class="cx"> new_dtmf.duration = switch_core_max_dtmf_duration(0);
</span><span class="cx"> } else if (!new_dtmf.duration) {
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> new_dtmf = *dtmf;
</span><span class="cx">
</span><span class="cx"> if (new_dtmf.duration > switch_core_max_dtmf_duration(0)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), new_dtmf.digit, new_dtmf.duration);
</span><span class="cx"> new_dtmf.duration = switch_core_max_dtmf_duration(0);
</span><span class="cx"> } else if (!new_dtmf.duration) {
</span><span class="lines">@@ -1186,7 +1186,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (strlen(dtmf_string) > 99) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Attempt to send very large dtmf string ignored!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Attempt to send very large dtmf string ignored!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1209,7 +1209,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (dtmf.duration > switch_core_max_dtmf_duration(0)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s EXCESSIVE DTMF DIGIT [%c] LEN [%d]\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), dtmf.digit, dtmf.duration);
</span><span class="cx"> dtmf.duration = switch_core_max_dtmf_duration(0);
</span><span class="cx"> } else if (!dtmf.duration) {
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx"> if (is_dtmf(*p)) {
</span><span class="cx"> dtmf.digit = *p;
</span><span class="cx"> if (switch_core_session_send_dtmf(session, &dtmf) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s send dtmf\ndigit=%c ms=%u samples=%u\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s send dtmf\ndigit=%c ms=%u samples=%u\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), dtmf.digit, dur, dtmf.duration);
</span><span class="cx"> sent++;
</span><span class="cx"> dur_total += dtmf.duration + 2000; /* account for 250ms pause */
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_media_bugc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_media_bug.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_media_bug.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_core_media_bug.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -137,12 +137,12 @@
</span><span class="cx"> bytes = read_impl.decoded_bytes_per_packet;
</span><span class="cx">
</span><span class="cx"> if (frame->buflen < bytes) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s frame buffer too small!\n", switch_channel_get_name(bug->session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_ERROR, "%s frame buffer too small!\n", switch_channel_get_name(bug->session->channel));
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(bug->raw_read_buffer && (bug->raw_write_buffer || !switch_test_flag(bug, SMBF_WRITE_STREAM)))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Buffer Error\n", switch_channel_get_name(bug->session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_ERROR, "%s Buffer Error\n", switch_channel_get_name(bug->session->channel));
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -253,7 +253,7 @@
</span><span class="cx"> switch_thread_rwlock_wrlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><span class="cx"> if (switch_test_flag(bp, SMBF_WRITE_REPLACE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n");
</ins><span class="cx"> switch_thread_rwlock_unlock(session->bug_rwlock);
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> switch_thread_rwlock_wrlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><span class="cx"> if (switch_test_flag(bp, SMBF_READ_REPLACE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Only one bug of this type allowed!\n");
</ins><span class="cx"> switch_thread_rwlock_unlock(session->bug_rwlock);
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="lines">@@ -310,12 +310,12 @@
</span><span class="cx"> switch_bool_t result = bug->callback(bug, bug->user_data, SWITCH_ABC_TYPE_INIT);
</span><span class="cx"> if (result == SWITCH_FALSE) {
</span><span class="cx"> switch_core_media_bug_destroy(bug);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error attaching BUG to %s\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error attaching BUG to %s\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Attaching BUG to %s\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> bug->ready = 1;
</span><span class="cx"> switch_thread_rwlock_wrlock(session->bug_rwlock);
</span><span class="cx"> bug->next = session->bugs;
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> switch_thread_rwlock_wrlock(session->bug_rwlock);
</span><span class="cx"> for (bp = session->bugs; bp; bp = bp->next) {
</span><span class="cx"> if (bp->thread_id && bp->thread_id != switch_thread_self()) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> bp->callback(bp, bp->user_data, SWITCH_ABC_TYPE_CLOSE);
</span><span class="cx"> }
</span><span class="cx"> switch_core_media_bug_destroy(bp);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx"> session->bugs = NULL;
</span><span class="cx"> switch_thread_rwlock_unlock(session->bug_rwlock);
</span><span class="lines">@@ -381,7 +381,7 @@
</span><span class="cx"> switch_media_bug_t *bp = *bug;
</span><span class="cx"> if (bp) {
</span><span class="cx"> if (bp->thread_id && bp->thread_id != switch_thread_self()) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(*bug)), SWITCH_LOG_DEBUG, "BUG is thread locked skipping.\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -390,7 +390,7 @@
</span><span class="cx"> bp->ready = 0;
</span><span class="cx"> }
</span><span class="cx"> switch_core_media_bug_destroy(bp);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(bp->session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(*bug)), SWITCH_LOG_DEBUG, "Removing BUG from %s\n", switch_channel_get_name(bp->session->channel));
</ins><span class="cx"> *bug = NULL;
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_rwlockc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_rwlock.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_rwlock.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_core_rwlock.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -48,13 +48,13 @@
</span><span class="cx"> if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_down(session->channel)) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s Read lock FAIL\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="cx"> status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock);
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -76,13 +76,13 @@
</span><span class="cx"> if (switch_test_flag(session, SSF_DESTROYED) || switch_channel_get_state(session->channel) >= CS_DESTROY) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s Read lock FAIL\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="cx"> status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock);
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -95,7 +95,7 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_perform_write_lock(switch_core_session_t *session, const char *file, const char *func, int line)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Write lock ACQUIRED\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s Write lock ACQUIRED\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #else
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_write_lock(switch_core_session_t *session)
</span><span class="lines">@@ -107,7 +107,7 @@
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_perform_rwunlock(switch_core_session_t *session, const char *file, const char *func, int line)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read/Write lock CLEARED\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_ERROR, "%s Read/Write lock CLEARED\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #else
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_rwunlock(switch_core_session_t *session)
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_sessionc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_session.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_session.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_core_session.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -95,13 +95,13 @@
</span><span class="cx"> if (switch_test_flag(session, SSF_DESTROYED)) {
</span><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock FAIL\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, uuid_str, SWITCH_LOG_ERROR, "%s Read lock FAIL\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #endif
</span><span class="cx"> } else {
</span><span class="cx"> status = (switch_status_t) switch_thread_rwlock_tryrdlock(session->rwlock);
</span><span class="cx"> #ifdef SWITCH_DEBUG_RWLOCKS
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, uuid_str, SWITCH_LOG_ERROR, "%s Read lock ACQUIRED\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> #endif
</span><span class="cx"> }
</span><span class="lines">@@ -358,12 +358,12 @@
</span><span class="cx"> int forwardval = 70;
</span><span class="cx">
</span><span class="cx"> if ((endpoint_interface = switch_loadable_module_get_endpoint_interface(endpoint_name)) == 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate channel type %s\n", endpoint_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Could not locate channel type %s\n", endpoint_name);
</ins><span class="cx"> return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!endpoint_interface->io_routines->outgoing_channel) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Could not locate outgoing channel interface for %s\n", endpoint_name);
</ins><span class="cx"> return SWITCH_CAUSE_CHAN_NOT_IMPLEMENTED;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -422,7 +422,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!*new_session) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Outgoing method for endpoint: [%s] returned: [%s] but there is no new session!\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Outgoing method for endpoint: [%s] returned: [%s] but there is no new session!\n",
</ins><span class="cx"> endpoint_name, switch_channel_cause2str(cause));
</span><span class="cx"> UNPROTECT_INTERFACE(endpoint_interface);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="lines">@@ -440,9 +440,9 @@
</span><span class="cx"> use_uuid = switch_core_session_strdup(*new_session, use_uuid);
</span><span class="cx"> if (switch_core_session_set_uuid(*new_session, use_uuid) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_del_header(var_event, "origination_uuid");
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(peer_channel), use_uuid);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG, "%s set UUID=%s\n", switch_channel_get_name(peer_channel), use_uuid);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s set UUID=%s FAILED\n", switch_channel_get_name(peer_channel), use_uuid);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "%s set UUID=%s FAILED\n", switch_channel_get_name(peer_channel), use_uuid);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -590,7 +590,7 @@
</span><span class="cx"> message->message_id = SWITCH_MESSAGE_INVALID;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_DEBUG, "%s receive message [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(session), SWITCH_LOG_DEBUG, "%s receive message [%s]\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), message_names[message->message_id]);
</span><span class="cx">
</span><span class="cx"> if (session->endpoint_interface->io_routines->receive_message) {
</span><span class="lines">@@ -944,7 +944,7 @@
</span><span class="cx"> switch_endpoint_interface_t *endpoint_interface = (*session)->endpoint_interface;
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, NULL, SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_ID_LOG, file, func, line, switch_core_session_get_uuid(*session), SWITCH_LOG_NOTICE, "Close Channel %s [%s]\n",
</ins><span class="cx"> switch_channel_get_name((*session)->channel), switch_channel_state_name(switch_channel_get_state((*session)->channel)));
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1031,14 +1031,14 @@
</span><span class="cx"> session->track_duration = seconds;
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(session->channel, CF_PROXY_MODE)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s using scheduler due to bypass_media mode\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s using scheduler due to bypass_media mode\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> switch_core_session_sched_heartbeat(session, seconds);
</span><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_core_session_unsched_heartbeat(session);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "%s setting session heartbeat to %u second(s).\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), seconds);
</span><span class="cx">
</span><span class="cx"> session->read_frame_count = 0;
</span><span class="lines">@@ -1065,7 +1065,7 @@
</span><span class="cx">
</span><span class="cx"> switch_core_session_run(session);
</span><span class="cx"> switch_core_media_bug_remove_all(session);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session %" SWITCH_SIZE_T_FMT " (%s) Locked, Waiting on external entities\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session %" SWITCH_SIZE_T_FMT " (%s) Locked, Waiting on external entities\n",
</ins><span class="cx"> session->id, switch_channel_get_name(session->channel));
</span><span class="cx"> switch_core_session_write_lock(session);
</span><span class="cx"> switch_set_flag(session, SSF_DESTROYED);
</span><span class="lines">@@ -1083,7 +1083,7 @@
</span><span class="cx">
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Session %" SWITCH_SIZE_T_FMT " (%s) Ended\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Session %" SWITCH_SIZE_T_FMT " (%s) Ended\n",
</ins><span class="cx"> session->id, switch_channel_get_name(session->channel));
</span><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> return NULL;
</span><span class="lines">@@ -1107,10 +1107,10 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> } else {
</span><span class="cx"> session->thread_running = 0;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot create thread!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Cannot create thread!\n");
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Cannot double-launch thread!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Cannot double-launch thread!\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_mutex_unlock(session->mutex);
</span><span class="lines">@@ -1366,31 +1366,31 @@
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> if (switch_channel_down(session->channel)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Channel is hungup, aborting execution of application: %s\n", app);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Channel is hungup, aborting execution of application: %s\n", app);
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((application_interface = switch_loadable_module_get_application_interface(app)) == 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", app);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Application %s\n", app);
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!application_interface->application_function) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Function for %s\n", app);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No Function for %s\n", app);
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, done);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(session->channel, CF_PROXY_MODE) && !switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA)) {
</span><span class="cx"> switch_ivr_media(session->uuid_str, SMF_NONE);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media on channel %s!\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Application %s Requires media on channel %s!\n",
</ins><span class="cx"> app, switch_channel_get_name(session->channel));
</span><span class="cx"> } else if (!switch_test_flag(application_interface, SAF_SUPPORT_NOMEDIA) && !switch_channel_media_ready(session->channel)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Application %s Requires media! pre_answering channel %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Application %s Requires media! pre_answering channel %s\n",
</ins><span class="cx"> app, switch_channel_get_name(session->channel));
</span><span class="cx"> if (switch_channel_pre_answer(session->channel) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Well, that didn't work very well did it? ...\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, done);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1421,7 +1421,7 @@
</span><span class="cx"> expanded = switch_channel_expand_variables(session->channel, arg);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG_CLEAN, SWITCH_LOG_DEBUG, "EXECUTE %s %s(%s)\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_DEBUG, "EXECUTE %s %s(%s)\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), app, switch_str_nil(expanded));
</span><span class="cx">
</span><span class="cx"> if ((var = switch_channel_get_variable(session->channel, "verbose_presence")) && switch_true(var)) {
</span><span class="lines">@@ -1508,7 +1508,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (session->stack_count > SWITCH_MAX_STACKS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error %s too many stacked extensions\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error %s too many stacked extensions\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1573,7 +1573,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> while (switch_channel_ready(channel) && extension->current_application) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Execute %s(%s)\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Execute %s(%s)\n",
</ins><span class="cx"> extension->current_application->application_name, switch_str_nil(extension->current_application->application_data));
</span><span class="cx">
</span><span class="cx"> if (switch_core_session_execute_application(session,
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_core_state_machinec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core_state_machine.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core_state_machine.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_core_state_machine.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -37,34 +37,34 @@
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_init(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard INIT\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard INIT\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_hangup(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard HANGUP, cause: %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard HANGUP, cause: %s\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), switch_channel_cause2str(switch_channel_get_cause(session->channel)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_reporting(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard REPORTING, cause: %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard REPORTING, cause: %s\n",
</ins><span class="cx"> switch_channel_get_name(session->channel), switch_channel_cause2str(switch_channel_get_cause(session->channel)));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_destroy(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard DESTROY\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard DESTROY\n",
</ins><span class="cx"> switch_channel_get_name(session->channel));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_reset(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard RESET\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard RESET\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_routing(switch_core_session_t *session)
</span><span class="lines">@@ -75,10 +75,10 @@
</span><span class="cx"> char *expanded = NULL;
</span><span class="cx"> char *dpstr = NULL;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard ROUTING\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard ROUTING\n", switch_channel_get_name(session->channel));
</ins><span class="cx">
</span><span class="cx"> if ((caller_profile = switch_channel_get_caller_profile(session->channel)) == 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't get profile!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't get profile!\n");
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return;
</span><span class="cx"> } else {
</span><span class="lines">@@ -121,10 +121,10 @@
</span><span class="cx"> if (!count) {
</span><span class="cx"> if (switch_channel_test_flag(session->channel, CF_OUTBOUND)) {
</span><span class="cx"> if (switch_channel_test_flag(session->channel, CF_ANSWERED)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No Dialplan on answered channel, changing state to HANGUP\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "No Dialplan on answered channel, changing state to HANGUP\n");
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No Dialplan, changing state to CONSUME_MEDIA\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "No Dialplan, changing state to CONSUME_MEDIA\n");
</ins><span class="cx"> switch_channel_set_state(session->channel, CS_CONSUME_MEDIA);
</span><span class="cx"> }
</span><span class="cx"> goto end;
</span><span class="lines">@@ -133,7 +133,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!extension) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "No Route, Aborting\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "No Route, Aborting\n");
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_NO_ROUTE_DESTINATION);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -148,7 +148,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_caller_extension_t *extension;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard EXECUTE\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard EXECUTE\n", switch_channel_get_name(session->channel));
</ins><span class="cx">
</span><span class="cx"> top:
</span><span class="cx"> switch_channel_clear_flag(session->channel, CF_RESET);
</span><span class="lines">@@ -183,19 +183,19 @@
</span><span class="cx"> static void switch_core_standard_on_exchange_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard EXCHANGE_MEDIA\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard EXCHANGE_MEDIA\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> switch_assert(session != NULL);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard SOFT_EXECUTE\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard SOFT_EXECUTE\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_park(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> switch_assert(session != NULL);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard PARK\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard PARK\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx"> switch_ivr_park(session, NULL);
</span><span class="cx"> }
</span><span class="lines">@@ -203,13 +203,13 @@
</span><span class="cx"> static void switch_core_standard_on_consume_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> switch_assert(session != NULL);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard CONSUME_MEDIA\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard CONSUME_MEDIA\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static void switch_core_standard_on_hibernate(switch_core_session_t *session)
</span><span class="cx"> {
</span><span class="cx"> switch_assert(session != NULL);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Standard HIBERNATE\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Standard HIBERNATE\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> #include <sqlite3.h>
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx">
</span><span class="cx"> #define STATE_MACRO(__STATE, __STATE_STR) do { \
</span><span class="cx"> midstate = state; \
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR); \
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) State %s\n", switch_channel_get_name(session->channel), __STATE_STR); \
</ins><span class="cx"> if (!driver_state_handler->on_##__STATE || (driver_state_handler->on_##__STATE(session) == SWITCH_STATUS_SUCCESS \
</span><span class="cx"> )) { \
</span><span class="cx"> while (do_extra_handlers && (application_state_handler = switch_channel_get_state_handler(session->channel, index++)) != 0) { \
</span><span class="lines">@@ -320,7 +320,7 @@
</span><span class="cx"> switch_core_standard_on_##__STATE(session); \
</span><span class="cx"> } \
</span><span class="cx"> } \
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State %s going to sleep\n", switch_channel_get_name(session->channel), __STATE_STR); \
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) State %s going to sleep\n", switch_channel_get_name(session->channel), __STATE_STR); \
</ins><span class="cx"> } while (silly)
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) switch_core_session_run(switch_core_session_t *session)
</span><span class="lines">@@ -349,7 +349,7 @@
</span><span class="cx"> switch_channel_event_set_data(session->channel, event);
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Thread has crashed for channel %s\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Thread has crashed for channel %s\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_CRASH);
</span><span class="cx"> } else {
</span><span class="cx"> switch_mutex_lock(stack_mutex);
</span><span class="lines">@@ -401,7 +401,7 @@
</span><span class="cx">
</span><span class="cx"> switch (state) {
</span><span class="cx"> case CS_NEW: /* Just created, Waiting for first instructions */
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "(%s) State NEW\n", switch_channel_get_name(session->channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "(%s) State NEW\n", switch_channel_get_name(session->channel));
</ins><span class="cx"> break;
</span><span class="cx"> case CS_DESTROY:
</span><span class="cx"> goto done;
</span><span class="lines">@@ -458,7 +458,7 @@
</span><span class="cx"> expanded = switch_channel_expand_variables(session->channel, arg);
</span><span class="cx">
</span><span class="cx"> switch_api_execute(cmd, expanded, use_session, &stream);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, switch_str_nil(expanded),
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Hangup Command %s(%s):\n%s\n", cmd, switch_str_nil(expanded),
</ins><span class="cx"> switch_str_nil((char *) stream.data));
</span><span class="cx">
</span><span class="cx"> if (expanded != arg) {
</span><span class="lines">@@ -522,7 +522,7 @@
</span><span class="cx"> if (endstate == CS_NEW) {
</span><span class="cx"> switch_cond_next();
</span><span class="cx"> if (!--new_loops) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "%s Timeout waiting for next instruction in CS_NEW!\n", session->uuid_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "%s Timeout waiting for next instruction in CS_NEW!\n", session->uuid_str);
</ins><span class="cx"> switch_channel_hangup(session->channel, SWITCH_CAUSE_INVALID_CALL_REFERENCE);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_cppcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_cpp.cpp (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_cpp.cpp 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_cpp.cpp 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -568,7 +568,7 @@
</span><span class="cx"> {
</span><span class="cx"> this_check_void();
</span><span class="cx"> sanity_check_noreturn;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::hangup\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CoreSession::hangup\n");
</ins><span class="cx"> this->begin_allow_threads();
</span><span class="cx"> switch_channel_hangup(channel, switch_channel_str2cause(cause));
</span><span class="cx"> this->end_allow_threads();
</span><span class="lines">@@ -656,12 +656,12 @@
</span><span class="cx"> sanity_check(-1);
</span><span class="cx">
</span><span class="cx"> if (!tts_name) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS engine specified\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No TTS engine specified\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!voice_name) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No TTS voice specified\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No TTS voice specified\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> &terminator,
</span><span class="cx"> (uint32_t) timeout, (uint32_t)interdigit, 0);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "getDigits dtmf_buf: %s\n", dtmf_buf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "getDigits dtmf_buf: %s\n", dtmf_buf);
</ins><span class="cx"> end_allow_threads();
</span><span class="cx"> return dtmf_buf;
</span><span class="cx"> }
</span><span class="lines">@@ -730,7 +730,7 @@
</span><span class="cx"> sanity_check(-1);
</span><span class="cx"> begin_allow_threads();
</span><span class="cx"> status = switch_ivr_session_transfer(session, extension, dialplan, context);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "transfer result: %d\n", status);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "transfer result: %d\n", status);
</ins><span class="cx"> end_allow_threads();
</span><span class="cx"> return status == SWITCH_STATUS_SUCCESS ? 1 : 0;
</span><span class="cx"> }
</span><span class="lines">@@ -791,7 +791,7 @@
</span><span class="cx"> sizeof(dtmf_buf),
</span><span class="cx"> digits_regex);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "playAndGetDigits dtmf_buf: %s\n", dtmf_buf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "playAndGetDigits dtmf_buf: %s\n", dtmf_buf);
</ins><span class="cx">
</span><span class="cx"> end_allow_threads();
</span><span class="cx"> return dtmf_buf;
</span><span class="lines">@@ -802,7 +802,7 @@
</span><span class="cx"> this_check_void();
</span><span class="cx"> sanity_check_noreturn;
</span><span class="cx"> if (!(tosay && module_name && say_type && say_method)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! invalid args.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error! invalid args.\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx"> begin_allow_threads();
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> sanity_check_noreturn;
</span><span class="cx">
</span><span class="cx"> if (!(phrase_name)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error! invalid args.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error! invalid args.\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -920,7 +920,7 @@
</span><span class="cx"> switch_channel_set_private(channel, "CoreSession", NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "destroy/unlink session from object\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "destroy/unlink session from object\n");
</ins><span class="cx">
</span><span class="cx"> if (switch_channel_up(channel) && switch_test_flag(this, S_HUP) && !switch_channel_test_flag(channel, CF_TRANSFER)) {
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_NORMAL_CLEARING);
</span><span class="lines">@@ -1097,7 +1097,7 @@
</span><span class="cx"> this_check_void();
</span><span class="cx"> sanity_check_noreturn;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CoreSession::seHangupHook, hangup_func: %p\n", hangup_func);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CoreSession::seHangupHook, hangup_func: %p\n", hangup_func);
</ins><span class="cx"> on_hangup = hangup_func;
</span><span class="cx"> switch_channel_t *channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><span class="lines">@@ -1144,7 +1144,7 @@
</span><span class="cx">
</span><span class="cx"> SWITCH_DECLARE(void) bridge(CoreSession &session_a, CoreSession &session_b)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "bridge called, session_a uuid: %s\n", session_a.get_uuid());
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_a.session), SWITCH_LOG_DEBUG, "bridge called, session_a uuid: %s\n", session_a.get_uuid());
</ins><span class="cx"> switch_input_callback_function_t dtmf_func = NULL;
</span><span class="cx"> switch_input_args_t args;
</span><span class="cx"> switch_channel_t *channel_a = NULL, *channel_b = NULL;
</span><span class="lines">@@ -1171,7 +1171,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (err) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s", err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_a.session), SWITCH_LOG_ERROR, "%s", err);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1183,7 +1183,7 @@
</span><span class="cx"> CoreSession *coresession = NULL;
</span><span class="cx"> switch_channel_state_t state = switch_channel_get_state(channel);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hangup_hook called\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_hungup), SWITCH_LOG_DEBUG, "hangup_hook called\n");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> if ((coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession"))) {
</span><span class="lines">@@ -1207,21 +1207,21 @@
</span><span class="cx"> CoreSession *coresession = NULL;
</span><span class="cx"> switch_status_t result;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "dtmf_callback called\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_cb), SWITCH_LOG_INFO, "dtmf_callback called\n");
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> //coresession = (CoreSession *) buf;
</span><span class="cx"> coresession = (CoreSession *) switch_channel_get_private(channel, "CoreSession");
</span><span class="cx">
</span><span class="cx"> if (!coresession) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid CoreSession\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_cb), SWITCH_LOG_ERROR, "Invalid CoreSession\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> result = coresession->run_dtmf_callback(input, itype);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "process_callback_result returned\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_cb), SWITCH_LOG_DEBUG, "process_callback_result returned\n");
</ins><span class="cx"> if (result) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "process_callback_result returned: %d\n", result);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session_cb), SWITCH_LOG_DEBUG, "process_callback_result returned: %d\n", result);
</ins><span class="cx"> }
</span><span class="cx"> return result;
</span><span class="cx">
</span><span class="lines">@@ -1306,7 +1306,7 @@
</span><span class="cx"> unsigned int pos = 0;
</span><span class="cx"> char *p;
</span><span class="cx"> codec = switch_core_session_get_read_codec(session);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "got codec\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "got codec\n");
</ins><span class="cx"> if ((p = strchr(result, ':'))) {
</span><span class="cx"> p++;
</span><span class="cx"> if (*p == '+' || *p == '-') {
</span><span class="lines">@@ -1316,20 +1316,20 @@
</span><span class="cx"> }
</span><span class="cx"> if (step > 0) {
</span><span class="cx"> samps = step * (codec->implementation->samples_per_second / 1000);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "going to seek\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "going to seek\n");
</ins><span class="cx"> switch_core_file_seek(fhp, &pos, samps, SEEK_CUR);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done seek\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done seek\n");
</ins><span class="cx"> } else {
</span><span class="cx"> samps = step * (codec->implementation->samples_per_second / 1000);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "going to seek\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "going to seek\n");
</ins><span class="cx"> switch_core_file_seek(fhp, &pos, fhp->pos - samps, SEEK_SET);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done seek\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done seek\n");
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> samps = atoi(p) * (codec->implementation->samples_per_second / 1000);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "going to seek\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "going to seek\n");
</ins><span class="cx"> switch_core_file_seek(fhp, &pos, samps, SEEK_SET);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done seek\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done seek\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1338,11 +1338,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!strcmp(result, "true") || !strcmp(result, "undefined")) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "return success\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "return success\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "no callback result match for '%s', return false\n", result);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "no callback result match for '%s', return false\n", result);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_ivr.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -67,7 +67,7 @@
</span><span class="cx"> imp.number_of_channels,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
</span><span class="cx"> switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
</ins><span class="cx"> imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -105,7 +105,7 @@
</span><span class="cx">
</span><span class="cx"> period_avg = (int)(period_sum / period_total);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CONSOLE,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CONSOLE,
</ins><span class="cx"> "\npacket_avg=%d packet_peak=%d period_avg=%d global_avg=%d\n\n", avg, peak, period_avg, global_avg);
</span><span class="cx">
</span><span class="cx"> if (period_total >= period_len) {
</span><span class="lines">@@ -143,7 +143,7 @@
</span><span class="cx"> if (!switch_channel_test_flag(channel, CF_OUTBOUND) && !switch_channel_test_flag(channel, CF_PROXY_MODE) &&
</span><span class="cx"> !switch_channel_media_ready(channel) && !switch_channel_test_flag(channel, CF_SERVICE)) {
</span><span class="cx"> if ((status = switch_channel_pre_answer(channel)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot establish media.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot establish media.\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -165,13 +165,13 @@
</span><span class="cx"> imp.number_of_channels,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
</span><span class="cx"> switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
</ins><span class="cx"> imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Activated L16@%uhz %u channels %dms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Codec Activated L16@%uhz %u channels %dms\n",
</ins><span class="cx"> imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
</span><span class="cx">
</span><span class="cx"> write_frame.codec = &codec;
</span><span class="lines">@@ -333,7 +333,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((conninfo = switch_channel_get_private(channel, "unicast"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Shutting down unicast connection\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Shutting down unicast connection\n");
</ins><span class="cx"> switch_clear_flag_locked(conninfo, SUF_READY);
</span><span class="cx"> switch_socket_shutdown(conninfo->socket, SWITCH_SHUTDOWN_READWRITE);
</span><span class="cx"> while (switch_test_flag(conninfo, SUF_THREAD_RUNNING)) {
</span><span class="lines">@@ -376,7 +376,7 @@
</span><span class="cx"> conninfo->type = AF_INET;
</span><span class="cx"> conninfo->transport = SOCK_STREAM;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid transport %s\n", transport);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid transport %s\n", transport);
</ins><span class="cx"> goto fail;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -398,11 +398,11 @@
</span><span class="cx"> read_codec->implementation->microseconds_per_packet / 1000,
</span><span class="cx"> 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
</span><span class="cx"> NULL, switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
</span><span class="cx"> read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed L16@%uhz 1 channel %dms\n",
</ins><span class="cx"> read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
</span><span class="cx"> goto fail;
</span><span class="cx"> }
</span><span class="lines">@@ -412,7 +412,7 @@
</span><span class="cx"> conninfo->write_frame.buflen = sizeof(conninfo->write_frame_data);
</span><span class="cx"> conninfo->write_frame.codec = switch_test_flag(conninfo, SUF_NATIVE) ? read_codec : &conninfo->read_codec;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "connect %s:%d->%s:%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "connect %s:%d->%s:%d\n",
</ins><span class="cx"> conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port);
</span><span class="cx">
</span><span class="cx"> if (switch_sockaddr_info_get(&conninfo->local_addr,
</span><span class="lines">@@ -435,7 +435,7 @@
</span><span class="cx"> goto fail;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Created unicast connection %s:%d->%s:%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Created unicast connection %s:%d->%s:%d\n",
</ins><span class="cx"> conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port);
</span><span class="cx"> switch_channel_set_private(channel, "unicast", conninfo);
</span><span class="cx"> switch_channel_set_flag(channel, CF_UNICAST);
</span><span class="lines">@@ -444,7 +444,7 @@
</span><span class="cx">
</span><span class="cx"> fail:
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure creating unicast connection %s:%d->%s:%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Failure creating unicast connection %s:%d->%s:%d\n",
</ins><span class="cx"> conninfo->local_ip, conninfo->local_port, conninfo->remote_ip, conninfo->remote_port);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -464,7 +464,7 @@
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(cmd)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Command!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Command!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -537,7 +537,7 @@
</span><span class="cx"> for (x = 0; x < loops || loops < 0; x++) {
</span><span class="cx"> switch_time_t b4, aftr;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Command Execute %s(%s)\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Command Execute %s(%s)\n",
</ins><span class="cx"> switch_channel_get_name(channel), app_name, switch_str_nil(app_arg));
</span><span class="cx"> b4 = switch_micro_time_now();
</span><span class="cx"> switch_core_session_exec(session, application_interface, app_arg);
</span><span class="lines">@@ -651,7 +651,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(channel, CF_CONTROLLED)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot park channels that are under control already.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot park channels that are under control already.\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -757,7 +757,7 @@
</span><span class="cx"> tstatus = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Codec Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Codec Error\n");
</ins><span class="cx"> switch_ivr_deactivate_unicast(session);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -917,13 +917,13 @@
</span><span class="cx"> imp.number_of_channels,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
</span><span class="cx"> switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error L16@%uhz %u channels %dms\n",
</ins><span class="cx"> imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Codec Activated L16@%uhz %u channels %dms\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Codec Activated L16@%uhz %u channels %dms\n",
</ins><span class="cx"> imp.samples_per_second, imp.number_of_channels, imp.microseconds_per_packet / 1000);
</span><span class="cx">
</span><span class="cx"> write_frame.codec = &codec;
</span><span class="lines">@@ -1346,7 +1346,7 @@
</span><span class="cx"> msg.from = __FILE__;
</span><span class="cx"> switch_core_session_receive_message(session, &msg);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Transfer %s to %s[%s@%s]\n", switch_channel_get_name(channel), dialplan, extension,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Transfer %s to %s[%s@%s]\n", switch_channel_get_name(channel), dialplan, extension,
</ins><span class="cx"> context);
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1970,7 +1970,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (delay_ms < 1 || delay_ms > 10000) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid delay [%d] must be between 1 and 10000\n", delay_ms);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid delay [%d] must be between 1 and 10000\n", delay_ms);
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1978,7 +1978,7 @@
</span><span class="cx"> samples = switch_samples_per_packet(read_impl.samples_per_second, interval);
</span><span class="cx">
</span><span class="cx"> qlen = delay_ms / (interval);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting delay to %dms (%d frames)\n", delay_ms, qlen);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setting delay to %dms (%d frames)\n", delay_ms, qlen);
</ins><span class="cx"> jb = stfu_n_init(qlen);
</span><span class="cx">
</span><span class="cx"> write_frame.codec = switch_core_session_get_read_codec(session);
</span><span class="lines">@@ -2027,7 +2027,7 @@
</span><span class="cx"> if (!chan_lang) {
</span><span class="cx"> chan_lang = "en";
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No language specified - Using [%s]\n", chan_lang);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "No language specified - Using [%s]\n", chan_lang);
</ins><span class="cx"> } else {
</span><span class="cx"> chan_lang = lang;
</span><span class="cx"> }
</span><span class="lines">@@ -2040,17 +2040,17 @@
</span><span class="cx"> switch_channel_event_set_data(channel, hint_data);
</span><span class="cx">
</span><span class="cx"> if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of phrases failed.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of phrases failed.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(macros = switch_xml_child(cfg, "macros"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find macros tag.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find macros tag.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(language = switch_xml_child(macros, "language"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find language tag.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find language tag.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2067,7 +2067,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!language) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find language %s.\n", chan_lang);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find language %s.\n", chan_lang);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2091,7 +2091,7 @@
</span><span class="cx"> /* should go back and proto all the say mods to const.... */
</span><span class="cx"> status = si->say_function(session, (char *) tosay, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method), args);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);
</ins><span class="cx"> status = SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2133,7 +2133,7 @@
</span><span class="cx"> *domain++ = '\0';
</span><span class="cx">
</span><span class="cx"> if (switch_xml_locate_user("id", user, domain, NULL, &xml, &x_domain, &x_user, &x_group, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "can't find user [%s@%s]\n", user, domain);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2182,7 +2182,7 @@
</span><span class="cx"> goto done;
</span><span class="cx">
</span><span class="cx"> error:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No user@domain specified.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No user@domain specified.\n");
</ins><span class="cx">
</span><span class="cx"> done:
</span><span class="cx"> if (xml) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_asyncc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_async.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_ivr_async.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -364,12 +364,12 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not displace session. Media not enabled on channel\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can not displace session. Media not enabled on channel\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((bug = switch_channel_get_private(channel, file))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Only 1 of the same file per channel please!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> switch_codec_implementation_t read_impl = {0};
</span><span class="cx"> switch_core_session_get_read_impl(session, &read_impl);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Stop recording file %s\n", rh->file);
</ins><span class="cx"> switch_channel_set_private(channel, rh->file, NULL);
</span><span class="cx">
</span><span class="cx"> if (rh->fh) {
</span><span class="lines">@@ -462,7 +462,7 @@
</span><span class="cx">
</span><span class="cx"> switch_core_file_close(rh->fh);
</span><span class="cx"> if (rh->fh->samples_out < read_impl.samples_per_second * 3) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Discarding short file %s\n", rh->file);
</ins><span class="cx"> switch_file_remove(rh->file, switch_core_session_get_pool(session));
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -688,7 +688,7 @@
</span><span class="cx"> tread_impl.number_of_channels,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE,
</span><span class="cx"> NULL, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot init codec\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot init codec\n");
</ins><span class="cx"> switch_core_session_rwunlock(tsession);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -718,7 +718,7 @@
</span><span class="cx"> if (switch_core_media_bug_add(tsession, eavesdrop_callback, ep, 0,
</span><span class="cx"> SMBF_READ_STREAM | SMBF_WRITE_STREAM | SMBF_READ_REPLACE | SMBF_WRITE_REPLACE | SMBF_READ_PING | SMBF_THREAD_LOCK,
</span><span class="cx"> &bug) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot attach bug\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot attach bug\n");
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -875,7 +875,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not record session. Media not enabled on channel\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can not record session. Media not enabled on channel\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -924,7 +924,7 @@
</span><span class="cx"> channels,
</span><span class="cx"> read_impl.actual_samples_per_second,
</span><span class="cx"> SWITCH_FILE_FLAG_WRITE | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error opening %s\n", file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error opening %s\n", file);
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="lines">@@ -976,7 +976,7 @@
</span><span class="cx"> rh->packet_len = read_impl.decoded_bytes_per_packet;
</span><span class="cx">
</span><span class="cx"> if ((status = switch_core_media_bug_add(session, record_callback, rh, to, flags, &bug)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error adding media bug for file %s\n", file);
</ins><span class="cx"> switch_core_file_close(fh);
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="lines">@@ -1016,7 +1016,7 @@
</span><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="cx"> p++;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "DTMF DETECTED: [%s]\n", digit_str);
</ins><span class="cx"> }
</span><span class="cx"> switch_core_media_bug_set_read_replace_frame(bug, frame);
</span><span class="cx"> }
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx"> buf[0] = dtmf->digit;
</span><span class="cx"> if (duration > 8000) {
</span><span class="cx"> duration = 4000;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Truncating ridiculous DTMF duration %d ms to 1/2 second.\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_WARNING, "%s Truncating ridiculous DTMF duration %d ms to 1/2 second.\n",
</ins><span class="cx"> switch_channel_get_name(switch_core_session_get_channel(pvt->session)), dtmf->duration / 8);
</span><span class="cx"> }
</span><span class="cx"> pvt->ts.duration = duration;
</span><span class="lines">@@ -1249,7 +1249,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!switch_channel_media_ready(channel) || !switch_core_session_get_read_codec(session)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can not install inband dtmf generate. Media not enabled on channel\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can not install inband dtmf generate. Media not enabled on channel\n");
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1348,18 +1348,18 @@
</span><span class="cx"> switch_event_t *event;
</span><span class="cx"> cont->list[i].hits++;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "TONE %s HIT %d/%d\n",
</ins><span class="cx"> cont->list[i].key, cont->list[i].hits, cont->list[i].total_hits);
</span><span class="cx"> cont->list[i].sleep = cont->list[i].default_sleep;
</span><span class="cx"> cont->list[i].expires = cont->list[i].default_expires;
</span><span class="cx">
</span><span class="cx"> if (cont->list[i].hits >= cont->list[i].total_hits) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "TONE %s DETECTED\n", cont->list[i].key);
</ins><span class="cx"> cont->list[i].up = 0;
</span><span class="cx">
</span><span class="cx"> if (cont->list[i].callback) {
</span><span class="cx"> if ((rval = cont->list[i].callback(cont->session, cont->list[i].app, cont->list[i].data)) == SWITCH_TRUE) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-enabling %s\n", cont->list[i].key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "Re-enabling %s\n", cont->list[i].key);
</ins><span class="cx"> cont->list[i].up = 1;
</span><span class="cx"> cont->list[i].hits = 0;
</span><span class="cx"> cont->list[i].sleep = 0;
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_core_session_queue_event(cont->session, &event) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_ERROR, "Event queue failed!\n");
</ins><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="lines">@@ -1446,19 +1446,19 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(key)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Key Specified!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No Key Specified!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (cont) {
</span><span class="cx"> if (cont->index >= MAX_TONES) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Max Tones Reached!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Max Tones Reached!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> for (i = 0; i < cont->index; i++) {
</span><span class="cx"> if (!switch_strlen_zero(cont->list[i].key) && !strcasecmp(key, cont->list[i].key)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Re-enabling %s\n", key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Re-enabling %s\n", key);
</ins><span class="cx"> cont->list[i].up = 1;
</span><span class="cx"> cont->list[i].hits = 0;
</span><span class="cx"> cont->list[i].sleep = 0;
</span><span class="lines">@@ -1469,7 +1469,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(tone_spec)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Spec Specified!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No Spec Specified!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1477,7 +1477,7 @@
</span><span class="cx"> return SWITCH_STATUS_MEMERR;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Adding tone spec %s index %d hits %d\n", tone_spec, cont->index, hits);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Adding tone spec %s index %d hits %d\n", tone_spec, cont->index, hits);
</ins><span class="cx">
</span><span class="cx"> i = 0;
</span><span class="cx"> p = (char *) tone_spec;
</span><span class="lines">@@ -1498,7 +1498,7 @@
</span><span class="cx"> cont->list[cont->index].map.freqs[i++] = 0;
</span><span class="cx">
</span><span class="cx"> if (!ok) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid tone spec!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid tone spec!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1563,7 +1563,7 @@
</span><span class="cx">
</span><span class="cx"> if (cont->bug_running) {
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s bug already running\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s bug already running\n", switch_channel_get_name(channel));
</ins><span class="cx"> } else {
</span><span class="cx"> cont->bug_running = 1;
</span><span class="cx"> if ((status = switch_core_media_bug_add(session, tone_detect_callback, cont, timeout, bflags, &cont->bug)) != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -1657,7 +1657,7 @@
</span><span class="cx">
</span><span class="cx"> if (md->sr[direction].meta_on && now - md->sr[direction].last_digit > 5) {
</span><span class="cx"> md->sr[direction].meta_on = SWITCH_FALSE;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "%s Meta digit timeout parsing %c\n", switch_channel_get_name(channel), dtmf->digit);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "%s Meta digit timeout parsing %c\n", switch_channel_get_name(channel), dtmf->digit);
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1708,7 +1708,7 @@
</span><span class="cx"> flags |= SMF_ECHO_ALEG;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Processing meta digit '%c' [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Processing meta digit '%c' [%s]\n",
</ins><span class="cx"> switch_channel_get_name(channel), dtmf->digit, md->sr[direction].map[dval].app);
</span><span class="cx">
</span><span class="cx"> if (switch_channel_test_flag(channel, CF_PROXY_MODE)) {
</span><span class="lines">@@ -1719,12 +1719,12 @@
</span><span class="cx">
</span><span class="cx"> if ((md->sr[direction].map[dval].bind_flags & SBF_ONCE)) {
</span><span class="cx"> memset(&md->sr[direction].map[dval], 0, sizeof(md->sr[direction].map[dval]));
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Unbinding meta digit '%c'\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Unbinding meta digit '%c'\n",
</ins><span class="cx"> switch_channel_get_name(channel), dtmf->digit);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "%s Ignoring meta digit '%c' not mapped\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "%s Ignoring meta digit '%c' not mapped\n",
</ins><span class="cx"> switch_channel_get_name(channel), dtmf->digit);
</span><span class="cx">
</span><span class="cx"> }
</span><span class="lines">@@ -1744,16 +1744,16 @@
</span><span class="cx"> dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY);
</span><span class="cx">
</span><span class="cx"> if (!md || key > 9) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid key %u\n", key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid key %u\n", key);
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> memset(&md->sr[SWITCH_DTMF_RECV].map[key], 0, sizeof(md->sr[SWITCH_DTMF_RECV].map[key]));
</span><span class="cx"> memset(&md->sr[SWITCH_DTMF_SEND].map[key], 0, sizeof(md->sr[SWITCH_DTMF_SEND].map[key]));
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UnBound A-Leg: %d\n", key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "UnBound A-Leg: %d\n", key);
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UnBound A-Leg: ALL\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "UnBound A-Leg: ALL\n");
</ins><span class="cx"> switch_channel_set_private(channel, SWITCH_META_VAR_KEY, NULL);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1767,7 +1767,7 @@
</span><span class="cx"> dtmf_meta_data_t *md = switch_channel_get_private(channel, SWITCH_META_VAR_KEY);
</span><span class="cx">
</span><span class="cx"> if (key > 9) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid key %u\n", key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid key %u\n", key);
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1785,22 +1785,22 @@
</span><span class="cx"> md->sr[SWITCH_DTMF_RECV].map[key].flags |= SMF_HOLD_BLEG;
</span><span class="cx"> md->sr[SWITCH_DTMF_RECV].map[key].bind_flags = bind_flags;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bound A-Leg: %d %s\n", key, app);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Bound A-Leg: %d %s\n", key, app);
</ins><span class="cx"> }
</span><span class="cx"> if ((bind_flags & SBF_DIAL_BLEG)) {
</span><span class="cx"> md->sr[SWITCH_DTMF_SEND].up = 1;
</span><span class="cx"> md->sr[SWITCH_DTMF_SEND].map[key].app = switch_core_session_strdup(session, app);
</span><span class="cx"> md->sr[SWITCH_DTMF_SEND].map[key].flags |= SMF_HOLD_BLEG;
</span><span class="cx"> md->sr[SWITCH_DTMF_SEND].map[key].bind_flags = bind_flags;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Bound B-Leg: %d %s\n", key, app);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Bound B-Leg: %d %s\n", key, app);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> if ((bind_flags & SBF_DIAL_ALEG)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UnBound A-Leg: %d\n", key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "UnBound A-Leg: %d\n", key);
</ins><span class="cx"> md->sr[SWITCH_DTMF_SEND].map[key].app = NULL;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "UnBound: B-Leg %d\n", key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "UnBound: B-Leg %d\n", key);
</ins><span class="cx"> md->sr[SWITCH_DTMF_SEND].map[key].app = NULL;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1892,7 +1892,7 @@
</span><span class="cx"> switch_dtmf_t dtmf;
</span><span class="cx"> dtmf.digit = c;
</span><span class="cx"> dtmf.duration = switch_core_default_dtmf_duration(0);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Queue speech detected dtmf %c\n", c);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "Queue speech detected dtmf %c\n", c);
</ins><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1918,7 +1918,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_core_session_queue_event(sth->session, &event) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Event queue failed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_ERROR, "Event queue failed!\n");
</ins><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "delivery-failure", "true");
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="lines">@@ -1969,7 +1969,7 @@
</span><span class="cx"> if (sth->ah) {
</span><span class="cx"> if (switch_core_media_bug_read(bug, &frame, SWITCH_TRUE) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (switch_core_asr_feed(sth->ah, frame.data, frame.datalen, &flags) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error Feeding Data\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(switch_core_media_bug_get_session(bug)), SWITCH_LOG_DEBUG, "Error Feeding Data\n");
</ins><span class="cx"> return SWITCH_FALSE;
</span><span class="cx"> }
</span><span class="cx"> if (switch_core_asr_check_results(sth->ah, &flags) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -2037,7 +2037,7 @@
</span><span class="cx">
</span><span class="cx"> if (sth) {
</span><span class="cx"> if (switch_core_asr_load_grammar(sth->ah, grammar, name) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error loading Grammar\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Error loading Grammar\n");
</ins><span class="cx"> switch_core_asr_close(sth->ah, &flags);
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -2055,7 +2055,7 @@
</span><span class="cx">
</span><span class="cx"> if (sth) {
</span><span class="cx"> if (switch_core_asr_unload_grammar(sth->ah, name) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error unloading Grammar\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Error unloading Grammar\n");
</ins><span class="cx"> switch_core_asr_close(sth->ah, &flags);
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -2085,7 +2085,7 @@
</span><span class="cx">
</span><span class="cx"> if (sth) {
</span><span class="cx"> if (switch_core_asr_load_grammar(sth->ah, grammar, name) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error loading Grammar\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Error loading Grammar\n");
</ins><span class="cx"> switch_core_asr_close(sth->ah, &flags);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="lines">@@ -2104,7 +2104,7 @@
</span><span class="cx"> switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx">
</span><span class="cx"> if (switch_core_asr_load_grammar(ah, grammar, name) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Error loading Grammar\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Error loading Grammar\n");
</ins><span class="cx"> switch_core_asr_close(ah, &flags);
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="lines">@@ -2159,7 +2159,7 @@
</span><span class="cx"> switch_channel_hangup(other_channel, helper->cause);
</span><span class="cx"> switch_core_session_rwunlock(other_session);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No channel to hangup\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No channel to hangup\n");
</ins><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="cx"> switch_channel_hangup(channel, helper->cause);
</span><span class="lines">@@ -2307,7 +2307,7 @@
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><span class="cx"> if ((switch_channel_test_flag(channel, CF_EVENT_PARSE))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel [%s][%s] already broadcasting...broadcast aborted\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Channel [%s][%s] already broadcasting...broadcast aborted\n",
</ins><span class="cx"> switch_channel_get_name(channel), path);
</span><span class="cx"> switch_core_session_rwunlock(session);
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_menuc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_menu.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_menu.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_ivr_menu.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx">
</span><span class="cx"> menu->ptr += menu_buf_len;
</span><span class="cx"> if (menu_buf_len < need) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "waiting for %u/%u digits t/o %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "waiting for %u/%u digits t/o %d\n",
</ins><span class="cx"> (uint32_t)(menu->inlen - strlen(menu->buf)), (uint32_t)need, menu->inter_timeout);
</span><span class="cx"> status = switch_ivr_collect_digits_count(session, menu->ptr, menu->inlen - strlen(menu->buf),
</span><span class="cx"> need, "#", &terminator, menu_buf_len ? menu->inter_timeout : menu->timeout,
</span><span class="lines">@@ -359,7 +359,7 @@
</span><span class="cx">
</span><span class="cx"> if (menu->confirm_key && *buf != '\0') {
</span><span class="cx"> if (*menu->confirm_key == *buf) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "approving digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key);
</span><span class="cx"> break;
</span><span class="cx"> } else {
</span><span class="lines">@@ -370,12 +370,12 @@
</span><span class="cx"> att--;
</span><span class="cx"> }
</span><span class="cx"> if (!att) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "rejecting digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "rejecting digits '%s' via confirm key %s\n", menu->buf, menu->confirm_key);
</ins><span class="cx"> *menu->buf = '\0';
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "digits '%s'\n", menu->buf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "digits '%s'\n", menu->buf);
</ins><span class="cx">
</span><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="lines">@@ -392,19 +392,19 @@
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_SUCCESS;
</span><span class="cx">
</span><span class="cx"> if (++stack->stack_count > 12) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Too many levels of recursion.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Too many levels of recursion.\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!session || !stack || switch_strlen_zero(name)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid menu context\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid menu context\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><span class="cx"> if (!(menu = switch_ivr_menu_find(stack, name))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Menu!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Menu!\n");
</ins><span class="cx"> switch_goto_status(SWITCH_STATUS_FALSE, end);
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -413,7 +413,7 @@
</span><span class="cx"> switch_channel_set_variable(channel, "tts_voice", menu->tts_voice);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Executing IVR menu %s\n", menu->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Executing IVR menu %s\n", menu->name);
</ins><span class="cx"> switch_channel_set_variable(channel, "ivr_menu_status", "success");
</span><span class="cx">
</span><span class="cx"> for (reps = 0; running && status == SWITCH_STATUS_SUCCESS; reps++) {
</span><span class="lines">@@ -421,12 +421,12 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (errs == menu->max_failures) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Maximum failures\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Maximum failures\n");
</ins><span class="cx"> switch_channel_set_variable(channel, "ivr_menu_status", "failure");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> if (timeouts == menu->max_timeouts) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Maximum timeouts\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Maximum timeouts\n");
</ins><span class="cx"> switch_channel_set_variable(channel, "ivr_menu_status", "timeout");
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -469,7 +469,7 @@
</span><span class="cx"> switch_perform_substitution(re, ok, ap->arg, menu->buf, substituted, sizeof(substituted), ovector);
</span><span class="cx"> use_arg = substituted;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "action regex [%s] [%s] [%d]\n", menu->buf, ap->bind, ok);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "action regex [%s] [%s] [%d]\n", menu->buf, ap->bind, ok);
</ins><span class="cx">
</span><span class="cx"> switch_regex_safe_free(re);
</span><span class="cx"> } else {
</span><span class="lines">@@ -480,18 +480,18 @@
</span><span class="cx"> match++;
</span><span class="cx"> errs = 0;
</span><span class="cx"> if (ap->function) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "IVR function on menu '%s' matched '%s' param '%s'\n", menu->name, menu->buf, use_arg);
</span><span class="cx"> todo = ap->function(menu, use_arg, arg, sizeof(arg), obj);
</span><span class="cx"> aptr = arg;
</span><span class="cx"> } else {
</span><span class="cx"> todo = ap->ivr_action;
</span><span class="cx"> aptr = use_arg;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "IVR action on menu '%s' matched '%s' param '%s'\n", menu->name, menu->buf, aptr);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "switch_ivr_menu_execute todo=[%d]\n", todo);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "switch_ivr_menu_execute todo=[%d]\n", todo);
</ins><span class="cx">
</span><span class="cx"> switch (todo) {
</span><span class="cx"> case SWITCH_IVR_ACTION_DIE:
</span><span class="lines">@@ -542,7 +542,7 @@
</span><span class="cx"> status = SWITCH_STATUS_SUCCESS;
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Invalid TODO!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Invalid TODO!\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -559,12 +559,12 @@
</span><span class="cx"> }
</span><span class="cx"> if (!match) {
</span><span class="cx"> if (*menu->buf) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "IVR menu '%s' caught invalid input '%s'\n", menu->name, menu->buf);
</ins><span class="cx"> if (menu->invalid_sound) {
</span><span class="cx"> play_and_collect(session, menu, menu->invalid_sound, 0);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "IVR menu '%s' no input detected\n", menu->name);
</ins><span class="cx"> }
</span><span class="cx"> errs++;
</span><span class="cx"> if (status == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -578,7 +578,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (stack->stack_count == 1) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "exit-sound '%s'\n", menu->exit_sound);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "exit-sound '%s'\n", menu->exit_sound);
</ins><span class="cx"> if (!switch_strlen_zero(menu->exit_sound)) {
</span><span class="cx"> status = play_and_collect(session, menu, menu->exit_sound, 0);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -159,14 +159,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if ((application_interface = switch_loadable_module_get_application_interface(app_name)) == 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", app_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(collect->session), SWITCH_LOG_ERROR, "Invalid Application %s\n", app_name);
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> UNPROTECT_INTERFACE(application_interface);
</span><span class="cx"> goto wbreak;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!application_interface->application_function) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No Function for %s\n", app_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(collect->session), SWITCH_LOG_ERROR, "No Function for %s\n", app_name);
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> goto wbreak;
</span><span class="cx"> }
</span><span class="lines">@@ -281,7 +281,7 @@
</span><span class="cx">
</span><span class="cx"> if (oglobals) {
</span><span class="cx"> if (oglobals->monitor_early_media_ring_total && ++oglobals->monitor_early_media_ring_count < oglobals->monitor_early_media_ring_total) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Ring %d/%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Ring %d/%d\n",
</ins><span class="cx"> oglobals->monitor_early_media_ring_count, oglobals->monitor_early_media_ring_total);
</span><span class="cx"> return SWITCH_TRUE;
</span><span class="cx"> }
</span><span class="lines">@@ -365,14 +365,14 @@
</span><span class="cx"> char *p, *q;
</span><span class="cx">
</span><span class="cx"> if (!(p = strchr(cause, ':'))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> *p++ = '\0';
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!p) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -383,13 +383,13 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!(p = strchr(p, ':'))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> *p++ = '\0';
</span><span class="cx">
</span><span class="cx"> if (!p) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -431,7 +431,7 @@
</span><span class="cx"> char *p = ring_array[fx], *q;
</span><span class="cx">
</span><span class="cx"> if (!p) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -440,13 +440,13 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(p = strchr(p, ':'))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> *p++ = '\0';
</span><span class="cx">
</span><span class="cx"> if (!p) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_ERROR, "Parse Error\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> if (var_total) {
</span><span class="cx"> int tmp = atoi(var_total);
</span><span class="cx"> if (tmp > 0 && tmp < 100) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setting ring total to %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(originate_status[i].peer_session), SWITCH_LOG_DEBUG, "%s setting ring total to %d\n",
</ins><span class="cx"> switch_channel_get_name(originate_status[i].peer_channel), tmp);
</span><span class="cx"> oglobals->monitor_early_media_ring_total = tmp;
</span><span class="cx"> }
</span><span class="lines">@@ -562,9 +562,9 @@
</span><span class="cx"> if (switch_core_session_get_read_impl(originate_status[pindex].peer_session, &impl) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_snprintf(tmp, sizeof(tmp), "%s@%uh@%ui", impl.iananame, impl.samples_per_second, impl.microseconds_per_packet / 1000);
</span><span class="cx"> switch_channel_set_variable(caller_channel, "absolute_codec_string", tmp);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "Setting codec string on %s to %s\n", switch_channel_get_name(caller_channel), tmp);
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Error inheriting codec. Channel %s has no read codec yet.\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(originate_status[pindex].peer_channel), SWITCH_LOG_WARNING, "Error inheriting codec. Channel %s has no read codec yet.\n",
</ins><span class="cx"> switch_channel_get_name(originate_status[pindex].peer_channel));
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -676,7 +676,7 @@
</span><span class="cx"> switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
</span><span class="cx"> read_codec->implementation->actual_samples_per_second, read_codec->implementation->microseconds_per_packet / 1000);
</span><span class="cx">
</span><span class="lines">@@ -701,7 +701,7 @@
</span><span class="cx"> ringback_data = tmp_data;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback File [%s]\n", ringback_data);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Play Ringback File [%s]\n", ringback_data);
</ins><span class="cx">
</span><span class="cx"> ringback.fhb.channels = read_codec->implementation->number_of_channels;
</span><span class="cx"> ringback.fhb.samplerate = read_codec->implementation->actual_samples_per_second;
</span><span class="lines">@@ -710,7 +710,7 @@
</span><span class="cx"> read_codec->implementation->number_of_channels,
</span><span class="cx"> read_codec->implementation->actual_samples_per_second,
</span><span class="cx"> SWITCH_FILE_FLAG_READ | SWITCH_FILE_DATA_SHORT, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing File\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error Playing File\n");
</ins><span class="cx"> switch_safe_free(tmp_data);
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -733,9 +733,9 @@
</span><span class="cx">
</span><span class="cx"> teletone_init_session(&ringback.ts, 0, teletone_handler, &ringback);
</span><span class="cx"> ringback.ts.rate = read_codec->implementation->actual_samples_per_second;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Play Ringback Tone [%s]\n", ringback_data);
</ins><span class="cx"> if (teletone_run(&ringback.ts, ringback_data)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Error Playing Tone\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Error Playing Tone\n");
</ins><span class="cx"> teletone_destroy_session(&ringback.ts);
</span><span class="cx"> switch_buffer_destroy(&ringback.audio_buffer);
</span><span class="cx"> ringback_data = NULL;
</span><span class="lines">@@ -745,7 +745,7 @@
</span><span class="cx"> switch_safe_free(tmp_data);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Codec Error!\n");
</ins><span class="cx"> if (caller_channel) {
</span><span class="cx"> switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE);
</span><span class="cx"> }
</span><span class="lines">@@ -943,7 +943,7 @@
</span><span class="cx"> odata = strdup(bridgeto);
</span><span class="cx">
</span><span class="cx"> if (!odata) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Memory Error!\n");
</ins><span class="cx"> status = SWITCH_STATUS_MEMERR;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -987,7 +987,7 @@
</span><span class="cx"> continue;
</span><span class="cx">
</span><span class="cx"> var_extract_error:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Parse Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Parse Error!\n");
</ins><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -998,7 +998,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(data)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "No origination URL specified!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "No origination URL specified!\n");
</ins><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -1024,7 +1024,7 @@
</span><span class="cx"> for (x = 0; x < var_count; x++) {
</span><span class="cx"> char *inner_var_array[2] = { 0 };
</span><span class="cx"> int inner_var_count;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "variable string %d = [%s]\n", x, var_array[x]);
</ins><span class="cx"> if ((inner_var_count =
</span><span class="cx"> switch_separate_string(var_array[x], '=', inner_var_array, (sizeof(inner_var_array) / sizeof(inner_var_array[0])))) == 2) {
</span><span class="cx"> switch_event_del_header(var_event, inner_var_array[0]);
</span><span class="lines">@@ -1209,7 +1209,7 @@
</span><span class="cx"> if (tmp > 0 && tmp < 101) {
</span><span class="cx"> retries = tmp;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Invalid originate_retries setting of %d ignored, value must be between 1 and 100\n", tmp);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1220,7 +1220,7 @@
</span><span class="cx"> if (tmp >= 500 && tmp <= 60000) {
</span><span class="cx"> sleep_ms = tmp;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Invalid originate_retry_sleep_ms setting of %d ignored, value must be between 500 and 60000\n", tmp);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1264,7 +1264,7 @@
</span><span class="cx"> or_argc = switch_separate_string(loop_data, '|', pipe_names, (sizeof(pipe_names) / sizeof(pipe_names[0])));
</span><span class="cx">
</span><span class="cx"> if ((flags & SOF_NOBLOCK) && or_argc > 1) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Only calling the first element in the list in this mode.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Only calling the first element in the list in this mode.\n");
</ins><span class="cx"> or_argc = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1293,7 +1293,7 @@
</span><span class="cx"> myflags = dftflags;
</span><span class="cx">
</span><span class="cx"> if (try > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_NOTICE, "Originate attempt %d/%d in %d ms\n", try + 1, retries, sleep_ms);
</ins><span class="cx"> if (caller_channel) {
</span><span class="cx"> switch_ivr_sleep(oglobals.session, sleep_ms, SWITCH_TRUE, NULL);
</span><span class="cx"> if (!switch_channel_ready(caller_channel)) {
</span><span class="lines">@@ -1325,7 +1325,7 @@
</span><span class="cx"> and_argc = switch_separate_string(pipe_names[r], ',', peer_names, (sizeof(peer_names) / sizeof(peer_names[0])));
</span><span class="cx">
</span><span class="cx"> if ((flags & SOF_NOBLOCK) && and_argc > 1) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Only calling the first element in the list in this mode.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Only calling the first element in the list in this mode.\n");
</ins><span class="cx"> and_argc = 1;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1507,7 +1507,7 @@
</span><span class="cx">
</span><span class="cx"> if ((reason = switch_core_session_outgoing_channel(oglobals.session, var_event, chan_type,
</span><span class="cx"> new_profile, &new_session, &pool, myflags)) != SWITCH_CAUSE_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot create outgoing channel of type [%s] cause: [%s]\n",
</ins><span class="cx"> chan_type, switch_channel_cause2str(reason));
</span><span class="cx">
</span><span class="cx"> if (pool) {
</span><span class="lines">@@ -1585,7 +1585,7 @@
</span><span class="cx"> if ((vvar = switch_channel_get_variable(originate_status[i].peer_channel, "leg_timeout"))) {
</span><span class="cx"> int val = atoi(vvar);
</span><span class="cx"> if (val > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg timeout to %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Setting leg timeout to %d\n",
</ins><span class="cx"> switch_channel_get_name(originate_status[0].peer_channel), val);
</span><span class="cx"> originate_status[i].per_channel_timelimit_sec = (uint32_t) val;
</span><span class="cx"> }
</span><span class="lines">@@ -1594,7 +1594,7 @@
</span><span class="cx"> if ((vvar = switch_channel_get_variable(originate_status[i].peer_channel, "leg_progress_timeout"))) {
</span><span class="cx"> int val = atoi(vvar);
</span><span class="cx"> if (val > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg progress timeout to %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Setting leg progress timeout to %d\n",
</ins><span class="cx"> switch_channel_get_name(originate_status[0].peer_channel), val);
</span><span class="cx"> originate_status[i].per_channel_progress_timelimit_sec = (uint32_t) val;
</span><span class="cx"> }
</span><span class="lines">@@ -1603,7 +1603,7 @@
</span><span class="cx"> if ((vvar = switch_channel_get_variable(originate_status[i].peer_channel, "leg_delay_start"))) {
</span><span class="cx"> int val = atoi(vvar);
</span><span class="cx"> if (val > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Setting leg delay start to %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Setting leg delay start to %d\n",
</ins><span class="cx"> switch_channel_get_name(originate_status[0].peer_channel), val);
</span><span class="cx"> originate_status[i].per_channel_delay_start = (uint32_t) val;
</span><span class="cx"> }
</span><span class="lines">@@ -1699,7 +1699,7 @@
</span><span class="cx"> if (ringback_data && !switch_channel_test_flag(caller_channel, CF_ANSWERED)
</span><span class="cx"> && !switch_channel_test_flag(caller_channel, CF_EARLY_MEDIA)) {
</span><span class="cx"> if ((status = switch_channel_pre_answer(caller_channel)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(caller_channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(caller_channel));
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1715,7 +1715,7 @@
</span><span class="cx"> switch_core_session_get_pool(oglobals.session)) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(oglobals.session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Raw Codec Activation Success L16@%uhz 1 channel %dms\n",
</span><span class="cx"> read_codec->implementation->actual_samples_per_second,
</span><span class="cx"> read_codec->implementation->microseconds_per_packet / 1000);
</span><span class="lines">@@ -1742,7 +1742,7 @@
</span><span class="cx"> ringback_data = tmp_data;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Play Ringback File [%s]\n", ringback_data);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(oglobals.session), SWITCH_LOG_DEBUG, "Play Ringback File [%s]\n", ringback_data);
</ins><span class="cx">
</span><span class="cx"> ringback.fhb.channels = read_codec->implementation->number_of_channels;
</span><span class="cx"> ringback.fhb.samplerate = read_codec->implementation->actual_samples_per_second;
</span><span class="lines">@@ -1788,7 +1788,7 @@
</span><span class="cx"> switch_safe_free(tmp_data);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(caller_channel), SWITCH_LOG_ERROR, "Codec Error!\n");
</ins><span class="cx"> switch_channel_hangup(caller_channel, SWITCH_CAUSE_NORMAL_TEMPORARY_FAILURE);
</span><span class="cx"> read_codec = NULL;
</span><span class="cx"> }
</span><span class="lines">@@ -2020,7 +2020,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(caller_channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(peer_channel), SWITCH_LOG_DEBUG, "%s Media Establishment Failed.\n", switch_channel_get_name(caller_channel));
</ins><span class="cx"> switch_channel_hangup(peer_channel, SWITCH_CAUSE_INCOMPATIBLE_DESTINATION);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2058,7 +2058,7 @@
</span><span class="cx"> switch_process_import(oglobals.session, peer_channel, "import");
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(oglobals.session), SWITCH_LOG_DEBUG, "Originate Resulted in Success: [%s]\n", switch_channel_get_name(peer_channel));
</ins><span class="cx"> *cause = SWITCH_CAUSE_SUCCESS;
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="lines">@@ -2131,11 +2131,11 @@
</span><span class="cx">
</span><span class="cx"> if (oglobals.idx == IDX_CANCEL) {
</span><span class="cx"> *cause = SWITCH_CAUSE_ORIGINATOR_CANCEL;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(oglobals.session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Originate Cancelled by originator termination Cause: %d [%s]\n", *cause, switch_channel_cause2str(*cause));
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(oglobals.session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Originate Resulted in Error Cause: %d [%s]\n", *cause, switch_channel_cause2str(*cause));
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_play_sayc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_play_say.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_play_say.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_ivr_play_say.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> int pause = 100;
</span><span class="cx">
</span><span class="cx"> if (!macro_name) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "No phrase macro specified.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "No phrase macro specified.\n");
</ins><span class="cx"> return status;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> if (!chan_lang) {
</span><span class="cx"> chan_lang = "en";
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No language specified - Using [%s]\n", chan_lang);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "No language specified - Using [%s]\n", chan_lang);
</ins><span class="cx"> } else {
</span><span class="cx"> chan_lang = lang;
</span><span class="cx"> }
</span><span class="lines">@@ -135,17 +135,17 @@
</span><span class="cx"> switch_channel_event_set_data(channel, hint_data);
</span><span class="cx">
</span><span class="cx"> if (switch_xml_locate("phrases", NULL, NULL, NULL, &xml, &cfg, hint_data, SWITCH_TRUE) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Open of phrases failed.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Open of phrases failed.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(macros = switch_xml_child(cfg, "macros"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find macros tag.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find macros tag.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(language = switch_xml_child(macros, "language"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find language tag.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find language tag.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!language) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find language %s.\n", chan_lang);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find language %s.\n", chan_lang);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -187,7 +187,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(macro = switch_xml_child(language, "macro"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find any macro tags.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find any macro tags.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -199,7 +199,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!macro) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find macro %s.\n", macro_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find macro %s.\n", macro_name);
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -211,7 +211,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(input = switch_xml_child(macro, "input"))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't find any input tags.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't find any input tags.\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -250,7 +250,7 @@
</span><span class="cx"> if (strchr(pattern, '(') && strchr(adata, '$')) {
</span><span class="cx"> len = (uint32_t) (strlen(data) + strlen(adata) + 10) * proceed;
</span><span class="cx"> if (!(substituted = malloc(len))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Memory Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Memory Error!\n");
</ins><span class="cx"> switch_regex_safe_free(re);
</span><span class="cx"> switch_safe_free(expanded);
</span><span class="cx"> goto done;
</span><span class="lines">@@ -270,7 +270,7 @@
</span><span class="cx"> odata = expanded;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s:%s)\n", func, odata, chan_lang, module_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Handle %s:[%s] (%s:%s)\n", func, odata, chan_lang, module_name);
</ins><span class="cx">
</span><span class="cx"> if (!strcasecmp(func, "play-file")) {
</span><span class="cx"> status = switch_ivr_play_file(session, NULL, odata, args);
</span><span class="lines">@@ -285,7 +285,7 @@
</span><span class="cx"> cmd = switch_core_session_strdup(session, odata);
</span><span class="cx">
</span><span class="cx"> if (!cmd) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Allocation error calling execute\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Allocation error calling execute\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -299,7 +299,7 @@
</span><span class="cx"> status = switch_core_session_exec(session, app, cmd_args);
</span><span class="cx"> UNPROTECT_INTERFACE(app);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Application %s\n", cmd);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Application %s\n", cmd);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(func, "say")) {
</span><span class="cx"> switch_say_interface_t *si;
</span><span class="lines">@@ -311,7 +311,7 @@
</span><span class="cx"> si->say_function(session, odata, switch_ivr_get_say_type_by_name(say_type), switch_ivr_get_say_method_by_name(say_method),
</span><span class="cx"> args);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid SAY Interface [%s]!\n", module_name);
</ins><span class="cx"> }
</span><span class="cx"> } else if (!strcasecmp(func, "speak-text")) {
</span><span class="cx"> const char *my_tts_engine = switch_xml_attr(action, "tts-engine");
</span><span class="lines">@@ -325,7 +325,7 @@
</span><span class="cx"> my_tts_voice = tts_voice;
</span><span class="cx"> }
</span><span class="cx"> if (switch_strlen_zero(tts_engine) || switch_strlen_zero(tts_voice)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "TTS is not configured\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "TTS is not configured\n");
</ins><span class="cx"> } else {
</span><span class="cx"> status = switch_ivr_speak_text(session, my_tts_engine, my_tts_voice, odata, args);
</span><span class="cx"> }
</span><span class="lines">@@ -361,7 +361,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!matches) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Macro [%s] did not match any patterns\n", macro_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Macro [%s] did not match any patterns\n", macro_name);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (old_sound_prefix) {
</span><span class="lines">@@ -445,7 +445,7 @@
</span><span class="cx"> read_impl.number_of_channels,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
</span><span class="cx"> switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated, ready to waste resources!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activated, ready to waste resources!\n");
</ins><span class="cx"> write_frame.data = write_buf;
</span><span class="cx"> write_frame.buflen = sizeof(write_buf);
</span><span class="cx"> write_frame.datalen = read_impl.decoded_bytes_per_packet;
</span><span class="lines">@@ -546,10 +546,10 @@
</span><span class="cx"> read_impl.number_of_channels,
</span><span class="cx"> SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
</span><span class="cx"> switch_core_session_get_pool(session)) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
</ins><span class="cx"> switch_core_session_set_read_codec(session, &codec);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR,
</ins><span class="cx"> "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate,
</span><span class="cx"> fh->channels, read_impl.microseconds_per_packet / 1000);
</span><span class="cx"> switch_core_file_close(fh);
</span><span class="lines">@@ -564,7 +564,7 @@
</span><span class="cx">
</span><span class="cx"> if (fh->thresh) {
</span><span class="cx"> if (asis) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Can't detect silence on a native recording.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Can't detect silence on a native recording.\n");
</ins><span class="cx"> } else {
</span><span class="cx"> if (fh->silence_hits) {
</span><span class="cx"> fh->silence_hits = fh->samplerate * fh->silence_hits / read_impl.samples_per_packet;
</span><span class="lines">@@ -943,7 +943,7 @@
</span><span class="cx"> }
</span><span class="cx"> continue;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Args\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Args\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> } else if (!strncasecmp(file, "say:", 4)) {
</span><span class="lines">@@ -977,7 +977,7 @@
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid Args\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Args\n");
</ins><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1094,12 +1094,12 @@
</span><span class="cx"> NULL,
</span><span class="cx"> fh->samplerate,
</span><span class="cx"> interval, fh->channels, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL, pool) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session),
</ins><span class="cx"> SWITCH_LOG_DEBUG, "Codec Activated %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, fh->channels, interval);
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG,
</ins><span class="cx"> "Raw Codec Activation Failed %s@%uhz %u channels %dms\n", codec_name, fh->samplerate, fh->channels, interval);
</span><span class="cx"> switch_core_file_close(fh);
</span><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="lines">@@ -1119,14 +1119,14 @@
</span><span class="cx">
</span><span class="cx"> len = samples * 2;
</span><span class="cx"> if (switch_core_timer_init(&timer, timer_name, interval, samples, pool) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setup timer failed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n");
</ins><span class="cx"> switch_core_codec_destroy(&codec);
</span><span class="cx"> switch_core_file_close(fh);
</span><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx"> status = SWITCH_STATUS_GENERR;
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", len, interval);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", len, interval);
</ins><span class="cx"> }
</span><span class="cx"> write_frame.rate = fh->samplerate;
</span><span class="cx">
</span><span class="lines">@@ -1388,7 +1388,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done playing file\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done playing file\n");
</ins><span class="cx">
</span><span class="cx"> if (read_impl.samples_per_second) switch_channel_set_variable_printf(channel, "playback_ms", "%d", fh->samples_out / read_impl.samples_per_second);
</span><span class="cx"> switch_channel_set_variable_printf(channel, "playback_samples", "%d", fh->samples_out);
</span><span class="lines">@@ -1572,7 +1572,7 @@
</span><span class="cx"> switch_assert(session);
</span><span class="cx">
</span><span class="cx"> if (max_digits < min_digits) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING,
</ins><span class="cx"> "Max digits %u is less than Min %u, forcing Max to %u\n", max_digits, min_digits, min_digits);
</span><span class="cx"> max_digits = min_digits;
</span><span class="cx"> }
</span><span class="lines">@@ -1581,7 +1581,7 @@
</span><span class="cx"> switch_channel_set_variable(channel, SWITCH_READ_RESULT_VARIABLE, NULL);
</span><span class="cx">
</span><span class="cx"> if ((min_digits && digit_buffer_length < min_digits) || digit_buffer_length < max_digits) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Buffer too small!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Buffer too small!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1679,7 +1679,7 @@
</span><span class="cx"> if (switch_strlen_zero(digits_regex)) {
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Test Regex [%s][%s]\n", digit_buffer, digits_regex);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Test Regex [%s][%s]\n", digit_buffer, digits_regex);
</ins><span class="cx"> if (switch_regex_match(digit_buffer, digits_regex) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> } else {
</span><span class="lines">@@ -1778,7 +1778,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_core_speech_feed_tts(sh, text, &flags);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Speaking text: %s\n", text);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Speaking text: %s\n", text);
</ins><span class="cx"> switch_safe_free(tmp);
</span><span class="cx"> text = NULL;
</span><span class="cx">
</span><span class="lines">@@ -1950,7 +1950,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "done speaking text\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "done speaking text\n");
</ins><span class="cx"> flags = 0;
</span><span class="cx"> switch_core_speech_flush_tts(sh);
</span><span class="cx"> return status;
</span><span class="lines">@@ -2046,7 +2046,7 @@
</span><span class="cx"> memset(sh, 0, sizeof(*sh));
</span><span class="cx"> if (switch_core_speech_open(sh, tts_name, voice_name, (uint32_t) rate, interval,
</span><span class="cx"> &flags, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Invalid TTS module!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid TTS module!\n");
</ins><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="cx"> if (cache_obj) {
</span><span class="cx"> switch_channel_set_private(channel, SWITCH_CACHE_SPEECH_HANDLES_OBJ_NAME, NULL);
</span><span class="lines">@@ -2061,7 +2061,7 @@
</span><span class="cx"> if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "OPEN TTS %s\n", tts_name);
</ins><span class="cx">
</span><span class="cx"> codec_name = "L16";
</span><span class="cx">
</span><span class="lines">@@ -2070,9 +2070,9 @@
</span><span class="cx"> codec_name,
</span><span class="cx"> NULL, (int) rate, interval, 1, SWITCH_CODEC_FLAG_ENCODE | SWITCH_CODEC_FLAG_DECODE, NULL,
</span><span class="cx"> pool) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activated\n");
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz 1 channel %dms\n", codec_name, rate, interval);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Raw Codec Activation Failed %s@%uhz 1 channel %dms\n", codec_name, rate, interval);
</ins><span class="cx"> flags = 0;
</span><span class="cx"> switch_core_speech_close(sh, &flags);
</span><span class="cx"> switch_core_session_reset(session, SWITCH_TRUE, SWITCH_TRUE);
</span><span class="lines">@@ -2088,7 +2088,7 @@
</span><span class="cx"> if (timer_name) {
</span><span class="cx"> if (need_create) {
</span><span class="cx"> if (switch_core_timer_init(timer, timer_name, interval, (int) sh->samples, pool) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Setup timer failed!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Setup timer failed!\n");
</ins><span class="cx"> switch_core_codec_destroy(write_frame.codec);
</span><span class="cx"> flags = 0;
</span><span class="cx"> switch_core_speech_close(sh, &flags);
</span><span class="lines">@@ -2098,7 +2098,7 @@
</span><span class="cx"> }
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", sh->samples * 2, interval);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Setup timer success %u bytes per %d ms!\n", sh->samples * 2, interval);
</ins><span class="cx"> }
</span><span class="cx"> /* start a thread to absorb incoming audio */
</span><span class="cx"> switch_core_service_session(session);
</span><span class="lines">@@ -2200,7 +2200,7 @@
</span><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Channel %s is not in a bridge\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "Channel %s is not in a bridge\n", switch_channel_get_name(channel));
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_logc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_log.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_log.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_log.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -401,6 +401,7 @@
</span><span class="cx"> node->content = content;
</span><span class="cx"> node->timestamp = now;
</span><span class="cx"> node->channel = channel;
</span><ins>+ node->userdata = userdata;
</ins><span class="cx">
</span><span class="cx"> if (switch_queue_trypush(LOG_QUEUE, node) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> free(node->data);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_swigc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_swig.c (14508 => 14509)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_swig.c 2009-08-13 19:57:00 UTC (rev 14508)
+++ freeswitch/trunk/src/switch_swig.c 2009-08-13 20:35:02 UTC (rev 14509)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_ivr_originate(session, &peer_session, &cause, bridgeto, timelimit, NULL, NULL, NULL, NULL, SOF_NONE) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot Create Outgoing Channel!\n");
</ins><span class="cx"> switch_channel_hangup(caller_channel, SWITCH_CAUSE_REQUESTED_CHAN_UNAVAIL);
</span><span class="cx"> return;
</span><span class="cx"> } else {
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>