<!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][14161] </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=14161">14161</a></dd>
<dt>Author</dt> <dd>rupa</dd>
<dt>Date</dt> <dd>2009-07-08 12:50:53 -0500 (Wed, 08 Jul 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre><a href="http://jira.freeswitch.org/browse/MODAPP-304">MODAPP-304</a> - add Job-UUID to conference bgdial</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec">freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunksrcmodapplicationsmod_conferencemod_conferencec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c (14160 => 14161)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-07-08 17:14:33 UTC (rev 14160)
+++ freeswitch/trunk/src/mod/applications/mod_conference/mod_conference.c 2009-07-08 17:50:53 UTC (rev 14161)
</span><span class="lines">@@ -380,7 +380,7 @@
</span><span class="cx"> static switch_status_t conference_outcall_bg(conference_obj_t *conference,
</span><span class="cx"> char *conference_name,
</span><span class="cx"> switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name,
</span><del>- const char *cid_num);
</del><ins>+ const char *cid_num, const char *call_uuid);
</ins><span class="cx"> SWITCH_STANDARD_APP(conference_function);
</span><span class="cx"> static void launch_conference_thread(conference_obj_t *conference);
</span><span class="cx"> static void launch_conference_video_thread(conference_obj_t *conference);
</span><span class="lines">@@ -2062,7 +2062,7 @@
</span><span class="cx"> for (x = 0; x < argc; x++) {
</span><span class="cx"> char *dial_str = switch_mprintf("%s%s", switch_str_nil(prefix), argv[x]);
</span><span class="cx"> switch_assert(dial_str);
</span><del>- conference_outcall_bg(member->conference, NULL, NULL, dial_str, to, switch_str_nil(flags), cid_name, cid_num);
</del><ins>+ conference_outcall_bg(member->conference, NULL, NULL, dial_str, to, switch_str_nil(flags), cid_name, cid_num, NULL);
</ins><span class="cx"> switch_safe_free(dial_str);
</span><span class="cx"> }
</span><span class="cx"> switch_safe_free(cpstr);
</span><span class="lines">@@ -3798,6 +3798,9 @@
</span><span class="cx">
</span><span class="cx"> static switch_status_t conf_api_sub_bgdial(conference_obj_t *conference, switch_stream_handle_t *stream, int argc, char **argv)
</span><span class="cx"> {
</span><ins>+ switch_uuid_t uuid;
+ char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
+
</ins><span class="cx"> switch_assert(stream != NULL);
</span><span class="cx">
</span><span class="cx"> if (argc <= 2) {
</span><span class="lines">@@ -3805,13 +3808,16 @@
</span><span class="cx"> return SWITCH_STATUS_GENERR;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ switch_uuid_get(&uuid);
+ switch_uuid_format(uuid_str, &uuid);
+
</ins><span class="cx"> if (conference) {
</span><del>- conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3]);
</del><ins>+ conference_outcall_bg(conference, NULL, NULL, argv[2], 60, NULL, argv[4], argv[3], uuid_str);
</ins><span class="cx"> } else {
</span><del>- conference_outcall_bg(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3]);
</del><ins>+ conference_outcall_bg(NULL, argv[0], NULL, argv[2], 60, NULL, argv[4], argv[3], uuid_str);
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- stream->write_function(stream, "OK\n");
</del><ins>+ stream->write_function(stream, "OK Job-UUID: %s\n", uuid_str);
</ins><span class="cx">
</span><span class="cx"> return SWITCH_STATUS_SUCCESS;
</span><span class="cx"> }
</span><span class="lines">@@ -4422,6 +4428,7 @@
</span><span class="cx"> char *cid_name;
</span><span class="cx"> char *cid_num;
</span><span class="cx"> char *conference_name;
</span><ins>+ char *uuid;
</ins><span class="cx"> switch_memory_pool_t *pool;
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -4441,6 +4448,7 @@
</span><span class="cx"> conference_add_event_data(call->conference, event);
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Action", "bgdial-result");
</span><span class="cx"> switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Result", switch_channel_cause2str(cause));
</span><ins>+ switch_event_add_header_string(event, SWITCH_STACK_BOTTOM, "Job-UUID", call->uuid);
</ins><span class="cx"> switch_event_fire(&event);
</span><span class="cx"> }
</span><span class="cx"> switch_safe_free(call->bridgeto);
</span><span class="lines">@@ -4448,6 +4456,7 @@
</span><span class="cx"> switch_safe_free(call->cid_name);
</span><span class="cx"> switch_safe_free(call->cid_num);
</span><span class="cx"> switch_safe_free(call->conference_name);
</span><ins>+ switch_safe_free(call->uuid);
</ins><span class="cx"> if (call->pool) {
</span><span class="cx"> switch_core_destroy_memory_pool(&call->pool);
</span><span class="cx"> }
</span><span class="lines">@@ -4460,7 +4469,7 @@
</span><span class="cx"> static switch_status_t conference_outcall_bg(conference_obj_t *conference,
</span><span class="cx"> char *conference_name,
</span><span class="cx"> switch_core_session_t *session, char *bridgeto, uint32_t timeout, const char *flags, const char *cid_name,
</span><del>- const char *cid_num)
</del><ins>+ const char *cid_num, const char *call_uuid)
</ins><span class="cx"> {
</span><span class="cx"> struct bg_call *call = NULL;
</span><span class="cx"> switch_thread_t *thread;
</span><span class="lines">@@ -4498,6 +4507,10 @@
</span><span class="cx"> if (conference_name) {
</span><span class="cx"> call->conference_name = strdup(conference_name);
</span><span class="cx"> }
</span><ins>+
+ if (call_uuid) {
+ call->uuid = strdup(call_uuid);
+ }
</ins><span class="cx">
</span><span class="cx"> switch_threadattr_create(&thd_attr, pool);
</span><span class="cx"> switch_threadattr_detach_set(thd_attr, 1);
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>