<!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][17246] </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=17246">17246</a></dd>
<dt>Author</dt> <dd>moy</dd>
<dt>Date</dt> <dd>2010-04-08 12:25:44 -0500 (Thu, 08 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>fix freetdm win compilation</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#freeswitchtrunklibsfreetdmmsvcfreetdm2008vcproj">freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_cpu_monitorc">freeswitch/trunk/libs/freetdm/src/ftdm_cpu_monitor.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_ioc">freeswitch/trunk/libs/freetdm/src/ftdm_io.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftdm_threadmutexc">freeswitch/trunk/libs/freetdm/src/ftdm_threadmutex.c</a></li>
<li><a href="#freeswitchtrunklibsfreetdmsrcftmodftmod_wanpipeftmod_wanpipec">freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="freeswitchtrunklibsfreetdmmsvcfreetdm2008vcproj"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj (17245 => 17246)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj 2010-04-08 17:12:52 UTC (rev 17245)
+++ freeswitch/trunk/libs/freetdm/msvc/freetdm.2008.vcproj 2010-04-08 17:25:44 UTC (rev 17246)
</span><span class="lines">@@ -327,63 +327,63 @@
</span><span class="cx"> UniqueIdentifier="{93995380-89BD-4b04-88EB-625FBE52EBFB}"
</span><span class="cx"> >
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\fsk.h"
</del><ins>+ RelativePath="..\src\include\freetdm.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\g711.h"
</del><ins>+ RelativePath="..\src\include\fsk.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\hashtable.h"
</del><ins>+ RelativePath="..\src\include\ftdm_buffer.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\hashtable_itr.h"
</del><ins>+ RelativePath="..\src\include\ftdm_config.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\hashtable_private.h"
</del><ins>+ RelativePath="..\src\include\ftdm_dso.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\libteletone.h"
</del><ins>+ RelativePath="..\src\include\ftdm_threadmutex.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\libteletone_detect.h"
</del><ins>+ RelativePath="..\src\include\ftdm_types.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\libteletone_generate.h"
</del><ins>+ RelativePath="..\src\include\g711.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\freetdm.h"
</del><ins>+ RelativePath="..\src\include\hashtable.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\uart.h"
</del><ins>+ RelativePath="..\src\include\hashtable_itr.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\ftdm_buffer.h"
</del><ins>+ RelativePath="..\src\include\hashtable_private.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\ftdm_config.h"
</del><ins>+ RelativePath="..\src\include\libteletone.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\ftdm_dso.h"
</del><ins>+ RelativePath="..\src\include\libteletone_detect.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\ftdm_threadmutex.h"
</del><ins>+ RelativePath="..\src\include\libteletone_generate.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\include\ftdm_types.h"
</del><ins>+ RelativePath="..\src\include\uart.h"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> </Filter>
</span><span class="lines">@@ -397,57 +397,61 @@
</span><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\g711.c"
</del><ins>+ RelativePath="..\src\ftdm_buffer.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\hashtable.c"
</del><ins>+ RelativePath="..\src\ftdm_callerid.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\hashtable_itr.c"
</del><ins>+ RelativePath="..\src\ftdm_config.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\libteletone_detect.c"
</del><ins>+ RelativePath="..\src\ftdm_cpu_monitor.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\libteletone_generate.c"
</del><ins>+ RelativePath="..\src\ftdm_dso.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\uart.c"
</del><ins>+ RelativePath="..\src\ftdm_io.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_buffer.c"
</del><ins>+ RelativePath="..\src\ftdm_queue.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_callerid.c"
</del><ins>+ RelativePath="..\src\ftdm_threadmutex.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_config.c"
</del><ins>+ RelativePath="..\src\g711.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_dso.c"
</del><ins>+ RelativePath="..\src\hashtable.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_io.c"
</del><ins>+ RelativePath="..\src\hashtable_itr.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_queue.c"
</del><ins>+ RelativePath="..\src\libteletone_detect.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><span class="cx"> <File
</span><del>- RelativePath="..\src\ftdm_threadmutex.c"
</del><ins>+ RelativePath="..\src\libteletone_generate.c"
</ins><span class="cx"> >
</span><span class="cx"> </File>
</span><ins>+ <File
+ RelativePath="..\src\uart.c"
+ >
+ </File>
</ins><span class="cx"> </Filter>
</span><span class="cx"> </Files>
</span><span class="cx"> <Globals>
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_cpu_monitorc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_cpu_monitor.c (17245 => 17246)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_cpu_monitor.c 2010-04-08 17:12:52 UTC (rev 17245)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_cpu_monitor.c 2010-04-08 17:25:44 UTC (rev 17246)
</span><span class="lines">@@ -201,28 +201,31 @@
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-#elif defined (WIN32) || defined (WIN64)
</del><ins>+#elif defined (__WINDOWS__)
</ins><span class="cx"> FT_DECLARE(ftdm_status_t) ftdm_cpu_get_system_idle_time(struct ftdm_cpu_monitor_stats *p, double *idle_percentage)
</span><span class="cx"> {
</span><span class="cx"> FILETIME idleTime;
</span><span class="cx"> FILETIME kernelTime;
</span><span class="cx"> FILETIME userTime;
</span><ins>+ int64_t i64UserTime;
+ int64_t i64KernelTime;
+ int64_t i64IdleTime;
</ins><span class="cx">
</span><del>- if (!::GetSystemTimes(&idleTime, &kernelTime, &userTime)) {
- return false;
</del><ins>+ if (!GetSystemTimes(&idleTime, &kernelTime, &userTime)) {
+ return FTDM_FAIL;
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- __int64 i64UserTime = (__int64)userTime.dwLowDateTime | ((__int64)userTime.dwHighDateTime << 32);
</del><ins>+ i64UserTime = (int64_t)userTime.dwLowDateTime | ((int64_t)userTime.dwHighDateTime << 32);
</ins><span class="cx">
</span><del>- __int64 i64KernelTime = (__int64)kernelTime.dwLowDateTime | ((__int64)kernelTime.dwHighDateTime << 32);
</del><ins>+ i64KernelTime = (int64_t)kernelTime.dwLowDateTime | ((int64_t)kernelTime.dwHighDateTime << 32);
</ins><span class="cx">
</span><del>- __int64 i64IdleTime = (__int64)idleTime.dwLowDateTime | ((__int64)idleTime.dwHighDateTime << 32);
</del><ins>+ i64IdleTime = (int64_t)idleTime.dwLowDateTime | ((int64_t)idleTime.dwHighDateTime << 32);
</ins><span class="cx">
</span><span class="cx"> if (p->valid_last_times) {
</span><del>- __int64 i64User = i64UserTime - p->i64LastUserTime;
- __int64 i64Kernel = i64KernelTime - p->i64LastKernelTime;
- __int64 i64Idle = i64IdleTime - p->i64LastIdleTime;
- __int64 i64System = i64User + i64Kernel;
</del><ins>+ int64_t i64User = i64UserTime - p->i64LastUserTime;
+ int64_t i64Kernel = i64KernelTime - p->i64LastKernelTime;
+ int64_t i64Idle = i64IdleTime - p->i64LastIdleTime;
+ int64_t i64System = i64User + i64Kernel;
</ins><span class="cx"> *idle_percentage = 100.0 * i64Idle / i64System;
</span><span class="cx"> } else {
</span><span class="cx"> *idle_percentage = 100.0;
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_ioc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_io.c (17245 => 17246)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-08 17:12:52 UTC (rev 17245)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_io.c 2010-04-08 17:25:44 UTC (rev 17246)
</span><span class="lines">@@ -2855,6 +2855,7 @@
</span><span class="cx"> ftdm_config_t cfg;
</span><span class="cx"> char *var, *val;
</span><span class="cx"> int catno = -1;
</span><ins>+ int intparam = 0;
</ins><span class="cx"> int currindex = 0;
</span><span class="cx"> ftdm_span_t *span = NULL;
</span><span class="cx"> unsigned configured = 0, d = 0;
</span><span class="lines">@@ -3059,14 +3060,16 @@
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Invalid cpu monitoring interval %s\n", val);
</span><span class="cx"> }
</span><span class="cx"> } else if (!strncasecmp(var, "cpu_set_alarm_threshold", sizeof("cpu_set_alarm_threshold")-1)) {
</span><del>- if (atoi(val) > 0 && atoi(val) < 100) {
- globals.cpu_monitor.set_alarm_threshold = atoi(val);
</del><ins>+ intparam = atoi(val);
+ if (intparam > 0 && intparam < 100) {
+ globals.cpu_monitor.set_alarm_threshold = (uint8_t)intparam;
</ins><span class="cx"> } else {
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Invalid cpu alarm set threshold %s\n", val);
</span><span class="cx"> }
</span><span class="cx"> } else if (!strncasecmp(var, "cpu_reset_alarm_threshold", sizeof("cpu_reset_alarm_threshold")-1)) {
</span><del>- if (atoi(val) > 0 && atoi(val) < 100) {
- globals.cpu_monitor.reset_alarm_threshold = atoi(val);
</del><ins>+ intparam = atoi(val);
+ if (intparam > 0 && intparam < 100) {
+ globals.cpu_monitor.reset_alarm_threshold = (uint8_t)intparam;
</ins><span class="cx"> if (globals.cpu_monitor.reset_alarm_threshold > globals.cpu_monitor.set_alarm_threshold) {
</span><span class="cx"> globals.cpu_monitor.reset_alarm_threshold = globals.cpu_monitor.set_alarm_threshold - 10;
</span><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Cpu alarm reset threshold must be lower than set threshold"
</span><span class="lines">@@ -3652,6 +3655,9 @@
</span><span class="cx"> ftdm_delete_cpu_monitor(cpu_stats);
</span><span class="cx"> monitor->running = 0;
</span><span class="cx"> return NULL;
</span><ins>+#ifdef __WINDOWS__
+ UNREFERENCED_PARAMETER(me);
+#endif
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> static ftdm_status_t ftdm_cpu_monitor_start(void)
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftdm_threadmutexc"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftdm_threadmutex.c (17245 => 17246)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftdm_threadmutex.c 2010-04-08 17:12:52 UTC (rev 17245)
+++ freeswitch/trunk/libs/freetdm/src/ftdm_threadmutex.c 2010-04-08 17:25:44 UTC (rev 17246)
</span><span class="lines">@@ -314,7 +314,7 @@
</span><span class="cx"> num++;
</span><span class="cx"> ints[1] = interrupt->device;
</span><span class="cx"> }
</span><del>- res = WaitForMultipleObjects(num, &ints, FALSE, ms >= 0 ? ms : INFINITE);
</del><ins>+ res = WaitForMultipleObjects(num, ints, FALSE, ms >= 0 ? ms : INFINITE);
</ins><span class="cx"> switch (res) {
</span><span class="cx"> case WAIT_TIMEOUT:
</span><span class="cx"> return FTDM_TIMEOUT;
</span><span class="lines">@@ -366,7 +366,7 @@
</span><span class="cx"> {
</span><span class="cx"> ftdm_assert_return(interrupt != NULL, FTDM_FAIL, "Interrupt is null!\n");
</span><span class="cx"> #ifdef WIN32
</span><del>- if (!SetEvent(interrupt->interrupt)) {
</del><ins>+ if (!SetEvent(interrupt->event)) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Failed to signal interrupt\n");
</span><span class="cx"> return FTDM_FAIL;
</span><span class="cx"> }
</span><span class="lines">@@ -400,10 +400,42 @@
</span><span class="cx">
</span><span class="cx"> FT_DECLARE(ftdm_status_t) ftdm_interrupt_multiple_wait(ftdm_interrupt_t *interrupts[], ftdm_size_t size, int ms)
</span><span class="cx"> {
</span><del>-#ifndef WIN32
- int i;
</del><ins>+ int numdevices = 0;
+ unsigned i;
+#if defined(__WINDOWS__)
+ DWORD res = 0;
+ HANDLE ints[20];
+ if (size > (ftdm_array_len(ints)/2)) {
+ /* improve if needed: dynamically allocate the list of interrupts *only* when exceeding the default size */
+ ftdm_log(FTDM_LOG_CRIT, "Unsupported size of interrupts: %d, implement me!\n", size);
+ return FTDM_FAIL;
+ }
+
+ for (i = 0; i < size; i++) {
+ ints[i] = interrupts[i]->event;
+ if (interrupts[i]->device != FTDM_INVALID_SOCKET) {
+ ints[i+numdevices] = interrupts[i]->device;
+ numdevices++;
+ }
+ }
+
+ res = WaitForMultipleObjects(size+numdevices, ints, FALSE, ms >= 0 ? ms : INFINITE);
+
+ switch (res) {
+ case WAIT_TIMEOUT:
+ return FTDM_TIMEOUT;
+ case WAIT_FAILED:
+ case WAIT_ABANDONED: /* is it right to fail with abandoned? */
+ return FTDM_FAIL;
+ default:
+ if (res >= (size+numdevices)) {
+ ftdm_log(FTDM_LOG_ERROR, "Error waiting for freetdm interrupt event (WaitForSingleObject returned %d)\n", res);
+ return FTDM_FAIL;
+ }
+ /* fall-through to FTDM_SUCCESS at the end of the function */
+ }
+#elif defined(__linux__)
</ins><span class="cx"> int res = 0;
</span><del>- int numdevices = 0;
</del><span class="cx"> char pipebuf[255];
</span><span class="cx"> struct pollfd ints[size*2];
</span><span class="cx">
</span><span class="lines">@@ -432,6 +464,7 @@
</span><span class="cx"> return FTDM_TIMEOUT;
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+ /* check for events in the pipes, NOT in the devices */
</ins><span class="cx"> for (i = 0; i < size; i++) {
</span><span class="cx"> if (ints[i].revents & POLLIN) {
</span><span class="cx"> res = read(ints[i].fd, pipebuf, sizeof(pipebuf));
</span><span class="lines">@@ -440,7 +473,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span><del>-
</del><ins>+#else
</ins><span class="cx"> #endif
</span><span class="cx"> return FTDM_SUCCESS;
</span><span class="cx"> }
</span></span></pre></div>
<a id="freeswitchtrunklibsfreetdmsrcftmodftmod_wanpipeftmod_wanpipec"></a>
<div class="modfile"><h4>Modified: freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c (17245 => 17246)</h4>
<pre class="diff"><span>
<span class="info">--- freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c 2010-04-08 17:12:52 UTC (rev 17245)
+++ freeswitch/trunk/libs/freetdm/src/ftmod/ftmod_wanpipe/ftmod_wanpipe.c 2010-04-08 17:25:44 UTC (rev 17246)
</span><span class="lines">@@ -101,8 +101,6 @@
</span><span class="cx"> FIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event);
</span><span class="cx"> FIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event);
</span><span class="cx">
</span><del>-#define WP_INVALID_SOCKET -1
-
</del><span class="cx"> /**
</span><span class="cx"> * \brief Poll for event on a wanpipe socket
</span><span class="cx"> * \param fd Wanpipe socket descriptor
</span><span class="lines">@@ -224,7 +222,7 @@
</span><span class="cx"> }
</span><span class="cx"> for(x = start; x < end; x++) {
</span><span class="cx"> ftdm_channel_t *chan;
</span><del>- ftdm_socket_t sockfd = WP_INVALID_SOCKET;
</del><ins>+ ftdm_socket_t sockfd = FTDM_INVALID_SOCKET;
</ins><span class="cx"> const char *dtmf = "none";
</span><span class="cx"> if (!strncasecmp(span->name, "smg_prid_nfas", 8) && span->trunk_type == FTDM_TRUNK_T1 && x == 24) {
</span><span class="cx"> #ifdef LIBSANGOMA_VERSION
</span><span class="lines">@@ -236,7 +234,7 @@
</span><span class="cx"> sockfd = tdmv_api_open_span_chan(spanno, x);
</span><span class="cx"> }
</span><span class="cx">
</span><del>- if (sockfd == WP_INVALID_SOCKET) {
</del><ins>+ if (sockfd == FTDM_INVALID_SOCKET) {
</ins><span class="cx"> ftdm_log(FTDM_LOG_ERROR, "Failed to open wanpipe device span %d channel %d\n", spanno, x);
</span><span class="cx"> continue;
</span><span class="cx"> }
</span><span class="lines">@@ -1166,9 +1164,8 @@
</span><span class="cx"> }
</span><span class="cx"> #endif
</span><span class="cx">
</span><del>- if (ftdmchan->sockfd > -1) {
- close(ftdmchan->sockfd);
- ftdmchan->sockfd = WP_INVALID_SOCKET;
</del><ins>+ if (ftdmchan->sockfd != FTDM_INVALID_SOCKET) {
+ sangoma_close(&ftdmchan->sockfd);
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> return FTDM_SUCCESS;
</span></span></pre>
</div>
</div>
<div id="footer">See you at ClueCon</div>
</body>
</html>