mirror of
https://github.com/asterisk/asterisk.git
synced 2025-09-05 12:16:00 +00:00
We have seen a number of problems caused by poll() not working properly on Mac OSX. If you search around, you'll find a number of references to using select() instead of poll() to work around these issues. In Asterisk, we've had poll.c which implements poll() using select() internally. However, we were still getting reports of problems. vadim investigated a bit and realized that at least on his system, even though we were compiling in poll.o, the system poll() was still being used. So, the primary purpose of this patch is to ensure that we're using the internal poll() when we want it to be used. The changes are: 1) Remove logic for when internal poll should be used from the Makefile. Instead, put it in the configure script. The logic in the configure script is the same as it was in the Makefile. Ideally, we would have a functionality test for the problem, but that's not actually possible, since we would have to be able to run an application on the _target_ system to test poll() behavior. 2) Always include poll.o in the build, but it will be empty if AST_POLL_COMPAT is not defined. 3) Change uses of poll() throughout the source tree to ast_poll(). I feel that it is good practice to give the API call a new name when we are changing its behavior and not using the system version directly in all cases. So, normally, ast_poll() is just redefined to poll(). On systems where AST_POLL_COMPAT is defined, ast_poll() is redefined to ast_internal_poll(). 4) Change poll() in main/poll.c to be ast_internal_poll(). It's worth noting that any code that still uses poll() directly will work fine (if they worked fine before). So, for example, out of tree modules that are using poll() will not stop working or anything. However, for modules to work properly on Mac OSX, ast_poll() needs to be used. (closes issue #13404) Reported by: agalbraith Tested by: russell, vadim http://reviewboard.digium.com/r/198/ git-svn-id: https://origsvn.digium.com/svn/asterisk/branches/1.4@182810 65c4cc65-6c06-0410-ace0-fbb531ad65f3
257 lines
5.6 KiB
C
257 lines
5.6 KiB
C
/*
|
|
* Asterisk -- An open source telephony toolkit.
|
|
*
|
|
* Copyright (C) 1999 - 2005, Digium, Inc.
|
|
*
|
|
* Mark Spencer <markster@digium.com>
|
|
*
|
|
* See http://www.asterisk.org for more information about
|
|
* the Asterisk project. Please do not directly contact
|
|
* any of the maintainers of this project for assistance;
|
|
* the project provides a web site, mailing lists and IRC
|
|
* channels for your use.
|
|
*
|
|
* This program is free software, distributed under the terms of
|
|
* the GNU General Public License Version 2. See the LICENSE file
|
|
* at the top of the source tree.
|
|
*/
|
|
|
|
/*! \file
|
|
*
|
|
* \brief Silly application to play an NBScat file -- uses nbscat8k
|
|
*
|
|
* \author Mark Spencer <markster@digium.com>
|
|
*
|
|
* \ingroup applications
|
|
*/
|
|
|
|
/*** MODULEINFO
|
|
<depend>working_fork</depend>
|
|
***/
|
|
|
|
#include "asterisk.h"
|
|
|
|
ASTERISK_FILE_VERSION(__FILE__, "$Revision$")
|
|
|
|
#include <string.h>
|
|
#include <stdio.h>
|
|
#include <signal.h>
|
|
#include <stdlib.h>
|
|
#include <unistd.h>
|
|
#include <fcntl.h>
|
|
#include <sys/time.h>
|
|
#include <sys/socket.h>
|
|
#ifdef HAVE_CAP
|
|
#include <sys/capability.h>
|
|
#endif /* HAVE_CAP */
|
|
|
|
#include "asterisk/lock.h"
|
|
#include "asterisk/file.h"
|
|
#include "asterisk/logger.h"
|
|
#include "asterisk/channel.h"
|
|
#include "asterisk/frame.h"
|
|
#include "asterisk/pbx.h"
|
|
#include "asterisk/module.h"
|
|
#include "asterisk/translate.h"
|
|
#include "asterisk/options.h"
|
|
|
|
#define LOCAL_NBSCAT "/usr/local/bin/nbscat8k"
|
|
#define NBSCAT "/usr/bin/nbscat8k"
|
|
|
|
#ifndef AF_LOCAL
|
|
#define AF_LOCAL AF_UNIX
|
|
#endif
|
|
|
|
static char *app = "NBScat";
|
|
|
|
static char *synopsis = "Play an NBS local stream";
|
|
|
|
static char *descrip =
|
|
" NBScat: Executes nbscat to listen to the local NBS stream.\n"
|
|
"User can exit by pressing any key\n.";
|
|
|
|
|
|
static int NBScatplay(int fd)
|
|
{
|
|
int res;
|
|
int x;
|
|
sigset_t fullset, oldset;
|
|
#ifdef HAVE_CAP
|
|
cap_t cap;
|
|
#endif
|
|
|
|
sigfillset(&fullset);
|
|
pthread_sigmask(SIG_BLOCK, &fullset, &oldset);
|
|
|
|
res = fork();
|
|
if (res < 0)
|
|
ast_log(LOG_WARNING, "Fork failed\n");
|
|
if (res) {
|
|
pthread_sigmask(SIG_SETMASK, &oldset, NULL);
|
|
return res;
|
|
}
|
|
signal(SIGPIPE, SIG_DFL);
|
|
pthread_sigmask(SIG_UNBLOCK, &fullset, NULL);
|
|
|
|
#ifdef HAVE_CAP
|
|
cap = cap_from_text("cap_net_admin-eip");
|
|
|
|
if (cap_set_proc(cap)) {
|
|
/* Careful with order! Logging cannot happen after we close FDs */
|
|
ast_log(LOG_WARNING, "Unable to remove capabilities.\n");
|
|
}
|
|
cap_free(cap);
|
|
#endif
|
|
if (ast_opt_high_priority)
|
|
ast_set_priority(0);
|
|
|
|
dup2(fd, STDOUT_FILENO);
|
|
for (x = STDERR_FILENO + 1; x < 1024; x++) {
|
|
if (x != STDOUT_FILENO)
|
|
close(x);
|
|
}
|
|
/* Most commonly installed in /usr/local/bin */
|
|
execl(NBSCAT, "nbscat8k", "-d", (char *)NULL);
|
|
execl(LOCAL_NBSCAT, "nbscat8k", "-d", (char *)NULL);
|
|
ast_log(LOG_WARNING, "Execute of nbscat8k failed\n");
|
|
_exit(0);
|
|
}
|
|
|
|
static int timed_read(int fd, void *data, int datalen)
|
|
{
|
|
int res;
|
|
struct pollfd fds[1];
|
|
fds[0].fd = fd;
|
|
fds[0].events = POLLIN;
|
|
res = ast_poll(fds, 1, 2000);
|
|
if (res < 1) {
|
|
ast_log(LOG_NOTICE, "Selected timed out/errored out with %d\n", res);
|
|
return -1;
|
|
}
|
|
return read(fd, data, datalen);
|
|
|
|
}
|
|
|
|
static int NBScat_exec(struct ast_channel *chan, void *data)
|
|
{
|
|
int res=0;
|
|
struct ast_module_user *u;
|
|
int fds[2];
|
|
int ms = -1;
|
|
int pid = -1;
|
|
int owriteformat;
|
|
struct timeval next;
|
|
struct ast_frame *f;
|
|
struct myframe {
|
|
struct ast_frame f;
|
|
char offset[AST_FRIENDLY_OFFSET];
|
|
short frdata[160];
|
|
} myf;
|
|
|
|
u = ast_module_user_add(chan);
|
|
|
|
if (socketpair(AF_LOCAL, SOCK_STREAM, 0, fds)) {
|
|
ast_log(LOG_WARNING, "Unable to create socketpair\n");
|
|
ast_module_user_remove(u);
|
|
return -1;
|
|
}
|
|
|
|
ast_stopstream(chan);
|
|
|
|
owriteformat = chan->writeformat;
|
|
res = ast_set_write_format(chan, AST_FORMAT_SLINEAR);
|
|
if (res < 0) {
|
|
ast_log(LOG_WARNING, "Unable to set write format to signed linear\n");
|
|
ast_module_user_remove(u);
|
|
return -1;
|
|
}
|
|
|
|
res = NBScatplay(fds[1]);
|
|
/* Wait 1000 ms first */
|
|
next = ast_tvnow();
|
|
next.tv_sec += 1;
|
|
if (res >= 0) {
|
|
pid = res;
|
|
/* Order is important -- there's almost always going to be mp3... we want to prioritize the
|
|
user */
|
|
for (;;) {
|
|
ms = ast_tvdiff_ms(next, ast_tvnow());
|
|
if (ms <= 0) {
|
|
res = timed_read(fds[0], myf.frdata, sizeof(myf.frdata));
|
|
if (res > 0) {
|
|
myf.f.frametype = AST_FRAME_VOICE;
|
|
myf.f.subclass = AST_FORMAT_SLINEAR;
|
|
myf.f.datalen = res;
|
|
myf.f.samples = res / 2;
|
|
myf.f.mallocd = 0;
|
|
myf.f.offset = AST_FRIENDLY_OFFSET;
|
|
myf.f.src = __PRETTY_FUNCTION__;
|
|
myf.f.delivery.tv_sec = 0;
|
|
myf.f.delivery.tv_usec = 0;
|
|
myf.f.data = myf.frdata;
|
|
if (ast_write(chan, &myf.f) < 0) {
|
|
res = -1;
|
|
break;
|
|
}
|
|
} else {
|
|
ast_log(LOG_DEBUG, "No more mp3\n");
|
|
res = 0;
|
|
break;
|
|
}
|
|
next = ast_tvadd(next, ast_samp2tv(myf.f.samples, 8000));
|
|
} else {
|
|
ms = ast_waitfor(chan, ms);
|
|
if (ms < 0) {
|
|
ast_log(LOG_DEBUG, "Hangup detected\n");
|
|
res = -1;
|
|
break;
|
|
}
|
|
if (ms) {
|
|
f = ast_read(chan);
|
|
if (!f) {
|
|
ast_log(LOG_DEBUG, "Null frame == hangup() detected\n");
|
|
res = -1;
|
|
break;
|
|
}
|
|
if (f->frametype == AST_FRAME_DTMF) {
|
|
ast_log(LOG_DEBUG, "User pressed a key\n");
|
|
ast_frfree(f);
|
|
res = 0;
|
|
break;
|
|
}
|
|
ast_frfree(f);
|
|
}
|
|
}
|
|
}
|
|
}
|
|
close(fds[0]);
|
|
close(fds[1]);
|
|
|
|
if (pid > -1)
|
|
kill(pid, SIGKILL);
|
|
if (!res && owriteformat)
|
|
ast_set_write_format(chan, owriteformat);
|
|
|
|
ast_module_user_remove(u);
|
|
|
|
return res;
|
|
}
|
|
|
|
static int unload_module(void)
|
|
{
|
|
int res;
|
|
|
|
res = ast_unregister_application(app);
|
|
|
|
ast_module_user_hangup_all();
|
|
|
|
return res;
|
|
}
|
|
|
|
static int load_module(void)
|
|
{
|
|
return ast_register_application(app, NBScat_exec, synopsis, descrip);
|
|
}
|
|
|
|
AST_MODULE_INFO_STANDARD(ASTERISK_GPL_KEY, "Silly NBS Stream Application");
|