X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=http_recv.c;h=05f452e6d02160ad33914ec96e0abbb48e696593;hp=8b550391294724741a86c0272f37fa1d2add7c1c;hb=8fe757457fa56a6a1c9f17c466391d790ff58c58;hpb=c0b370bfc250a599e88b482978c6c50206f7e4a5 diff --git a/http_recv.c b/http_recv.c index 8b550391..05f452e6 100644 --- a/http_recv.c +++ b/http_recv.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2005-2007 Andre Noll * - * 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 */ @@ -139,7 +127,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,8 +175,7 @@ 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;