From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (qmail 95420 invoked by alias); 11 Jul 2018 21:48:28 -0000 Mailing-List: contact gdb-patches-help@sourceware.org; run by ezmlm Precedence: bulk List-Id: List-Subscribe: List-Archive: List-Post: List-Help: , Sender: gdb-patches-owner@sourceware.org Received: (qmail 95315 invoked by uid 89); 11 Jul 2018 21:48:27 -0000 Authentication-Results: sourceware.org; auth=none X-Spam-SWARE-Status: No, score=-1.9 required=5.0 tests=AWL,BAYES_00,KAM_LAZY_DOMAIN_SECURITY,SPF_HELO_PASS autolearn=no version=3.3.2 spammy= X-HELO: mx1.redhat.com Received: from mx3-rdu2.redhat.com (HELO mx1.redhat.com) (66.187.233.73) by sourceware.org (qpsmtpd/0.93/v0.84-503-g423c35a) with ESMTP; Wed, 11 Jul 2018 21:48:26 +0000 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.rdu2.redhat.com [10.11.54.3]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mx1.redhat.com (Postfix) with ESMTPS id 0EB0F40073B7; Wed, 11 Jul 2018 21:48:25 +0000 (UTC) Received: from [127.0.0.1] (ovpn04.gateway.prod.ext.ams2.redhat.com [10.39.146.4]) by smtp.corp.redhat.com (Postfix) with ESMTP id 34A93111DD0A; Wed, 11 Jul 2018 21:48:18 +0000 (UTC) Subject: Re: [PATCH v4] Implement IPv6 support for GDB/gdbserver To: Sergio Durigan Junior , GDB Patches References: <20180523185719.22832-1-sergiodj@redhat.com> <20180711191609.23752-1-sergiodj@redhat.com> Cc: Eli Zaretskii , Jan Kratochvil , Paul Fertser , Tsutomu Seki , Armand Scholtes From: Pedro Alves Message-ID: <453bd3a6-3cd8-b1df-5a84-52903b5deb36@redhat.com> Date: Wed, 11 Jul 2018 21:48:00 -0000 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:52.0) Gecko/20100101 Thunderbird/52.8.0 MIME-Version: 1.0 In-Reply-To: <20180711191609.23752-1-sergiodj@redhat.com> Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 7bit X-SW-Source: 2018-07/txt/msg00325.txt.bz2 On 07/11/2018 08:16 PM, Sergio Durigan Junior wrote: > Changes since v3: > > - No longer use gdb::optional as a return type for try_connect; use > int instead. > > - Fix a bunch of typos and thinkos. > Thanks. > +/* Helper class to guarantee that we always call 'freeaddrinfo'. */ > + > +class scoped_free_addrinfo > +{ > +public: > + /* Default constructor. */ > + scoped_free_addrinfo (struct addrinfo *ainfo) > + : m_res (ainfo) explicit. > > if ( > #ifdef USE_WIN32API > - /* Under Windows, calling "connect" with a non-blocking socket > - results in WSAEWOULDBLOCK, not WSAEINPROGRESS. */ > + /* Any other error (except EINPROGRESS) will be "swallowed" > + here. We return without specifying a return value, and > + set errno if the caller wants to inspect what > + happened. */ This comment should be outside "#ifdef USE_WIN32API", and the existing comment "Under Windows, ... WSAEWOULDBLOCK" should be preserved. > err != WSAEWOULDBLOCK > #else > err != EINPROGRESS > #endif > ) > { > + close (sock); > errno = err; > - net_close (scb); > return -1; > } > > + /* On Windows, the fourth parameter to getsockopt is a "char *"; > + on UNIX systems it is generally "void *". The cast to "char *" > + is OK everywhere, since in C++ any data pointer type can be > + implicitly converted to "void *". */ > + int ret = getsockopt (sock, SOL_SOCKET, SO_ERROR, (char *) &err, &len); > + > + if (ret < 0) > + { > + close (sock); > + errno = ret; I don't think this "errno = ret" here is right. getsockopt returns -1 on error with errno already set. Pedantically, close can fail and set errno, so the correct thing to do is: int save_errno = errno; close (sock); errno = save_errno; return -1; > + return -1; > + } > + else if (ret == 0 && err != 0) > + { > + close (sock); > + errno = err; > + > + /* Check if the connection was refused. */ > + if ( > #ifdef USE_WIN32API > - && err == WSAECONNREFUSED > + err == WSAECONNREFUSED > #else > - && err == ECONNREFUSED > + err == ECONNREFUSED > #endif > - && wait_for_connect (NULL, &polls) >= 0) > - { > - close (scb->fd); > - goto retry; > - } > - if (err) > - errno = err; > - net_close (scb); > + ) > return -1;> - } > - } > + else > + { > + /* If we have any other kind of error, just return nothing. */ > + return -1; > + } Aren't both the then/else branches exactly the same, i.e., just "return -1;" ? Seems like you can all the "if then/else", and just return -1; > + } > + > + /* The connection succeeded. Return the socket. */ > + return sock; > +} > + OK with the issues above fixed. Thanks, Pedro Alves