X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=send_common.c;h=2af6a8dad7b80cec0e72c621c44be3a3d98a74bf;hp=448ddfec0f83692f0fa144487418df3a9b02fad7;hb=1e012cf40238883621692051a22fb9c7cad5e944;hpb=eea9d1cae30df921ae2fd1771518b8b21dbd0daf diff --git a/send_common.c b/send_common.c index 448ddfec..2af6a8da 100644 --- a/send_common.c +++ b/send_common.c @@ -6,7 +6,10 @@ /** \file send_common.c Functions used by more than one paraslash sender. */ +#include #include +#include + #include "para.h" #include "error.h" #include "string.h" @@ -159,8 +162,8 @@ void send_chunk(struct sender_client *sc, struct sender_status *ss, if (ret < 0) goto out; } - sc->header_sent = 1; } + sc->header_sent = 1; ret = send_queued_chunks(sc->fd, sc->cq, max_bytes_per_write); if (ret < 0) { shutdown_client(sc, ss); @@ -214,7 +217,7 @@ void init_sender_status(struct sender_status *ss, char **access_arg, * * \return The string printed in the "si" command. */ -char *get_sender_info(struct sender_status *ss, char *name) +char *get_sender_info(struct sender_status *ss, const char *name) { char *clnts = NULL, *ret; struct sender_client *sc, *tmp_sc; @@ -389,8 +392,9 @@ char *generic_sender_help(void) { return make_message( "usage: {on|off}\n" - "usage: {allow|deny} IP mask\n" - "example: allow 127.0.0.1 32\n" + "usage: {allow|deny} IP[/netmask]\n" + " where mask defaults to 32\n" + "example: allow 192.168.0.1/24\n" ); } @@ -440,6 +444,21 @@ out: return ret; } +/** + * Parse a FEC URL string. + * + * \param arg the URL string to parse. + * \param scd The structure containing host, port and the FEC parameters. + * + * \return Standard. + * + * A FEC URL consists of an ordinary URL string according to RFC 3986, + * optionally followed by a slash and the three FEC parameters slice_size, + * data_slices_per_group and slices_per_group. The three FEC parameters are + * separated by colons. + * + * \sa \ref parse_url(). + */ int parse_fec_url(const char *arg, struct sender_command_data *scd) { int ret;