X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=fd0cbf12f1d5ea3899636b1deaa0c62b5f95d5e9;hp=5d8e6593fe0bffd5b628fe92eeffac8d9638c90a;hb=c8862b9e246b4ef6ff1fe103946e18cf2537ecde;hpb=7a0852896a75d852dbd2ac848ec5c0be3b5dea71 diff --git a/dccp_send.c b/dccp_send.c index 5d8e6593..fd0cbf12 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. */ @@ -69,7 +69,16 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds) return; 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; + } + /* + * 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(ret, SHUT_RD) < 0) { + PARA_ERROR_LOG("shutdown(SHUT_RD): %s\n", strerror(errno)); return; } dc = para_calloc(sizeof(struct dccp_client)); @@ -191,7 +200,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; } @@ -254,7 +263,7 @@ void dccp_send_init(struct sender *s) self = s; ret = dccp_open(); if (ret < 0) { - PARA_ERROR_LOG("%s\n", PARA_STRERROR(-ret)); + PARA_ERROR_LOG("%s\n", para_strerror(-ret)); s->status = SENDER_OFF; } else s->status = SENDER_ON;