FEATURES: Fix a typo and use uniform capitalization for list items.

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index ab88b07fbd60827e56299c2338acc7cb9e3a541d..a5ae0268cfde442345cd2c0993f6a95ce07f1c2a 100644 (file)
--- a/server.c
+++ b/server.c
@@ -1,17 +1,65 @@
 /*
 /*

- * Copyright (C) 1997-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 1997-2008 Andre Noll <maan@systemlinux.org>

  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 

-/** \file server.c Paraslash's main server */
+/** \file server.c Paraslash's main server. */

 
 
 
 

-/** \mainpage Paraslash API Reference
+/**
+ * \mainpage Paraslash API Reference
+ *
+ * Starting points for getting an overview are
+ *
+ * probably:
+ *
+ *     - The main programs: \ref server.c, \ref audiod.c, \ref client.c,
+ *       \ref audioc.c, \ref fsck.c,
+ *     - Server: \ref server_command, \ref sender,
+ *     - Audio file selector: \ref audio_format_handler, \ref mood, \ref afs_table,
+ *     - Client: \ref receiver, \ref receiver_node, \ref filter, \ref filter_node.
+ *
+ *
+ * The gory details, listed by topic:
+ *
+ *     - Audio format handlers: \ref mp3_afh.c, \ref ogg_afh.c, \ref aac_afh.c,
+ *     - Decoders: \ref mp3dec.c, \ref oggdec.c, \ref aacdec.c,
+ *     - Volume normalizer: \ref compress.c,
+ *     - Output: \ref alsa_write.c, \ref osx_write.c,
+ *     - http: \ref http_recv.c, \ref http_send.c,
+ *     - ortp: \ref ortp_recv.c, \ref ortp_send.c,
+ *     - dccp: \ref dccp_recv.c, \ref dccp_send.c,
+ *     - Audio file selector: \ref afs.c, \ref aft.c, \ref mood.c,
+ *     - Afs structures: \ref afs_table, \ref audio_file_data,
+ *       \ref afs_info \ref afh_info,
+ *     - Afs tables: \ref aft.c, \ref mood.c, \ref playlist.c,
+ *       \ref attribute.c, \ref score.c,
+ *     - The virtual streaming system: \ref vss.c, \ref chunk_queue.c.
+ *
+ * Lower levels:
+ *
+ *     - Scheduling: \ref sched.c, \ref sched.h,
+ *     - Networking: \ref net.c,
+ *     - File descriptors: \ref fd.c,
+ *     - Signals: \ref signal.c,
+ *     - Daemons: \ref daemon.c,
+ *     - Strings: \ref string.c, \ref string.h,
+ *     - Time: \ref time.c,
+ *     - Spawning processes: \ref exec.c,
+ *     - Inter process communication: \ref ipc.c,
+ *     - The object storage layer: \ref osl.c,
+ *     - Blob tables: \ref blob.c,
+ *     - The error subssystem: \ref error.h.
+ *     - Access control for paraslash senders: \ref acl.c, \ref acl.h.
+ *
+ * Low-level data structures:

  *
  *

- *  Good starting points for reading are probably \ref audio_file_selector,
- *  \ref sender, \ref receiver, \ref receiver_node, \ref filter, \ref
- *  filter_node.
+ *     - Doubly linked lists: \ref list.h,
+ *     - Red-black trees: \ref rbtree.h, \ref rbtree.c,
+ *     - Ring buffer: \ref ringbuffer.c, \ref ringbuffer.h,
+ *     - Hashing: \ref hash.h, \ref sha1.h, \ref sha1.c,
+ *     - Crypto: \ref crypt.c.

  *
  */
 
  *
  */
 


@@ -22,7 +70,6 @@
 #include "para.h"
 #include "error.h"
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
 #include "server.cmdline.h"

-#include "afs_common.h"

 #include "afh.h"
 #include "string.h"
 #include "afs.h"
 #include "afh.h"
 #include "string.h"
 #include "afs.h"


