X-Git-Url: http://git.tuebingen.mpg.de/?p=paraslash.git;a=blobdiff_plain;f=dccp_recv.c;h=f113968346e19c136fad2d764e8a1a1b31422c7d;hp=335ad2e630598de4d98cafbb2257e5e07be144af;hb=de25f9d0d999b2a911ecc93d19511ff437211d18;hpb=e0c146b3e200d875dbcc78b3c5a306f090d7dcd5 diff --git a/dccp_recv.c b/dccp_recv.c index 335ad2e6..f1139683 100644 --- a/dccp_recv.c +++ b/dccp_recv.c @@ -1,19 +1,7 @@ /* - * Copyright (C) 2006 Andre Noll + * 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 */ @@ -95,9 +83,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 = -E_DCCP_CONNECT; - if (connect(pdd->fd, ai->ai_addr, ai->ai_addrlen) < 0) + ret = connect(pdd->fd, ai->ai_addr, ai->ai_addrlen); + freeaddrinfo(ai); + if (ret < 0) { + ret = -E_DCCP_CONNECT; goto err_out; + } + mark_fd_nonblock(pdd->fd); return 1; err_out: dccp_recv_close(rn);