replace para_connect() by PARA_CONNECT.

[paraslash.git] / dccp_send.c

diff --git a/dccp_send.c b/dccp_send.c
index 2c8f800f995ef8fafc6e97b35d3f4420ccddb60e..3509d5d88a5e18f00089885ae7be41b8207e1b17 100644 (file)
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -11,13 +11,15 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 

+#include "para.h"
+#include "error.h"
+#include "afh.h"

 #include "server.h"
 #include "net.h"
 #include "list.h"
 #include "vss.h"
 #include "send.h"
 #include "dccp.h"
 #include "server.h"
 #include "net.h"
 #include "list.h"
 #include "vss.h"
 #include "send.h"
 #include "dccp.h"

-#include "error.h"

 #include "string.h"
 #include "fd.h"
 #include "close_on_fork.h"
 #include "string.h"
 #include "fd.h"
 #include "close_on_fork.h"


@@ -65,7 +67,7 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
        dc = para_calloc(sizeof(struct dccp_client));
        ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in));
        if (ret < 0) {
        dc = para_calloc(sizeof(struct dccp_client));
        ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in));
        if (ret < 0) {

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

                return;
        }
        PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));
                return;
        }
        PARA_NOTICE_LOG("connection from %s\n", inet_ntoa(dc->addr.sin_addr));


@@ -119,8 +121,8 @@ static void dccp_shutdown_client(struct dccp_client *dc)
 }
 
 /*
 }
 
 /*

- * ret: Negative on errors, zero if nothing was written and write would block,
- * number of bytes written else.
+ * ret: Negative on errors, zero if nothing was written and write returned
+ * EAGAIN, number of bytes written else.

  */
 static int dccp_write(int fd, const char *buf, size_t len)
 {
  */
 static int dccp_write(int fd, const char *buf, size_t len)
 {


@@ -163,9 +165,7 @@ static int send_queued_chunks(struct dccp_client *dc)
        while ((qc = cq_peek(dc->cq))) {
                char *buf;
                size_t len;
        while ((qc = cq_peek(dc->cq))) {
                char *buf;
                size_t len;

-               int ret = write_ok(dc->fd);
-               if (ret <= 0)
-                       return ret? -E_WRITE_OK : 0;
+               int ret;

                cq_get(qc, &buf, &len);
                ret = dccp_write(dc->fd, buf, len);
                if (ret < 0)
                cq_get(qc, &buf, &len);
                ret = dccp_write(dc->fd, buf, len);
                if (ret < 0)


@@ -184,7 +184,7 @@ static void dccp_send(long unsigned current_chunk,
        struct dccp_client *dc, *tmp;
        int ret;
        char *header_buf;
        struct dccp_client *dc, *tmp;
        int ret;
        char *header_buf;

-       unsigned header_len;
+       size_t header_len;

 
        if (listen_fd < 0 || !len)
                return;
 
        if (listen_fd < 0 || !len)
                return;