<!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][15125] </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=15125">15125</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-10-08 19:52:25 -0500 (Thu, 08 Oct 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>omfg</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodendpointsmod_loopbackmod_loopbackc">freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c</a></li>
<li><a href="#freeswitchtrunksrcmodendpointsmod_sofiasofiac">freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivrc">freeswitch/trunk/src/switch_ivr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_ivr_originatec">freeswitch/trunk/src/switch_ivr_originate.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodendpointsmod_loopbackmod_loopbackc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c (15124 => 15125)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c 2009-10-09 00:49:50 UTC (rev 15124)
+++ freeswitch/trunk/src/mod/endpoints/mod_loopback/mod_loopback.c 2009-10-09 00:52:25 UTC (rev 15125)
</span><span class="lines">@@ -314,6 +314,7 @@
</span><span class="cx"> {
</span><span class="cx"> switch_channel_t *channel = NULL;
</span><span class="cx"> private_t *tech_pvt = NULL;
</span><ins>+ const char *app, *arg;
</ins><span class="cx">
</span><span class="cx"> channel = switch_core_session_get_channel(session);
</span><span class="cx"> assert(channel != NULL);
</span><span class="lines">@@ -324,6 +325,21 @@
</span><span class="cx"> do_reset(tech_pvt);
</span><span class="cx">
</span><span class="cx"> switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(session), SWITCH_LOG_DEBUG, "%s CHANNEL ROUTING\n", switch_channel_get_name(channel));
</span><ins>+
+
+ if (!switch_test_flag(tech_pvt, TFLAG_OUTBOUND) && (app = switch_channel_get_variable(channel, "loopback_app"))) {
+ switch_caller_extension_t *extension = NULL;
+ arg = switch_channel_get_variable(channel, "loopback_app_arg");
+ extension = switch_caller_extension_new(session, app, app);
+ switch_caller_extension_add_application(session, extension, "pre_answer", NULL);
+ switch_caller_extension_add_application(session, extension, app, arg);
+
+ switch_channel_set_caller_extension(channel, extension);
+ switch_channel_set_state(channel, CS_EXECUTE);
+ return SWITCH_STATUS_FALSE;
+ }
+
+
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -555,6 +571,7 @@
</span><span class="cx"> if (tech_pvt->write_frame) {
</span><span class="cx"> switch_frame_free(&tech_pvt->write_frame);
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx"> tech_pvt->write_frame = (switch_frame_t *) pop;
</span><span class="cx"> tech_pvt->write_frame->codec = &tech_pvt->read_codec;
</span><span class="cx"> *frame = tech_pvt->write_frame;
</span><span class="lines">@@ -571,6 +588,7 @@
</span><span class="cx"> *frame = &tech_pvt->cng_frame;
</span><span class="cx"> tech_pvt->cng_frame.codec = &tech_pvt->read_codec;
</span><span class="cx"> tech_pvt->cng_frame.datalen = tech_pvt->read_codec.implementation->decoded_bytes_per_packet;
</span><ins>+
</ins><span class="cx"> memset(tech_pvt->cng_frame.data, 0, tech_pvt->cng_frame.datalen);
</span><span class="cx"> memset(&data, 0, sizeof(data));
</span><span class="cx">
</span><span class="lines">@@ -797,6 +815,23 @@
</span><span class="cx">
</span><span class="cx"> caller_profile = switch_caller_profile_clone(*new_session, outbound_profile);
</span><span class="cx"> caller_profile->source = switch_core_strdup(caller_profile->pool, modname);
</span><ins>+ if (!strncasecmp(caller_profile->destination_number, "app=", 4)) {
+ char *dest = switch_core_session_strdup(*new_session, caller_profile->destination_number);
+ char *app = dest + 4;
+ char *arg = NULL;
+
+ if ((arg = strchr(app, ':'))) {
+ *arg++ = '\0';
+ }
+
+ switch_channel_set_variable(channel, "loopback_app", app);
+ if (arg) {
+ switch_channel_set_variable(channel, "loopback_app_arg", arg);
+ }
+
+ caller_profile->destination_number = switch_core_strdup(caller_profile->pool, app);
+ }
+
</ins><span class="cx"> if ((context = strchr(caller_profile->destination_number, '/'))) {
</span><span class="cx"> *context++ = '\0';
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcmodendpointsmod_sofiasofiac"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c (15124 => 15125)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-09 00:49:50 UTC (rev 15124)
+++ freeswitch/trunk/src/mod/endpoints/mod_sofia/sofia.c 2009-10-09 00:52:25 UTC (rev 15125)
</span><span class="lines">@@ -4271,7 +4271,11 @@
</span><span class="cx">
</span><span class="cx"> switch_channel_set_variable(channel_b, SWITCH_HOLDING_UUID_VARIABLE, br_a);
</span><span class="cx"> switch_channel_set_flag(channel_b, CF_XFER_ZOMBIE);
</span><ins>+ switch_channel_set_flag(channel_b, CF_TRANSFER);
</ins><span class="cx">
</span><ins>+ //switch_channel_set_variable(channel_b, "park_timeout", "2");
+ //switch_channel_set_state(channel_b, CS_PARK);
+
</ins><span class="cx"> if ((a_session = switch_core_session_locate(br_a))) {
</span><span class="cx"> const char *moh = profile->hold_music;
</span><span class="cx"> switch_channel_t *a_channel = switch_core_session_get_channel(a_session);
</span><span class="lines">@@ -4284,21 +4288,40 @@
</span><span class="cx"> if (!strcasecmp(moh, "silence")) {
</span><span class="cx"> moh = NULL;
</span><span class="cx"> }
</span><del>-
</del><ins>+
</ins><span class="cx"> //switch_channel_set_variable(a_channel, SWITCH_PARK_AFTER_BRIDGE_VARIABLE, "true");
</span><ins>+
</ins><span class="cx"> if (moh) {
</span><del>- switch_channel_set_variable_printf(a_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE,
- "'endless_playback:%s',park:inline", moh);
</del><ins>+ char *xdest;
+ //switch_channel_set_variable_printf(a_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE,
+ // "'endless_playback:%s,park':inline", moh);
+ xdest = switch_core_session_sprintf(a_session, "endless_playback:%s,park", moh);
+ switch_ivr_session_transfer(a_session, xdest, "inline", NULL);
</ins><span class="cx"> } else {
</span><del>- switch_channel_set_variable(a_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE, "park:inline");
</del><ins>+ //switch_channel_set_variable(a_channel, SWITCH_TRANSFER_AFTER_BRIDGE_VARIABLE, "park:inline");
+ switch_ivr_session_transfer(a_session, "park", "inline", NULL);
</ins><span class="cx"> }
</span><span class="cx"> //switch_channel_set_variable_printf(a_channel, "park_command", "moh");
</span><span class="cx"> switch_core_session_rwunlock(a_session);
</span><ins>+
+ nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
+ NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END());
+
+
+ if (0 && b_tech_pvt) {
+ sofia_set_flag_locked(b_tech_pvt, TFLAG_BYE);
+ nua_bye(b_tech_pvt->nh,
+ SIPTAG_REASON_STR("Q.850;cause=16;text=\"normal_clearing\""),
+ TAG_IF(!switch_strlen_zero(tech_pvt->user_via), SIPTAG_VIA_STR(tech_pvt->user_via)),
+ TAG_END());
+ }
+ } else {
+ nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
+ NUTAG_SUBSTATE(nua_substate_terminated),
+ SIPTAG_PAYLOAD_STR("SIP/2.0 403 Forbidden"), SIPTAG_EVENT_STR(etmp), TAG_END());
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- nua_notify(tech_pvt->nh, NUTAG_NEWSUB(1), SIPTAG_CONTENT_TYPE_STR("message/sipfrag"),
- NUTAG_SUBSTATE(nua_substate_terminated), SIPTAG_PAYLOAD_STR("SIP/2.0 200 OK"), SIPTAG_EVENT_STR(etmp), TAG_END());
-
</del><ins>+
</ins><span class="cx"> //switch_channel_set_variable(channel_b, "park_timeout", "2");
</span><span class="cx"> //switch_channel_set_state(channel_b, CS_PARK);
</span><span class="cx">
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivrc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr.c (15124 => 15125)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr.c 2009-10-09 00:49:50 UTC (rev 15124)
+++ freeswitch/trunk/src/switch_ivr.c 2009-10-09 00:52:25 UTC (rev 15125)
</span><span class="lines">@@ -1283,6 +1283,9 @@
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(dialplan)) {
</span><span class="cx"> dialplan = profile->dialplan;
</span><ins>+ if (!switch_strlen_zero(dialplan) && !strcasecmp(dialplan, "inline")) {
+ dialplan = NULL;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (switch_strlen_zero(context)) {
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (15124 => 15125)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-10-09 00:49:50 UTC (rev 15124)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-10-09 00:52:25 UTC (rev 15125)
</span><span class="lines">@@ -364,6 +364,9 @@
</span><span class="cx">
</span><span class="cx"> if (oglobals->session) {
</span><span class="cx"> caller_channel = switch_core_session_get_channel(oglobals->session);
</span><ins>+ if (switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE)) {
+ caller_channel = NULL;
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><span class="lines">@@ -1997,8 +2000,8 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (caller_channel && switch_channel_get_state(caller_channel) != wait_state && !switch_channel_test_flag(caller_channel, CF_XFER_ZOMBIE)) {
</span><del>- oglobals.idx = IDX_NADA;
- goto notready;
</del><ins>+ //oglobals.idx = IDX_NADA;
+ //goto notready;
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if (!oglobals.sent_ring && !oglobals.progress && (progress_timelimit_sec && elapsed > (time_t) progress_timelimit_sec)) {
</span><span class="lines">@@ -2162,10 +2165,6 @@
</span><span class="cx"> switch_core_session_reset(oglobals.session, SWITCH_FALSE, SWITCH_TRUE);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if ((oglobals.idx == IDX_TIMEOUT || oglobals.idx == IDX_KEY_CANCEL) && (caller_channel && switch_channel_ready(caller_channel))) {
- holding = NULL;
- }
-
</del><span class="cx"> if (holding) {
</span><span class="cx"> if (oglobals.idx > IDX_NADA) {
</span><span class="cx"> peer_session = originate_status[oglobals.idx].peer_session;
</span><span class="lines">@@ -2202,26 +2201,62 @@
</span><span class="cx">
</span><span class="cx"> end_search:
</span><span class="cx">
</span><ins>+ if (peer_channel && (oglobals.idx == IDX_TIMEOUT || to || oglobals.idx == IDX_KEY_CANCEL || oglobals.idx == IDX_CANCEL)) {
+ const char *dest = switch_channel_get_variable(peer_channel, "destination_number");
+ const char *context = switch_channel_get_variable(peer_channel, "context");
+ const char *dialplan = switch_channel_get_variable(peer_channel, "dialplan");
+ switch_core_session_t *holding_session;
</ins><span class="cx">
</span><del>- if (peer_channel && switch_channel_ready(peer_channel)) {
- force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER;
- switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(peer_session));
- oglobals.idx = IDX_NADA;
</del><span class="cx"> if (caller_channel) {
</span><del>- switch_channel_hangup(caller_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
</del><ins>+ if (switch_strlen_zero(context)) {
+ context = switch_channel_get_variable(caller_channel, "context");
+ }
+ if (switch_strlen_zero(dialplan)) {
+ dialplan = switch_channel_get_variable(caller_channel, "dialplan");
+ }
</ins><span class="cx"> }
</span><ins>+
+ if (switch_strlen_zero(context)) {
+ context = "default";
+ }
+
+ if (switch_strlen_zero(context)) {
+ dialplan = "XML";
+ }
+
+ if ((holding_session = switch_core_session_locate(holding))) {
+ switch_ivr_session_transfer(holding_session, dest, dialplan, context);
+ switch_core_session_rwunlock(holding_session);
+ holding = NULL;
+ holding_session = NULL;
+ }
+
+ switch_channel_hangup(peer_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
</ins><span class="cx"> switch_core_session_rwunlock(peer_session);
</span><span class="cx"> } else {
</span><del>- switch_core_session_t *holding_session;
</del><ins>+ if (peer_channel && switch_channel_ready(peer_channel)) {
+ force_reason = SWITCH_CAUSE_ATTENDED_TRANSFER;
+ switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(peer_session));
+ oglobals.idx = IDX_NADA;
+ if (caller_channel && switch_channel_up(caller_channel)) {
+ switch_channel_hangup(caller_channel, SWITCH_CAUSE_ATTENDED_TRANSFER);
+ }
+ caller_channel = NULL;
+ oglobals.session = NULL;
+ session = NULL;
+ switch_core_session_rwunlock(peer_session);
+ } else {
+ switch_core_session_t *holding_session;
</ins><span class="cx">
</span><del>- if ((holding_session = switch_core_session_locate(holding))) {
- switch_channel_t *holding_channel = switch_core_session_get_channel(holding_session);
- if (caller_channel && switch_channel_ready(caller_channel)) {
- switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(session));
- } else {
- switch_channel_hangup(holding_channel, SWITCH_CAUSE_NORMAL_UNSPECIFIED);
</del><ins>+ if ((holding_session = switch_core_session_locate(holding))) {
+ switch_channel_t *holding_channel = switch_core_session_get_channel(holding_session);
+ if (caller_channel && switch_channel_ready(caller_channel)) {
+ switch_ivr_uuid_bridge(holding, switch_core_session_get_uuid(session));
+ } else {
+ switch_channel_hangup(holding_channel, SWITCH_CAUSE_NORMAL_UNSPECIFIED);
+ }
+ switch_core_session_rwunlock(holding_session);
</ins><span class="cx"> }
</span><del>- switch_core_session_rwunlock(holding_session);
</del><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -2229,8 +2264,7 @@
</span><span class="cx"> peer_channel = NULL;
</span><span class="cx">
</span><span class="cx"> }
</span><del>-
-
</del><ins>+
</ins><span class="cx"> for (i = 0; i < and_argc; i++) {
</span><span class="cx"> if (!peer_eligible(originate_status[i].peer_channel)) {
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>