fade: cosmetic cleanups

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index b566acf3c0612a48d5796ca01dae5359bb93386e..8b550391294724741a86c0272f37fa1d2add7c1c 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,5 +1,5 @@
 /*
- * 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
@@ -51,7 +51,7 @@ struct private_http_recv_data {
  *
  * 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.
@@ -69,11 +69,11 @@ struct private_http_recv_data {
  *
  * 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;
 };
@@ -87,7 +87,7 @@ static char *make_request_msg(void)
 {
        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;
 }
@@ -110,44 +110,49 @@ static void http_recv_post_select(struct sched *s, struct task *t)
        struct receiver_node *rn = t->private_data;
        struct private_http_recv_data *phd = rn->private_data;
 
+       t->ret = -E_HTTP_RECV_EOF;
+       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)
-               return;
+               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)
@@ -179,22 +184,25 @@ static int http_recv_open(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 */
        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: