/*
* 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"
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;