<!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][14983] </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=14983">14983</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-09-25 14:48:28 -0500 (Fri, 25 Sep 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>pita bypass media transfer fiasco fix</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcswitch_ivr_asyncc">freeswitch/trunk/src/switch_ivr_async.c</a></li>
<li><a href="#freeswitchtrunksupportdemacs">freeswitch/trunk/support-d/.emacs</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcswitch_ivr_asyncc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_async.c (14982 => 14983)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_async.c 2009-09-25 19:32:44 UTC (rev 14982)
+++ freeswitch/trunk/src/switch_ivr_async.c 2009-09-25 19:48:28 UTC (rev 14983)
</span><span class="lines">@@ -1938,7 +1938,13 @@
</span><span class="cx"> {
</span><span class="cx"> bch_t *bch = (bch_t *) obj;
</span><span class="cx">
</span><ins>+ if (!bch->session) {
+ return NULL;
+ }
+
+ switch_core_session_read_lock(bch->session);
</ins><span class="cx"> switch_ivr_broadcast(switch_core_session_get_uuid(bch->session), bch->app, bch->flags);
</span><ins>+ switch_core_session_rwunlock(bch->session);
</ins><span class="cx">
</span><span class="cx"> return NULL;
</span><span class="cx">
</span><span class="lines">@@ -2031,8 +2037,6 @@
</span><span class="cx"> } else {
</span><span class="cx"> flags |= SMF_ECHO_ALEG;
</span><span class="cx"> }
</span><del>- } else if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_INLINE)) {
- flags |= SMF_EXEC_INLINE;
</del><span class="cx"> } else if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_ALEG)) {
</span><span class="cx"> flags |= SMF_ECHO_ALEG;
</span><span class="cx"> } else if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_BLEG)) {
</span><span class="lines">@@ -2041,6 +2045,10 @@
</span><span class="cx"> flags |= SMF_ECHO_ALEG;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ if ((md->sr[direction].map[dval].bind_flags & SBF_EXEC_INLINE)) {
+ flags |= SMF_EXEC_INLINE;
+ }
+
</ins><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s Processing meta digit '%c' [%s]\n",
</span><span class="cx"> switch_channel_get_name(channel), dtmf->digit, md->sr[direction].map[dval].app);
</span><span class="cx">
</span><span class="lines">@@ -2673,22 +2681,24 @@
</span><span class="cx">
</span><span class="cx"> if ((flags & SMF_ECHO_BLEG) && (other_uuid = switch_channel_get_variable(channel, SWITCH_SIGNAL_BOND_VARIABLE))
</span><span class="cx"> && (other_session = switch_core_session_locate(other_uuid))) {
</span><del>- if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", path);
- switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true");
- if ((flags & SMF_LOOP)) {
- switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1);
- }
- if ((flags & SMF_HOLD_BLEG)) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hold-bleg", "true");
- }
</del><ins>+ if ((flags & SMF_EXEC_INLINE)) {
+ switch_core_session_execute_application(other_session, app, path);
+ nomedia = 0;
+ } else {
+ if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", path);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true");
+ if ((flags & SMF_LOOP)) {
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1);
+ }
</ins><span class="cx">
</span><del>- if ((flags & SMF_EXEC_INLINE)) {
- switch_core_session_execute_application(other_session, app, path);
- } else {
</del><ins>+ if ((flags & SMF_HOLD_BLEG)) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hold-bleg", "true");
+ }
+
</ins><span class="cx"> switch_core_session_queue_private_event(other_session, &event);
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="lines">@@ -2702,21 +2712,25 @@
</span><span class="cx"> nomedia = 0;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+
</ins><span class="cx"> if ((flags & SMF_ECHO_ALEG)) {
</span><del>- if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", path);
- switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true");
- if ((flags & SMF_LOOP)) {
- switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1);
</del><ins>+ if ((flags & SMF_EXEC_INLINE)) {
+ switch_core_session_execute_application(session, app, path);
+ nomedia = 0;
+ } else {
+ if (switch_event_create(&event, SWITCH_EVENT_COMMAND) == SWITCH_STATUS_SUCCESS) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "call-command", "execute");
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-name", app);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "execute-app-arg", path);
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "lead-frames", "%d", 5);
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "event-lock", "true");
+ if ((flags & SMF_LOOP)) {
+ switch_event_add_header(event, SWITCH_STACK_BOTTOM, "loops", "%d", -1);
+ }
+ if ((flags & SMF_HOLD_BLEG)) {
+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hold-bleg", "true");
+ }
</ins><span class="cx"> }
</span><del>- if ((flags & SMF_HOLD_BLEG)) {
- switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "hold-bleg", "true");
- }
-
- switch_core_session_queue_private_event(session, &event);
</del><span class="cx"> }
</span><span class="cx"> master = session;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunksupportdemacs"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/support-d/.emacs (14982 => 14983)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/support-d/.emacs 2009-09-25 19:32:44 UTC (rev 14982)
+++ freeswitch/trunk/support-d/.emacs 2009-09-25 19:48:28 UTC (rev 14983)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> ;(setq cperl-hairy t)
</span><span class="cx"> (global-unset-key "\C-h")
</span><span class="cx"> (global-set-key "\C-h" 'delete-backward-char)
</span><del>-(load "/usr/share/emacs/site-lisp/rng-auto.el")
</del><ins>+;(load "/usr/share/emacs/site-lisp/rng-auto.el")
</ins><span class="cx">
</span><span class="cx"> (require 'cc-mode)
</span><span class="cx"> (defun my-build-tab-stop-list (width)
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>