X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=f0d7d66e2b7563e766efeea4211b09c843efd427;hp=6580fe9b734e518a0e1e9f164dca7e466b30bc65;hb=f7d66eb4d34ef6ced15be21c809fbe046659264d;hpb=a8066a827c4521d5b9a46aadace5fcd87c81540f diff --git a/dccp_recv.c b/dccp_recv.c index 6580fe9b..f0d7d66e 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,19 +1,7 @@ /* * Copyright (C) 2006-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 dccp_recv.c paraslash's dccp receiver */ @@ -23,6 +11,9 @@ * (C) 2005 Ian McDonald */ +#include +#include + #include "para.h" #include "error.h" #include "dccp.h" @@ -95,13 +86,13 @@ static int dccp_recv_open(struct receiver_node *rn) if (ret < 0) goto err_out; PARA_NOTICE_LOG("connecting to %s:%d\n", conf->host_arg, conf->port_arg); - ret = connect(pdd->fd, ai->ai_addr, ai->ai_addrlen); + ret = PARA_CONNECT(pdd->fd, ai->ai_addr); freeaddrinfo(ai); if (ret < 0) { ret = -E_DCCP_CONNECT; goto err_out; } - mark_fd_nonblock(pdd->fd); + mark_fd_nonblocking(pdd->fd); return 1; err_out: dccp_recv_close(rn);