@@ -30,12 +77,12 @@
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"
 #include "vss.h"
 #include "config.h"
 #include "close_on_fork.h"

+#include "list.h"

 #include "send.h"
 #include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"
 #include "send.h"
 #include "net.h"
 #include "daemon.h"
 #include "ipc.h"
 #include "fd.h"

-#include "list.h"

 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"
 #include "sched.h"
 #include "signal.h"
 #include "user_list.h"


@@ -47,16 +94,16 @@ INIT_SERVER_ERRLISTS;
 #define ALARM_TIMEOUT 10
 
 /**
 #define ALARM_TIMEOUT 10
 
 /**

- * pointer to shared memory area for communication between para_server
- * and its children. exported to vss.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 afs.

  */
 struct misc_meta_data *mmd;
 
 /**
  * the configuration of para_server
  *
  */
 struct misc_meta_data *mmd;
 
 /**
  * the configuration of para_server
  *

- * It also contains the options for all audio file selectors, audio format handler
- * and all supported senders.
+ * It also contains the options for the audio file selector, audio format
+ * handler and all supported senders.

  */
 struct server_args_info conf;
 
  */
 struct server_args_info conf;
 


@@ -120,7 +167,7 @@ void para_log(int ll, const char* fmt,...)
                fprintf(outfd, "%i: ", ll);
        mypid = getpid();
        if (conf.loglevel_arg <= INFO)
                fprintf(outfd, "%i: ", ll);
        mypid = getpid();
        if (conf.loglevel_arg <= INFO)

-               fprintf(outfd, "(%d) ", mypid);
+               fprintf(outfd, "(%d) ", (int)mypid);

        va_start(argp, fmt);
        vfprintf(outfd, fmt, argp);
        va_end(argp);
        va_start(argp, fmt);
        vfprintf(outfd, fmt, argp);
        va_end(argp);


@@ -148,27 +195,24 @@ static void shm_init(void)
                goto err_out;
        mmd_mutex = ret;
 
                goto err_out;
        mmd_mutex = ret;
 

-       mmd->selector_num = 0;

        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;
        mmd->num_connects = 0;
        mmd->active_connections = 0;
        mmd->num_played = 0;
        mmd->num_commands = 0;
        mmd->events = 0;
        mmd->num_connects = 0;
        mmd->active_connections = 0;

-       strcpy(mmd->filename, "(none)");
-       mmd->audio_format = -1;

        mmd->vss_status_flags = VSS_NEXT;
        mmd->new_vss_status_flags = VSS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;
        return;
 err_out:
        mmd->vss_status_flags = VSS_NEXT;
        mmd->new_vss_status_flags = VSS_NEXT;
        mmd->sender_cmd_data.cmd_num = -1;
        return;
 err_out:

