/*
- * Copyright (C) 2005-2006 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
*
* This program is free software; you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
*
* the current status of the http receiver node
*
- * It gets initialized to #HTTP_CONNECTED by the open function of the
+ * It gets initialized to \p HTTP_CONNECTED by the open function of the
* http receiver.
*
* \sa receiver::open, receiver_node.
*
* The post_select function of the http receiver uses \a fd, if ready, to
* establish the http connection, and updates \a status according to the new
- * state of the connection. As soon as \a status is #HTTP_STREAMING, \a fd is
+ * state of the connection. As soon as \a status is \p HTTP_STREAMING, \a fd is
* going to be only checked for reading. If data is available, it is read into
* the output buffer of the receiver node by post_select.
*
- * \sa receiver::pre_select receiver::post_select receiver_node
+ * \sa receiver::pre_select receiver::post_select receiver_node, http_recv_status
*/
int fd;
};
{
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 = get_host_info(conf->host_arg, &he);
- if (!ret < 0)
+ if (ret < 0)
goto err_out;
/* get new socket */
ret = get_socket();
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;