<!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][15274] </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=15274">15274</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-29 12:52:52 -0500 (Thu, 29 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add uuid_debug_audio <uuid> <read|write|both> <on|off></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeswitch_typesh">freeswitch/trunk/src/include/switch_types.h</a></li>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc">freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_rtpc">freeswitch/trunk/src/switch_rtp.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcincludeswitch_typesh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_types.h (15273 => 15274)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_types.h 2009-10-29 17:29:05 UTC (rev 15273)
+++ freeswitch/trunk/src/include/switch_types.h 2009-10-29 17:52:52 UTC (rev 15274)
</span><span class="lines">@@ -514,7 +514,8 @@
</span><span class="cx"> SWITCH_ZRTP_FLAG_SECURE_RECV = (1 << 24),
</span><span class="cx"> SWITCH_ZRTP_FLAG_SECURE_MITM_SEND = (1 << 25),
</span><span class="cx"> SWITCH_ZRTP_FLAG_SECURE_MITM_RECV = (1 << 26),
</span><del>- SWITCH_RTP_FLAG_DEBUG_RTP = (1 << 27)
</del><ins>+ SWITCH_RTP_FLAG_DEBUG_RTP_READ = (1 << 27),
+ SWITCH_RTP_FLAG_DEBUG_RTP_WRITE = (1 << 28)
</ins><span class="cx"> } switch_rtp_flag_enum_t;
</span><span class="cx"> typedef uint32_t switch_rtp_flag_t;
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodapplicationsmod_commandsmod_commandsc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c (15273 => 15274)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-10-29 17:29:05 UTC (rev 15273)
+++ freeswitch/trunk/src/mod/applications/mod_commands/mod_commands.c 2009-10-29 17:52:52 UTC (rev 15274)
</span><span class="lines">@@ -2106,10 +2106,10 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-#define DEBUG_AUDIO_SYNTAX "<uuid> <on|off>"
</del><ins>+#define DEBUG_AUDIO_SYNTAX "<uuid> <read|write|both> <on|off>"
</ins><span class="cx"> SWITCH_STANDARD_API(uuid_debug_audio_function)
</span><span class="cx"> {
</span><del>- char *mycmd = NULL, *argv[2] = { 0 };
</del><ins>+ char *mycmd = NULL, *argv[3] = { 0 };
</ins><span class="cx"> int argc = 0;
</span><span class="cx"> switch_status_t status = SWITCH_STATUS_FALSE;
</span><span class="cx">
</span><span class="lines">@@ -2117,14 +2117,15 @@
</span><span class="cx"> argc = switch_separate_string(mycmd, ' ', argv, (sizeof(argv) / sizeof(argv[0])));
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (zstr(cmd) || argc < 2 || zstr(argv[0]) || zstr(argv[1])) {
</del><ins>+ if (zstr(cmd) || argc < 3 || zstr(argv[0]) || zstr(argv[1]) || zstr(argv[2])) {
</ins><span class="cx"> stream->write_function(stream, "-USAGE: %s\n", DEBUG_AUDIO_SYNTAX);
</span><span class="cx"> } else {
</span><span class="cx"> switch_core_session_message_t msg = { 0 };
</span><span class="cx"> switch_core_session_t *lsession = NULL;
</span><del>-
</del><ins>+
</ins><span class="cx"> msg.message_id = SWITCH_MESSAGE_INDICATE_DEBUG_AUDIO;
</span><del>- msg.string_arg = argv[1];
</del><ins>+ msg.string_array_arg[0] = argv[1];
+ msg.string_array_arg[1] = argv[2];
</ins><span class="cx"> msg.from = __FILE__;
</span><span class="cx">
</span><span class="cx"> if ((lsession = switch_core_session_locate(argv[0]))) {
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiamod_sofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c (15273 => 15274)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-29 17:29:05 UTC (rev 15273)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/mod_sofia.c 2009-10-29 17:52:52 UTC (rev 15274)
</span><span class="lines">@@ -1082,14 +1082,28 @@
</span><span class="cx"> switch (msg->message_id) {
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_DEBUG_AUDIO:
</span><span class="cx"> {
</span><del>- if (switch_rtp_ready(tech_pvt->rtp_session)) {
- if (switch_true(msg->string_arg)) {
- switch_rtp_set_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP);
</del><ins>+ if (switch_rtp_ready(tech_pvt->rtp_session) && !zstr(msg->string_array_arg[0]) && !zstr(msg->string_array_arg[1])) {
+ int32_t flags = 0;
+ if (!strcasecmp(msg->string_array_arg[0], "read")) {
+ flags |= SWITCH_RTP_FLAG_DEBUG_RTP_READ;
+ } else if (!strcasecmp(msg->string_array_arg[0], "write")) {
+ flags |= SWITCH_RTP_FLAG_DEBUG_RTP_WRITE;
+ } else if (!strcasecmp(msg->string_array_arg[0], "both")) {
+ flags |= SWITCH_RTP_FLAG_DEBUG_RTP_READ | SWITCH_RTP_FLAG_DEBUG_RTP_WRITE;
+ }
+
+ if (flags) {
+ if (switch_true(msg->string_array_arg[1])) {
+ switch_rtp_set_flag(tech_pvt->rtp_session, flags);
+ } else {
+ switch_rtp_clear_flag(tech_pvt->rtp_session, flags);
+ }
</ins><span class="cx"> } else {
</span><del>- switch_rtp_clear_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP);
</del><ins>+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_ERROR, "Invalid Options\n");
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+ status = SWITCH_STATUS_FALSE;
</ins><span class="cx"> goto end;
</span><span class="cx"> case SWITCH_MESSAGE_INDICATE_TRANSCODING_NECESSARY:
</span><span class="cx"> if (tech_pvt->rtp_session && switch_rtp_test_flag(tech_pvt->rtp_session, SWITCH_RTP_FLAG_PASS_RFC2833)) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_rtpc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_rtp.c (15273 => 15274)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_rtp.c 2009-10-29 17:29:05 UTC (rev 15273)
+++ freeswitch/trunk/src/switch_rtp.c 2009-10-29 17:52:52 UTC (rev 15274)
</span><span class="lines">@@ -1679,10 +1679,10 @@
</span><span class="cx">
</span><span class="cx"> if (switch_rtp_ready(rtp_session)) {
</span><span class="cx">
</span><del>- if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP)) {
</del><ins>+ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ)) {
</ins><span class="cx"> switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
</span><span class="cx"> if (!session) {
</span><del>- switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP);
</del><ins>+ switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "RTP HAS NO SESSION!\n");
</span><span class="cx"> } else {
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session),
</span><span class="lines">@@ -1904,11 +1904,11 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>- if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP)) {
</del><ins>+ if (bytes && switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ)) {
</ins><span class="cx"> switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
</span><span class="cx">
</span><span class="cx"> if (!session) {
</span><del>- switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP);
</del><ins>+ switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_READ);
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "RTP HAS NO SESSION!\n");
</span><span class="cx"> } else {
</span><span class="cx"> const char *tx_host;
</span><span class="lines">@@ -1923,7 +1923,7 @@
</span><span class="cx"> my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_CONSOLE,
</span><del>- "%s b=%ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n",
</del><ins>+ "R %s b=%ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n",
</ins><span class="cx"> switch_channel_get_name(switch_core_session_get_channel(session)),
</span><span class="cx"> (long)bytes,
</span><span class="cx"> my_host, switch_sockaddr_get_port(rtp_session->local_addr),
</span><span class="lines">@@ -2748,6 +2748,37 @@
</span><span class="cx"> #endif
</span><span class="cx">
</span><span class="cx">
</span><ins>+ if (switch_test_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_WRITE)) {
+ switch_core_session_t *session = switch_core_memory_pool_get_data(rtp_session->pool, "__session");
+
+ if (!session) {
+ switch_clear_flag(rtp_session, SWITCH_RTP_FLAG_DEBUG_RTP_WRITE);
+ switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_CRIT, "RTP HAS NO SESSION!\n");
+ } else {
+ const char *tx_host;
+ const char *old_host;
+ const char *my_host;
+
+ char bufa[30], bufb[30], bufc[30];
+
+
+ tx_host = switch_get_addr(bufa, sizeof(bufa), rtp_session->from_addr);
+ old_host = switch_get_addr(bufb, sizeof(bufb), rtp_session->remote_addr);
+ my_host = switch_get_addr(bufc, sizeof(bufc), rtp_session->local_addr);
+
+ switch_log_printf(SWITCH_CHANNEL_SESSION_LOG_CLEAN(session), SWITCH_LOG_CONSOLE,
+ "W %s b=%ld %s:%u %s:%u %s:%u pt=%d ts=%u m=%d\n",
+ switch_channel_get_name(switch_core_session_get_channel(session)),
+ (long)bytes,
+ my_host, switch_sockaddr_get_port(rtp_session->local_addr),
+ old_host, rtp_session->remote_port,
+ tx_host, switch_sockaddr_get_port(rtp_session->from_addr),
+ send_msg->header.pt, ntohl(send_msg->header.ts), send_msg->header.m);
+
+ }
+ }
+
+
</ins><span class="cx"> if (switch_socket_sendto(rtp_session->sock_output, rtp_session->remote_addr, 0, (void *) send_msg, &bytes) != SWITCH_STATUS_SUCCESS) {
</span><span class="cx"> rtp_session->seq--;
</span><span class="cx"> ret = -1;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>