-       PARA_EMERG_LOG("%s", PARA_STRERROR(-ret));
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));

        exit(EXIT_FAILURE);
 }
 
 /**
  * lock the shared memory area containing the mmd struct
  *
        exit(EXIT_FAILURE);
 }
 
 /**
  * lock the shared memory area containing the mmd struct
  *

- * \sa semop(2), struct misc_meta_data
+ * \sa semop(2), struct misc_meta_data.

  */
 void mmd_lock(void)
 {
  */
 void mmd_lock(void)
 {


@@ -194,7 +238,7 @@ static void parse_config(int override)
        char *cf;
 
        if (conf.config_file_given)
        char *cf;
 
        if (conf.config_file_given)

-               cf = conf.config_file_arg;
+               cf = para_strdup(conf.config_file_arg);

        else
                cf = make_message("%s/.paraslash/server.conf", home);
        free(user_list_file);
        else
                cf = make_message("%s/.paraslash/server.conf", home);
        free(user_list_file);


@@ -222,7 +266,7 @@ static void parse_config(int override)
        /* logfile */
        if (!conf.logfile_given && conf.daemon_given) {
                ret = -1;
        /* logfile */
        if (!conf.logfile_given && conf.daemon_given) {
                ret = -1;

-               PARA_EMERG_LOG("%s", "daemon, but no log file\n");
+               PARA_EMERG_LOG("fatal: daemon option, but no log file given\n");

                goto out;
        }
        if (conf.logfile_given)
                goto out;
        }
        if (conf.logfile_given)


@@ -240,59 +284,71 @@ out:
 
 static void setup_signal_handling(void)
 {
 
 static void setup_signal_handling(void)
 {

-       int ret = 0;
-
-       signal_pipe = para_signal_init();
-       PARA_NOTICE_LOG("%s", "setting up signal handlers\n");
-       ret += para_install_sighandler(SIGINT);
-       ret += para_install_sighandler(SIGTERM);
-       ret += para_install_sighandler(SIGHUP);
-       ret += para_install_sighandler(SIGCHLD);
-       ret += para_install_sighandler(SIGUSR1);
-       signal(SIGPIPE, SIG_IGN);
-       if (ret != 5) {
-               PARA_EMERG_LOG("%s", "could not install signal handlers\n");
-               exit(EXIT_FAILURE);
-       }
+       signal_pipe = para_signal_init(); /* always successful */
+
+       PARA_NOTICE_LOG("setting up signal handlers\n");
+       if (para_install_sighandler(SIGINT) < 0)
+               goto err;
+       if (para_install_sighandler(SIGTERM) < 0)
+               goto err;
+       if (para_install_sighandler(SIGHUP) < 0)
+               goto err;
+       if (para_install_sighandler(SIGCHLD) < 0)
+               goto err;
+       if (signal(SIGPIPE, SIG_IGN) == SIG_ERR)
+               goto err;
+       if (signal(SIGUSR1, SIG_IGN) == SIG_ERR)
+               goto err;
+       add_close_on_fork_list(signal_pipe);
+       return;
+err:
+       PARA_EMERG_LOG("could not install signal handlers\n");
+       exit(EXIT_FAILURE);

 }
 
 static unsigned init_network(void)
 {
 }
 
 static unsigned init_network(void)
 {

-       int fd, ret = init_tcp_socket(conf.port_arg);
+       int fd, ret = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.port_arg);

 
        if (ret < 0)
                goto err;
        fd = ret;
 
        if (ret < 0)
                goto err;
        fd = ret;

-       ret = mark_fd_nonblock(fd);
+       ret = mark_fd_nonblocking(fd);

        if (ret < 0)
                goto err;
        if (ret < 0)
                goto err;

+       add_close_on_fork_list(fd); /* child doesn't need the listener */

        return fd;
 err:
        return fd;
 err:

-       PARA_EMERG_LOG("%s\n", PARA_STRERROR(-ret));
+       PARA_EMERG_LOG("%s\n", para_strerror(-ret));

        exit(EXIT_FAILURE);
 }
 
 static void init_random_seed(void)
 {
        exit(EXIT_FAILURE);
 }
 
 static void init_random_seed(void)
 {

-       int fd, ret = -1;

        unsigned int seed;
        unsigned int seed;

-       size_t len = sizeof(unsigned int);
+       int fd, ret = para_open("/dev/urandom", O_RDONLY, 0);

 
 

-       fd = open("/dev/urandom", O_RDONLY);
-       if (fd < 0)
+       if (ret < 0)
+               goto err;
+       fd = ret;
+       ret = read(fd, &seed, sizeof(seed));
+       if (ret < 0) {
+               ret = -ERRNO_TO_PARA_ERROR(errno);

                goto out;
                goto out;

-       ret = -2;
-       if (read(fd, &seed, len) != len)
+       }
+       if (ret != sizeof(seed)) {
+               ret = -ERRNO_TO_PARA_ERROR(EIO);

                goto out;
                goto out;

+       }

        srandom(seed);
        ret = 1;
 out:
        srandom(seed);
        ret = 1;
 out:

-       if (fd >= 0)
-               close(fd);
-       if (ret > 0)
+       close(fd);
+       if (ret >= 0)

                return;
                return;

-       PARA_EMERG_LOG("can not seed pseudo random generator (ret = %d)\n",
-               ret);
+err:
+       PARA_EMERG_LOG("can not seed pseudo random number generator: %s\n",
+               para_strerror(-ret));

        exit(EXIT_FAILURE);
 }
 
        exit(EXIT_FAILURE);
 }
 


@@ -317,7 +373,7 @@ static void init_afs(void)
        }
        close(afs_server_socket[1]);
        afs_socket = afs_server_socket[0];
        }
        close(afs_server_socket[1]);
        afs_socket = afs_server_socket[0];

