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 is ready for sending audio data. */
HTTP_STREAMING,
/** We didn't receive a valid get request. */
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 */
};
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;
}
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;
}
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_STREAMING;
+ if (http_send_err_msg(hc) >= 0)
+ http_shutdown_client(hc, "invalid get request");
break;
}
}
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;
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_GOT_GET_REQUEST: /* need to send ok msg */
+ case HTTP_INVALID_GET_REQUEST: /* need to send err msg */
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;
- 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 */