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. */
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 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;
// 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)) {
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;
+ hc->status = HTTP_STREAMING;
http_send_ok_msg(hc);
}
break;
"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;
- break;
}
}
if (!FD_ISSET(listen_fd, rfds))
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);
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;
- break;
}
}
}
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(); /* ignore errors */