X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_send.c;h=faae208c2d6d9142760d93d2d7033b2b53e9e95f;hp=4580f009b3cb4b75d2f9e4c3a4e274cfc230e387;hb=6fbd93c8420823356a24a3637d332c23c0c85dcd;hpb=6a79f16de242c0c70ef56bbd96a748055df65917

diff --git a/udp_send.c b/udp_send.c
index 4580f009..faae208c 100644
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -10,12 +10,10 @@
 #include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <sys/socket.h>
 #include <netinet/udp.h>
 #include <net/if.h>
 #include <arpa/inet.h>
 #include <sys/un.h>
-#include <osl.h>
 #include <netdb.h>
 
 #include "server.cmdline.h"
@@ -23,7 +21,6 @@
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
@@ -60,7 +57,7 @@ static void udp_close_target(struct sender_client *sc)
 	size_t len = vss_get_fec_eof_packet(&buf);
 
 	/*
-	 * Ignore the return value of wirte() since we are closing the target
+	 * Ignore the return value of write() since we are closing the target
 	 * anyway. The sole purpose of the "do_nothing" statement is to silence
 	 * gcc.
 	 */
@@ -159,11 +156,6 @@ err:
 	return -ERRNO_TO_PARA_ERROR(errno);
 }
 
-static void udp_init_session(struct sender_client *sc)
-{
-	PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
-}
-
 static void udp_shutdown_targets(void)
 {
 	struct sender_client *sc, *tmp;
@@ -242,7 +234,7 @@ static int udp_init_fec(struct sender_client *sc)
 {
 	int mps;
 
-	udp_init_session(sc);
+	PARA_NOTICE_LOG("sending to udp %s\n", sc->name);
 	mps = generic_max_transport_msg_size(sc->fd) - sizeof(struct udphdr);
 	PARA_INFO_LOG("current MPS = %d bytes\n", mps);
 	return mps;
@@ -355,7 +347,7 @@ err:
 	return ret;
 }
 
-static char *udp_info(void)
+static char *udp_status(void)
 {
 	struct sender_client *sc;
 	char *ret, *tgts = NULL;
@@ -371,10 +363,9 @@ static char *udp_info(void)
 		tgts = tmp;
 	}
 	ret = make_message(
-		"udp sender:\n"
-		"\tstatus: %s\n"
-		"\tport: %s\n"
-		"\ttargets: %s\n",
+		"status: %s\n"
+		"port: %s\n"
+		"targets: %s\n",
 		(sender_status == SENDER_ON)? "on" : "off",
 		stringify_port(conf.udp_default_port_arg, "udp"),
 		tgts? tgts : "(none)"
@@ -427,7 +418,7 @@ static char *udp_help(void)
 void udp_send_init(struct sender *s)
 {
 	INIT_LIST_HEAD(&targets);
-	s->info = udp_info;
+	s->status = udp_status;
 	s->help = udp_help;
 	s->send = NULL;
 	s->pre_select = NULL;