<!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][16062] </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=16062">16062</a></dd>
<dt>Author</dt> <dd>anthm</dd>
<dt>Date</dt> <dd>2009-12-28 10:40:18 -0600 (Mon, 28 Dec 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>doh</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunksrcincludeprivateswitch_core_pvth">freeswitch/trunk/src/include/private/switch_core_pvt.h</a></li>
<li><a href="#freeswitchtrunksrcincludeswitch_coreh">freeswitch/trunk/src/include/switch_core.h</a></li>
<li><a href="#freeswitchtrunksrcswitch_aprc">freeswitch/trunk/src/switch_apr.c</a></li>
<li><a href="#freeswitchtrunksrcswitch_corec">freeswitch/trunk/src/switch_core.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="freeswitchtrunksrcincludeprivateswitch_core_pvth"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/private/switch_core_pvt.h (16061 => 16062)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/private/switch_core_pvt.h 2009-12-28 16:37:54 UTC (rev 16061)
+++ freeswitch/trunk/src/include/private/switch_core_pvt.h 2009-12-28 16:40:18 UTC (rev 16062)
</span><span class="lines">@@ -74,8 +74,6 @@
</span><span class="cx"> #endif
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>-#include "uuid.h"
-
</del><span class="cx"> /* #define DEBUG_ALLOC */
</span><span class="cx"> #define DO_EVENTS
</span><span class="cx">
</span><span class="lines">@@ -194,7 +192,6 @@
</span><span class="cx"> char uuid_str[SWITCH_UUID_FORMATTED_LENGTH + 1];
</span><span class="cx"> uint32_t flags;
</span><span class="cx"> switch_time_t timestamp;
</span><del>- switch_mutex_t *uuid_mutex;
</del><span class="cx"> switch_mutex_t *throttle_mutex;
</span><span class="cx"> switch_mutex_t *session_hash_mutex;
</span><span class="cx"> switch_mutex_t *global_mutex;
</span><span class="lines">@@ -215,7 +212,6 @@
</span><span class="cx"> char *odbc_user;
</span><span class="cx"> char *odbc_pass;
</span><span class="cx"> uint32_t debug_level;
</span><del>- uuid_t *uuid;
</del><span class="cx"> };
</span><span class="cx">
</span><span class="cx"> extern struct switch_runtime runtime;
</span></span></pre></div>
<a id="freeswitchtrunksrcincludeswitch_coreh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/include/switch_core.h (16061 => 16062)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/include/switch_core.h 2009-12-28 16:37:54 UTC (rev 16061)
+++ freeswitch/trunk/src/include/switch_core.h 2009-12-28 16:40:18 UTC (rev 16062)
</span><span class="lines">@@ -2049,7 +2049,6 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_detach(void);
</span><span class="cx"> SWITCH_DECLARE(uint32_t) switch_core_debug_level(void);
</span><span class="cx"> SWITCH_DECLARE(void) switch_cache_db_flush_handles(void);
</span><del>-SWITCH_DECLARE(void) switch_core_uuid_get(switch_uuid_t *uuid);
</del><span class="cx">
</span><span class="cx"> SWITCH_END_EXTERN_C
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_aprc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_apr.c (16061 => 16062)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_apr.c 2009-12-28 16:37:54 UTC (rev 16061)
+++ freeswitch/trunk/src/switch_apr.c 2009-12-28 16:40:18 UTC (rev 16062)
</span><span class="lines">@@ -883,8 +883,7 @@
</span><span class="cx"> SWITCH_DECLARE(void) switch_uuid_get(switch_uuid_t *uuid)
</span><span class="cx"> {
</span><span class="cx"> #ifndef WIN32
</span><del>- //apr_uuid_get((apr_uuid_t *) uuid);
- switch_core_uuid_get(uuid);
</del><ins>+ apr_uuid_get((apr_uuid_t *) uuid);
</ins><span class="cx"> #else
</span><span class="cx"> UuidCreate((UUID*)uuid);
</span><span class="cx"> #endif
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_corec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_core.c (16061 => 16062)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_core.c 2009-12-28 16:37:54 UTC (rev 16061)
+++ freeswitch/trunk/src/switch_core.c 2009-12-28 16:40:18 UTC (rev 16062)
</span><span class="lines">@@ -1166,22 +1166,6 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-SWITCH_DECLARE(void) switch_core_uuid_get(switch_uuid_t *uuid)
-{
- size_t n;
- void *vp;
- uuid_t *xuuid;
-
- uuid_create(&xuuid);
-
- switch_mutex_lock(runtime.uuid_mutex);
- uuid_make(xuuid, UUID_MAKE_V4);
- uuid_export(xuuid, UUID_FMT_BIN, &vp, &n);
- //memcpy(xuuid, vp, n);
- switch_mutex_unlock(runtime.uuid_mutex);
-
-}
-
</del><span class="cx"> SWITCH_DECLARE(switch_status_t) switch_core_init(switch_core_flag_t flags, switch_bool_t console, const char **err)
</span><span class="cx"> {
</span><span class="cx"> switch_uuid_t uuid;
</span><span class="lines">@@ -1192,7 +1176,7 @@
</span><span class="cx"> char hostname[256] = "";
</span><span class="cx">
</span><span class="cx"> memset(&runtime, 0, sizeof(runtime));
</span><del>-
</del><ins>+
</ins><span class="cx"> runtime.dummy_cng_frame.data = runtime.dummy_data;
</span><span class="cx"> runtime.dummy_cng_frame.datalen = sizeof(runtime.dummy_data);
</span><span class="cx"> runtime.dummy_cng_frame.buflen = sizeof(runtime.dummy_data);
</span><span class="lines">@@ -1218,7 +1202,6 @@
</span><span class="cx"> }
</span><span class="cx"> switch_assert(runtime.memory_pool != NULL);
</span><span class="cx">
</span><del>-
</del><span class="cx"> dir_path = switch_mprintf("%s%ssounds", SWITCH_GLOBAL_dirs.base_dir, SWITCH_PATH_SEPARATOR);
</span><span class="cx"> switch_dir_make_recursive(dir_path, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx"> switch_safe_free(dir_path);
</span><span class="lines">@@ -1233,8 +1216,6 @@
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.grammar_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx"> switch_dir_make_recursive(SWITCH_GLOBAL_dirs.temp_dir, SWITCH_DEFAULT_DIR_PERMS, runtime.memory_pool);
</span><span class="cx">
</span><del>- switch_mutex_init(&runtime.uuid_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
- uuid_create(&runtime.uuid);
</del><span class="cx">
</span><span class="cx"> switch_mutex_init(&runtime.throttle_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
</span><span class="cx"> switch_mutex_init(&runtime.session_hash_mutex, SWITCH_MUTEX_NESTED, runtime.memory_pool);
</span></span></pre></div>
<a id="freeswitchtrunksrcswitch_ivr_originatec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/src/switch_ivr_originate.c (16061 => 16062)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/src/switch_ivr_originate.c 2009-12-28 16:37:54 UTC (rev 16061)
+++ freeswitch/trunk/src/switch_ivr_originate.c 2009-12-28 16:40:18 UTC (rev 16062)
</span><span class="lines">@@ -198,10 +198,7 @@
</span><span class="cx"> switch_input_args_t args = { 0 };
</span><span class="cx"> args.buf = buf;
</span><span class="cx"> args.buflen = sizeof(buf);
</span><del>- if (switch_ivr_play_file(collect->session, NULL, collect->file, &args) != SWITCH_STATUS_SUCCESS) {
- switch_log_printf(SWITCH_CHANNEL_SESSION_LOG(collect->session), SWITCH_LOG_ERROR, "%s Error Playing File!", switch_channel_get_name(channel));
- switch_channel_hangup(channel, SWITCH_CAUSE_DESTINATION_OUT_OF_ORDER);
- }
</del><ins>+ switch_ivr_play_file(collect->session, NULL, collect->file, &args);
</ins><span class="cx"> } else {
</span><span class="cx"> switch_ivr_collect_digits_count(collect->session, buf, sizeof(buf), 1, SWITCH_BLANK_STRING, &term, 0, 0, 0);
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>