X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=5449a6a9664f070b0115d3bdb2a6f9471718f796;hp=4394b33bf2c5707f1895716de490c3bafda12ece;hb=d85091bebd5abb6f473a31dd118f4d853d1317c9;hpb=cb6d1dfb9e4067229a4bbde0abd05784d97ef14b diff --git a/dccp_send.c b/dccp_send.c index 4394b33b..5449a6a9 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2007 Andre Noll + * Copyright (C) 2006-2008 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -11,16 +11,19 @@ * (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" @@ -38,8 +41,8 @@ static struct sender *self; struct dccp_client { /** the dccp socket */ int fd; - /** address information about the client */ - struct sockaddr_in addr; + /** The socket `name' of the client. */ + char *name; /** the position of this client in the client list */ struct list_head node; /** non-zero if audio file header has been sent */ @@ -48,7 +51,7 @@ struct dccp_client { struct chunk_queue *cq; }; -static void dccp_pre_select( int *max_fileno, fd_set *rfds, +static void dccp_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds) { if (listen_fd < 0) @@ -60,59 +63,62 @@ static void dccp_pre_select( int *max_fileno, fd_set *rfds, static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds) { struct dccp_client *dc; - int ret; + int ret, fd; - if (!FD_ISSET(listen_fd, rfds)) + if (listen_fd < 0 || !FD_ISSET(listen_fd, rfds)) return; - dc = para_calloc(sizeof(struct dccp_client)); - ret = para_accept(listen_fd, &dc->addr, sizeof(struct sockaddr_in)); + ret = para_accept(listen_fd, NULL, 0); if (ret < 0) { - PARA_ERROR_LOG("%s\n", 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)); - dc->fd = ret; + fd = ret; + /* + * Bypass unused CCID paths: the sender does not receive application data + * from the client; by shutting down this unused communication path we can + * reduce processing costs a bit. See analogous comment in dccp_recv.c. + */ + if (shutdown(fd, SHUT_RD) < 0) { + PARA_ERROR_LOG("shutdown(SHUT_RD): %s\n", strerror(errno)); + goto err; + } + ret = mark_fd_nonblocking(fd); + if (ret < 0) { + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); + goto err; + } + dc = para_calloc(sizeof(struct dccp_client)); + dc->fd = fd; + dc->name = make_message("%s", remote_name(dc->fd)); + PARA_NOTICE_LOG("connection from %s\n", dc->name); para_list_add(&dc->node, &clients); add_close_on_fork_list(dc->fd); - mark_fd_nonblock(dc->fd); dc->cq = cq_new(DCCP_MAX_PENDING_BYTES); + return; +err: + close(fd); } static int dccp_open(void) { - struct sockaddr_in servaddr; - int ret; + int ret = para_listen(AF_UNSPEC, IPPROTO_DCCP, conf.dccp_port_arg); - ret = dccp_get_socket(); if (ret < 0) return ret; listen_fd = ret; - - memset(&servaddr, 0, sizeof(servaddr)); - servaddr.sin_family = AF_INET; - servaddr.sin_addr.s_addr = htonl(INADDR_ANY); - servaddr.sin_port = htons(conf.dccp_port_arg); - ret = bind(listen_fd, (struct sockaddr *)&servaddr, sizeof(servaddr)); - if (ret < 0) - return -E_DCCP_BIND; - ret = dccp_set_socket(listen_fd); - if (ret < 0) - return ret; - ret = listen(listen_fd, 0); + ret = mark_fd_nonblocking(listen_fd); if (ret < 0) { - PARA_ERROR_LOG("%s\n", strerror(errno)); - return -E_DCCP_LISTEN; + PARA_EMERG_LOG("%s\n", para_strerror(-ret)); + exit(EXIT_FAILURE); } - PARA_DEBUG_LOG("listening on fd %d\n", listen_fd); add_close_on_fork_list(listen_fd); - mark_fd_nonblock(listen_fd); return 1; } static void dccp_shutdown_client(struct dccp_client *dc) { - PARA_DEBUG_LOG("shutting down %s (fd %d)\n", inet_ntoa(dc->addr.sin_addr), - dc->fd); + PARA_DEBUG_LOG("shutting down %s (fd %d)\n", dc->name, dc->fd); + free(dc->name); close(dc->fd); del_close_on_fork_list(dc->fd); cq_destroy(dc->cq); @@ -132,17 +138,15 @@ static int dccp_write(int fd, const char *buf, size_t len) while (written < len) { ret = write(fd, buf + written, PARA_MIN(1024, len - written)); /* - * Error handling: CCID3 has a sending wait queue which fills up and is - * emptied asynchronously. The EAGAIN case means that there is currently - * no space in the wait queue, but this can change at any moment and is - * thus not an error condition. + * Error handling: CCID3 has a sending wait queue which fills + * up and is emptied asynchronously. The EAGAIN case means that + * there is currently no space in the wait queue, but this can + * change at any moment and is thus not an error condition. */ if (ret < 0 && errno == EAGAIN) return written; - if (ret < 0) { - PARA_ERROR_LOG("%s\n", strerror(errno)); - return -E_DCCP_WRITE; - } + if (ret < 0) + return -ERRNO_TO_PARA_ERROR(errno); written += ret; } return written; @@ -206,7 +210,7 @@ static void dccp_send(long unsigned current_chunk, // PARA_DEBUG_LOG("writing %d bytes to fd %d\n", len, dc->fd); ret = dccp_write(dc->fd, buf, len); if (ret < 0) { - PARA_NOTICE_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_NOTICE_LOG("%s\n", para_strerror(-ret)); dccp_shutdown_client(dc); continue; } @@ -268,9 +272,6 @@ void dccp_send_init(struct sender *s) s->client_cmds[SENDER_DELETE] = NULL; self = s; ret = dccp_open(); - if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); - s->status = SENDER_OFF; - } else - s->status = SENDER_ON; + if (ret < 0) + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); }