X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=b038fc01c4d18f971ce699d6c78c087c96614039;hp=0484778eb593d342eaa0fd961a521e587a5ef468;hb=f189411b9986564c2652ef87e54189e5fa0d5d11;hpb=32e646780461f96682d1191d31e08e4602ab125e

diff --git a/dccp_send.c b/dccp_send.c
index 0484778e..b038fc01 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,19 +11,23 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.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 "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "fd.h"
 #include "close_on_fork.h"
@@ -101,13 +105,12 @@ static int dccp_init_fec(struct sender_client *sc)
 	return mps;
 }
 
-static int dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
-	int ret = write_nonblock(sc->fd, buf, len);
+	int ret = xwrite(sc->fd, buf, len);
 
 	if (ret < 0)
 		dccp_shutdown_client(sc);
-	return ret;
 }
 
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
@@ -194,13 +197,13 @@ static const char *dccp_list_available_ccids(void)
 	return list;
 }
 
-static char *dccp_info(void)
+static char *dccp_status(void)
 {
-	char *info = get_sender_info(dss, "dccp");
-	char *ret  = make_message("%s" "\tsupported ccids: %s\n",
-				  info, dccp_list_available_ccids());
-	free(info);
-	return ret;
+	char *status = generic_sender_status(dss, "dccp");
+	char *result = make_message("%ssupported ccids: %s\n", status,
+		dccp_list_available_ccids());
+	free(status);
+	return result;
 }
 
 /**
@@ -215,7 +218,7 @@ void dccp_send_init(struct sender *s)
 {
 	int ret, k, n;
 
-	s->info = dccp_info;
+	s->status = dccp_status;
 	s->send = NULL;
 	s->pre_select = dccp_pre_select;
 	s->post_select = dccp_post_select;