Fix use of uninitialized afhi->header_len.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index a36038ad23ddad69a7139891ff07404e05671182..a3167bd8626f8bc40361bfb71369079db955d9cc 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,31 +1,21 @@
 /*
- * Copyright (C) 2005-2007 Andre Noll <maan@systemlinux.org>
+ * Copyright (C) 2005-2008 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 Free Software Foundation; either version 2 of the License, or
- *     (at your option) any later version.
- *
- *     This program is distributed in the hope that it will be useful,
- *     but WITHOUT ANY WARRANTY; without even the implied warranty of
- *     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- *     GNU General Public License for more details.
- *
- *     You should have received a copy of the GNU General Public License
- *     along with this program; if not, write to the Free Software
- *     Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111, USA.
+ * Licensed under the GPL v2. For licencing details see COPYING.
  */
 
 /** \file http_recv.c paraslash's http receiver */
 
-#include "para.h"
+#include <sys/types.h>
+#include <dirent.h>
 
+#include "para.h"
+#include "error.h"
 #include "http.h"
 #include "list.h"
 #include "sched.h"
 #include "recv.h"
 #include "http_recv.cmdline.h"
-#include "error.h"
 #include "net.h"
 #include "string.h"
 #include "fd.h"
@@ -110,9 +100,10 @@ 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)
+       if (rn->output_error && *rn->output_error) {
+               t->ret = *rn->output_error;
                goto out;
+       }
        t->ret = 1;
        if (!s->select_ret)
                goto out;
@@ -121,7 +112,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                if (!FD_ISSET(phd->fd, &s->wfds))
                        goto out;
                rq = make_request_msg();
-               PARA_INFO_LOG("%s", "sending http request\n");
+               PARA_INFO_LOG("sending http request\n");
                t->ret = send_va_buffer(phd->fd, "%s", rq);
                free(rq);
                if (t->ret > 0)
@@ -134,7 +125,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                t->ret = recv_pattern(phd->fd, HTTP_OK_MSG, MAXLINE);
                if (t->ret < 0)
                        goto out;
-               PARA_INFO_LOG("%s", "received ok msg, streaming\n");
+               PARA_INFO_LOG("received ok msg, streaming\n");
                t->ret = 1;
                phd->status = HTTP_STREAMING;
                goto out;
@@ -146,13 +137,13 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                BUFSIZE - rn->loaded);
        if (t->ret <= 0) {
                if (!t->ret)
-                       t->ret = -E_HTTP_RECV_EOF;
+                       t->ret = -E_RECV_EOF;
                goto out;
        }
        rn->loaded += t->ret;
 out:
        if (t->ret < 0)
-               rn->eof = 1;
+               rn->error = t->ret;
 }
 
 static void http_recv_close(struct receiver_node *rn)
@@ -176,39 +167,23 @@ static void *http_recv_parse_config(int argc, char **argv)
 static int http_recv_open(struct receiver_node *rn)
 {
        struct private_http_recv_data *phd;
-       struct hostent *he;
        struct http_recv_args_info *conf = rn->conf;
-       struct sockaddr_in their_addr;
-       int ret;
+       int fd, ret = makesock(AF_UNSPEC, IPPROTO_TCP, 0, conf->host_arg,
+               conf->port_arg);
 
-       rn->buf = para_calloc(BUFSIZE);
-       rn->private_data = para_calloc(sizeof(struct private_http_recv_data));
-       phd = rn->private_data;
-       ret = get_host_info(conf->host_arg, &he);
-       if (ret < 0)
-               goto err_out;
-       /* get new socket */
-       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);
+               return ret;
+       fd = ret;
+       ret = mark_fd_nonblocking(fd);
        if (ret < 0) {
-               close(phd->fd);
-               goto err_out;
+               close(fd);
+               return ret;
        }
-       mark_fd_nonblock(phd->fd);
+       rn->buf = para_calloc(BUFSIZE);
+       rn->private_data = phd = para_calloc(sizeof(struct private_http_recv_data));
+       phd->fd = fd;
        phd->status = HTTP_CONNECTED;
        return 1;
-err_out:
-       free(rn->private_data);
-       free(rn->buf);
-       return ret;
 }
 
 /**