struct private_http_recv_data *phd = rn->private_data;
t->ret = -E_HTTP_RECV_EOF;
- if (rn->output_eof && *rn->output_eof) {
- rn->eof = 1;
- return;
- }
+ if (rn->output_eof && *rn->output_eof)
+ goto out;
t->ret = 1;
- if (!s->select_ret) /* we're not interested in timeouts */
- return;
+ if (!s->select_ret)
+ goto out;
if (phd->status == HTTP_CONNECTED) {
char *rq;
if (!FD_ISSET(phd->fd, &s->wfds))
- return; /* nothing to do */
+ goto out;
rq = make_request_msg();
- PARA_NOTICE_LOG("%s", "sending http request\n");
+ PARA_INFO_LOG("%s", "sending http request\n");
t->ret = send_va_buffer(phd->fd, "%s", rq);
free(rq);
if (t->ret > 0)
phd->status = HTTP_SENT_GET_REQUEST;
- return;
+ goto out;
}
if (!FD_ISSET(phd->fd, &s->rfds))
- return; /* nothing to do */
+ goto out;
if (phd->status == HTTP_SENT_GET_REQUEST) {
t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
if (t->ret < 0)
- return;
- PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");
+ goto out;
+ PARA_INFO_LOG("%s", "received ok msg, streaming\n");
+ t->ret = 1;
phd->status = HTTP_STREAMING;
- return;
+ goto out;
}
t->ret = -E_OVERRUN;
- /* already streaming */
- if (rn->loaded >= BUFSIZE) {
- rn->eof = 1;
- return;
- }
+ if (rn->loaded >= BUFSIZE)
+ goto out;
t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
BUFSIZE - rn->loaded);
if (t->ret <= 0) {
- rn->eof = 1;
if (!t->ret)
t->ret = -E_HTTP_RECV_EOF;
- return;
+ goto out;
}
rn->loaded += t->ret;
+out:
+ if (t->ret < 0)
+ rn->eof = 1;
}
static void http_recv_close(struct receiver_node *rn)
rn->buf = para_calloc(BUFSIZE);
rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
phd = rn->private_data;
- PARA_NOTICE_LOG("phd = %p, rn = %p\n", phd, rn);
- ret = -E_HOST_INFO;
- if (!(he = get_host_info(conf->host_arg)))
+ ret = get_host_info(conf->host_arg, &he);
+ if (!ret < 0)
goto err_out;
/* get new socket */
- ret = -E_SOCKET;
- if ((phd->fd = get_socket()) < 0)
+ ret = get_socket();
+ if (ret < 0)
goto err_out;
+ phd->fd = ret;
/* init their_addr */
init_sockaddr(&their_addr, conf->port_arg, he);
/* connect */
ret = para_connect(phd->fd, &their_addr);
if (ret < 0)
goto err_out;
+ mark_fd_nonblock(phd->fd);
phd->status = HTTP_CONNECTED;
return 1;
err_out: