X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=1e95aac6401cf43cf7368a0ad61a2c37e6428587;hp=a2ee0270733a3d47b2053173b9e74bbdbfb4eeff;hb=e8ca7526ddebc98f3023736f77fa13b65034767b;hpb=5bf80b0268b0afb3984aea74d41eddef34d50d03

diff --git a/dccp_send.c b/dccp_send.c
index a2ee0270..1e95aac6 100644
--- a/dccp_send.c
+++ b/dccp_send.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (C) 2006-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2006-2014 Andre Noll <maan@systemlinux.org>
  *
  * Licensed under the GPL v2. For licencing details see COPYING.
  */
@@ -11,10 +11,14 @@
  * (C) 2005 Ian McDonald <imcdnzl@gmail.com>
  */
 
+#include <netinet/in.h>
+#include <sys/socket.h>
 #include <regex.h>
 #include <sys/types.h>
-#include <dirent.h>
 #include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
 
 #include "para.h"
 #include "error.h"
@@ -25,6 +29,7 @@
 #include "net.h"
 #include "list.h"
 #include "send.h"
+#include "sched.h"
 #include "vss.h"
 #include "fd.h"
 #include "close_on_fork.h"
@@ -102,13 +107,12 @@ static int dccp_init_fec(struct sender_client *sc)
 	return mps;
 }
 
-static int dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
+static void dccp_send_fec(struct sender_client *sc, char *buf, size_t len)
 {
-	int ret = write_nonblock(sc->fd, buf, len);
+	int ret = xwrite(sc->fd, buf, len);
 
 	if (ret < 0)
 		dccp_shutdown_client(sc);
-	return ret;
 }
 
 static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
@@ -145,6 +149,7 @@ static void dccp_post_select(fd_set *rfds, __a_unused fd_set *wfds)
 	dfc->fcp.slices_per_group	= conf.dccp_slices_per_group_arg;
 	dfc->fcp.init_fec		= dccp_init_fec;
 	dfc->fcp.send_fec		= dccp_send_fec;
+	dfc->fcp.need_periodic_header   = false;
 	dfc->fc = vss_add_fec_client(sc, &dfc->fcp);
 }