{
char *ret, *hn = para_hostname();
ret = make_message("%s1.0\nHost: %s\nUser-Agent: para_recv/%s\n\n\n",
- HTTP_GET_MSG, hn, VERSION);
+ HTTP_GET_MSG, hn, PACKAGE_VERSION);
free(hn);
return ret;
}
if (!FD_ISSET(phd->fd, &s->wfds))
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)
t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
if (t->ret < 0)
goto out;
- PARA_NOTICE_LOG("%s", "received ok msg, streaming\n");
+ PARA_INFO_LOG("%s", "received ok msg, streaming\n");
t->ret = 1;
phd->status = HTTP_STREAMING;
goto out;
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 */
PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg,
conf->port_arg);
ret = para_connect(phd->fd, &their_addr);
- if (ret < 0)
+ if (ret < 0) {
+ close(phd->fd);
goto err_out;
+ }
+ mark_fd_nonblock(phd->fd);
phd->status = HTTP_CONNECTED;
return 1;
err_out: