X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=udp_recv.c;h=15cf73eb210dd0354b27abf795e60fdd1959377b;hp=f9c70ec83d9a32427574bd32984da14ee5269b7c;hb=465f84546f810776ea6c4bd06fec34ff8452e933;hpb=a28eef552dc779eac12c1df430522dc4e20ae428

diff --git a/udp_recv.c b/udp_recv.c
index f9c70ec8..15cf73eb 100644
--- a/udp_recv.c
+++ b/udp_recv.c
@@ -1,13 +1,18 @@
 /*
- * Copyright (C) 2005-2013 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
 /** \file udp_recv.c Paraslash's udp receiver */
 
+#include <netinet/in.h>
 #include <regex.h>
 #include <sys/socket.h>
 #include <net/if.h>
+#include <sys/types.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -43,7 +48,7 @@ static int udp_check_eof(size_t sz, struct iovec iov[2])
 	}
 	if (memcmp(iov[0].iov_base, FEC_EOF_PACKET, iov[0].iov_len) != 0)
 		return 0;
-	if (memcmp(iov[1].iov_base, FEC_EOF_PACKET + iov[0].iov_len,
+	if (memcmp(iov[1].iov_base, &FEC_EOF_PACKET[iov[0].iov_len],
 			FEC_EOF_PACKET_LEN - iov[0].iov_len) != 0)
 		return 0;
 	return -E_RECV_EOF;
@@ -100,15 +105,9 @@ static void udp_recv_close(struct receiver_node *rn)
 
 static void *udp_recv_parse_config(int argc, char **argv)
 {
-	int ret;
-	struct udp_recv_args_info *tmp =
-		para_calloc(sizeof(struct udp_recv_args_info));
-
-	ret = udp_recv_cmdline_parser(argc, argv, tmp)? -E_UDP_SYNTAX : 1;
-	if (ret >= 0)
-		return tmp;
-	free(tmp);
-	return NULL;
+	struct udp_recv_args_info *tmp = para_calloc(sizeof(*tmp));
+	udp_recv_cmdline_parser(argc, argv, tmp);
+	return tmp;
 }
 
 /*
@@ -226,9 +225,6 @@ void udp_recv_init(struct receiver *r)
 	r->post_select = udp_recv_post_select;
 	r->parse_config = udp_recv_parse_config;
 	r->free_config = udp_recv_free_config;
-	r->help = (struct ggo_help) {
-		.short_help = udp_recv_args_info_help,
-		.detailed_help = udp_recv_args_info_detailed_help
-	};
+	r->help = (struct ggo_help)DEFINE_GGO_HELP(udp_recv);
 	udp_recv_cmdline_parser_free(&dummy);
 }