X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=0310584ddad17737efcc110db94a8623fbc1635e;hp=2c8f800f995ef8fafc6e97b35d3f4420ccddb60e;hb=7a8d90c41b758d1c3ae8530a44ccd9aaa857581e;hpb=bd38899d7d8cd4043bfee85fcdb55159ca5ba1a2

diff --git a/dccp_send.c b/dccp_send.c
index 2c8f800f..0310584d 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -11,14 +11,20 @@
  * (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 +42,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 */
@@ -62,55 +68,37 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 
 	if (!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", 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 = para_calloc(sizeof(struct dccp_client));
 	dc->fd = ret;
+	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);
+	mark_fd_nonblocking(dc->fd);
 	dc->cq = cq_new(DCCP_MAX_PENDING_BYTES);
 }
 
 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);
-	if (ret < 0) {
-		PARA_ERROR_LOG("%s\n", strerror(errno));
-		return -E_DCCP_LISTEN;
-	}
-	PARA_DEBUG_LOG("listening on fd %d\n", listen_fd);
 	add_close_on_fork_list(listen_fd);
-	mark_fd_nonblock(listen_fd);
+	mark_fd_nonblocking(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);
@@ -119,8 +107,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)
 {
@@ -163,9 +151,7 @@ static int send_queued_chunks(struct dccp_client *dc)
 	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)
@@ -184,7 +170,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;