<!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][17285] </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=17285">17285</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-13 14:18:18 -0500 (Tue, 13 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>add realloc OS hooks and fix boost pri CLI</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmcyginstallsh">freeswitch/trunk/libs/freetdm/cyginstall.sh</a></li>
<li><a href="#freeswitchtrunklibsfreetdmfreetdm2008sln">freeswitch/trunk/libs/freetdm/freetdm.2008.sln</a></li>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdm2008vcproj">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc">freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcincludefreetdmh">freeswitch/trunk/libs/freetdm/src/include/freetdm.h</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmcyginstallsh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/cyginstall.sh (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/cyginstall.sh 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/cyginstall.sh 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -3,8 +3,9 @@
</span><span class="cx"> # FreeSWITCH is trunk is located at ../../
</span><span class="cx"> fsdir=../..
</span><span class="cx"> set -x
</span><ins>+cp Debug/mod/*.dll $fsdir/Debug/mod/
+cp mod_freetdm/Debug/*.pdb $fsdir/Debug/mod/
</ins><span class="cx"> cp Debug/*.dll $fsdir/Debug/
</span><del>-cp Debug/mod/*.dll $fsdir/Debug/mod/
</del><span class="cx"> cp Debug/*.pdb $fsdir/Debug/
</span><span class="cx"> echo "FRIENDLY REMINDER: RECOMPILE ftmod_wanpipe WHENEVER YOU INSTALL NEW DRIVERS"
</span><span class="cx"> set +x
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmfreetdm2008sln"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/freetdm.2008.sln (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/freetdm.2008.sln 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/freetdm.2008.sln 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -54,6 +54,9 @@
</span><span class="cx"> EndProjectSection
</span><span class="cx"> EndProject
</span><span class="cx"> Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "testsangomaboost", "msvc\testboost\testsangomaboost.2008.vcproj", "{0DA69C18-4FA1-4E8C-89CE-12498637C5BE}"
</span><ins>+ ProjectSection(ProjectDependencies) = postProject
+ {93B8812C-3EC4-4F78-8970-FFBFC99E167D} = {93B8812C-3EC4-4F78-8970-FFBFC99E167D}
+ EndProjectSection
</ins><span class="cx"> EndProject
</span><span class="cx"> Global
</span><span class="cx"> GlobalSection(SolutionConfigurationPlatforms) = preSolution
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdm2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.2008.vcproj 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> LinkIncremental="2"
</span><span class="cx"> AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
</span><span class="cx"> GenerateDebugInformation="true"
</span><del>- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
</del><ins>+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
</ins><span class="cx"> SubSystem="2"
</span><span class="cx"> RandomizedBaseAddress="1"
</span><span class="cx"> DataExecutionPrevention="0"
</span><span class="lines">@@ -151,7 +151,7 @@
</span><span class="cx"> LinkIncremental="1"
</span><span class="cx"> AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
</span><span class="cx"> GenerateDebugInformation="true"
</span><del>- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
</del><ins>+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
</ins><span class="cx"> SubSystem="2"
</span><span class="cx"> OptimizeReferences="2"
</span><span class="cx"> EnableCOMDATFolding="2"
</span><span class="lines">@@ -237,7 +237,7 @@
</span><span class="cx"> LinkIncremental="2"
</span><span class="cx"> AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
</span><span class="cx"> GenerateDebugInformation="true"
</span><del>- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
</del><ins>+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
</ins><span class="cx"> SubSystem="2"
</span><span class="cx"> RandomizedBaseAddress="1"
</span><span class="cx"> DataExecutionPrevention="0"
</span><span class="lines">@@ -317,7 +317,7 @@
</span><span class="cx"> LinkIncremental="1"
</span><span class="cx"> AdditionalLibraryDirectories="&quot;../../../w32/Library/$(OutDir)&quot;"
</span><span class="cx"> GenerateDebugInformation="true"
</span><del>- ProgramDatabaseFile="$(OutDir)$(TargetName).pdb"
</del><ins>+ ProgramDatabaseFile="$(OutDir)/$(TargetName).pdb"
</ins><span class="cx"> SubSystem="2"
</span><span class="cx"> OptimizeReferences="2"
</span><span class="cx"> EnableCOMDATFolding="2"
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmmod_freetdmmod_freetdmc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/mod_freetdm/mod_freetdm.c 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -3108,11 +3108,12 @@
</span><span class="cx"> }
</span><span class="cx"> stream->write_function(stream, "+OK gains set to Rx %f and Tx %f\n", rxgain, txgain);
</span><span class="cx"> } else {
</span><ins>+
</ins><span class="cx"> char *rply = ftdm_api_execute(cmd, NULL);
</span><span class="cx">
</span><span class="cx"> if (rply) {
</span><span class="cx"> stream->write_function(stream, "%s", rply);
</span><del>- free(rply);
</del><ins>+ ftdm_safe_free(rply);
</ins><span class="cx"> } else {
</span><span class="cx"> stream->write_function(stream, "-ERR Usage: %s\n", FT_SYNTAX);
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -223,6 +223,14 @@
</span><span class="cx"> return ptr;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+static __inline__ void *ftdm_std_realloc(void *pool, void *buff, ftdm_size_t size)
+{
+ buff = realloc(buff, size);
+ pool = NULL;
+ ftdm_assert_return(buff != NULL, NULL, "Out of memory");
+ return buff;
+}
+
</ins><span class="cx"> static __inline__ void ftdm_std_free(void *pool, void *ptr)
</span><span class="cx"> {
</span><span class="cx"> pool = NULL;
</span><span class="lines">@@ -235,6 +243,7 @@
</span><span class="cx"> /*.pool =*/ NULL,
</span><span class="cx"> /*.malloc =*/ ftdm_std_malloc,
</span><span class="cx"> /*.calloc =*/ ftdm_std_calloc,
</span><ins>+ /*.realloc =*/ ftdm_std_realloc,
</ins><span class="cx"> /*.free =*/ ftdm_std_free
</span><span class="cx"> };
</span><span class="cx">
</span><span class="lines">@@ -3360,6 +3369,11 @@
</span><span class="cx"> ftdm_module_t *mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type);
</span><span class="cx"> ftdm_status_t status = FTDM_FAIL;
</span><span class="cx">
</span><ins>+ if (!span->chan_count) {
+ ftdm_log(FTDM_LOG_WARNING, "Cannot configure signaling on span with no channels\n");
+ return FTDM_FAIL;
+ }
+
</ins><span class="cx"> if (!mod) {
</span><span class="cx"> ftdm_load_module_assume(type);
</span><span class="cx"> if ((mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type))) {
</span><span class="lines">@@ -3371,10 +3385,10 @@
</span><span class="cx"> va_list ap;
</span><span class="cx"> va_start(ap, sig_cb);
</span><span class="cx"> status = mod->sig_configure(span, sig_cb, ap);
</span><ins>+ va_end(ap);
</ins><span class="cx"> if (status == FTDM_SUCCESS && ftdm_test_flag(span, FTDM_SPAN_USE_CHAN_QUEUE)) {
</span><span class="cx"> status = ftdm_queue_create(&span->pendingchans, SPAN_PENDING_CHANS_QUEUE_SIZE);
</span><span class="cx"> }
</span><del>- va_end(ap);
</del><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "can't find '%s'\n", type);
</span><span class="cx"> status = FTDM_FAIL;
</span><span class="lines">@@ -3393,6 +3407,11 @@
</span><span class="cx"> ftdm_assert_return(sig_cb != NULL, FTDM_FAIL, "No signaling callback");
</span><span class="cx"> ftdm_assert_return(parameters != NULL, FTDM_FAIL, "No parameters");
</span><span class="cx">
</span><ins>+ if (!span->chan_count) {
+ ftdm_log(FTDM_LOG_WARNING, "Cannot configure signaling on span with no channels\n");
+ return FTDM_FAIL;
+ }
+
</ins><span class="cx"> if (!mod) {
</span><span class="cx"> ftdm_load_module_assume(type);
</span><span class="cx"> if ((mod = (ftdm_module_t *) hashtable_search(globals.module_hash, (void *)type))) {
</span><span class="lines">@@ -4071,7 +4090,7 @@
</span><span class="cx"> void *new_data;
</span><span class="cx">
</span><span class="cx"> new_len = handle->data_size + need + handle->alloc_chunk;
</span><del>- if ((new_data = realloc(handle->data, new_len))) {
</del><ins>+ if ((new_data = ftdm_realloc(handle->data, new_len))) {
</ins><span class="cx"> handle->data_size = handle->alloc_len = new_len;
</span><span class="cx"> handle->data = new_data;
</span><span class="cx"> buf = handle->data;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_sangoma_boostftmod_sangoma_boostc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_sangoma_boost/ftmod_sangoma_boost.c 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -1798,7 +1798,7 @@
</span><span class="cx"> if (sigmod_iface) {
</span><span class="cx"> char *p = strchr(data, ' ');
</span><span class="cx"> if (++p) {
</span><del>- char* mydup = strdup(p);
</del><ins>+ char* mydup = ftdm_strdup(p);
</ins><span class="cx"> if(sigmod_iface->exec_api == NULL) {
</span><span class="cx"> stream->write_function(stream, "%s does not support api functions\n", sigmod_iface->name);
</span><span class="cx"> goto done;
</span><span class="lines">@@ -1807,7 +1807,7 @@
</span><span class="cx"> if (sigmod_iface->exec_api(stream, mydup) != FTDM_SUCCESS) {
</span><span class="cx"> stream->write_function(stream, "-ERR:failed to execute command:%s\n", mydup);
</span><span class="cx"> }
</span><del>- free(mydup);
</del><ins>+ ftdm_safe_free(mydup);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> goto done;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcincludefreetdmh"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/include/freetdm.h (17284 => 17285)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-13 18:36:00 UTC (rev 17284)
+++ freeswitch/trunk/libs/freetdm/src/include/freetdm.h 2010-04-13 19:18:18 UTC (rev 17285)
</span><span class="lines">@@ -364,7 +364,7 @@
</span><span class="cx"> FT_DECLARE_NONSTD(ftdm_status_t) ftdm_console_stream_write(ftdm_stream_handle_t *handle, const char *fmt, ...);
</span><span class="cx">
</span><span class="cx"> #define FTDM_CMD_CHUNK_LEN 1024
</span><del>-#define FTDM_STANDARD_STREAM(s) memset(&s, 0, sizeof(s)); s.data = malloc(FTDM_CMD_CHUNK_LEN); \
</del><ins>+#define FTDM_STANDARD_STREAM(s) memset(&s, 0, sizeof(s)); s.data = ftdm_malloc(FTDM_CMD_CHUNK_LEN); \
</ins><span class="cx"> assert(s.data); \
</span><span class="cx"> memset(s.data, 0, FTDM_CMD_CHUNK_LEN); \
</span><span class="cx"> s.end = s.data; \
</span><span class="lines">@@ -681,11 +681,13 @@
</span><span class="cx">
</span><span class="cx"> typedef void *(*ftdm_malloc_func_t)(void *pool, ftdm_size_t len);
</span><span class="cx"> typedef void *(*ftdm_calloc_func_t)(void *pool, ftdm_size_t elements, ftdm_size_t len);
</span><ins>+typedef void *(*ftdm_realloc_func_t)(void *pool, void *buff, ftdm_size_t len);
</ins><span class="cx"> typedef void (*ftdm_free_func_t)(void *pool, void *ptr);
</span><span class="cx"> typedef struct ftdm_memory_handler {
</span><span class="cx"> void *pool;
</span><span class="cx"> ftdm_malloc_func_t malloc;
</span><span class="cx"> ftdm_calloc_func_t calloc;
</span><ins>+ ftdm_realloc_func_t realloc;
</ins><span class="cx"> ftdm_free_func_t free;
</span><span class="cx"> } ftdm_memory_handler_t;
</span><span class="cx">
</span><span class="lines">@@ -874,6 +876,13 @@
</span><span class="cx"> #define ftdm_malloc(chunksize) g_ftdm_mem_handler.malloc(g_ftdm_mem_handler.pool, chunksize)
</span><span class="cx">
</span><span class="cx"> /*!
</span><ins>+ \brief Reallocates memory
+ \command buff the buffer
+ \command chunksize the chunk size
+*/
+#define ftdm_realloc(buff, chunksize) g_ftdm_mem_handler.realloc(g_ftdm_mem_handler.pool, buff, chunksize)
+
+/*!
</ins><span class="cx"> \brief Allocate initialized memory
</span><span class="cx"> \command chunksize the chunk size
</span><span class="cx"> */
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>