windows T.31

This commit is contained in:
Jeff Lenk 2011-12-09 15:10:55 -06:00
parent 7f77ae4ea8
commit 190426dfba
1 changed files with 109 additions and 58 deletions

View File

@ -76,7 +76,23 @@ static int t31_at_tx_handler(at_state_t *s, void *user_data, const uint8_t *buf,
modem_t *modem = user_data; modem_t *modem = user_data;
switch_size_t wrote; switch_size_t wrote;
#ifndef WIN32
wrote = write(modem->master, buf, len); wrote = write(modem->master, buf, len);
#else
OVERLAPPED o;
o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
/* Initialize the rest of the OVERLAPPED structure to zero. */
o.Internal = 0;
o.InternalHigh = 0;
o.Offset = 0;
o.OffsetHigh = 0;
assert(o.hEvent);
if (!WriteFile((HANDLE)modem->master, buf, len, (LPDWORD)&wrote, &o)) {
GetOverlappedResult((HANDLE)modem->master,&o,(LPDWORD)&wrote,TRUE);
}
CloseHandle (o.hEvent);
#endif
if (wrote != len) { if (wrote != len) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to pass the full buffer onto the device file. " switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Unable to pass the full buffer onto the device file. "
@ -152,8 +168,13 @@ int modem_close(modem_t *modem)
switch_clear_flag(modem, MODEM_FLAG_RUNNING); switch_clear_flag(modem, MODEM_FLAG_RUNNING);
if (modem->master > -1) { if (modem->master > -1) {
#ifndef WIN32
shutdown(modem->master, 2); shutdown(modem->master, 2);
close(modem->master); close(modem->master);
#else
SetCommMask((HANDLE)modem->master, 0);
CloseHandle((HANDLE)modem->master);
#endif
modem->master = -1; modem->master = -1;
r++; r++;
} }
@ -184,7 +205,7 @@ int modem_close(modem_t *modem)
int modem_init(modem_t *modem, modem_control_handler_t control_handler) int modem_init(modem_t *modem, modem_control_handler_t control_handler)
{ {
#ifdef WIN32 #ifdef WIN32
u_long arg = 1; COMMTIMEOUTS timeouts={0};
#endif #endif
memset(modem, 0, sizeof(*modem)); memset(modem, 0, sizeof(*modem));
@ -207,19 +228,37 @@ int modem_init(modem_t *modem, modem_control_handler_t control_handler)
modem->stty = ttyname(modem->slave); modem->stty = ttyname(modem->slave);
#else #else
#if WIN32
modem->slot = 4+globals.NEXT_ID++; /* need work here we start at COM4 for now*/
snprintf(modem->devlink, sizeof(modem->devlink), "COM%d", modem->slot);
#if !defined(HAVE_POSIX_OPENPT) modem->master = (int)CreateFile(modem->devlink,
GENERIC_READ | GENERIC_WRITE,
0,
0,
OPEN_EXISTING,
FILE_FLAG_OVERLAPPED,
0);
if(modem->master==(int)INVALID_HANDLE_VALUE) {
if(GetLastError()==ERROR_FILE_NOT_FOUND) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: Serial port does not exist\n");
return -1;
}
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: Serial port open error\n");
return -1;
}
#elif !defined(HAVE_POSIX_OPENPT)
modem->master = open("/dev/ptmx", O_RDWR); modem->master = open("/dev/ptmx", O_RDWR);
#else #else
modem->master = posix_openpt(O_RDWR | O_NOCTTY); modem->master = posix_openpt(O_RDWR | O_NOCTTY);
#endif #endif
#ifndef WIN32
if (modem->master < 0) { if (modem->master < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to initialize UNIX98 master pty\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to initialize UNIX98 master pty\n");
} }
#ifndef WIN32
if (grantpt(modem->master) < 0) { if (grantpt(modem->master) < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to grant access to slave pty\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to grant access to slave pty\n");
@ -231,7 +270,6 @@ int modem_init(modem_t *modem, modem_control_handler_t control_handler)
} }
modem->stty = ptsname(modem->master); modem->stty = ptsname(modem->master);
#endif
if (modem->stty == NULL) { if (modem->stty == NULL) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to obtain slave pty filename\n"); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to obtain slave pty filename\n");
@ -243,6 +281,7 @@ int modem_init(modem_t *modem, modem_control_handler_t control_handler)
if (modem->slave < 0) { if (modem->slave < 0) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to open slave pty %s\n", modem->stty); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to open slave pty %s\n", modem->stty);
} }
#endif
#ifdef SOLARIS #ifdef SOLARIS
ioctl(modem->slave, I_PUSH, "ptem"); /* push ptem */ ioctl(modem->slave, I_PUSH, "ptem"); /* push ptem */
@ -250,12 +289,12 @@ int modem_init(modem_t *modem, modem_control_handler_t control_handler)
#endif #endif
#endif #endif
#ifndef WIN32
modem->slot = globals.NEXT_ID++; modem->slot = globals.NEXT_ID++;
snprintf(modem->devlink, sizeof(modem->devlink), "/dev/FS%d", modem->slot); snprintf(modem->devlink, sizeof(modem->devlink), "/dev/FS%d", modem->slot);
unlink(modem->devlink); unlink(modem->devlink);
#ifndef WIN32
if (symlink(modem->stty, modem->devlink)) { if (symlink(modem->stty, modem->devlink)) {
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to create %s symbolic link\n", modem->devlink); switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Fatal error: failed to create %s symbolic link\n", modem->devlink);
modem_close(modem); modem_close(modem);
@ -268,8 +307,15 @@ int modem_init(modem_t *modem, modem_control_handler_t control_handler)
return -1; return -1;
} }
#else #else
if (ioctlsocket(modem->master, FIONBIO, &arg) == SOCKET_ERROR) { timeouts.ReadIntervalTimeout=50;
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set up non-blocking read on %s\n", "Unknown"); /* need ttyname(modem->master)); */ timeouts.ReadTotalTimeoutConstant=50;
timeouts.ReadTotalTimeoutMultiplier=10;
timeouts.WriteTotalTimeoutConstant=50;
timeouts.WriteTotalTimeoutMultiplier=10;
if(!SetCommTimeouts((HANDLE)modem->master, &timeouts)){
switch_log_printf(SWITCH_CHANNEL_LOG, SWITCH_LOG_ERROR, "Cannot set up non-blocking read on %s\n", modem->devlink);
modem_close(modem); modem_close(modem);
return -1; return -1;
} }
@ -365,7 +411,9 @@ static switch_status_t channel_on_init(switch_core_session_t *session)
switch_assert(channel != NULL); switch_assert(channel != NULL);
if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) { if (switch_channel_direction(channel) == SWITCH_CALL_DIRECTION_OUTBOUND) {
#ifndef WIN32
int tioflags; int tioflags;
#endif
char call_time[16]; char call_time[16];
char call_date[16]; char call_date[16];
switch_size_t retsize; switch_size_t retsize;
@ -1118,75 +1166,62 @@ static int modem_wait_sock(int sock, uint32_t ms, modem_poll_t flags)
} }
#else #else
#pragma warning( push ) static int modem_wait_sock(int handle, int ms, modem_poll_t flags)
#pragma warning( disable : 6262 ) /* warning C6262: Function uses '98348' bytes of stack: exceeds /analyze:stacksize'16384'. Consider moving some data to heap */
static int modem_wait_sock(int sock, uint32_t ms, modem_poll_t flags)
{ {
int s = 0, r = 0; /* this method ignores ms and waits infinitely */
fd_set rfds; DWORD dwEvtMask;
fd_set wfds; OVERLAPPED o;
fd_set efds; BOOL result;
struct timeval tv;
FD_ZERO(&rfds); result = SetCommMask((HANDLE)handle, EV_RXCHAR);
FD_ZERO(&wfds);
FD_ZERO(&efds);
/* Wouldn't you rather know?? */ if (!result)
assert(sock <= FD_SETSIZE); {
/* failed */
return 0;
if ((flags & MODEM_POLL_READ)) {
#pragma warning( push )
#pragma warning( disable : 4127 )
FD_SET(sock, &rfds);
} }
if ((flags & MODEM_POLL_WRITE)) { o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
#pragma warning( push )
#pragma warning( disable : 4127 ) /* Initialize the rest of the OVERLAPPED structure to zero. */
FD_SET(sock, &wfds); o.Internal = 0;
#pragma warning( pop ) o.InternalHigh = 0;
o.Offset = 0;
o.OffsetHigh = 0;
assert(o.hEvent);
result = WaitCommEvent((HANDLE)handle, &dwEvtMask, &o);
if (result == 0)
{
if (GetLastError() != ERROR_IO_PENDING) {
/* something went horribly wrong with WaitCommEvent(), so
clear all errors and try again */
DWORD comerrors;
ClearCommError((HANDLE)handle,&comerrors,0);
CloseHandle (o.hEvent);
} else {
/* IO is pending, wait for it to finish */
WaitForSingleObject(o.hEvent,INFINITE);
CloseHandle (o.hEvent);
return MODEM_POLL_READ;
}
return 0;
} }
if ((flags & MODEM_POLL_ERROR)) { CloseHandle (o.hEvent);
#pragma warning( push ) return MODEM_POLL_READ;
#pragma warning( disable : 4127 )
FD_SET(sock, &efds);
#pragma warning( pop )
} }
tv.tv_sec = ms / 1000;
tv.tv_usec = (ms % 1000) * ms;
s = select(sock + 1, (flags & MODEM_POLL_READ) ? &rfds : NULL, (flags & MODEM_POLL_WRITE) ? &wfds : NULL, (flags & MODEM_POLL_ERROR) ? &efds : NULL, &tv);
if (s < 0) {
r = s;
} else if (s > 0) {
if ((flags & MODEM_POLL_READ) && FD_ISSET(sock, &rfds)) {
r |= MODEM_POLL_READ;
}
if ((flags & MODEM_POLL_WRITE) && FD_ISSET(sock, &wfds)) {
r |= MODEM_POLL_WRITE;
}
if ((flags & MODEM_POLL_ERROR) && FD_ISSET(sock, &efds)) {
r |= MODEM_POLL_ERROR;
}
}
return r;
}
#pragma warning( pop )
#endif #endif
static void *SWITCH_THREAD_FUNC modem_thread(switch_thread_t *thread, void *obj) static void *SWITCH_THREAD_FUNC modem_thread(switch_thread_t *thread, void *obj)
{ {
modem_t *modem = obj; modem_t *modem = obj;
int r, avail; int r, avail;
#ifdef WIN32
DWORD readBytes;
OVERLAPPED o;
#endif
char buf[T31_TX_BUF_LEN], tmp[80]; char buf[T31_TX_BUF_LEN], tmp[80];
switch_mutex_lock(globals.mutex); switch_mutex_lock(globals.mutex);
@ -1224,7 +1259,23 @@ static void *SWITCH_THREAD_FUNC modem_thread(switch_thread_t *thread, void *obj)
continue; continue;
} }
#ifndef WIN32
r = read(modem->master, buf, avail); r = read(modem->master, buf, avail);
#else
o.hEvent = CreateEvent(NULL, TRUE, FALSE, NULL);
/* Initialize the rest of the OVERLAPPED structure to zero. */
o.Internal = 0;
o.InternalHigh = 0;
o.Offset = 0;
o.OffsetHigh = 0;
assert(o.hEvent);
if (!ReadFile((HANDLE)modem->master, buf, avail, &readBytes, &o)) {
GetOverlappedResult((HANDLE)modem->master,&o,&readBytes,TRUE);
}
CloseHandle (o.hEvent);
r = readBytes;
#endif
t31_at_rx(modem->t31_state, buf, r); t31_at_rx(modem->t31_state, buf, r);