#include "daemon.h"
#include "string.h"
#include "ipc.h"
+#include "fd.h"
/** define the array of error lists needed by para_server */
INIT_SERVER_ERRLISTS;
*/
struct gengetopt_args_info conf;
char *user_list = NULL;
+extern void dccp_send_init(struct sender *);
extern void http_send_init(struct sender *);
extern void ortp_send_init(struct sender *);
-extern struct audio_format afl[];
+/* TODO: This is better handled by autoconf */
/** the list of supported audio file selectors */
-struct audio_file_selector dblist[] = {
+struct audio_file_selector selectors[] = {
{
.name = "random",
.init = random_selector_init,
.name = "http",
.init = http_send_init,
},
+ {
+ .name = "dccp",
+ .init = dccp_send_init,
+ },
#ifdef HAVE_ORTP
{
.name = "ortp",
* \param ll the log level
* \param fmt the format string describing the log message
*/
-void para_log(int ll, char* fmt,...)
+void para_log(int ll, const char* fmt,...)
{
va_list argp;
FILE *outfd;
if (ll < conf.loglevel_arg)
return;
- if (!logfile) {
- if (ll < WARNING)
- outfd = stdout;
- else
- outfd = stderr;
- } else
- outfd = logfile;
- if (conf.daemon_given && !logfile)
- return;
+ outfd = logfile? logfile : stderr;
time(&t1);
tm = localtime(&t1);
strftime(str, MAXLINE, "%b %d %H:%M:%S", tm);
int ret = 0;
signal_pipe = para_signal_init();
-// fcntl(signal_pipe, F_SETFL, O_NONBLOCK);
PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
ret += para_install_sighandler(SIGINT);
ret += para_install_sighandler(SIGTERM);
{
int i, ret;
- mmd->dbt_change = -1; /* no change nec., set to new dbt num by com_cdt */
+ mmd->selector_change = -1; /* no change nec., set to new num by com_chs */
if (!conf.selector_given)
goto random;
- for (i = 0; dblist[i].name; i++) {
- if (strcmp(dblist[i].name, conf.selector_arg))
+ for (i = 0; selectors[i].name; i++) {
+ if (strcmp(selectors[i].name, conf.selector_arg))
continue;
PARA_NOTICE_LOG("initializing %s audio file selector\n",
- dblist[i].name);
- ret = dblist[i].init(&dblist[i]);
+ selectors[i].name);
+ ret = selectors[i].init(&selectors[i]);
if (ret < 0) {
PARA_WARNING_LOG("%s", PARA_STRERROR(-ret));
break;
PARA_WARNING_LOG("%s", "falling back to the random selector\n");
random:
mmd->selector_num = 0;
- dblist[0].init(&dblist[0]); /* always successful */
+ selectors[0].init(&selectors[0]); /* always successful */
}
static unsigned init_network(void)
int fd, ret = -1, len = sizeof(unsigned int);
unsigned int seed;
- fd = open("/dev/random", O_RDONLY);
+ fd = open("/dev/urandom", O_RDONLY);
if (fd < 0)
goto out;
ret = -2;
init_random_seed();
/* parse command line options */
cmdline_parser(argc, argv, &conf);
- para_drop_privileges(conf.user_arg);
+ para_drop_privileges(conf.user_arg, conf.group_arg);
/* parse config file, open log and set defaults */
parse_config(0);
log_welcome("para_server", conf.loglevel_arg);
return sockfd;
}
-static void handle_dbt_change(void)
+static void change_selector(void)
{
- int ret, old = mmd->selector_num, new = mmd->dbt_change;
+ int ret, old = mmd->selector_num, new = mmd->selector_change;
- dblist[old].shutdown();
- ret = dblist[new].init(&dblist[new]);
- mmd->dbt_change = -1; /* reset */
+ selectors[old].shutdown();
+ ret = selectors[new].init(&selectors[new]);
+ mmd->selector_change = -1; /* reset */
if (ret >= 0) {
mmd->selector_num = new;
return;
}
/* init failed */
PARA_ERROR_LOG("%s -- switching to the random selector\n", PARA_STRERROR(-ret));
- dblist[0].init(&dblist[0]);
+ selectors[0].init(&selectors[0]);
mmd->selector_num = 0;
}
close_log(logfile); /* gets reopened if necessary by parse_config */
logfile = NULL;
parse_config(1); /* reopens log */
- mmd->dbt_change = mmd->selector_num; /* do not change selector */
- handle_dbt_change(); /* reload selector */
+ mmd->selector_change = mmd->selector_num; /* do not change selector.. */
+ change_selector(); /* .. just reload */
}
static void status_refresh(void)
/* listen on sock_fd, new connection on new_fd */
int sockfd, new_fd;
struct sockaddr_in their_addr;
- int err, i, max_fileno, ret;
+ int i, max_fileno, ret;
pid_t chld_pid;
fd_set rfds, wfds;
struct timeval *timeout;
valid_fd_012();
sockfd = do_inits(argc, argv);
repeat:
- /* check socket and signal pipe in any case */
FD_ZERO(&rfds);
FD_ZERO(&wfds);
- FD_SET(sockfd, &rfds);
- max_fileno = sockfd;
- FD_SET(signal_pipe, &rfds);
- max_fileno = MAX(max_fileno, signal_pipe);
-
+ max_fileno = -1;
+ /* check socket and signal pipe in any case */
+ para_fd_set(sockfd, &rfds, &max_fileno);
+ para_fd_set(signal_pipe, &rfds, &max_fileno);
timeout = afs_preselect();
status_refresh();
for (i = 0; senders[i].name; i++) {
continue;
if (!senders[i].pre_select)
continue;
- senders[i].pre_select(mmd->audio_format >= 0?
- &afl[mmd->audio_format] : NULL,
- &max_fileno,
- &rfds, &wfds);
+ senders[i].pre_select( &max_fileno, &rfds, &wfds);
}
- if (dblist[mmd->selector_num].pre_select) {
- ret = dblist[mmd->selector_num].pre_select(&rfds, &wfds);
- max_fileno = MAX(max_fileno, ret);
+ if (selectors[mmd->selector_num].pre_select) {
+ ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
+ max_fileno = PARA_MAX(max_fileno, ret);
}
mmd_unlock();
-// PARA_DEBUG_LOG("%s: select (max = %i)\n", __func__, max_fileno);
- ret = select(max_fileno + 1, &rfds, &wfds, NULL, timeout);
- err = errno;
- //PARA_DEBUG_LOG("%s: select returned %i\n", __func__, ret);
+ ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
mmd_lock();
- if (mmd->dbt_change >= 0)
- handle_dbt_change();
- if (dblist[mmd->selector_num].post_select)
- dblist[mmd->selector_num].post_select(&rfds, &wfds);
- if (ret < 0 && err == EINTR)
- goto repeat;
- if (ret < 0) {
- PARA_CRIT_LOG("select error (%s)\n", strerror(err));
+ if (mmd->selector_change >= 0)
+ change_selector();
+ if (selectors[mmd->selector_num].post_select)
+ selectors[mmd->selector_num].post_select(&rfds, &wfds);
+ if (ret < 0)
goto repeat;
- }
for (i = 0; senders[i].name; i++) {
if (senders[i].status != SENDER_ON)
continue;
if (!senders[i].post_select)
continue;
- senders[i].post_select(mmd->audio_format >= 0?
- &afl[mmd->audio_format] : NULL,
- &rfds, &wfds);
- }
- if (!ret) {
- afs_send_chunk();
- status_refresh();
+ senders[i].post_select(&rfds, &wfds);
}
+ afs_send_chunk();
+ status_refresh();
if (FD_ISSET(signal_pipe, &rfds)) {
int sig;
sig = para_next_signal();
case SIGTERM:
PARA_EMERG_LOG("terminating on signal %d\n", sig);
kill(0, SIGTERM);
- dblist[mmd->selector_num].shutdown();
+ selectors[mmd->selector_num].shutdown();
mutex_destroy(mmd_mutex);
shm_detach(mmd);
shm_destroy(mmd_shm_id);
projects / paraslash.git / blobdiff