udp_send.c: Remove pointless function.

[paraslash.git] / udp_send.c

diff --git a/udp_send.c b/udp_send.c
index d55a9abf3e43355118f77d9c158311d730effcf9..faae208c2d6d9142760d93d2d7033b2b53e9e95f 100644 (file)
--- a/udp_send.c
+++ b/udp_send.c
@@ -1,25 +1,26 @@
 /*
- * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file udp_send.c Para_server's udp sender. */
 
-
-#include <regex.h>
-#include <sys/time.h>
+#include <netinet/in.h>
 #include <sys/socket.h>
+#include <regex.h>
+#include <sys/types.h>
 #include <netinet/udp.h>
 #include <net/if.h>
-#include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "server.cmdline.h"
 #include "para.h"
 #include "error.h"
 #include "string.h"
 #include "afh.h"
-#include "afs.h"
 #include "server.h"
 #include "list.h"
 #include "send.h"
@@ -56,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.
         */
@@ -155,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;
@@ -238,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;
@@ -277,18 +273,18 @@ static int udp_check_socket_state(struct sender_client *sc)
        return -ERRNO_TO_PARA_ERROR(ret);
 }
 
-static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void udp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
        int ret;
 
        if (sender_status == SENDER_OFF)
-               return 0;
+               return;
        if (len == 0)
-               return 0;
+               return;
        ret = udp_check_socket_state(sc);
        if (ret < 0)
                goto fail;
-       ret = write_nonblock(sc->fd, buf, len);
+       ret = xwrite(sc->fd, buf, len);
        if (ret == -ERRNO_TO_PARA_ERROR(ECONNREFUSED)) {
                /*
                 * Happens if meanwhile an ICMP Destination / Port Unreachable
@@ -298,10 +294,9 @@ static int udp_send_fec(struct sender_client *sc, char *buf, size_t len)
        }
        if (ret < 0)
                goto fail;
-       return 1;
+       return;
 fail:
        udp_delete_target(sc, para_strerror(-ret));
-       return ret;
 }
 
 static int udp_com_add(struct sender_command_data *scd)
@@ -352,7 +347,7 @@ err:
        return ret;
 }
 
-static char *udp_info(void)
+static char *udp_status(void)
 {
        struct sender_client *sc;
        char *ret, *tgts = NULL;
@@ -368,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)"
@@ -424,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;