<!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][15461] </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=15461">15461</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-11-13 10:37:42 -0600 (Fri, 13 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>add ringback to enterprise_originate</pre>
<h3>Modified Paths</h3>
<ul>
<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="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (15460 => 15461)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-11-13 16:37:23 UTC (rev 15460)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-11-13 16:37:42 UTC (rev 15461)
</span><span class="lines">@@ -1155,6 +1155,13 @@
</span><span class="cx"> } enterprise_originate_handle_t;
</span><span class="cx">
</span><span class="cx">
</span><ins>+struct ent_originate_ringback {
+ switch_core_session_t *session;
+ int running;
+ const char *ringback_data;
+ switch_thread_t *thread;
+};
+
</ins><span class="cx"> static void *SWITCH_THREAD_FUNC enterprise_originate_thread(switch_thread_t *thread, void *obj)
</span><span class="cx"> {
</span><span class="cx"> enterprise_originate_handle_t *handle = (enterprise_originate_handle_t *) obj;
</span><span class="lines">@@ -1176,18 +1183,49 @@
</span><span class="cx"> return NULL;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static void *SWITCH_THREAD_FUNC enterprise_originate_ringback_thread(switch_thread_t *thread, void *obj)
+{
+ struct ent_originate_ringback *rb_data = (struct ent_originate_ringback *) obj;
+ switch_core_session_t *session = rb_data->session;
+ switch_channel_t *channel = switch_core_session_get_channel(rb_data->session);
+ switch_status_t status = SWITCH_STATUS_FALSE;
+
+ switch_core_session_read_lock(session);
+
+ while(rb_data->running && switch_channel_ready(channel)) {
+ if (status != SWITCH_STATUS_BREAK) {
+ if (zstr(rb_data->ringback_data) || !strcasecmp(rb_data->ringback_data, "silence")) {
+ status = switch_ivr_collect_digits_callback(session, NULL, 0, 0);
+ } else if (switch_is_file_path(rb_data->ringback_data)) {
+ status = switch_ivr_play_file(session, NULL, rb_data->ringback_data, NULL);
+ } else {
+ status = switch_ivr_gentones(session, rb_data->ringback_data, 0, NULL);
+ }
+ }
+
+ if (status == SWITCH_STATUS_BREAK) {
+ switch_channel_set_flag(channel, CF_NOT_READY);
+ }
+ }
+ switch_core_session_rwunlock(session);
+
+ rb_data->running = 0;
+ return NULL;
+}
+
+
</ins><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_ivr_enterprise_originate(switch_core_session_t *session,
</span><del>- switch_core_session_t **bleg,
- switch_call_cause_t *cause,
- const char *bridgeto,
- uint32_t timelimit_sec,
- const switch_state_handler_table_t *table,
- const char *cid_name_override,
- const char *cid_num_override,
- switch_caller_profile_t *caller_profile_override,
- switch_event_t *ovars,
- switch_originate_flag_t flags
- )
</del><ins>+ switch_core_session_t **bleg,
+ switch_call_cause_t *cause,
+ const char *bridgeto,
+ uint32_t timelimit_sec,
+ const switch_state_handler_table_t *table,
+ const char *cid_name_override,
+ const char *cid_num_override,
+ switch_caller_profile_t *caller_profile_override,
+ switch_event_t *ovars,
+ switch_originate_flag_t flags
+ )
</ins><span class="cx"> {
</span><span class="cx"> int x_argc;
</span><span class="cx"> char *x_argv[MAX_PEERS] = { 0 };
</span><span class="lines">@@ -1202,6 +1240,8 @@
</span><span class="cx"> switch_status_t tstatus = SWITCH_STATUS_FALSE;
</span><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> switch_event_header_t *hi = NULL;
</span><ins>+ struct ent_originate_ringback rb_data = { 0 };
+ const char *ringback_data = NULL;
</ins><span class="cx">
</span><span class="cx"> switch_core_new_memory_pool(&pool);
</span><span class="cx">
</span><span class="lines">@@ -1251,9 +1291,36 @@
</span><span class="cx"> handles[i].flags = flags;
</span><span class="cx"> switch_thread_create(&handles[i].thread, thd_attr, enterprise_originate_thread, &handles[i], pool);
</span><span class="cx"> }
</span><ins>+
+ if (channel && !switch_channel_test_flag(channel, CF_PROXY_MODE) && !switch_channel_test_flag(channel, CF_PROXY_MEDIA)) {
+ if (switch_channel_test_flag(channel, CF_ANSWERED)) {
+ ringback_data = switch_channel_get_variable(channel, "transfer_ringback");
+ }
+
+ if (!ringback_data) {
+ ringback_data = switch_channel_get_variable(channel, "ringback");
+ }
</ins><span class="cx">
</span><ins>+ if (ringback_data || switch_channel_media_ready(channel)) {
+ rb_data.ringback_data = ringback_data;
+ rb_data.session = session;
+ rb_data.running = 1;
+ if (!switch_channel_media_ready(channel)) {
+ if (switch_channel_pre_answer(channel) != SWITCH_STATUS_SUCCESS) {
+ goto done;
+ }
+ }
+ switch_thread_create(&rb_data.thread, thd_attr, enterprise_originate_ringback_thread, &rb_data, pool);
+ }
+ }
+
+
</ins><span class="cx"> for(;;) {
</span><span class="cx"> running = 0;
</span><ins>+
+ if (channel && !switch_channel_ready(channel)) {
+ break;
+ }
</ins><span class="cx">
</span><span class="cx"> for(i = 0; i < x_argc; i++) {
</span><span class="cx"> if (handles[i].done == 0) {
</span><span class="lines">@@ -1273,9 +1340,17 @@
</span><span class="cx"> break;
</span><span class="cx"> }
</span><span class="cx"> }
</span><ins>+
</ins><span class="cx">
</span><span class="cx"> done:
</span><span class="cx">
</span><ins>+ if (channel && rb_data.thread) {
+ switch_channel_set_flag(channel, CF_NOT_READY);
+ switch_thread_join(&tstatus, rb_data.thread);
+ switch_channel_clear_flag(channel, CF_NOT_READY);
+ }
+
+
</ins><span class="cx"> for(i = 0; i < x_argc; i++) {
</span><span class="cx"> if (hp && hp == &handles[i]) {
</span><span class="cx"> continue;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>