fix dccp sender/receiver

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 74976cf202a27c430be96448011a966865fbf249..9bfe65f68a7bc7634c5ba581589e95c96c434e18 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -50,17 +50,16 @@ struct dccp_client {
        int header_sent;
 };
 
-static void dccp_pre_select(__unused struct audio_format *af, int *max_fileno, fd_set *rfds,
-               __unused fd_set *wfds)
+static void dccp_pre_select( int *max_fileno, fd_set *rfds,
+               __a_unused fd_set *wfds)
 {
        if (listen_fd < 0)
                return;
        FD_SET(listen_fd, rfds);
-       *max_fileno = MAX(*max_fileno, listen_fd);
+       *max_fileno = PARA_MAX(*max_fileno, listen_fd);
 }
 
-static void dccp_post_select(__unused struct audio_format *af, fd_set *rfds,
-               __unused fd_set *wfds)
+static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 {
        struct dccp_client *dc;
        int ret;
@@ -119,7 +118,7 @@ static int dccp_write(int fd, const char *buf, size_t len)
        size_t send, written = 0;
        int ret;
 again:
-       send = MIN(1024, len - written);
+       send = PARA_MIN(1024, len - written);
        ret = write(fd, buf + written, send);
        if (ret < 0)
                goto err_out;
@@ -133,9 +132,8 @@ err_out:
        return -E_DCCP_WRITE;
 }
 
-static void dccp_send(__unused struct audio_format *af,
-               long unsigned current_chunk,
-               __unused long unsigned chunks_sent, const char *buf, size_t len)
+static void dccp_send(long unsigned current_chunk,
+               __a_unused long unsigned chunks_sent, const char *buf, size_t len)
 {
        struct dccp_client *dc, *tmp;
        int ret, header_len;
@@ -152,27 +150,27 @@ static void dccp_send(__unused struct audio_format *af,
                }
                if (!ret)
                        continue;
-               if (!dc->header_sent && af->get_header_info && current_chunk) {
-                       header_buf = af->get_header_info(&header_len);
-                       if (!header_buf || header_len <= 0)
-                               continue; /* header not yet available */
-                       ret = dccp_write(dc->fd, header_buf, header_len);
-                       if (ret != header_len) {
-                               int err = errno;
-                               PARA_ERROR_LOG("header write: %d/%d (%s)\n",
-                                       ret, header_len, ret < 0?
-                                       strerror(err) : "");
-                               dccp_shutdown_client(dc);
-                               continue;
+               if (!dc->header_sent && current_chunk) {
+                       header_buf = afs_get_header(&header_len);
+                       if (header_buf && header_len > 0) {
+                               ret = dccp_write(dc->fd, header_buf, header_len);
+                               if (ret != header_len) {
+                                       int err = errno;
+                                       PARA_ERROR_LOG("header write: %d/%d (%s)\n",
+                                               ret, header_len, ret < 0?
+                                               strerror(err) : "");
+                                       dccp_shutdown_client(dc);
+                                       continue;
+                               }
+                               dc->header_sent = 1;
+                               ret = write_ok(dc->fd);
+                               if (ret < 0) {
+                                       dccp_shutdown_client(dc);
+                                       continue;
+                               }
+                               if (!ret)
+                                       continue;
                        }
-                       dc->header_sent = 1;
-                       ret = write_ok(dc->fd);
-                       if (ret < 0) {
-                               dccp_shutdown_client(dc);
-                               continue;
-                       }
-                       if (!ret)
-                               continue;
                }
 //             PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd);
                ret = dccp_write(dc->fd, buf, len);
@@ -234,8 +232,9 @@ void dccp_send_init(struct sender *s)
        s->client_cmds[SENDER_DELETE] = NULL;
        self = s;
        ret = dccp_open();
-       if (ret < 0)
+       if (ret < 0) {
                PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret));
-       else
+               s->status = SENDER_OFF;
+       } else
                s->status = SENDER_ON;
 }