<!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][14511] </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=14511">14511</a></dd>
<dt>Author</dt> <dd>mrene</dd>
<dt>Date</dt> <dd>2009-08-13 16:52:05 -0500 (Thu, 13 Aug 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Per-call logging, part three</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmoddialplansmod_dialplan_directorymod_dialplan_directoryc">freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_alsamod_alsac">freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_dingalingmod_dingalingc">freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_iaxmod_iaxc">freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_loopbackmod_loopbackc">freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_opalmod_opalcpp">freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_portaudiomod_portaudioc">freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_referencemod_referencec">freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_unicallmod_unicallc">freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.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>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmoddialplansmod_dialplan_directorymod_dialplan_directoryc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/dialplans/mod_dialplan_directory/mod_dialplan_directory.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> caller_profile = switch_channel_get_caller_profile(channel);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Hello %s You Dialed %s!\n", caller_profile->caller_id_name,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Hello %s You Dialed %s!\n", caller_profile->caller_id_name,
</ins><span class="cx"> caller_profile->destination_number);
</span><span class="cx">
</span><span class="cx"> if (!(globals.directory_name && globals.host && globals.dn && globals.base && globals.pass)) {
</span><span class="lines">@@ -106,7 +106,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_core_directory_open(&dh, globals.directory_name, globals.host, globals.dn, globals.pass, NULL) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Can't connect\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Can't connect\n");
</ins><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -119,11 +119,11 @@
</span><span class="cx"> switch_core_directory_query(&dh, globals.base, filter);
</span><span class="cx"> while (switch_core_directory_next(&dh) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> while (switch_core_directory_next_pair(&dh, &var, &val) == SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DIRECTORY VALUE [%s]=[%s]\n", var, val);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "DIRECTORY VALUE [%s]=[%s]\n", var, val);
</ins><span class="cx"> if (!strcasecmp(var, "callflow")) {
</span><span class="cx"> if (!extension) {
</span><span class="cx"> if ((extension = switch_caller_extension_new(session, caller_profile->destination_number, 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"> goto out;
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_alsamod_alsac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_alsa/mod_alsa.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx"> if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL INIT %d %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL INIT %d %d\n",
</ins><span class="cx"> switch_channel_get_name(channel), switch_channel_get_state(channel), switch_test_flag(tech_pvt, TFLAG_ANSWER));
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -229,12 +229,12 @@
</span><span class="cx">
</span><span class="cx"> if (engage_device(fh.samplerate, fh.channels) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ring Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Ring Error!\n");
</ins><span class="cx"> switch_core_file_close(&fh);
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file);
</ins><span class="cx"> ring_file = NULL;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", buf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s\n", buf);
</ins><span class="cx"> last = switch_micro_time_now();
</span><span class="cx"> if (ring_file) {
</span><span class="cx"> unsigned int pos = 0;
</span><span class="lines">@@ -312,7 +312,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -329,7 +329,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -463,7 +463,7 @@
</span><span class="cx"> switch_core_file_close(&tech_pvt->fh);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -487,7 +487,7 @@
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -495,7 +495,7 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -510,7 +510,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -523,7 +523,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%c]\n", tech_pvt->call_id, dtmf->digit);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%c]\n", tech_pvt->call_id, dtmf->digit);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -567,7 +567,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(session), SWITCH_LOG_ERROR, "Can't load codec?\n");
</ins><span class="cx"> switch_core_codec_destroy(&globals.read_codec);
</span><span class="cx"> tech_pvt->hold_file = NULL;
</span><span class="cx"> goto cng;
</span><span class="lines">@@ -711,7 +711,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_PROGRESS:
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engage Early Media\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Engage Early Media\n");
</ins><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -792,7 +792,7 @@
</span><span class="cx"> tech_pvt->session = *new_session;
</span><span class="cx"> globals.flags = GFLAG_EAR | GFLAG_MOUTH;
</span><span class="cx"> } else {
</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"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -808,7 +808,7 @@
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_dingalingmod_dingalingc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_dingaling/mod_dingaling.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -695,7 +695,7 @@
</span><span class="cx"> switch_channel_state_t state = switch_channel_get_state(channel);
</span><span class="cx"> struct private_object *tech_pvt = NULL;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Terminate called from line %d state=%s\n", line, switch_channel_state_name(state));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*session), SWITCH_LOG_DEBUG, "Terminate called from line %d state=%s\n", line, switch_channel_state_name(state));
</ins><span class="cx">
</span><span class="cx"> tech_pvt = switch_core_session_get_private(*session);
</span><span class="cx">
</span><span class="lines">@@ -830,7 +830,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!(tech_pvt->remote_ip && tech_pvt->remote_port)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "No valid candidates received!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "No valid candidates received!\n");
</ins><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -842,14 +842,14 @@
</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_DEBUG, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Can't load codec?\n");
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx"> tech_pvt->read_frame.rate = tech_pvt->read_codec.implementation->samples_per_second;
</span><span class="cx"> tech_pvt->read_frame.codec = &tech_pvt->read_codec;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Read Codec to %s@%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Set Read Codec to %s@%d\n",
</ins><span class="cx"> tech_pvt->codec_name, (int) tech_pvt->read_codec.implementation->samples_per_second);
</span><span class="cx">
</span><span class="cx"> if (switch_core_codec_init(&tech_pvt->write_codec,
</span><span class="lines">@@ -860,11 +860,11 @@
</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_DEBUG, "Can't load codec?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Can't load codec?\n");
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Set Write Codec to %s@%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Set Write Codec to %s@%d\n",
</ins><span class="cx"> tech_pvt->codec_name, (int) tech_pvt->write_codec.implementation->samples_per_second);
</span><span class="cx">
</span><span class="cx"> switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
</span><span class="lines">@@ -877,7 +877,7 @@
</span><span class="cx"> tech_pvt->local_port = external_port;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "SETUP RTP %s:%d -> %s:%d\n", tech_pvt->profile->ip,
</ins><span class="cx"> tech_pvt->local_port, tech_pvt->remote_ip, tech_pvt->remote_port);
</span><span class="cx">
</span><span class="cx"> flags = SWITCH_RTP_FLAG_DATAWAIT | SWITCH_RTP_FLAG_GOOGLEHACK | SWITCH_RTP_FLAG_AUTOADJ | SWITCH_RTP_FLAG_RAW_WRITE | SWITCH_RTP_FLAG_AUTO_CNG;
</span><span class="lines">@@ -899,7 +899,7 @@
</span><span class="cx"> tech_pvt->read_codec.implementation->samples_per_packet,
</span><span class="cx"> tech_pvt->read_codec.implementation->microseconds_per_packet,
</span><span class="cx"> flags, tech_pvt->profile->timer_name, &err, switch_core_session_get_pool(tech_pvt->session)))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "RTP ERROR %s\n", err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "RTP ERROR %s\n", err);
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return 0;
</span><span class="cx"> } else {
</span><span class="lines">@@ -909,7 +909,7 @@
</span><span class="cx"> switch_rtp_activate_ice(tech_pvt->rtp_session, tech_pvt->remote_user, tech_pvt->local_user);
</span><span class="cx"> if ((vad_in && inb) || (vad_out && !inb)) {
</span><span class="cx"> if (switch_rtp_enable_vad(tech_pvt->rtp_session, tech_pvt->session, &tech_pvt->read_codec, SWITCH_VAD_FLAG_TALKING) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "VAD ERROR %s\n", err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "VAD ERROR %s\n", err);
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="lines">@@ -963,21 +963,21 @@
</span><span class="cx"> cand[0].port = tech_pvt->stun_port;
</span><span class="cx"> } else {
</span><span class="cx"> if (!stun_ip) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! NO STUN SERVER!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Stun Failed! NO STUN SERVER!\n");
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> cand[0].address = tech_pvt->profile->ip;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Stun Lookup Local %s:%d\n", cand[0].address, cand[0].port);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Stun Lookup Local %s:%d\n", cand[0].address, cand[0].port);
</ins><span class="cx"> if (switch_stun_lookup
</span><span class="cx"> (&cand[0].address, &cand[0].port, stun_ip, SWITCH_STUN_DEFAULT_PORT, &err,
</span><span class="cx"> switch_core_session_get_pool(tech_pvt->session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, err);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Stun Failed! %s:%d [%s]\n", stun_ip, SWITCH_STUN_DEFAULT_PORT, err);
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return 0;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Stun Success %s:%d\n", cand[0].address, cand[0].port);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_INFO, "Stun Success %s:%d\n", cand[0].address, cand[0].port);
</ins><span class="cx"> }
</span><span class="cx"> cand[0].type = "stun";
</span><span class="cx"> tech_pvt->stun_ip = switch_core_session_strdup(tech_pvt->session, cand[0].address);
</span><span class="lines">@@ -991,7 +991,7 @@
</span><span class="cx"> cand[0].password = tech_pvt->local_pass;
</span><span class="cx"> cand[0].pref = 1;
</span><span class="cx"> cand[0].protocol = "udp";
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Candidate %s:%d [%s]\n", cand[0].address, cand[0].port, cand[0].username);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Send Candidate %s:%d [%s]\n", cand[0].address, cand[0].port, cand[0].username);
</ins><span class="cx"> tech_pvt->cand_id = ldl_session_candidates(tech_pvt->dlsession, cand, 1);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_RTP_READY);
</span><span class="lines">@@ -1039,7 +1039,7 @@
</span><span class="cx">
</span><span class="cx"> if (force || !switch_test_flag(tech_pvt, TFLAG_CODEC_READY)) {
</span><span class="cx"> if (tech_pvt->codec_index < 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Don't have my codec yet here's one\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Don't have my codec yet here's one\n");
</ins><span class="cx"> tech_pvt->codec_name = lame(tech_pvt->codecs[0]->iananame);
</span><span class="cx"> tech_pvt->codec_num = tech_pvt->codecs[0]->ianacode;
</span><span class="cx"> tech_pvt->codec_rate = tech_pvt->codecs[0]->samples_per_second;
</span><span class="lines">@@ -1059,7 +1059,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Send Describe [%s@%d]\n", payloads[0].name, payloads[0].rate);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_DEBUG, "Send Describe [%s@%d]\n", payloads[0].name, payloads[0].rate);
</ins><span class="cx"> tech_pvt->desc_id =
</span><span class="cx"> ldl_session_describe(tech_pvt->dlsession, payloads, 1,
</span><span class="cx"> switch_test_flag(tech_pvt, TFLAG_OUTBOUND) ? LDL_DESCRIPTION_INITIATE : LDL_DESCRIPTION_ACCEPT);
</span><span class="lines">@@ -1192,7 +1192,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1209,7 +1209,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1225,7 +1225,7 @@
</span><span class="cx"> if (tech_pvt) {
</span><span class="cx"> if (tech_pvt->rtp_session) {
</span><span class="cx"> switch_rtp_destroy(&tech_pvt->rtp_session);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "NUKE RTP\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "NUKE RTP\n");
</ins><span class="cx"> tech_pvt->rtp_session = NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1278,7 +1278,7 @@
</span><span class="cx"> ldl_session_destroy(&tech_pvt->dlsession);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1318,7 +1318,7 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -1326,13 +1326,13 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL 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 channel_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1344,7 +1344,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF [%c]\n", dtmf->digit);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "DTMF [%c]\n", dtmf->digit);
</ins><span class="cx">
</span><span class="cx"> return switch_rtp_queue_rfc2833(tech_pvt->rtp_session, dtmf);
</span><span class="cx">
</span><span class="lines">@@ -1629,7 +1629,7 @@
</span><span class="cx"> if ((callto = strchr(profile_name, '/'))) {
</span><span class="cx"> *callto++ = '\0';
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Invalid URL!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG, "Invalid URL!\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_CAUSE_INVALID_NUMBER_FORMAT;
</span><span class="cx"> }
</span><span class="lines">@@ -1674,17 +1674,17 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!ldl_handle_ready(mdl_profile->handle)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! we are not logged in yet!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG, "Doh! we are not logged in yet!\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="cx"> if (!(full_id = ldl_handle_probe(mdl_profile->handle, callto, user, idbuf, sizeof(idbuf)))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unknown Recipient!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG, "Unknown Recipient!\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_NO_USER_RESPONSE);
</span><span class="cx"> return SWITCH_CAUSE_NO_USER_RESPONSE;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Unknown Profile!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG, "Unknown Profile!\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -1701,7 +1701,7 @@
</span><span class="cx"> tech_pvt->session = *new_session;
</span><span class="cx"> tech_pvt->codec_index = -1;
</span><span class="cx"> if (!(tech_pvt->local_port = switch_rtp_request_port(mdl_profile->ip))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP port available!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_CRIT, "No RTP port available!\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -1710,7 +1710,7 @@
</span><span class="cx"> tech_pvt->dnis = switch_core_session_strdup(*new_session, dnis);
</span><span class="cx"> }
</span><span class="cx"> } else {
</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(*new_session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -1725,7 +1725,7 @@
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_DEBUG, "Doh! no caller profile\n");
</ins><span class="cx"> terminate_session(new_session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -2452,7 +2452,7 @@
</span><span class="cx"> switch_assert(handle != NULL);
</span><span class="cx">
</span><span class="cx"> if (!(profile = ldl_handle_get_private(handle))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR NO PROFILE!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "ERROR NO PROFILE!\n");
</ins><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -2474,7 +2474,7 @@
</span><span class="cx">
</span><span class="cx"> case LDL_SIGNAL_SUBSCRIBE:
</span><span class="cx"> if (profile->user_flags & LDL_FLAG_COMPONENT && ldl_jid_domcmp(from, to)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Attempt to add presence from/to our own domain [%s][%s]\n", from, to);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Attempt to add presence from/to our own domain [%s][%s]\n", from, to);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_mutex_lock(profile->mutex);
</span><span class="cx"> if ((sql = switch_mprintf("delete from jabber_subscriptions where sub_from='%q' and sub_to='%q'", from, to))) {
</span><span class="lines">@@ -2657,17 +2657,17 @@
</span><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "using Existing session for %s\n", ldl_session_get_id(dlsession));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "using Existing session for %s\n", ldl_session_get_id(dlsession));
</ins><span class="cx">
</span><span class="cx"> if (switch_channel_down(channel)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Call %s is already over\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Call %s is already over\n", switch_channel_get_name(channel));
</ins><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><span class="cx"> if (dl_signal != LDL_SIGNAL_INITIATE && !msg) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session is already dead\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session is already dead\n");
</ins><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -2691,7 +2691,7 @@
</span><span class="cx"> tech_pvt->codec_index = -1;
</span><span class="cx"> tech_pvt->profile = profile;
</span><span class="cx"> if (!(tech_pvt->local_port = switch_rtp_request_port(profile->ip))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "No RTP port available!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "No RTP port available!\n");
</ins><span class="cx"> terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="lines">@@ -2756,7 +2756,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!tech_pvt->caller_profile) {
</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"> "Creating an identity for %s %s <%s> %s\n", ldl_session_get_id(dlsession), cid_name, cid_num, exten);
</span><span class="cx">
</span><span class="cx"> if ((tech_pvt->caller_profile = switch_caller_profile_new(switch_core_session_get_pool(session),
</span><span class="lines">@@ -2779,18 +2779,18 @@
</span><span class="cx">
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_TRANSPORT_ACCEPT);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Hey where is my memory pool?\n");
</ins><span class="cx"> terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating a session for %s\n", ldl_session_get_id(dlsession));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Creating a session for %s\n", ldl_session_get_id(dlsession));
</ins><span class="cx"> ldl_session_set_private(dlsession, session);
</span><span class="cx"> tech_pvt->dlsession = dlsession;
</span><span class="cx"> switch_channel_set_name(channel, "DingaLing/new");
</span><span class="cx"> switch_channel_set_state(channel, CS_INIT);
</span><span class="cx"> if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error spawning thread\n");
</ins><span class="cx"> terminate_session(&session, __LINE__, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="cx"> goto done;
</span><span class="lines">@@ -2818,7 +2818,7 @@
</span><span class="cx"> switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_BREAK);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "SESSION MSG [%s]\n", msg);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "SESSION MSG [%s]\n", msg);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_event_create(&event, SWITCH_EVENT_MESSAGE) == SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -2871,7 +2871,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->codec_index > -1) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already decided on a codec\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Already decided on a codec\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2885,16 +2885,16 @@
</span><span class="cx">
</span><span class="cx"> if (ldl_session_get_payloads(dlsession, &payloads, &len) == LDL_STATUS_SUCCESS) {
</span><span class="cx"> unsigned int x, y;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%u payloads\n", len);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%u payloads\n", len);
</ins><span class="cx"> for (x = 0; x < len; x++) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Available Payload %s %u\n", payloads[x].name, payloads[x].id);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Available Payload %s %u\n", payloads[x].name, payloads[x].id);
</ins><span class="cx"> for (y = 0; y < tech_pvt->num_codecs; y++) {
</span><span class="cx"> char *name = tech_pvt->codecs[y]->iananame;
</span><span class="cx">
</span><span class="cx"> if (!strncasecmp(name, "ilbc", 4)) {
</span><span class="cx"> name = "ilbc";
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "compare %s %d/%d to %s %d/%d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "compare %s %d/%d to %s %d/%d\n",
</ins><span class="cx"> payloads[x].name, payloads[x].id, payloads[x].rate,
</span><span class="cx"> name, tech_pvt->codecs[y]->ianacode, tech_pvt->codecs[y]->samples_per_second);
</span><span class="cx"> if (tech_pvt->codecs[y]->ianacode > 95) {
</span><span class="lines">@@ -2905,7 +2905,7 @@
</span><span class="cx">
</span><span class="cx"> if (match && payloads[x].rate == tech_pvt->codecs[y]->samples_per_second) {
</span><span class="cx"> tech_pvt->codec_index = y;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Choosing Payload index %u %s %u\n", y, payloads[x].name,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Choosing Payload index %u %s %u\n", y, payloads[x].name,
</ins><span class="cx"> payloads[x].id);
</span><span class="cx"> tech_pvt->codec_name = tech_pvt->codecs[y]->iananame;
</span><span class="cx"> tech_pvt->codec_num = tech_pvt->codecs[y]->ianacode;
</span><span class="lines">@@ -2942,7 +2942,7 @@
</span><span class="cx"> uint8_t lanaddr = 0;
</span><span class="cx">
</span><span class="cx"> if (ldl_session_get_candidates(dlsession, &candidates, &len) != LDL_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Candidate Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Candidate Error!\n");
</ins><span class="cx"> switch_set_flag(tech_pvt, TFLAG_BYE);
</span><span class="cx"> switch_clear_flag(tech_pvt, TFLAG_IO);
</span><span class="cx"> status = LDL_STATUS_FALSE;
</span><span class="lines">@@ -2951,11 +2951,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (tech_pvt->remote_ip) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Already picked an IP [%s]\n", tech_pvt->remote_ip);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Already picked an IP [%s]\n", tech_pvt->remote_ip);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%u candidates\n", len);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%u candidates\n", len);
</ins><span class="cx">
</span><span class="cx"> if (profile->acl_count) {
</span><span class="cx"> for (x = 0; x < len; x++) {
</span><span class="lines">@@ -2967,11 +2967,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (ok) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidate %s:%d PASS ACL %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "candidate %s:%d PASS ACL %s\n",
</ins><span class="cx"> candidates[x].address, candidates[x].port, profile->acl[y]);
</span><span class="cx"> break;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidate %s:%d FAIL ACL %s\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "candidate %s:%d FAIL ACL %s\n",
</ins><span class="cx"> candidates[x].address, candidates[x].port, profile->acl[y]);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2983,7 +2983,7 @@
</span><span class="cx"> lanaddr = strncasecmp(candidates[x].address, profile->lanaddr, strlen(profile->lanaddr)) ? 0 : 1;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "candidates %s:%d\n", candidates[x].address, candidates[x].port);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "candidates %s:%d\n", candidates[x].address, candidates[x].port);
</ins><span class="cx">
</span><span class="cx"> // 192.0.0.0 - 192.0.127.255 is marked as reserved, should we filter all of them?
</span><span class="cx"> if (!strcasecmp(candidates[x].protocol, "udp") &&
</span><span class="lines">@@ -3016,7 +3016,7 @@
</span><span class="cx">
</span><span class="cx"> memset(payloads, 0, sizeof(payloads));
</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"> "Acceptable Candidate %s:%d\n", candidates[choice].address, candidates[choice].port);
</span><span class="cx">
</span><span class="cx"> if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
</span><span class="lines">@@ -3063,24 +3063,24 @@
</span><span class="cx"> break;
</span><span class="cx"> case LDL_SIGNAL_REJECT:
</span><span class="cx"> if (channel) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "reject %s\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "reject %s\n", switch_channel_get_name(channel));
</ins><span class="cx"> terminate_session(&session, __LINE__, SWITCH_CAUSE_CALL_REJECTED);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call (Rejected)\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "End Call (Rejected)\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case LDL_SIGNAL_ERROR:
</span><span class="cx"> case LDL_SIGNAL_TERMINATE:
</span><span class="cx"> if (channel) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "hungup %s\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "hungup %s\n", switch_channel_get_name(channel));
</ins><span class="cx"> terminate_session(&session, __LINE__, SWITCH_CAUSE_NORMAL_CLEARING);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "End Call\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "End Call\n");
</ins><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "ERROR\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "ERROR\n");
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_iaxmod_iaxc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_iax/mod_iax.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (num_codecs <= 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "NO codecs?\n");
</ins><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -290,7 +290,7 @@
</span><span class="cx"> strncat(pref_str, x == len - 1 ? ")" : ",", sizeof(pref_str) - 1);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Codec Prefs Detected: %s\n", pref_str);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_INFO, "Codec Prefs Detected: %s\n", pref_str);
</ins><span class="cx">
</span><span class="cx"> for (x = 0; x < len; x++) {
</span><span class="cx"> if ((prefs[x] & mixed_cap)) {
</span><span class="lines">@@ -341,7 +341,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!dname && !chosen) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "NO codecs?\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "NO codecs?\n");
</ins><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -381,7 +381,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_GENERR;
</span><span class="cx"> } else {
</span><span class="cx"> if (switch_core_codec_init(&tech_pvt->write_codec,
</span><span class="lines">@@ -392,7 +392,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"> switch_core_codec_destroy(&tech_pvt->read_codec);
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> } else {
</span><span class="lines">@@ -400,7 +400,7 @@
</span><span class="cx"> int rate;
</span><span class="cx"> ms = tech_pvt->write_codec.implementation->microseconds_per_packet / 1000;
</span><span class="cx"> rate = tech_pvt->write_codec.implementation->samples_per_second;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Activate Codec %s/%d %d ms\n", dname, rate, ms);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_INFO, "Activate Codec %s/%d %d ms\n", dname, rate, ms);
</ins><span class="cx"> switch_core_session_set_read_codec(tech_pvt->session, &tech_pvt->read_codec);
</span><span class="cx"> switch_core_session_set_write_codec(tech_pvt->session, &tech_pvt->write_codec);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_CODEC);
</span><span class="lines">@@ -491,13 +491,13 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_routing(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL 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 CHANNEL ROUTING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL 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 CHANNEL EXECUTE\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -543,7 +543,7 @@
</span><span class="cx"> iax_session_destroy(&tech_pvt->iax_session);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\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 CHANNEL HANGUP\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx"> globals.calls--;
</span><span class="cx"> if (globals.calls < 0) {
</span><span class="cx"> globals.calls = 0;
</span><span class="lines">@@ -576,13 +576,13 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL 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 channel_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -758,7 +758,7 @@
</span><span class="cx"> channel = switch_core_session_get_channel(*new_session);
</span><span class="cx"> tech_init(tech_pvt, *new_session);
</span><span class="cx"> } else {
</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"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -773,7 +773,7 @@
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -939,7 +939,7 @@
</span><span class="cx">
</span><span class="cx"> if (!switch_test_flag(tech_pvt, TFLAG_CODEC) &&
</span><span class="cx"> (status = iax_set_codec(tech_pvt, iaxevent->session, &format, &cap, &iaxevent->ies.samprate, IAX_SET)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Codec Error %u %u\n", iaxevent->ies.format, iaxevent->ies.capability);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(tech_pvt->session), SWITCH_LOG_ERROR, "Codec Error %u %u\n", iaxevent->ies.format, iaxevent->ies.capability);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return status;
</span><span class="lines">@@ -1001,18 +1001,18 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (globals.debug && iaxevent->etype != IAX_EVENT_VOICE) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Event %d [%s]!\n", iaxevent->etype, IAXNAMES[iaxevent->etype]);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "Event %d [%s]!\n", iaxevent->etype, IAXNAMES[iaxevent->etype]);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_mutex_lock(globals.mutex);
</span><span class="cx"> switch (iaxevent->etype) {
</span><span class="cx"> case IAX_EVENT_REGACK:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration completed successfully.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Registration completed successfully.\n");
</ins><span class="cx"> //if (iaxevent->ies.refresh)
</span><span class="cx"> //refresh = iaxevent->ies.refresh;
</span><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_REGREJ:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Registration failed.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Registration failed.\n");
</ins><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_REGREQ:
</span><span class="cx"> /* what is the right way to handle this? */
</span><span class="lines">@@ -1028,14 +1028,14 @@
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Call accepted.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Call accepted.\n");
</ins><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_RINGA:
</span><span class="cx"> if (channel) {
</span><span class="cx"> switch_core_session_queue_indication(tech_pvt->session, SWITCH_MESSAGE_INDICATE_RINGING);
</span><span class="cx"> switch_channel_mark_ring_ready(channel);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Ringing heard.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Ringing heard.\n");
</ins><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_PONG:
</span><span class="cx"> // informative only
</span><span class="lines">@@ -1045,10 +1045,10 @@
</span><span class="cx"> if (channel) {
</span><span class="cx"> if (tech_media(tech_pvt, iaxevent) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> if (switch_channel_test_flag(channel, CF_ANSWERED)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Multiple Answer %s?\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_WARNING, "Multiple Answer %s?\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Answer %s\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Answer %s\n", switch_channel_get_name(channel));
</ins><span class="cx"> switch_channel_mark_answered(channel);
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><span class="lines">@@ -1058,7 +1058,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_CONNECT:
</span><span class="cx"> // incoming call detected
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE,
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE,
</ins><span class="cx"> "Incoming call connected %s, %s, %s %u/%u\n",
</span><span class="cx"> iaxevent->ies.called_number,
</span><span class="cx"> iaxevent->ies.calling_number, iaxevent->ies.calling_name, iaxevent->ies.format, iaxevent->ies.capability);
</span><span class="lines">@@ -1066,14 +1066,14 @@
</span><span class="cx"> if (iaxevent) {
</span><span class="cx"> switch_core_session_t *session;
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "New Inbound Channel %s!\n", iaxevent->ies.calling_name);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "New Inbound Channel %s!\n", iaxevent->ies.calling_name);
</ins><span class="cx"> if ((session = switch_core_session_request(iax_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL)) != 0) {
</span><span class="cx"> switch_core_session_add_stream(session, NULL);
</span><span class="cx"> if ((tech_pvt = (private_t *) switch_core_session_alloc(session, sizeof(private_t))) != 0) {
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> tech_init(tech_pvt, session);
</span><span class="cx"> } else {
</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"> switch_core_session_destroy(&session);
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="lines">@@ -1106,7 +1106,7 @@
</span><span class="cx"> iax_ring_announce(tech_pvt->iax_session);
</span><span class="cx"> switch_channel_set_state(channel, CS_INIT);
</span><span class="cx"> if (switch_core_session_thread_launch(session) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error spawning thread\n");
</ins><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -1114,7 +1114,7 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_REJECT:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Rejected call.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Rejected call.\n");
</ins><span class="cx"> case IAX_EVENT_BUSY:
</span><span class="cx"> case IAX_EVENT_HANGUP:
</span><span class="cx"> if (channel) {
</span><span class="lines">@@ -1125,7 +1125,7 @@
</span><span class="cx"> switch_mutex_unlock(tech_pvt->flag_mutex);
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Hangup %s\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Hangup %s\n", switch_channel_get_name(channel));
</ins><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_HANGUP);
</span><span class="cx"> switch_channel_hangup(channel, iaxevent->etype == IAX_EVENT_HANGUP ? SWITCH_CAUSE_NORMAL_CLEARING : SWITCH_CAUSE_FACILITY_REJECTED);
</span><span class="cx"> iaxevent->session = NULL;
</span><span class="lines">@@ -1134,7 +1134,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_CNG:
</span><span class="cx"> // pseudo-silence
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "sending silence\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "sending silence\n");
</ins><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_VOICE:
</span><span class="cx"> if (tech_pvt && iaxevent->datalen) {
</span><span class="lines">@@ -1166,13 +1166,13 @@
</span><span class="cx"> }
</span><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_TRANSFER:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_NOTICE, "Call transfer occurred.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_NOTICE, "Call transfer occurred.\n");
</ins><span class="cx"> break;
</span><span class="cx"> case IAX_EVENT_DTMF:
</span><span class="cx"> if (channel) {
</span><span class="cx"> switch_dtmf_t dtmf = { (char) iaxevent->subclass, switch_core_default_dtmf_duration(0) };
</span><span class="cx"> if (globals.debug) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "%c DTMF %s\n", dtmf.digit, switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_INFO, "%c DTMF %s\n", dtmf.digit, switch_channel_get_name(channel));
</ins><span class="cx"> }
</span><span class="cx"> switch_mutex_lock(tech_pvt->flag_mutex);
</span><span class="cx"> switch_channel_queue_dtmf(channel, &dtmf);
</span><span class="lines">@@ -1182,7 +1182,7 @@
</span><span class="cx">
</span><span class="cx"> break;
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Don't know what to do with IAX event %d.\n", iaxevent->etype);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_CHANNEL_LOG(channel), SWITCH_LOG_DEBUG, "Don't know what to do with IAX event %d.\n", iaxevent->etype);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> iax_event_free(iaxevent);
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_loopbackmod_loopbackc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -125,7 +125,7 @@
</span><span class="cx"> switch_core_codec_destroy(&tech_pvt->write_codec);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s setup codec %s/%d/%d\n", switch_channel_get_name(channel), iananame, rate, interval);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s setup codec %s/%d/%d\n", switch_channel_get_name(channel), iananame, rate, interval);
</ins><span class="cx">
</span><span class="cx"> status = switch_core_codec_init(&tech_pvt->read_codec,
</span><span class="cx"> iananame,
</span><span class="lines">@@ -223,12 +223,12 @@
</span><span class="cx"> if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && !switch_test_flag(tech_pvt, TFLAG_BLEG)) {
</span><span class="cx">
</span><span class="cx"> if (!(b_session = switch_core_session_request(loopback_endpoint_interface, SWITCH_CALL_DIRECTION_INBOUND, NULL))) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Failure.\n");
</ins><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_core_session_read_lock(b_session) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Failure.\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Failure.\n");
</ins><span class="cx"> switch_core_session_destroy(&b_session);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -274,7 +274,7 @@
</span><span class="cx"> switch_channel_set_variable(b_channel, "other_loopback_leg_uuid", switch_channel_get_uuid(channel));
</span><span class="cx">
</span><span class="cx"> if (switch_core_session_thread_launch(b_session) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error spawning thread\n");
</ins><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><span class="cx"> goto end;
</span><span class="cx"> }
</span><span class="lines">@@ -323,7 +323,7 @@
</span><span class="cx">
</span><span class="cx"> do_reset(tech_pvt);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -339,7 +339,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -391,7 +391,7 @@
</span><span class="cx">
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> switch_clear_flag_locked(tech_pvt, TFLAG_LINKED);
</span><span class="cx">
</span><span class="lines">@@ -445,14 +445,14 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -467,7 +467,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -478,7 +478,7 @@
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><span class="cx"> do_reset(tech_pvt);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s 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 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">@@ -487,7 +487,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_assert(switch_core_session_get_private(session));
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s 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 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">@@ -503,7 +503,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL CONSUME_MEDIA\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL CONSUME_MEDIA\n");
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -653,7 +653,7 @@
</span><span class="cx"> switch_clear_flag_locked(tech_pvt->other_tech_pvt, TFLAG_WRITE);
</span><span class="cx">
</span><span class="cx"> if (a_uuid && b_uuid) {
</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"> "%s detected bridge on both ends, attempting direct connection.\n", switch_channel_get_name(channel));
</span><span class="cx">
</span><span class="cx"> /* channel_masquerade eat your heart out....... */
</span><span class="lines">@@ -787,7 +787,7 @@
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="cx"> } else {
</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(*new_session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -828,7 +828,7 @@
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_opalmod_opalcpp"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_opal/mod_opal.cpp 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -1034,7 +1034,7 @@
</span><span class="cx">
</span><span class="cx"> if (GetPhase() >= ReleasingPhase) {
</span><span class="cx"> // Call got aborted
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Call abandoned!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(m_fsSession), SWITCH_LOG_ERROR, "Call abandoned!\n");
</ins><span class="cx"> return SWITCH_STATUS_FALSE;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_portaudiomod_portaudioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_portaudio/mod_portaudio.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -198,7 +198,7 @@
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag(tech_pvt, TFLAG_OUTBOUND)) {
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL INIT %d %d\n",
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL INIT %d %d\n",
</ins><span class="cx"> switch_channel_get_name(channel), switch_channel_get_state(channel), switch_test_flag(tech_pvt, TFLAG_ANSWER));
</span><span class="cx">
</span><span class="cx"> if (engage_device(0) != SWITCH_STATUS_SUCCESS) {
</span><span class="lines">@@ -227,12 +227,12 @@
</span><span class="cx">
</span><span class="cx"> if (engage_ring_device() != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Ring Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Ring Error!\n");
</ins><span class="cx"> switch_core_file_close(&fh);
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Cannot open %s, disabling ring file!\n", ring_file);
</ins><span class="cx"> ring_file = NULL;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -265,7 +265,7 @@
</span><span class="cx"> switch_channel_event_set_data(channel, event);
</span><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s\n", buf);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s\n", buf);
</ins><span class="cx"> last = switch_micro_time_now();
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -312,13 +312,13 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_routing(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL 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 CHANNEL ROUTING\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL 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 CHANNEL EXECUTE\n", switch_channel_get_name(switch_core_session_get_channel(session)));
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -493,7 +493,7 @@
</span><span class="cx">
</span><span class="cx"> tech_close_file(tech_pvt);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\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 CHANNEL HANGUP\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">@@ -512,20 +512,20 @@
</span><span class="cx"> default:
</span><span class="cx"> break;
</span><span class="cx"> }
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL KILL\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\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 channel_on_exchange_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -535,7 +535,7 @@
</span><span class="cx"> private_t *tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%c]\n", tech_pvt->call_id, dtmf->digit);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "DTMF ON CALL %s [%c]\n", tech_pvt->call_id, dtmf->digit);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -685,7 +685,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_PROGRESS:
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Engage Early Media\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Engage Early Media\n");
</ins><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_IO);
</span><span class="cx"> }
</span><span class="cx"> default:
</span><span class="lines">@@ -741,7 +741,7 @@
</span><span class="cx"> tech_pvt->session = *new_session;
</span><span class="cx"> globals.flags = GFLAG_EAR | GFLAG_MOUTH;
</span><span class="cx"> } else {
</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(*new_session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -761,7 +761,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -1730,7 +1730,7 @@
</span><span class="cx"> tech_pvt->session = session;
</span><span class="cx"> globals.flags = GFLAG_EAR | GFLAG_MOUTH;
</span><span class="cx"> } else {
</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"> switch_core_session_destroy(&session);
</span><span class="cx"> return SWITCH_STATUS_MEMERR;
</span><span class="cx"> }
</span><span class="lines">@@ -1773,7 +1773,7 @@
</span><span class="cx"> switch_channel_mark_answered(channel);
</span><span class="cx"> switch_channel_set_state(channel, CS_INIT);
</span><span class="cx"> if (switch_core_session_thread_launch(tech_pvt->session) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Error spawning thread\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Error spawning thread\n");
</ins><span class="cx"> switch_core_session_destroy(&session);
</span><span class="cx"> stream->write_function(stream, "FAIL:Thread Error!\n");
</span><span class="cx"> } else {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_referencemod_referencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_reference/mod_reference.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -163,7 +163,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -180,7 +180,7 @@
</span><span class="cx"> tech_pvt = switch_core_session_get_private(session);
</span><span class="cx"> assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL EXECUTE\n", switch_channel_get_name(channel));
</ins><span class="cx">
</span><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="lines">@@ -226,7 +226,7 @@
</span><span class="cx"> //switch_thread_cond_signal(tech_pvt->cond);
</span><span class="cx">
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL HANGUP\n", switch_channel_get_name(channel));
</ins><span class="cx"> switch_mutex_lock(globals.mutex);
</span><span class="cx"> globals.calls--;
</span><span class="cx"> if (globals.calls < 0) {
</span><span class="lines">@@ -267,13 +267,13 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t channel_on_exchange_media(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL LOOPBACK\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL 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 channel_on_soft_execute(switch_core_session_t *session)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "CHANNEL TRANSMIT\n");
</ins><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -426,7 +426,7 @@
</span><span class="cx"> channel = switch_core_session_get_channel(*new_session);
</span><span class="cx"> tech_init(tech_pvt, *new_session);
</span><span class="cx"> } else {
</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(*new_session), SWITCH_LOG_CRIT, "Hey where is my memory pool?\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -441,7 +441,7 @@
</span><span class="cx"> switch_channel_set_caller_profile(channel, caller_profile);
</span><span class="cx"> tech_pvt->caller_profile = caller_profile;
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_unicallmod_unicallc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/endpoints/mod_unicall/mod_unicall.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -1138,7 +1138,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "redirect_audio(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "redirect_audio(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1156,7 +1156,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "transmit_text(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "transmit_text(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1174,12 +1174,12 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "answer(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "answer(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> #if 0
</span><span class="cx"> if ((ret = uc_call_control(uc, UC_OP_ANSWERCALL, crn, NULL)) < 0)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Answer call failed - %s\n", uc_ret_to_str(ret));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Answer call failed - %s\n", uc_ret_to_str(ret));
</ins><span class="cx"> return SWITCH_STATUS_FAILED;
</span><span class="cx"> }
</span><span class="cx"> /*endif*/
</span><span class="lines">@@ -1201,12 +1201,12 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "progress(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "progress(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> #if 0
</span><span class="cx"> if ((ret = uc_call_control(uc, UC_OP_ACCEPTCALL, crn, NULL)) < 0)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Accept call failed - %s\n", uc_ret_to_str(ret));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "Accept call failed - %s\n", uc_ret_to_str(ret));
</ins><span class="cx"> return SWITCH_STATUS_FAILED;
</span><span class="cx"> }
</span><span class="cx"> /*endif*/
</span><span class="lines">@@ -1228,7 +1228,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "bridge(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "bridge(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1246,7 +1246,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unbridge(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unbridge(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1264,7 +1264,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "transfer(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "transfer(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1282,7 +1282,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "ringing(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "ringing(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1300,7 +1300,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "media(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "media(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1318,7 +1318,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "nomedia(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "nomedia(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1336,7 +1336,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "hold(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "hold(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1354,7 +1354,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unhold(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unhold(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1372,7 +1372,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "redirect(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "redirect(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1390,7 +1390,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "respond(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "respond(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1408,7 +1408,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "broadcast(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "broadcast(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1426,7 +1426,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "media_redirect(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "media_redirect(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1444,7 +1444,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "deflect(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "deflect(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1462,7 +1462,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "video_refresh_req(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "video_refresh_req(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1480,7 +1480,7 @@
</span><span class="cx"> uc = tech_pvt->uc;
</span><span class="cx"> assert(uc != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "display(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "display(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -1528,7 +1528,7 @@
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_DISPLAY:
</span><span class="cx"> return display(session, msg);
</span><span class="cx"> default:
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_receive_message(%p) %d\n", (void *) session, msg->message_id);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unicall_receive_message(%p) %d\n", (void *) session, msg->message_id);
</ins><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1555,7 +1555,7 @@
</span><span class="cx"> int hide;
</span><span class="cx"> char name[128];
</span><span class="cx">
</span><del>-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_outgoing_channel(%p)\n", (void *) session);
</del><ins>+switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unicall_outgoing_channel(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> if ((*new_session = switch_core_session_request(unicall_endpoint_interface, SWITCH_CALL_DIRECTION_OUTBOUND, pool)) == NULL)
</span><span class="cx"> {
</span><span class="lines">@@ -1565,7 +1565,7 @@
</span><span class="cx"> switch_core_session_add_stream(*new_session, NULL);
</span><span class="cx"> if ((tech_pvt = (private_t *) switch_core_session_alloc(*new_session, sizeof(private_t))) == NULL)
</span><span class="cx"> {
</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"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -1574,7 +1574,7 @@
</span><span class="cx">
</span><span class="cx"> if (outbound_profile == NULL)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Doh! no caller profile\n");
</ins><span class="cx"> switch_core_session_destroy(new_session);
</span><span class="cx"> return SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER;
</span><span class="cx"> }
</span><span class="lines">@@ -1596,7 +1596,7 @@
</span><span class="cx"> //uc_callparm_userinfo_layer1_protocol(callparms, prot);
</span><span class="cx"> //uc_callparm_user_rate(callparms, rate);
</span><span class="cx">
</span><del>-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "destination '%s'\n", outbound_profile->destination_number);
</del><ins>+switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "destination '%s'\n", outbound_profile->destination_number);
</ins><span class="cx"> uc_callparm_set_destination_number(callparms, outbound_profile->destination_number);
</span><span class="cx"> uc_callparm_set_destination_ton(callparms, outbound_profile->destination_number_ton);
</span><span class="cx"> uc_callparm_set_destination_npi(callparms, outbound_profile->destination_number_numplan);
</span><span class="lines">@@ -1617,8 +1617,8 @@
</span><span class="cx"> //uc_callparm_set_original_called_number_ton(callparms, ton);
</span><span class="cx"> //uc_callparm_set_original_called_number_npi(callparms, npi);
</span><span class="cx">
</span><del>-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "caller id name '%s'\n", outbound_profile->caller_id_name);
-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "caller id number '%s'\n", outbound_profile->caller_id_number);
</del><ins>+switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "caller id name '%s'\n", outbound_profile->caller_id_name);
+switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "caller id number '%s'\n", outbound_profile->caller_id_number);
</ins><span class="cx"> uc_callparm_set_originating_name(callparms, outbound_profile->caller_id_name);
</span><span class="cx"> uc_callparm_set_originating_number(callparms, outbound_profile->caller_id_number);
</span><span class="cx"> screen = switch_test_flag(outbound_profile, SWITCH_CPF_SCREEN);
</span><span class="lines">@@ -1645,7 +1645,7 @@
</span><span class="cx"> #if 0
</span><span class="cx"> if ((ret = uc_call_control(uc, UC_OP_MAKECALL, 0, (void *) &makecall)) < 0)
</span><span class="cx"> {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "Make call failed - %s\n", uc_ret_to_str(ret));
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "Make call failed - %s\n", uc_ret_to_str(ret));
</ins><span class="cx"> return SWITCH_STATUS_FAILED;
</span><span class="cx"> }
</span><span class="cx"> /*endif*/
</span><span class="lines">@@ -1655,7 +1655,7 @@
</span><span class="cx"> switch_channel_set_flag(channel, CF_OUTBOUND);
</span><span class="cx"> switch_set_flag_locked(tech_pvt, TFLAG_OUTBOUND);
</span><span class="cx"> switch_channel_set_state(channel, CS_INIT);
</span><del>-switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_outgoing_channel(%p) SUCCESS\n", (void *) session);
</del><ins>+switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(*new_session), SWITCH_LOG_INFO, "unicall_outgoing_channel(%p) SUCCESS\n", (void *) session);
</ins><span class="cx"> return SWITCH_CAUSE_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -1666,7 +1666,7 @@
</span><span class="cx">
</span><span class="cx"> switch_assert(tech_pvt != NULL);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_INFO, "unicall_receive_event(%p)\n", (void *) session);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_INFO, "unicall_receive_event(%p)\n", (void *) session);
</ins><span class="cx">
</span><span class="cx"> if (body == NULL)
</span><span class="cx"> body = "";
</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 (14510 => 14511)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2009-08-13 21:24:51 UTC (rev 14510)
+++ freeswitch/trunk/src/mod/event_handlers/mod_event_socket/mod_event_socket.c 2009-08-13 21:52:05 UTC (rev 14511)
</span><span class="lines">@@ -238,7 +238,7 @@
</span><span class="cx">
</span><span class="cx"> if (switch_test_flag(l, LFLAG_STATEFUL) && l->timeout && switch_epoch_time_now(NULL) - l->last_flush > l->timeout) {
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(l->session), SWITCH_LOG_WARNING, "Stateful Listener %u has expired\n", l->id);
</ins><span class="cx"> }
</span><span class="cx"> remove_listener(l);
</span><span class="cx"> expire_listener(&l);
</span><span class="lines">@@ -319,7 +319,7 @@
</span><span class="cx"> if (l->lost_events) {
</span><span class="cx"> int le = l->lost_events;
</span><span class="cx"> l->lost_events = 0;
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Lost %d events!\n", le);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(l->session), SWITCH_LOG_CRIT, "Lost %d events!\n", le);
</ins><span class="cx"> clone = NULL;
</span><span class="cx"> if (switch_event_create(&clone, SWITCH_EVENT_TRAP) == SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> switch_event_add_header(clone, SWITCH_STACK_BOTTOM, "info", "lost %d events", le);
</span><span class="lines">@@ -331,7 +331,7 @@
</span><span class="cx"> switch_event_destroy(&clone);
</span><span class="cx"> }
</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(l->session), SWITCH_LOG_ERROR, "Memory Error!\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -357,14 +357,14 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (argc < 1) {
</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"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> host = argv[0];
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(host)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Missing Host!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Missing Host!\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -381,13 +381,13 @@
</span><span class="cx"> switch_channel_set_variable(channel, "socket_host", host);
</span><span class="cx">
</span><span class="cx"> if (switch_sockaddr_info_get(&sa, host, AF_INET, port, 0, switch_core_session_get_pool(session)) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Socket Error!\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_socket_create(&new_sock, AF_INET, SOCK_STREAM, SWITCH_PROTO_TCP, switch_core_session_get_pool(session))
</span><span class="cx"> != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Socket Error!\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -395,13 +395,13 @@
</span><span class="cx"> switch_socket_opt_set(new_sock, SWITCH_SO_TCP_NODELAY, 1);
</span><span class="cx">
</span><span class="cx"> if (switch_socket_connect(new_sock, sa) != SWITCH_STATUS_SUCCESS) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Socket Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Socket Error!\n");
</ins><span class="cx"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> if (!(listener = switch_core_session_alloc(session, sizeof(*listener)))) {
</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"> return;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -816,7 +816,7 @@
</span><span class="cx"> stream->write_function(stream, "</data>\n");
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Creating event-sink listener [%u]\n", listener->id);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Creating event-sink listener [%u]\n", listener->id);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> goto end;
</span><span class="lines">@@ -830,7 +830,7 @@
</span><span class="cx">
</span><span class="cx"> if ((listener = find_listener(idl))) {
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Destroying event-sink listener [%u]\n", idl);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Destroying event-sink listener [%u]\n", idl);
</ins><span class="cx"> }
</span><span class="cx"> remove_listener(listener);
</span><span class="cx"> stream->write_function(stream, "<data>\n <reply type=\"success\">listener %u destroyed</reply>\n", listener->id);
</span><span class="lines">@@ -840,7 +840,7 @@
</span><span class="cx"> goto end;
</span><span class="cx"> } else {
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Request to destroy unknown event-sink listener [%u]\n", idl);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Request to destroy unknown event-sink listener [%u]\n", idl);
</ins><span class="cx"> }
</span><span class="cx"> stream->write_function(stream, "<data><reply type=\"error\">Can't find listener</reply></data>\n");
</span><span class="cx"> goto end;
</span><span class="lines">@@ -1208,7 +1208,7 @@
</span><span class="cx"> listener->ebuf = switch_xml_toxml(xml, SWITCH_FALSE);
</span><span class="cx"> switch_xml_free(xml);
</span><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "XML ERROR!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(listener->session), SWITCH_LOG_ERROR, "XML ERROR!\n");
</ins><span class="cx"> goto endloop;
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2009,7 +2009,7 @@
</span><span class="cx"> const char message[] = "Access Denied, go away.\n";
</span><span class="cx"> int mlen = strlen(message);
</span><span class="cx">
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", listener->remote_ip, prefs.acl[x]);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_WARNING, "IP %s Rejected by acl \"%s\"\n", listener->remote_ip, prefs.acl[x]);
</ins><span class="cx">
</span><span class="cx"> switch_snprintf(buf, sizeof(buf), "Content-Type: text/rude-rejection\nContent-Length: %d\n\n", mlen);
</span><span class="cx"> len = strlen(buf);
</span><span class="lines">@@ -2023,9 +2023,9 @@
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><span class="cx"> if (switch_strlen_zero(listener->remote_ip)) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Connection Open\n");
</ins><span class="cx"> } else {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Open from %s:%d\n", listener->remote_ip, listener->remote_port);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Connection Open from %s:%d\n", listener->remote_ip, listener->remote_port);
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2040,7 +2040,7 @@
</span><span class="cx"> status = read_packet(listener, &ievent, 25);
</span><span class="cx">
</span><span class="cx"> if (status != SWITCH_STATUS_SUCCESS || !ievent) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "Socket Error!\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_CRIT, "Socket Error!\n");
</ins><span class="cx"> switch_clear_flag_locked(listener, LFLAG_RUNNING);
</span><span class="cx"> goto done;
</span><span class="cx"> }
</span><span class="lines">@@ -2127,7 +2127,7 @@
</span><span class="cx"> remove_listener(listener);
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Session complete, waiting for children\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_thread_rwlock_wrlock(listener->rwlock);
</span><span class="lines">@@ -2168,7 +2168,7 @@
</span><span class="cx"> switch_thread_rwlock_unlock(listener->rwlock);
</span><span class="cx">
</span><span class="cx"> if (globals.debug > 0) {
</span><del>- switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_DEBUG, "Connection Closed\n");
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "Connection Closed\n");
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> switch_core_hash_destroy(&listener->event_hash);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>