X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=c9a03b94738848b94911cf7d7becea1227bd42b6;hp=3d2511f7ef755e759a2d2f486d4060a785cff225;hb=47fc5bc792648cff3bf37679764ee1d296f6c386;hpb=0869d99a5dcfa351536a129f10ddf3a99211cf46

diff --git a/dccp_send.c b/dccp_send.c
index 3d2511f7..c9a03b94 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2008 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,14 +11,19 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <sys/types.h>
+#include <dirent.h>
+
+#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"
@@ -36,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 */
@@ -58,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);
@@ -204,7 +212,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;
 		}
@@ -266,9 +274,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));
 }