-       ret = mark_fd_nonblock(afs_socket);
+       ret = mark_fd_nonblocking(afs_socket);

        if (ret < 0)
                exit(EXIT_FAILURE);
        add_close_on_fork_list(afs_socket);
        if (ret < 0)
                exit(EXIT_FAILURE);
        add_close_on_fork_list(afs_socket);


@@ -325,8 +381,7 @@ static void init_afs(void)
                (unsigned) afs_socket_cookie);
 }
 
                (unsigned) afs_socket_cookie);
 }
 

-
-static unsigned do_inits(int argc, char **argv)
+static unsigned server_init(int argc, char **argv)

 {
        /* connector's address information */
        int sockfd;
 {
        /* connector's address information */
        int sockfd;


@@ -345,19 +400,19 @@ static unsigned do_inits(int argc, char **argv)
        /* become daemon */
        if (conf.daemon_given)
                daemon_init();
        /* become daemon */
        if (conf.daemon_given)
                daemon_init();

-//     init_selector();
-//     PARA_ERROR_LOG("num: %d\n", mmd->selector_num);
-       PARA_NOTICE_LOG("%s", "initializing virtual streaming system\n");
+       PARA_NOTICE_LOG("initializing audio format handlers\n");

        afh_init();
        afh_init();

-       vss_init();
+       PARA_NOTICE_LOG("initializing virtual streaming system\n");

        mmd->server_pid = getpid();
        setup_signal_handling();
        mmd->server_pid = getpid();
        setup_signal_handling();

+       PARA_NOTICE_LOG("initializing the audio file selector\n");

        init_afs();
        init_afs();

+       vss_init();

        mmd_lock();
        /* init network socket */
        mmd_lock();
        /* init network socket */

-       PARA_NOTICE_LOG("%s", "initializing tcp command socket\n");
+       PARA_NOTICE_LOG("initializing tcp command socket\n");

        sockfd = init_network();
        sockfd = init_network();

-       PARA_NOTICE_LOG("%s", "init complete\n");
+       PARA_NOTICE_LOG("server init complete\n");

        return sockfd;
 }
 
        return sockfd;
 }
 


@@ -366,7 +421,7 @@ static unsigned do_inits(int argc, char **argv)
  */
 static void handle_sighup(void)
 {
  */
 static void handle_sighup(void)
 {

-       PARA_NOTICE_LOG("%s", "SIGHUP\n");
+       PARA_NOTICE_LOG("SIGHUP\n");

        close_log(logfile); /* gets reopened if necessary by parse_config */
        logfile = NULL;
        parse_config(1); /* reopens log */
        close_log(logfile); /* gets reopened if necessary by parse_config */
        logfile = NULL;
        parse_config(1); /* reopens log */


@@ -392,8 +447,8 @@ out:
        prev_events = mmd->events;
        mmd->vss_status_flags = mmd->new_vss_status_flags;
        if (ret) {
        prev_events = mmd->events;
        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);
+               PARA_DEBUG_LOG("%d events, forcing status update\n",
+                       mmd->events);

                killpg(0, SIGUSR1);
        }
 }
                killpg(0, SIGUSR1);
        }
 }


