Make crypo a per fd feature

[paraslash.git] / server.c

diff --git a/server.c b/server.c
index bcb43a20e610d275294447b4fc4728f8caaece78..2391e07c360d93f68e85a76c99bc783e1f2d4bc0 100644 (file)
--- a/server.c
+++ b/server.c
@@ -61,8 +61,8 @@ 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 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 selectors[] = {
        {
 /** the list of supported audio file selectors */
 struct audio_file_selector selectors[] = {
        {


@@ -436,14 +436,12 @@ int main(int argc, char *argv[])
        valid_fd_012();
        sockfd = do_inits(argc, argv);
 repeat:
        valid_fd_012();
        sockfd = do_inits(argc, argv);
 repeat:

-       /* check socket and signal pipe in any case */

        FD_ZERO(&rfds);
        FD_ZERO(&wfds);
        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++) {
        timeout = afs_preselect();
        status_refresh();
        for (i = 0; senders[i].name; i++) {


@@ -451,14 +449,11 @@ repeat:
                        continue;
                if (!senders[i].pre_select)
                        continue;
                        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);
        }
        if (selectors[mmd->selector_num].pre_select) {
                ret = selectors[mmd->selector_num].pre_select(&rfds, &wfds);

-               max_fileno = MAX(max_fileno, ret);
+               max_fileno = PARA_MAX(max_fileno, ret);

        }
        mmd_unlock();
        ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);
        }
        mmd_unlock();
        ret = para_select(max_fileno + 1, &rfds, &wfds, timeout);


@@ -474,14 +469,10 @@ repeat:
                        continue;
                if (!senders[i].post_select)
                        continue;
                        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();
        if (FD_ISSET(signal_pipe, &rfds)) {
                int sig;
                sig = para_next_signal();