HTTP_CONNECTED,
/** Successfully received the get request. */
HTTP_GOT_GET_REQUEST,
- /** We sent the OK message back to the client. */
- HTTP_SENT_OK_MSG,
- /** Connection established, we might need to send the audio file header. */
- HTTP_READY_TO_STREAM,
/** Connection is ready for sending audio data. */
HTTP_STREAMING,
/** We didn't receive a valid get request. */
char *name;
/** The client's current status. */
enum http_status status;
- /** Non-zero if we included \a fd in the read set.*/
- int check_r;
- /** Non-zero if we included \a fd in the write set. */
- int check_w;
/** The position of this client in the client list. */
struct list_head node;
+ /** non-zero if audio file header has been sent */
+ int header_sent;
/** The list of pending chunks for this client. */
struct chunk_queue *cq;
};
static int listen_fd = -1, numclients;
-static struct sender *self;
static void http_shutdown_client(struct http_client *hc, const char *msg)
return http_send_msg(hc, HTTP_ERR_MSG);
}
+/*
+ * ret: Negative on errors, zero if nothing was written and write returned
+ * EAGAIN, number of bytes written else.
+ */
+static int http_write(int fd, const char *buf, size_t len)
+{
+ size_t written = 0;
+
+ while (written < len) {
+ int ret = write(fd, buf + written, len - written);
+ if (ret < 0 && errno == EAGAIN)
+ return written;
+ if (ret < 0)
+ return -ERRNO_TO_PARA_ERROR(errno);
+ written += ret;
+ }
+ return written;
+}
+
+
static int send_queued_chunks(struct http_client *hc)
{
struct queued_chunk *qc;
while ((qc = cq_peek(hc->cq))) {
char *buf;
size_t len;
- int ret = write_ok(hc->fd);
- if (ret <= 0)
- return ret? -E_WRITE_OK : 0;
+ int ret;
cq_get(qc, &buf, &len);
- ret = write(hc->fd, buf, len);
+ ret = http_write(hc->fd, buf, len);
if (ret < 0)
- return -E_SEND_QUEUED_CHUNK;
+ return ret;
cq_update(hc->cq, ret);
if (ret != len)
return 1;
return ret;
}
-static void http_send( long unsigned current_chunk,
+static void http_send(long unsigned current_chunk,
__a_unused long unsigned chunks_sent, const char *buf, size_t len)
{
struct http_client *hc, *tmp;
int ret;
list_for_each_entry_safe(hc, tmp, &clients, node) {
- if (hc->status != HTTP_STREAMING &&
- hc->status != HTTP_READY_TO_STREAM)
+ if (hc->status != HTTP_STREAMING)
continue;
- if (hc->status == HTTP_READY_TO_STREAM) {
+ if (!hc->header_sent && current_chunk) {
size_t hlen;
char *hbuf = vss_get_header(&hlen);
- if (hbuf && hlen > 0 && current_chunk) {
- /* need to send header */
+ if (hbuf && hlen > 0) { /* need to send header */
PARA_INFO_LOG("queueing header: %zu\n", hlen);
if (queue_chunk_or_shutdown(hc, -1U, 0) < 0)
continue;
} else
PARA_INFO_LOG("no need to queue header\n");
- hc->status = HTTP_STREAMING;
+ hc->header_sent = 1;
}
ret = send_queued_chunks(hc);
if (ret < 0) {
}
if (!len)
continue;
- if (!ret || write_ok(hc->fd) <= 0) {
- queue_chunk_or_shutdown(hc, current_chunk, 0);
- continue;
- }
-// PARA_DEBUG_LOG("sending %d -> %s\n", len, remote_name(hc->fd));
- ret = write(hc->fd, buf, len);
-// PARA_DEBUG_LOG("ret: %d\n", ret);
+ ret = http_write(hc->fd, buf, len);
if (ret < 0) {
http_shutdown_client(hc, "send error");
continue;
}
}
-static void http_post_select(fd_set *rfds, fd_set *wfds)
+static void http_post_select(fd_set *rfds, __a_unused fd_set *wfds)
{
int i = -1, match;
struct http_client *hc, *tmp;
// PARA_DEBUG_LOG("handling client %d: %s\n", i, remote_name(hc->fd));
switch (hc->status) {
case HTTP_STREAMING: /* nothing to do */
- case HTTP_READY_TO_STREAM:
break;
case HTTP_CONNECTED: /* need to recv get request */
- if (hc->check_r && FD_ISSET(hc->fd, rfds)) {
+ if (FD_ISSET(hc->fd, rfds)) {
if (recv_pattern(hc->fd, HTTP_GET_MSG, MAXLINE)
< 0) {
hc->status = HTTP_INVALID_GET_REQUEST;
}
break;
case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
- if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
- hc->status = HTTP_SENT_OK_MSG;
- http_send_ok_msg(hc);
- }
+ hc->status = HTTP_STREAMING;
+ http_send_ok_msg(hc);
break;
case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
- if (hc->check_w && FD_ISSET(hc->fd, wfds)) {
- if (http_send_err_msg(hc) >= 0)
- http_shutdown_client(hc,
- "invalid get request");
- }
- break;
- case HTTP_SENT_OK_MSG: /* need to send header? */
- if (hc->check_w && FD_ISSET(hc->fd, wfds))
- hc->status = HTTP_READY_TO_STREAM;
+ if (http_send_err_msg(hc) >= 0)
+ http_shutdown_client(hc, "invalid get request");
break;
}
}
err_msg = "permission denied";
goto err_out;
}
+ err_msg = "failed to mark fd non-blocking";
+ if (mark_fd_nonblocking(hc->fd) < 0)
+ goto err_out;
hc->status = HTTP_CONNECTED;
hc->cq = cq_new(MAX_BACKLOG);
numclients++;
hc->name, hc->fd);
para_list_add(&hc->node, &clients);
add_close_on_fork_list(hc->fd);
- mark_fd_nonblocking(hc->fd);
return;
err_out:
PARA_WARNING_LOG("ignoring connect request from %s (%s)\n",
free(hc);
}
-static void http_pre_select(int *max_fileno, fd_set *rfds, fd_set *wfds)
+static void http_pre_select(int *max_fileno, fd_set *rfds, __a_unused fd_set *wfds)
{
struct http_client *hc, *tmp;
para_fd_set(listen_fd, rfds, max_fileno);
list_for_each_entry_safe(hc, tmp, &clients, node) {
//PARA_DEBUG_LOG("hc %p on fd %d: status %d\n", hc, hc->fd, hc->status);
- hc->check_r = 0;
- hc->check_w = 0;
switch (hc->status) {
case HTTP_STREAMING:
- case HTTP_READY_TO_STREAM:
- break;
- case HTTP_CONNECTED: /* need to recv get request */
- para_fd_set(hc->fd, rfds, max_fileno);
- hc->check_r = 1;
- break;
case HTTP_GOT_GET_REQUEST: /* need to send ok msg */
case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
- para_fd_set(hc->fd, wfds, max_fileno);
- hc->check_w = 1;
break;
- case HTTP_SENT_OK_MSG:
- if (!vss_playing())
- break; /* wait until server starts playing */
- para_fd_set(hc->fd, wfds, max_fileno);
- hc->check_w = 1;
+ case HTTP_CONNECTED: /* need to recv get request */
+ para_fd_set(hc->fd, rfds, max_fileno);
break;
}
}
}
-static int http_open(int port)
+static int http_open(void)
{
int ret;
- listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, port);
- if (listen_fd < 0) {
- http_shutdown_clients();
+ listen_fd = para_listen(AF_UNSPEC, IPPROTO_TCP, conf.http_port_arg);
+ if (listen_fd < 0)
return listen_fd;
- }
ret = mark_fd_nonblocking(listen_fd);
if (ret < 0) {
PARA_EMERG_LOG("%s\n", para_strerror(-ret));
{
if (listen_fd >= 0)
return 1;
- return http_open(conf.http_port_arg);
+ return http_open();
}
static int http_com_off(__a_unused struct sender_command_data *scd)
s->client_cmds[SENDER_ALLOW] = http_com_allow;
s->client_cmds[SENDER_ADD] = NULL;
s->client_cmds[SENDER_DELETE] = NULL;
- self = s;
acl_init(&http_acl, conf.http_access_arg, conf.http_access_given);
if (!conf.http_no_autostart_given)
- http_open(conf.http_port_arg); /* ignore errors */
+ http_open(); /* ignore errors */
PARA_DEBUG_LOG("%s", "http sender init complete\n");
}
projects / paraslash.git / blobdiff