Intoduce send_common.c and use it from the dccp sender.

[paraslash.git] / http_send.c

diff --git a/http_send.c b/http_send.c
index 18ad9a5411ce52512fff7ad66e397b9968fc5a15..b629d9579ea02854176cb2d5ff0174ab42313a59 100644 (file)
--- a/http_send.c
+++ b/http_send.c
@@ -18,8 +18,8 @@
 #include "server.h"
 #include "http.h"
 #include "vss.h"
-#include "send.h"
 #include "list.h"
+#include "send.h"
 #include "close_on_fork.h"
 #include "net.h"
 #include "fd.h"
@@ -57,10 +57,6 @@ struct http_client {
        char *name;
        /** The client's current status. */
        enum http_status status;
-       /** Non-zero if we included \a fd in the read set.*/
-       int check_r;
-       /** Non-zero if we included \a fd in the write set. */
-       int check_w;
        /** The position of this client in the client list. */
        struct list_head node;
        /** non-zero if audio file header has been sent */
@@ -198,7 +194,7 @@ static void http_send(long unsigned current_chunk,
        }
 }
 
-static void http_post_select(fd_set *rfds, fd_set *wfds)
+static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
        int i = -1, match;
        struct http_client *hc, *tmp;
@@ -213,7 +209,7 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                case HTTP_STREAMING: /* nothing to do */
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
-                       if (hc->check_r && FD_ISSET(hc->fd, rfds)) {
+                       if (FD_ISSET(hc->fd, rfds)) {
                                if (recv_pattern(hc->fd, HTTP_GET_MSG, MAXLINE)
                                                < 0) {
                                        hc->status = HTTP_INVALID_GET_REQUEST;
@@ -225,17 +221,12 @@ static void http_post_select(fd_set *rfds, fd_set *wfds)
                        }
                        break;
                case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               hc->status = HTTP_STREAMING;
-                               http_send_ok_msg(hc);
-                       }
+                       hc->status = HTTP_STREAMING;
+                       http_send_ok_msg(hc);
                        break;
                case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
-                               if (http_send_err_msg(hc) >= 0)
-                                       http_shutdown_client(hc,
-                                               "invalid get request");
-                       }
+                       if (http_send_err_msg(hc) >= 0)
+                               http_shutdown_client(hc, "invalid get request");
                        break;
                }
        }
@@ -279,7 +270,7 @@ err_out:
        free(hc);
 }
 
-static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
 {
        struct http_client *hc, *tmp;
 
@@ -288,19 +279,13 @@ static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
        para_fd_set(listen_fd, rfds, max_fileno);
        list_for_each_entry_safe(hc, tmp, &clients, node) {
                //PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
-               hc->check_r = 0;
-               hc->check_w = 0;
                switch (hc->status) {
                case HTTP_STREAMING:
+               case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
+               case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
                        break;
                case HTTP_CONNECTED: /* need to recv get request */
                        para_fd_set(hc->fd, rfds, max_fileno);
-                       hc->check_r = 1;
-                       break;
-               case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
-               case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
-                       para_fd_set(hc->fd, wfds, max_fileno);
-                       hc->check_w = 1;
                        break;
                }
        }