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;
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",
}
}
-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)
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");
}