X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_send.c;h=3979982c725da1b6e83966b6ac6887cb2cfae2a6;hp=a2ee0270733a3d47b2053173b9e74bbdbfb4eeff;hb=23b121a85984baa9252f4b4c0b8c4f186e394bb7;hpb=5bf80b0268b0afb3984aea74d41eddef34d50d03 diff --git a/dccp_send.c b/dccp_send.c index a2ee0270..3979982c 100644 --- a/dccp_send.c +++ b/dccp_send.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2006-2010 Andre Noll + * Copyright (C) 2006-2013 Andre Noll * * Licensed under the GPL v2. For licencing details see COPYING. */ @@ -13,7 +13,6 @@ #include #include -#include #include #include "para.h" @@ -25,6 +24,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 +102,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 +144,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); }