/*
- * Copyright (C) 2005-2008 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file send_common.c Functions used by more than one paraslash sender. */
+#include <regex.h>
#include <dirent.h>
+#include <osl.h>
+
#include "para.h"
#include "error.h"
#include "string.h"
*/
static int open_sender(unsigned l4type, int port)
{
- int fd, ret = para_listen(AF_UNSPEC, l4type, port);
+ int fd, ret = para_listen_simple(l4type, port);
if (ret < 0)
return ret;
shutdown_client(sc, ss);
}
-/**
- * Write a buffer to a non-blocking file descriptor.
- *
- * \param fd The file descriptor.
- * \param buf the buffer to write.
- * \param len the number of bytes of \a buf.
- * \param max_bytes_per_write Do not write more than that many bytes at once.
- *
- * If \a max_bytes_per_write is non-zero, do not send more than that many bytes
- * per write().
- *
- * EAGAIN is not considered an error condition. For example CCID3 has a
- * sending wait queue which fills up and is emptied asynchronously. The EAGAIN
- * case means that there is currently no space in the wait queue, but this can
- * change at any moment.
- *
- * \return Negative on errors, number of bytes written else.
- */
-static int write_nonblock(int fd, const char *buf, size_t len,
- size_t max_bytes_per_write)
-{
- size_t written = 0;
- int ret = 0;
-
- while (written < len) {
- size_t num = len - written;
-
- if (max_bytes_per_write && max_bytes_per_write < num)
- num = max_bytes_per_write;
- ret = write(fd, buf + written, num);
- if (ret < 0 && errno == EAGAIN)
- return written;
- if (ret < 0)
- return -ERRNO_TO_PARA_ERROR(errno);
- written += ret;
- }
- return written;
-}
-
static int queue_chunk_or_shutdown(struct sender_client *sc,
struct sender_status *ss, const char *buf, size_t num_bytes)
{
return ret;
}
-/* return: negative on errors, zero if not everything was sent, one otherwise */
-static int send_queued_chunks(struct sender_client *sc,
+/**
+ * Try to empty the chunk queue for this fd.
+ *
+ * \param fd The file descriptor.
+ * \param cq The list of queued chunks.
+ * \param max_bytes_per_write Do not send more than this in one go.
+ *
+ * \return Negative on errors, zero if not everything was sent, one otherwise.
+ */
+int send_queued_chunks(int fd, struct chunk_queue *cq,
size_t max_bytes_per_write)
{
struct queued_chunk *qc;
- while ((qc = cq_peek(sc->cq))) {
+ while ((qc = cq_peek(cq))) {
const char *buf;
size_t len;
int ret;
cq_get(qc, &buf, &len);
- ret = write_nonblock(sc->fd, buf, len, max_bytes_per_write);
+ ret = write_nonblock(fd, buf, len, max_bytes_per_write);
if (ret < 0)
return ret;
- cq_update(sc->cq, ret);
+ cq_update(cq, ret);
if (ret != len)
return 0;
- cq_dequeue(sc->cq);
+ cq_dequeue(cq);
}
return 1;
}
if (ret < 0)
goto out;
}
- sc->header_sent = 1;
}
- ret = send_queued_chunks(sc, max_bytes_per_write);
+ sc->header_sent = 1;
+ ret = send_queued_chunks(sc->fd, sc->cq, max_bytes_per_write);
if (ret < 0) {
shutdown_client(sc, ss);
goto out;
*
* \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;
ret = make_message(
"%s sender:\n"
"\tstatus: %s\n"
- "\tport: %d\n"
+ "\tport: %s\n"
"\tnumber of connected clients: %d\n"
"\tmaximal number of clients: %d%s\n"
"\tconnected clients: %s\n"
"\taccess %s list: %s\n",
name,
(ss->listen_fd >= 0)? "on" : "off",
- ss->port,
+ stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"),
ss->num_clients,
ss->max_clients,
ss->max_clients > 0? "" : " (unlimited)",
void generic_com_allow(struct sender_command_data *scd,
struct sender_status *ss)
{
- acl_allow(scd->addr, scd->netmask, &ss->acl, ss->default_deny);
+ acl_allow(scd->host, scd->netmask, &ss->acl, ss->default_deny);
}
/**
void generic_com_deny(struct sender_command_data *scd,
struct sender_status *ss)
{
- acl_deny(scd->addr, scd->netmask, &ss->acl, ss->default_deny);
+ acl_deny(scd->host, scd->netmask, &ss->acl, ss->default_deny);
}
/**
* \sa \ref para_accept(), \ref mark_fd_nonblocking(), \ref acl_check_access(),
* \ref cq_new(), \ref add_close_on_fork_list().
*/
-struct sender_client *accept_sender_client(struct sender_status *ss)
+struct sender_client *accept_sender_client(struct sender_status *ss, fd_set *rfds)
{
struct sender_client *sc;
- int fd, ret = para_accept(ss->listen_fd, NULL, 0);
- if (ret < 0) {
+ int fd, ret;
+
+ if (ss->listen_fd < 0)
+ return NULL;
+ ret = para_accept(ss->listen_fd, rfds, NULL, 0, &fd);
+ if (ret < 0)
PARA_ERROR_LOG("%s\n", para_strerror(-ret));
+ if (ret <= 0)
return NULL;
- }
- fd = ret;
ret = -E_MAX_CLIENTS;
if (ss->max_clients > 0 && ss->num_clients >= ss->max_clients)
goto err_out;
{
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"
);
}
+
+static int parse_fec_parms(const char *arg, struct sender_command_data *scd)
+{
+ int32_t val;
+ char *a = para_strdup(arg), *b = a, *e = strchr(b, ':');
+ int ret = -E_COMMAND_SYNTAX;
+
+ /* parse max slice bytes */
+ if (!e)
+ goto out;
+ *e = '\0';
+ ret = para_atoi32(b, &val);
+ if (ret < 0)
+ goto out;
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ if (val < 0 || val > 65535)
+ goto out;
+ scd->max_slice_bytes = val;
+ /* parse data_slices_per_group */
+ b = e + 1;
+ e = strchr(b, ':');
+ ret = -E_COMMAND_SYNTAX;
+ if (!e)
+ goto out;
+ *e = '\0';
+ ret = para_atoi32(b, &val);
+ if (ret < 0)
+ goto out;
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ if (val < 0 || val > 255)
+ goto out;
+ scd->data_slices_per_group = val;
+ /* parse slices_per_group */
+ b = e + 1;
+ ret = para_atoi32(b, &val);
+ if (ret < 0)
+ goto out;
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ if (val < 0 || val < scd->data_slices_per_group)
+ goto out;
+ scd->slices_per_group = val;
+ ret = 0;
+out:
+ free(a);
+ 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;
+ ssize_t len = sizeof(scd->host);
+ char *a = para_strdup(arg), *p = strchr(a, '/');
+
+ if (p) {
+ *p = '\0';
+ len = strlen(a);
+ }
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ if (!parse_url(a, scd->host, len, &scd->port))
+ goto out;
+ if (p) {
+ ret = parse_fec_parms(p + 1, scd);
+ goto out;
+ }
+ /* use default fec parameters. */
+ scd->max_slice_bytes = 0;
+ scd->slices_per_group = 16;
+ scd->data_slices_per_group = 14;
+ ret = 0;
+out:
+ free(a);
+ return ret;
+}
projects / paraslash.git / blobdiff