X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=1ea8de25ed4f63ab622ec12cc6d6f54093bf7401;hp=b5373e0e2fb32a8b03f2004924bec0b38c367fea;hb=f491dc59b5eee838165b60e7815a06139fed7f74;hpb=72ed0a92d2c9a76b3bd2b4e8f81b69e57280a79d;ds=sidebyside diff --git a/dccp_send.c b/dccp_send.c index b5373e0e..1ea8de25 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -11,14 +11,20 @@ * (C) 2005 Ian McDonald */ +#include +#include + +#include "para.h" +#include "error.h" +#include "string.h" +#include "afh.h" +#include "afs.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 "chunk_queue.h" @@ -65,7 +71,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) { - 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)); @@ -119,8 +125,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) { @@ -182,7 +188,7 @@ static void dccp_send(long unsigned current_chunk, struct dccp_client *dc, *tmp; int ret; char *header_buf; - unsigned header_len; + size_t header_len; if (listen_fd < 0 || !len) return;