@@ -411,14 +466,14 @@ int main(int argc, char *argv[])
 {
        /* listen on sock_fd, new connection on new_fd */
        int sockfd, new_fd;
 {
        /* listen on sock_fd, new connection on new_fd */
        int sockfd, new_fd;

-       struct sockaddr_in their_addr;
+       char *peer_name;

        int i, max_fileno, ret;
        pid_t chld_pid;
        fd_set rfds, wfds;
        struct timeval *timeout;
 
        valid_fd_012();
        int i, max_fileno, ret;
        pid_t chld_pid;
        fd_set rfds, wfds;
        struct timeval *timeout;
 
        valid_fd_012();

-       sockfd = do_inits(argc, argv);
+       sockfd = server_init(argc, argv);

 repeat:
        FD_ZERO(&rfds);
        FD_ZERO(&wfds);
 repeat:
        FD_ZERO(&rfds);
        FD_ZERO(&wfds);


@@ -429,8 +484,6 @@ repeat:
        timeout = vss_preselect(&rfds, &wfds, &max_fileno);
        status_refresh();
        for (i = 0; senders[i].name; i++) {
        timeout = vss_preselect(&rfds, &wfds, &max_fileno);
        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(&max_fileno, &rfds, &wfds);
                if (!senders[i].pre_select)
                        continue;
                senders[i].pre_select(&max_fileno, &rfds, &wfds);


@@ -442,8 +495,6 @@ repeat:
        if (ret < 0)
                goto repeat;
        for (i = 0; senders[i].name; i++) {
        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(&rfds, &wfds);
                if (!senders[i].post_select)
                        continue;
                senders[i].post_select(&rfds, &wfds);


@@ -493,17 +544,17 @@ genocide:
        if (!FD_ISSET(sockfd, &rfds))
                goto repeat;
 
        if (!FD_ISSET(sockfd, &rfds))
                goto repeat;
 

-       new_fd = para_accept(sockfd, &their_addr, sizeof(struct sockaddr_in));
+       new_fd = para_accept(sockfd, NULL, 0);

        if (new_fd < 0)
                goto repeat;
        if (new_fd < 0)
                goto repeat;

-       PARA_INFO_LOG("got connection from %s, forking\n",
-               inet_ntoa(their_addr.sin_addr));
+       peer_name = remote_name(new_fd);
+       PARA_INFO_LOG("got connection from %s, forking\n", peer_name);

        mmd->num_connects++;
        mmd->active_connections++;
        random();
        chld_pid = fork();
        if (chld_pid < 0) {
        mmd->num_connects++;
        mmd->active_connections++;
        random();
        chld_pid = fork();
        if (chld_pid < 0) {

-               PARA_CRIT_LOG("%s", "fork failed\n");
+               PARA_CRIT_LOG("fork failed\n");

                goto repeat;
        }
        if (chld_pid) {
                goto repeat;
        }
        if (chld_pid) {


@@ -513,14 +564,13 @@ genocide:
        }
        alarm(ALARM_TIMEOUT);
        close_listed_fds();
        }
        alarm(ALARM_TIMEOUT);
        close_listed_fds();

-       close(sockfd); /* child doesn't need the listener */
+       para_signal_shutdown();

        /*
         * put info on who we are serving into argv[0] to make
         * client ip visible in top/ps
         */
        for (i = argc - 1; i >= 0; i--)
                memset(argv[i], 0, strlen(argv[i]));
        /*
         * put info on who we are serving into argv[0] to make
         * client ip visible in top/ps
         */
        for (i = argc - 1; i >= 0; i--)
                memset(argv[i], 0, strlen(argv[i]));

-       sprintf(argv[0], "para_server (serving %s)",
-               inet_ntoa(their_addr.sin_addr));
-       return handle_connect(new_fd, &their_addr);
+       sprintf(argv[0], "para_server (serving %s)", peer_name);
+       return handle_connect(new_fd, peer_name);

 }
 }