/*
- * Copyright (C) 1997-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
#include "server.cmdline.h"
-#include "db.h"
-#include "server.h"
#include "afs.h"
+#include "server.h"
+#include "vss.h"
#include "config.h"
#include "close_on_fork.h"
#include "send.h"
#include "string.h"
#include "ipc.h"
#include "fd.h"
+#include "signal.h"
+#include "user_list.h"
/** define the array of error lists needed by para_server */
INIT_SERVER_ERRLISTS;
/** shut down non-authorized connections after that many seconds */
#define ALARM_TIMEOUT 10
-/* these are exported to afs.c. command.c and to all selectors */
+/**
+ * pointer to shared memory area for communication between para_server
+ * and its children. exported to vss.c. command.c and to all selectors.
+ */
struct misc_meta_data *mmd;
-/** the configuration of para_server
+
+/**
+ * the configuration of para_server
*
- * It also contains the options for all audio file selectors and all supported
- * senders.
-*/
-struct gengetopt_args_info conf;
-char *user_list = NULL;
+ * It also contains the options for all audio file selectors, audio format handler
+ * and all supported senders.
+ */
+struct server_args_info conf;
+
+/** the file containing user information (public key, permissions) */
+char *user_list_file = 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_handler afl[];
/* TODO: This is better handled by autoconf */
/** the list of supported audio file selectors */
mmd->active_connections = 0;
strcpy(mmd->filename, "(none)");
mmd->audio_format = -1;
- mmd->afs_status_flags = AFS_NEXT;
- mmd->new_afs_status_flags = AFS_NEXT;
+ mmd->vss_status_flags = VSS_NEXT;
+ mmd->new_vss_status_flags = VSS_NEXT;
mmd->sender_cmd_data.cmd_num = -1;
return;
err_out:
cf = conf.config_file_arg;
else
cf = make_message("%s/.paraslash/server.conf", home);
- free(user_list);
+ free(user_list_file);
if (!conf.user_list_given)
- user_list = make_message("%s/.paraslash/server.users", home);
+ user_list_file = make_message("%s/.paraslash/server.users", home);
else
- user_list = para_strdup(conf.user_list_arg);
+ user_list_file = para_strdup(conf.user_list_arg);
ret = stat(cf, &statbuf);
if (ret && conf.config_file_given) {
ret = -1;
}
if (!ret) {
int tmp = conf.daemon_given;
- cmdline_parser_configfile(cf, &conf, override, 0, 0);
+ server_cmdline_parser_configfile(cf, &conf, override, 0, 0);
conf.daemon_given = tmp;
}
/* logfile */
free(home);
if (ret > 0)
return;
- free(user_list);
- user_list = NULL;
+ free(user_list_file);
+ user_list_file = NULL;
exit(EXIT_FAILURE);
}
static unsigned init_network(void)
{
- int sockfd = init_tcp_socket(conf.port_arg);
+ int fd, ret = init_tcp_socket(conf.port_arg);
- if (sockfd < 0)
- exit(EXIT_FAILURE);
- return sockfd;
+ if (ret < 0)
+ goto err;
+ fd = ret;
+ ret = mark_fd_nonblock(fd);
+ if (ret < 0)
+ goto err;
+ return fd;
+err:
+ PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+ exit(EXIT_FAILURE);
}
static void init_random_seed(void)
{
- int fd, ret = -1, len = sizeof(unsigned int);
+ int fd, ret = -1;
unsigned int seed;
+ size_t len = sizeof(unsigned int);
fd = open("/dev/urandom", O_RDONLY);
if (fd < 0)
init_random_seed();
/* parse command line options */
- cmdline_parser(argc, argv, &conf);
+ server_cmdline_parser(argc, argv, &conf);
+ HANDLE_VERSION_FLAG("server", conf);
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);
shm_init(); /* init mmd struct */
server_uptime(UPTIME_SET); /* reset server uptime */
+ init_user_list(user_list_file);
/* become daemon */
if (conf.daemon_given)
daemon_init();
init_selector();
- PARA_NOTICE_LOG("%s", "initializing audio file sender\n");
- /* audio file sender */
- afs_init();
+// PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
+ PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+ vss_init();
mmd->server_pid = getpid();
setup_signal_handling();
mmd_lock();
/* init network socket */
PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
sockfd = init_network();
- if (conf.autoplay_given) {
- mmd->afs_status_flags |= AFS_PLAYING;
- mmd->new_afs_status_flags |= AFS_PLAYING;
- }
PARA_NOTICE_LOG("%s", "init complete\n");
return sockfd;
}
parse_config(1); /* reopens log */
mmd->selector_change = mmd->selector_num; /* do not change selector.. */
change_selector(); /* .. just reload */
+ init_user_list(user_list_file); /* reload user list */
}
static void status_refresh(void)
if (prev_events != mmd->events)
goto out;
- if (mmd->new_afs_status_flags != mmd->afs_status_flags)
+ if (mmd->new_vss_status_flags != mmd->vss_status_flags)
goto out;
if (uptime / 60 != prev_uptime / 60)
goto out;
out:
prev_uptime = uptime;
prev_events = mmd->events;
- mmd->afs_status_flags = mmd->new_afs_status_flags;
+ mmd->vss_status_flags = mmd->new_vss_status_flags;
if (ret) {
PARA_DEBUG_LOG("%d events, forcing status update, af = %d\n",
mmd->events, mmd->audio_format);
}
}
-/*
- * MAIN
+/**
+ * the main function of para_server
+ *
+ * \param argc usual argument count
+ * \param argv usual argument vector
+ *
+ * \return EXIT_SUCCESS or EXIT_FAILURE
+ *
*/
int main(int argc, char *argv[])
{
/* 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();
+ timeout = vss_preselect();
status_refresh();
for (i = 0; senders[i].name; i++) {
if (senders[i].status != SENDER_ON)
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 (selectors[mmd->selector_num].pre_select) {
ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);
continue;
if (!senders[i].post_select)
continue;
- senders[i].post_select(mmd->audio_format >= 0?
- &afl[mmd->audio_format] : NULL,
- &rfds, &wfds);
+ senders[i].post_select(&rfds, &wfds);
}
- afs_send_chunk();
+ vss_send_chunk();
status_refresh();
if (FD_ISSET(signal_pipe, &rfds)) {
int sig;
projects / paraslash.git / blobdiff