kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-24 19:52:35 +00:00
Code Issues Projects Releases Wiki Activity

revert openzap temporary workaround for Windows compilation

Browse Source
This commit is contained in:
Moises Silva 2010-04-08 12:58:56 -04:00
parent 2c830f84aa
commit 61c563afcb
1 changed files with 4 additions and 17 deletions

21
libs/openzap/src/ozmod/ozmod_wanpipe/ozmod_wanpipe.c

@ -43,8 +43,6 @@
#include "libsangoma.h" #include "libsangoma.h"
#if defined(__WINDOWS__) #if defined(__WINDOWS__)
/* remove this when http://jira.freeswitch.org/browse/FSBUILD-259 wanpipe issue is fixed */
#define WINDOWS_BUILD_BROKEN 1
/*! Backward compatible defines - current code is all using the old names*/ /*! Backward compatible defines - current code is all using the old names*/
#define sangoma_open_tdmapi_span_chan sangoma_open_api_span_chan #define sangoma_open_tdmapi_span_chan sangoma_open_api_span_chan
#define sangoma_open_tdmapi_span sangoma_open_api_span #define sangoma_open_tdmapi_span sangoma_open_api_span
@ -96,8 +94,6 @@ static struct {
ZIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event); ZIO_SPAN_POLL_EVENT_FUNCTION(wanpipe_poll_event);
ZIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event); ZIO_SPAN_NEXT_EVENT_FUNCTION(wanpipe_next_event);
#define WP_INVALID_SOCKET -1
/** /**
* \brief Poll for event on a wanpipe socket * \brief Poll for event on a wanpipe socket
* \param fd Wanpipe socket descriptor * \param fd Wanpipe socket descriptor
@ -219,7 +215,7 @@ static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start,
} }
for(x = start; x < end; x++) { for(x = start; x < end; x++) {
zap_channel_t *chan; zap_channel_t *chan;
zap_socket_t sockfd = WP_INVALID_SOCKET; zap_socket_t sockfd = ZAP_INVALID_SOCKET;
const char *dtmf = "none"; const char *dtmf = "none";
if (!strncasecmp(span->name, "smg_prid_nfas", 8) && span->trunk_type == ZAP_TRUNK_T1 && x == 24) { if (!strncasecmp(span->name, "smg_prid_nfas", 8) && span->trunk_type == ZAP_TRUNK_T1 && x == 24) {
#ifdef LIBSANGOMA_VERSION #ifdef LIBSANGOMA_VERSION
@ -231,7 +227,7 @@ static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start,
sockfd = tdmv_api_open_span_chan(spanno, x); sockfd = tdmv_api_open_span_chan(spanno, x);
} }
if (sockfd == WP_INVALID_SOCKET) { if (sockfd == ZAP_INVALID_SOCKET) {
zap_log(ZAP_LOG_ERROR, "Failed to open wanpipe device span %d channel %d\n", spanno, x); zap_log(ZAP_LOG_ERROR, "Failed to open wanpipe device span %d channel %d\n", spanno, x);
continue; continue;
} }
@ -587,29 +583,24 @@ static ZIO_COMMAND_FUNCTION(wanpipe_command)
break; break;
case ZAP_COMMAND_ENABLE_ECHOCANCEL: case ZAP_COMMAND_ENABLE_ECHOCANCEL:
{ {
#ifndef WINDOWS_BUILD_BROKEN
err=sangoma_tdm_enable_hwec(zchan->sockfd, &tdm_api); err=sangoma_tdm_enable_hwec(zchan->sockfd, &tdm_api);
if (err) { if (err) {
snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Enable Failed"); snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Enable Failed");
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif /* WINDOWS_BUILD_BROKEN */
} }
break; break;
case ZAP_COMMAND_DISABLE_ECHOCANCEL: case ZAP_COMMAND_DISABLE_ECHOCANCEL:
{ {
#ifndef WINDOWS_BUILD_BROKEN
err=sangoma_tdm_disable_hwec(zchan->sockfd, &tdm_api); err=sangoma_tdm_disable_hwec(zchan->sockfd, &tdm_api);
if (err) { if (err) {
snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Disable Failed"); snprintf(zchan->last_error, sizeof(zchan->last_error), "HWEC Disable Failed");
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif /* WINDOWS_BUILD_BROKEN */
} }
break; break;
case ZAP_COMMAND_ENABLE_LOOP: case ZAP_COMMAND_ENABLE_LOOP:
{ {
#ifndef WINDOWS_BUILD_BROKEN
#ifdef WP_API_FEATURE_LOOP #ifdef WP_API_FEATURE_LOOP
err=sangoma_tdm_enable_loop(zchan->sockfd, &tdm_api); err=sangoma_tdm_enable_loop(zchan->sockfd, &tdm_api);
if (err) { if (err) {
@ -617,11 +608,9 @@ static ZIO_COMMAND_FUNCTION(wanpipe_command)
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif #endif
#endif /* WINDOWS_BUILD_BROKEN */
} }
case ZAP_COMMAND_DISABLE_LOOP: case ZAP_COMMAND_DISABLE_LOOP:
{ {
#ifndef WINDOWS_BUILD_BROKEN
#ifdef WP_API_FEATURE_LOOP #ifdef WP_API_FEATURE_LOOP
err=sangoma_tdm_disable_loop(zchan->sockfd, &tdm_api); err=sangoma_tdm_disable_loop(zchan->sockfd, &tdm_api);
if (err) { if (err) {
@ -629,7 +618,6 @@ static ZIO_COMMAND_FUNCTION(wanpipe_command)
return ZAP_FAIL; return ZAP_FAIL;
} }
#endif #endif
#endif /* WINDOWS_BUILD_BROKEN */
} }
case ZAP_COMMAND_SET_INTERVAL: case ZAP_COMMAND_SET_INTERVAL:
{ {
@ -1163,9 +1151,8 @@ static ZIO_CHANNEL_DESTROY_FUNCTION(wanpipe_channel_destroy)
} }
#endif #endif
if (zchan->sockfd > -1) { if (zchan->sockfd != ZAP_INVALID_SOCKET) {
close(zchan->sockfd); sangoma_close(&zchan->sockfd);
zchan->sockfd = WP_INVALID_SOCKET;
} }
return ZAP_SUCCESS; return ZAP_SUCCESS;