X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=92dd933347d2c48d857355da34c13673da54968b;hp=ed03b6140d3854710b85355f68165f6316f878ce;hb=ce9e297eb91a932a11f81890c800d0380b5bc9c9;hpb=36ec2a43a7d9c085f16544e282a439cdbaec1e00

diff --git a/dccp_send.c b/dccp_send.c
index ed03b614..92dd9333 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2014 Andre Noll <maan@tuebingen.mpg.de>
+ * Copyright (C) 2006 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -15,7 +15,6 @@
 #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>
@@ -24,7 +23,6 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "net.h"
 #include "list.h"
@@ -199,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;
 }
 
 /**
@@ -220,19 +218,19 @@ 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;
 	s->shutdown_clients = dccp_shutdown_clients;
 	s->resolve_target = NULL;
 	s->help = generic_sender_help;
-	s->client_cmds[SENDER_ON] = dccp_com_on;
-	s->client_cmds[SENDER_OFF] = dccp_com_off;
-	s->client_cmds[SENDER_DENY] = dccp_com_deny;
-	s->client_cmds[SENDER_ALLOW] = dccp_com_allow;
-	s->client_cmds[SENDER_ADD] = NULL;
-	s->client_cmds[SENDER_DELETE] = NULL;
+	s->client_cmds[SENDER_on] = dccp_com_on;
+	s->client_cmds[SENDER_off] = dccp_com_off;
+	s->client_cmds[SENDER_deny] = dccp_com_deny;
+	s->client_cmds[SENDER_allow] = dccp_com_allow;
+	s->client_cmds[SENDER_add] = NULL;
+	s->client_cmds[SENDER_delete] = NULL;
 
 	k = conf.dccp_data_slices_per_group_arg;
 	n = conf.dccp_slices_per_group_arg;