projects
/
paraslash.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Remove some duplicate #include statements.
[paraslash.git]
/
udp_send.c
diff --git
a/udp_send.c
b/udp_send.c
index 4580f009b3cb4b75d2f9e4c3a4e274cfc230e387..8fca5bc6c2759c27b4e0402cba3e341b60b82ebc 100644
(file)
--- a/
udp_send.c
+++ b/
udp_send.c
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (C) 2005-201
3 Andre Noll <maan@systemlinux.org
>
+ * Copyright (C) 2005-201
4 Andre Noll <maan@tuebingen.mpg.de
>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
*
* 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 <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 <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"
#include <netdb.h>
#include "server.cmdline.h"
@@
-23,7
+21,6
@@
#include "error.h"
#include "string.h"
#include "afh.h"
#include "error.h"
#include "string.h"
#include "afh.h"
-#include "afs.h"
#include "server.h"
#include "list.h"
#include "send.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);
/*
size_t len = vss_get_fec_eof_packet(&buf);
/*
- * Ignore the return value of w
ir
te() since we are closing the target
+ * Ignore the return value of w
ri
te() since we are closing the target
* anyway. The sole purpose of the "do_nothing" statement is to silence
* gcc.
*/
* anyway. The sole purpose of the "do_nothing" statement is to silence
* gcc.
*/
@@
-355,7
+352,7
@@
err:
return ret;
}
return ret;
}
-static char *udp_
info
(void)
+static char *udp_
status
(void)
{
struct sender_client *sc;
char *ret, *tgts = NULL;
{
struct sender_client *sc;
char *ret, *tgts = NULL;
@@
-371,10
+368,9
@@
static char *udp_info(void)
tgts = tmp;
}
ret = make_message(
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)"
(sender_status == SENDER_ON)? "on" : "off",
stringify_port(conf.udp_default_port_arg, "udp"),
tgts? tgts : "(none)"
@@
-427,7
+423,7
@@
static char *udp_help(void)
void udp_send_init(struct sender *s)
{
INIT_LIST_HEAD(&targets);
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;
s->help = udp_help;
s->send = NULL;
s->pre_select = NULL;