some cross platform cleanup.
git-svn-id: http://svn.openzap.org/svn/openzap/trunk@40 a93c3328-9c30-0410-af19-c9cd2b2d52af
This commit is contained in:
Michael Jerris
parent
69bd1dab46
commit
425083a45d
|
|
@ -1,5 +1,5 @@
|
|||
/*****************************************************************************
|
||||
* win_api_common.h Windows Sangoma API Code Library
|
||||
* sangoma_tdm_api.h Sangoma API Code Library
|
||||
*
|
||||
* Author(s): David Rokhvarg <davidr@sangoma.com>
|
||||
*
|
||||
|
|
@ -8,12 +8,45 @@
|
|||
* ============================================================================
|
||||
*/
|
||||
|
||||
#ifndef _WIN_API_COMMON_H
|
||||
#define _WIN_API_COMMON_H
|
||||
#ifndef _SANGOMA_TDM_API_H
|
||||
#define _SANGOMA_TDM_API_H
|
||||
|
||||
#ifndef __WINDOWS__
|
||||
#if defined(WIN32) || defined(WIN64) || defined(_MSC_VER) || defined(_WIN32)
|
||||
#define __WINDOWS__
|
||||
#endif
|
||||
#endif
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#ifdef _MSC_VER
|
||||
/* disable warning for zero length array in a struct */
|
||||
/* this will cause errors on c99 and ansi compliant compilers and will need to be fixed in the wanpipe header files */
|
||||
#pragma warning(disable:4200 4201 4214)
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#define WP_INVALID_SOCKET INVALID_HANDLE_VALUE
|
||||
#else
|
||||
#define WP_INVALID_SOCKET -1
|
||||
#include <stropts.h>
|
||||
#endif
|
||||
|
||||
#include <wanpipe_defines.h>
|
||||
#include <wanpipe_cfg.h>
|
||||
#include <wanpipe_tdm_api.h>
|
||||
#include <sdla_te1_pmc.h>
|
||||
#ifdef __WINDOWS__
|
||||
#include <sang_status_defines.h>
|
||||
#include <sang_api.h>
|
||||
#endif
|
||||
#include <sdla_aft_te1.h>
|
||||
|
||||
#define FNAME_LEN 50
|
||||
#define DEV_NAME_LEN 100
|
||||
char device_name[DEV_NAME_LEN];
|
||||
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
|
||||
/* IOCTL management structures and variables*/
|
||||
wan_udp_hdr_t wan_udp;
|
||||
|
||||
|
|
@ -22,13 +55,10 @@ static api_tx_hdr_t *tx_hdr = (api_tx_hdr_t *)api_cmd.data;
|
|||
|
||||
/* keeps the LAST (and single) event received */
|
||||
static wp_tdm_api_rx_hdr_t last_tdm_api_event_buffer;
|
||||
#endif
|
||||
|
||||
static
|
||||
int
|
||||
tdmv_api_ioctl(
|
||||
HANDLE fd,
|
||||
wanpipe_tdm_api_cmd_t *tdm_api_cmd
|
||||
)
|
||||
#ifdef __WINDOWS__
|
||||
static int tdmv_api_ioctl(sng_fd_t fd, wanpipe_tdm_api_cmd_t *tdm_api_cmd)
|
||||
{
|
||||
DWORD ln;
|
||||
unsigned char id = 0;
|
||||
|
|
@ -75,12 +105,49 @@ tdmv_api_ioctl(
|
|||
return 0;
|
||||
}
|
||||
|
||||
static
|
||||
int
|
||||
wanpipe_api_ioctl(
|
||||
HANDLE fd,
|
||||
wan_cmd_api_t *api_cmd
|
||||
)
|
||||
#else
|
||||
static int tdmv_api_ioctl(sng_fd_t fd, wanpipe_tdm_api_cmd_t *tdm_api_cmd)
|
||||
{
|
||||
return ioctl(fd, SIOC_WANPIPE_TDM_API, tdm_api_cmd);
|
||||
}
|
||||
#endif
|
||||
|
||||
static sng_fd_t tdmv_api_open_span_chan(int span, int chan)
|
||||
{
|
||||
char fname[FNAME_LEN];
|
||||
#if defined(__WINDOWS__)
|
||||
|
||||
//NOTE: under Windows Interfaces are zero based but 'chan' is 1 based.
|
||||
// Subtract 1 from 'chan'.
|
||||
_snprintf(fname , FNAME_LEN, "\\\\.\\WANPIPE%d_IF%d", span, chan - 1);
|
||||
|
||||
//prn(verbose, "Opening device: %s...\n", fname);
|
||||
|
||||
return CreateFile( fname,
|
||||
GENERIC_READ | GENERIC_WRITE,
|
||||
FILE_SHARE_READ | FILE_SHARE_WRITE,
|
||||
(LPSECURITY_ATTRIBUTES)NULL,
|
||||
OPEN_EXISTING,
|
||||
FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH,
|
||||
(HANDLE)NULL
|
||||
);
|
||||
#else
|
||||
int fd = WP_INVALID_SOCKET;
|
||||
|
||||
sprintf(fname,"/dev/wptdm_s%dc%d",span,chan);
|
||||
|
||||
fd = open(fname, O_RDWR);
|
||||
|
||||
if (fd < 0) {
|
||||
fd = WP_INVALID_SOCKET;
|
||||
}
|
||||
|
||||
return fd;
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
static int wanpipe_api_ioctl(sng_fd_t fd, wan_cmd_api_t *api_cmd)
|
||||
{
|
||||
DWORD ln;
|
||||
unsigned char id = 0;
|
||||
|
|
@ -130,7 +197,7 @@ wanpipe_api_ioctl(
|
|||
static
|
||||
USHORT
|
||||
DoReadCommand(
|
||||
HANDLE drv,
|
||||
sng_fd_t drv,
|
||||
RX_DATA_STRUCT * pRx
|
||||
)
|
||||
{
|
||||
|
|
@ -158,7 +225,7 @@ DoReadCommand(
|
|||
static
|
||||
UCHAR
|
||||
DoWriteCommand(
|
||||
HANDLE drv,
|
||||
sng_fd_t drv,
|
||||
TX_DATA_STRUCT * pTx
|
||||
)
|
||||
{
|
||||
|
|
@ -184,7 +251,7 @@ DoWriteCommand(
|
|||
static
|
||||
USHORT
|
||||
DoApiPollCommand(
|
||||
HANDLE drv,
|
||||
sng_fd_t drv,
|
||||
API_POLL_STRUCT *api_poll_ptr
|
||||
)
|
||||
{
|
||||
|
|
@ -209,7 +276,7 @@ DoApiPollCommand(
|
|||
static
|
||||
int
|
||||
DoManagementCommand(
|
||||
HANDLE drv,
|
||||
sng_fd_t drv,
|
||||
wan_udp_hdr_t* wan_udp
|
||||
)
|
||||
{
|
||||
|
|
@ -266,7 +333,7 @@ typedef struct
|
|||
//remove from head
|
||||
api_queue_element_t * head;
|
||||
//mutex for synchronizing access to the queue
|
||||
HANDLE api_queue_mutex;
|
||||
sng_fd_t api_queue_mutex;
|
||||
}api_queue_t;
|
||||
|
||||
|
||||
|
|
@ -360,4 +427,6 @@ static __inline void empty_api_queue(api_queue_t* api_queue)
|
|||
}
|
||||
|
||||
///////////////////////////////////////////////////////////////////////////
|
||||
#endif /* _WIN_API_COMMON_H */
|
||||
#endif
|
||||
|
||||
#endif /* _SANGOMA_TDM_API_H */
|
||||
|
|
@ -36,37 +36,12 @@
|
|||
#include "openzap.h"
|
||||
#include "zap_wanpipe.h"
|
||||
|
||||
#ifdef __WINDOWS__
|
||||
#ifdef _MSC_VER
|
||||
/* disable warning for zero length array in a struct */
|
||||
/* this will cause errors on c99 and ansi compliant compilers and will need to be fixed in the wanpipe header files */
|
||||
#pragma warning(disable:4200 4201 4214)
|
||||
#endif
|
||||
#include <windows.h>
|
||||
#define FNAME_LEN 50
|
||||
#define WP_INVALID_SOCKET INVALID_HANDLE_VALUE
|
||||
#else
|
||||
#define WP_INVALID_SOCKET -1
|
||||
#include <stropts.h>
|
||||
#endif
|
||||
|
||||
#include <wanpipe_defines.h>
|
||||
#include <wanpipe_cfg.h>
|
||||
#include <wanpipe_tdm_api.h>
|
||||
#include <sdla_te1_pmc.h>
|
||||
#ifdef __WINDOWS__
|
||||
#include <sang_status_defines.h>
|
||||
#include <sang_api.h>
|
||||
#endif
|
||||
#include <sdla_aft_te1.h>
|
||||
#include <sangoma_tdm_api.h>
|
||||
|
||||
#ifdef HAVE_SYS_SOCKET_H
|
||||
#include <sys/socket.h>
|
||||
#endif
|
||||
|
||||
#if defined(__WINDOWS__)
|
||||
#include <zap_wanpipe_windows.h>
|
||||
#endif
|
||||
|
||||
static struct {
|
||||
unsigned codec_ms;
|
||||
|
|
@ -78,11 +53,7 @@ static zap_status_t wp_tdm_cmd_exec(zap_channel_t *zchan, wanpipe_tdm_api_t *tdm
|
|||
{
|
||||
int err;
|
||||
|
||||
#if defined(__WINDOWS__)
|
||||
err = tdmv_api_ioctl(zchan->sockfd, &tdm_api->wp_tdm_cmd);
|
||||
#else
|
||||
err = ioctl(zchan->sockfd, SIOC_WANPIPE_TDM_API, &tdm_api->wp_tdm_cmd);
|
||||
#endif
|
||||
|
||||
if (err) {
|
||||
snprintf(zchan->last_error, sizeof(zchan->last_error), "%s", strerror(errno));
|
||||
|
|
@ -92,36 +63,6 @@ static zap_status_t wp_tdm_cmd_exec(zap_channel_t *zchan, wanpipe_tdm_api_t *tdm
|
|||
return ZAP_SUCCESS;
|
||||
}
|
||||
|
||||
static zap_socket_t wp_open_device(int span, int chan)
|
||||
{
|
||||
char fname[256];
|
||||
#if defined(__WINDOWS__)
|
||||
|
||||
_snprintf(fname , FNAME_LEN, "\\\\.\\WANPIPE%d_IF%d", span, chan - 1);
|
||||
|
||||
return CreateFile( fname,
|
||||
GENERIC_READ | GENERIC_WRITE,
|
||||
FILE_SHARE_READ | FILE_SHARE_WRITE,
|
||||
(LPSECURITY_ATTRIBUTES)NULL,
|
||||
OPEN_EXISTING,
|
||||
FILE_FLAG_NO_BUFFERING | FILE_FLAG_WRITE_THROUGH,
|
||||
(HANDLE)NULL
|
||||
);
|
||||
#else
|
||||
int fd=-1;
|
||||
|
||||
sprintf(fname, "/dev/wptdm_s%dc%d", span, chan);
|
||||
|
||||
fd = open(fname, O_RDWR);
|
||||
|
||||
if (fd < 0) {
|
||||
fd = WP_INVALID_SOCKET;
|
||||
}
|
||||
|
||||
return fd;
|
||||
#endif
|
||||
}
|
||||
|
||||
static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start, unsigned end, zap_chan_type_t type)
|
||||
{
|
||||
unsigned configured = 0, x;
|
||||
|
|
@ -130,7 +71,7 @@ static unsigned wp_open_range(zap_span_t *span, unsigned spanno, unsigned start,
|
|||
zap_channel_t *chan;
|
||||
zap_socket_t sockfd = WP_INVALID_SOCKET;
|
||||
|
||||
sockfd = wp_open_device(spanno, x);
|
||||
sockfd = tdmv_api_open_span_chan(spanno, x);
|
||||
|
||||
if (sockfd != WP_INVALID_SOCKET && zap_span_add_channel(span, sockfd, type, &chan) == ZAP_SUCCESS) {
|
||||
zap_log(ZAP_LOG_INFO, "configuring device s%dc%d as OpenZAP device %d:%d fd:%d\n", spanno, x, chan->span_id, chan->chan_id, sockfd);
|
||||
|
|
|
|||
Loading…
Reference in New Issue