kenmirrors/freeswitch
1
0
Fork 0
mirror of https://github.com/signalwire/freeswitch.git synced 2025-04-15 08:29:45 +00:00
Code Issues Projects Releases Wiki Activity

ftmod_misdn: Remove unused timerfd code.

Browse Source 
Timer-based b-channel tx gating won't work anyway, so remove all those
"#if 0"-ed bits of cruft.

Also remove the mISDN-specific timerfd_create() check in configure.

Signed-off-by: Stefan Knoblich <stkn@openisdn.net>
This commit is contained in:
Stefan Knoblich 2012-03-29 11:09:46 +02:00
parent 9ced4a353b
commit 5f38a7f857
2 changed files with 3 additions and 54 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
libs/freetdm/configure.ac
View File

@ -407,22 +407,13 @@ AC_ARG_WITH([misdn],
) )
AS_IF([test "${with_misdn}" != "no"], AS_IF([test "${with_misdn}" != "no"],
[AC_MSG_RESULT([${as_nl}<<>> ftmod_misdn (Linux mISDN I/O plugin)]) [AC_MSG_RESULT([${as_nl}<<>> ftmod_misdn (Linux mISDN I/O plugin)])
AC_CHECK_FUNCS([timerfd_create],, AC_CHECK_HEADER([mISDN/mISDNif.h],
[AS_IF([test "${with_misdn}" = "yes"], [HAVE_MISDN="yes"],
[AC_MSG_ERROR([no timerfd support in libc])],
[AC_MSG_NOTICE([no timerfd support in libc])]
)]
)
AC_CHECK_HEADER([mISDN/mISDNif.h],,
[AS_IF([test "${with_misdn}" = "yes"], [AS_IF([test "${with_misdn}" = "yes"],
[AC_MSG_ERROR([mISDN/mISDNif.h not found])], [AC_MSG_ERROR([mISDN/mISDNif.h not found])],
[AC_MSG_NOTICE([mISDN/mISDNif.h not found])] [AC_MSG_NOTICE([mISDN/mISDNif.h not found])]
)], )],
[#include <sys/socket.h>] [#include <sys/socket.h>]
)
AS_IF([test "${ac_cv_func_timerfd_create}" = "yes" -a "${ac_cv_header_mISDN_mISDNif_h}" = "yes"],
[HAVE_MISDN="yes"],
[AC_MSG_NOTICE([Some required dependencies are missing, module disabled])]
)] )]
) )
AM_CONDITIONAL([HAVE_MISDN], [test "${HAVE_MISDN}" = "yes"]) AM_CONDITIONAL([HAVE_MISDN], [test "${HAVE_MISDN}" = "yes"])

44
libs/freetdm/src/ftmod/ftmod_misdn/ftmod_misdn.c
View File

@ -45,8 +45,6 @@
#include <poll.h> #include <poll.h>
#include <pthread.h> #include <pthread.h>
#include <sys/timerfd.h>
/* this is how it should have been... /* this is how it should have been...
#ifdef HAVE_FREETDM_FREETDM_H #ifdef HAVE_FREETDM_FREETDM_H
#include <freetdm/freetdm.h> #include <freetdm/freetdm.h>
@ -256,7 +254,6 @@ struct misdn_chan_private {
/* */ /* */
int state; int state;
int debugfd; int debugfd;
int timerfd;
int active; int active;
/* hw addr of channel */ /* hw addr of channel */
@ -941,36 +938,7 @@ static FIO_OPEN_FUNCTION(misdn_open)
ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "mISDN channel activation request sent\n"); ftdm_log_chan_msg(ftdmchan, FTDM_LOG_DEBUG, "mISDN channel activation request sent\n");
switch (ftdmchan->type) { switch (ftdmchan->type) {
case FTDM_CHAN_TYPE_B: { case FTDM_CHAN_TYPE_B:
#if 0
struct itimerspec its = {
.it_interval = { 0, 0 },
.it_value = { 0, 0 },
};
its.it_interval.tv_nsec = (ftdmchan->effective_interval * 1000000);
its.it_value.tv_nsec = (ftdmchan->effective_interval * 1000000);
/* create tx timerfd */
chan_priv->timerfd = timerfd_create(CLOCK_MONOTONIC, O_NONBLOCK);
if (chan_priv->timerfd < 0) {
ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "mISDN failed to create b-channel tx interval timer: %s\n",
strerror(errno));
return FTDM_FAIL;
}
/* start tx timerfd */
ret = timerfd_settime(chan_priv->timerfd, 0, &its, NULL);
if (ret < 0) {
ftdm_log_chan(ftdmchan, FTDM_LOG_ERROR, "mISDN failed to start b-channel tx interval timer: %s\n",
strerror(errno));
return FTDM_FAIL;
}
ftdm_log_chan(ftdmchan, FTDM_LOG_DEBUG, "mISDN created tx interval (%d ms) timer\n",
ftdmchan->effective_interval);
#endif
}
case FTDM_CHAN_TYPE_DQ921: case FTDM_CHAN_TYPE_DQ921:
chan_priv->state = MISDN_CHAN_STATE_OPEN; chan_priv->state = MISDN_CHAN_STATE_OPEN;
break; break;
@ -998,15 +966,6 @@ static FIO_CLOSE_FUNCTION(misdn_close)
/* deactivate b-channels on close */ /* deactivate b-channels on close */
if (ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B) { if (ftdm_channel_get_type(ftdmchan) == FTDM_CHAN_TYPE_B) {
#if 0
/*
* Stop tx timerfd
*/
if (chan_priv->timerfd >= 0) {
close(chan_priv->timerfd);
chan_priv->timerfd = -1;
}
#endif
/* /*
* Send deactivation request (don't wait for answer) * Send deactivation request (don't wait for answer)
*/ */
@ -1570,7 +1529,6 @@ static ftdm_status_t misdn_open_range(ftdm_span_t *span, ftdm_chan_type_t type,
priv->addr = addr; priv->addr = addr;
priv->debugfd = -1; priv->debugfd = -1;
priv->timerfd = -1;
/* /*
* Create event queue * Create event queue