Kill afd->current_play_mode.

[paraslash.git] / http_recv.c

diff --git a/http_recv.c b/http_recv.c
index 8b550391294724741a86c0272f37fa1d2add7c1c..71aef76ad3bcd49e6eccb9d1221addb4884bc96d 100644 (file)
--- a/http_recv.c
+++ b/http_recv.c
@@ -1,31 +1,21 @@
 /*
  * 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 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"
@@ -139,7 +129,7 @@ static void http_recv_post_select(struct sched *s, struct task *t)
                phd->status = HTTP_STREAMING;
                goto out;
        }
-       t->ret = -E_OVERRUN;
+       t->ret = -E_HTTP_RECV_OVERRUN;
        if (rn->loaded >= BUFSIZE)
                goto out;
        t->ret = recv_bin_buffer(phd->fd, rn->buf + rn->loaded,
@@ -187,17 +177,15 @@ static int http_recv_open(struct receiver_node *rn)
        ret = get_host_info(conf->host_arg, &he);
        if (ret < 0)
                goto err_out;
-       /* get new socket */
-       ret = get_socket();
+       ret = get_stream_socket(AF_INET);
        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);
+       ret = PARA_CONNECT(phd->fd, &their_addr);
        if (ret < 0) {
                close(phd->fd);
                goto err_out;