/*
- * Copyright (C) 2005-2010 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2011 Andre Noll <maan@systemlinux.org>
*
* Licensed under the GPL v2. For licencing details see COPYING.
*/
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.
*
return 1;
}
-/**
- * Send one chunk of audio data to a connected client.
- *
- * \param sc The client.
- * \param ss The sender.
- * \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,
- 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);
- 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);
- 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.
*
* 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
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)
+ if (!b || !c)
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);
+ *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 = 0;
- 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;
projects / paraslash.git / blobdiff