/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005 Andre Noll <maan@tuebingen.mpg.de>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
/** \file send_common.c Functions used by more than one paraslash sender. */
+#include <netinet/in.h>
+#include <sys/socket.h>
#include <regex.h>
-#include <dirent.h>
#include <osl.h>
+#include <arpa/inet.h>
+#include <sys/un.h>
+#include <netdb.h>
+#include <lopsub.h>
#include "para.h"
#include "error.h"
#include "send.h"
#include "close_on_fork.h"
#include "chunk_queue.h"
+#include "sched.h"
#include "vss.h"
/** Clients will be kicked if there are more than that many bytes pending. */
* list, destroy the chunk queue of this client, delete the client from the
* list of connected clients and free the sender_client struct.
*
- * \sa shutdown_clients().
+ * \sa \ref shutdown_clients().
*/
void shutdown_client(struct sender_client *sc, struct sender_status *ss)
{
shutdown_client(sc, ss);
}
-static int queue_chunk_or_shutdown(struct sender_client *sc,
- struct sender_status *ss, const char *buf, size_t num_bytes)
-{
- int ret = cq_enqueue(sc->cq, buf, num_bytes);
- if (ret < 0)
- shutdown_client(sc, ss);
- return ret;
-}
-
/**
* 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)
+int send_queued_chunks(int fd, struct chunk_queue *cq)
{
struct queued_chunk *qc;
while ((qc = cq_peek(cq))) {
const char *buf;
size_t len;
int ret;
+
cq_get(qc, &buf, &len);
- ret = write_nonblock(fd, buf, len, max_bytes_per_write);
+ ret = xwrite(fd, buf, len);
if (ret < 0)
return ret;
cq_update(cq, ret);
return 1;
}
-/**
- * Send one chunk of audio data to a connected client.
- *
- * \param sc The client.
- * \param ss The sender.
- * \param max_bytes_per_write Split writes to chunks of at most that many bytes.
- * \param current_chunk The number of the chunk to write.
- * \param buf The data to write.
- * \param len The number of bytes of \a buf.
- * \param header_buf The audio file header.
- * \param header_len The number of bytes of \a header_buf.
- *
- * On errors, the client is shut down. If only a part of the buffer could be
- * written, the remainder is put into the chunk queue for that client.
- */
-void send_chunk(struct sender_client *sc, struct sender_status *ss,
- size_t max_bytes_per_write, long unsigned current_chunk,
- const char *buf, size_t len, const char *header_buf,
- size_t header_len)
-{
- int ret;
-
- if (!sc->header_sent && current_chunk) {
- if (header_buf && header_len > 0) {
- ret = queue_chunk_or_shutdown(sc, ss, header_buf, header_len);
- if (ret < 0)
- goto out;
- }
- }
- 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;
- }
- if (!len)
- goto out;
- if (!ret) { /* still data left in the queue */
- ret = queue_chunk_or_shutdown(sc, ss, buf, len);
- goto out;
- }
- ret = write_nonblock(sc->fd, buf, len, max_bytes_per_write);
- if (ret < 0) {
- shutdown_client(sc, ss);
- goto out;
- }
- if (ret != len)
- ret = queue_chunk_or_shutdown(sc, ss, buf + ret, len - ret);
-out:
- if (ret < 0)
- PARA_NOTICE_LOG("%s\n", para_strerror(-ret));
-}
-
/**
* Initialize a struct sender status.
*
* \param ss The struct to initialize.
- * \param access_arg The array of access arguments given at the command line.
- * \param num_access_args The number of elements in \a access_arg.
+ * \param acl_opt_result Contains array of --{http|dccp}-access arguments.
* \param port The tcp or dccp port to listen on.
* \param max_clients The maximal number of simultaneous connections.
* \param default_deny Whether a blacklist should be used for access control.
*/
-void init_sender_status(struct sender_status *ss, char **access_arg,
- int num_access_args, int port, int max_clients, int default_deny)
+void init_sender_status(struct sender_status *ss,
+ const struct lls_opt_result *acl_opt_result, int port,
+ int max_clients, int default_deny)
{
+ int i;
+
ss->listen_fd = -1;
INIT_LIST_HEAD(&ss->client_list);
ss->port = port;
- acl_init(&ss->acl, access_arg, num_access_args);
+
+ /* Initialize an access control list */
+ INIT_LIST_HEAD(&ss->acl);
+ for (i = 0; i < lls_opt_given(acl_opt_result); i++) {
+ const char *arg = lls_string_val(i, acl_opt_result);
+ char addr[16];
+ int mask;
+ if (!parse_cidr(arg, addr, sizeof(addr), &mask))
+ PARA_WARNING_LOG("ACL syntax error: %s, ignoring\n",
+ arg);
+ else
+ acl_add_entry(&ss->acl, addr, mask);
+ }
ss->num_clients = 0;
ss->max_clients = max_clients;
ss->default_deny = default_deny;
*
* \return The string printed in the "si" command.
*/
-char *get_sender_info(struct sender_status *ss, const char *name)
+char *generic_sender_status(struct sender_status *ss, const char *name)
{
char *clnts = NULL, *ret;
struct sender_client *sc, *tmp_sc;
clnts = tmp;
}
ret = make_message(
- "%s sender:\n"
- "\tstatus: %s\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,
+ "status: %s\n"
+ "port: %s\n"
+ "number of connected clients: %d\n"
+ "maximal number of clients: %d%s\n"
+ "connected clients: %s\n"
+ "access %s list: %s\n",
(ss->listen_fd >= 0)? "on" : "off",
stringify_port(ss->port, strcmp(name, "http") ? "dccp" : "tcp"),
ss->num_clients,
* \param scd Contains the IP and the netmask.
* \param ss The sender.
*
- * \sa generic_com_deny().
+ * \sa \ref generic_com_deny().
*/
void generic_com_allow(struct sender_command_data *scd,
struct sender_status *ss)
* \param scd see \ref generic_com_allow().
* \param ss see \ref generic_com_allow().
*
- * \sa generic_com_allow().
+ * \sa \ref generic_com_allow().
*/
void generic_com_deny(struct sender_command_data *scd,
struct sender_status *ss)
*
* \param ss The sender to deactivate.
*
- * \sa \ref del_close_on_fork_list(), shutdown_clients().
+ * \sa \ref del_close_on_fork_list(), \ref shutdown_clients().
*/
void generic_com_off(struct sender_status *ss)
{
* Accept a connection on the socket this server is listening on.
*
* \param ss The sender whose listening fd is ready for reading.
+ * \param rfds Passed to para_accept(),
*
* This must be called only if the socket fd of \a ss is ready for reading. It
* calls para_accept() to accept the connection and performs the following
* \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;
ss->num_clients++;
sc = para_calloc(sizeof(*sc));
sc->fd = fd;
- sc->name = make_message("%s", remote_name(fd));
+ sc->name = para_strdup(remote_name(fd));
sc->cq = cq_new(MAX_CQ_BYTES);
para_list_add(&sc->node, &ss->client_list);
add_close_on_fork_list(fd);
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, ':');
+ char *a = para_strdup(arg),
+ *b = strchr(a, ':'),
+ *c = strrchr(a, ':');
int ret = -E_COMMAND_SYNTAX;
- /* parse max slice bytes */
- if (!e)
- goto out;
- *e = '\0';
- ret = para_atoi32(b, &val);
- if (ret < 0)
+ if (!b || !c)
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);
+ *b = *c = '\0';
+
+ ret = para_atoi32(a, &val);
if (ret < 0)
goto out;
- ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+
+ /* optional max_slice_bytes (0 means "use MTU") */
+ if (b == c) {
+ scd->max_slice_bytes = 0;
+ } else {
+ if (val < 0 || val > 65535)
+ goto fec_einval;
+ scd->max_slice_bytes = val;
+
+ ret = para_atoi32(b + 1, &val);
+ if (ret < 0)
+ goto out;
+ }
+
+ /* k = data_slices_per_group */
if (val < 0 || val > 255)
- goto out;
+ goto fec_einval;
scd->data_slices_per_group = val;
- /* parse slices_per_group */
- b = e + 1;
- ret = para_atoi32(b, &val);
+
+ /* n = slices_per_group */
+ ret = para_atoi32(c + 1, &val);
if (ret < 0)
goto out;
- ret = -ERRNO_TO_PARA_ERROR(EINVAL);
if (val < 0 || val < scd->data_slices_per_group)
- goto out;
+ goto fec_einval;
scd->slices_per_group = val;
ret = 0;
out:
free(a);
return ret;
+fec_einval:
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
+ goto out;
}
/**
*/
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, '/');
+ int ret = 0;
+
+ /* default fec parameters */
+ scd->max_slice_bytes = 0;
+ scd->data_slices_per_group = 14;
+ scd->slices_per_group = 16;
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;
+ if (ret < 0)
+ goto out;
}
- /* use default fec parameters. */
- scd->max_slice_bytes = 1490;
- scd->slices_per_group = 16;
- scd->data_slices_per_group = 14;
- ret = 0;
+ if (!parse_url(a, scd->host, sizeof(scd->host), &scd->port))
+ ret = -ERRNO_TO_PARA_ERROR(EINVAL);
out:
free(a);
return ret;