From patchwork Thu Apr 1 02:13:36 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1686 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director7.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id 2FCpLTvHZWCwSgAAIUCqbw (envelope-from ) for ; Thu, 01 Apr 2021 09:14:35 -0400 Received: from proxy4.mail.ord1d.rsapps.net ([172.30.191.6]) by director7.mail.ord1d.rsapps.net with LMTP id wMhsLTvHZWDcEwAAovjBpQ (envelope-from ) for ; Thu, 01 Apr 2021 09:14:35 -0400 Received: from smtp31.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy4.mail.ord1d.rsapps.net with LMTPS id OH0iLTvHZWCcLAAAiYrejw (envelope-from ) for ; Thu, 01 Apr 2021 09:14:35 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: openvpnslackdevel@openvpn.net X-Originating-Ip: [216.105.38.7] Authentication-Results: smtp31.gate.ord1d.rsapps.net; iprev=pass policy.iprev="216.105.38.7"; spf=pass smtp.mailfrom="openvpn-devel-bounces@lists.sourceforge.net" smtp.helo="lists.sourceforge.net"; dkim=fail (signature verification failed) header.d=sourceforge.net; dkim=fail (signature verification failed) header.d=sf.net; dmarc=none (p=nil; dis=none) header.from=rfc2549.org X-Suspicious-Flag: YES X-Classification-ID: 33a9fc32-92ec-11eb-939e-525400b3ac8c-1-1 Received: from [216.105.38.7] ([216.105.38.7:53432] helo=lists.sourceforge.net) by smtp31.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id E8/1F-31436-A37C5606; Thu, 01 Apr 2021 09:14:35 -0400 Received: from [127.0.0.1] (helo=sfs-ml-2.v29.lw.sourceforge.com) by sfs-ml-2.v29.lw.sourceforge.com with esmtp (Exim 4.92.3) (envelope-from ) id 1lRx8z-0007F0-8F; Thu, 01 Apr 2021 13:13:53 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-2.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) (envelope-from ) id 1lRx8w-0007Ek-6Y for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 13:13:50 +0000 DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sourceforge.net; s=x; h=References:In-Reply-To:Message-Id:Date:Subject:To: From:Sender:Reply-To:Cc:MIME-Version:Content-Type:Content-Transfer-Encoding: Content-ID:Content-Description:Resent-Date:Resent-From:Resent-Sender: Resent-To:Resent-Cc:Resent-Message-ID:List-Id:List-Help:List-Unsubscribe: List-Subscribe:List-Post:List-Owner:List-Archive; bh=Gn16S0buCBc+byfZ6nQEiWzcWuqDQYSCnXpspO9NaOM=; b=jEfBqALKrXXRAc2BpxeYg45C1C /WG473g4G84EzMPe2TTAtUv8MRWi3/LcQJpw01BZT/7sZmtTecIGgVR3mpl9hjiFe/VR6emd+XhFo po/hJaNYqgWKXtXJGIhLzF1eMsXDhNx7KZgwTjHwNGlP44cnvrayxCIWfq9UHYpQHGIM=; DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=sf.net; s=x ; h=References:In-Reply-To:Message-Id:Date:Subject:To:From:Sender:Reply-To:Cc :MIME-Version:Content-Type:Content-Transfer-Encoding:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=Gn16S0buCBc+byfZ6nQEiWzcWuqDQYSCnXpspO9NaOM=; b=cIa1454eIPnqt6FWnSnqE70khz 170xUpoD4XKYytN/FxXXQwKMS1BSpjVRDV1wtBUu+Bq0gAIRgVBlf+gXD6zSF1Xv+aiSzfi8l5A4y XkxG1nA8qxF0ifFQIphqG9j84NiotlRjwcfdyyc8X4bongsLzAKt5GYCgVEUrMFE2o6E=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.2) id 1lRx8s-0036an-Ij for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 13:13:50 +0000 Received: from kamera.blinkt.de ([2001:638:502:390:20c:29ff:fec8:535c]) by mail.blinkt.de with smtp (Exim 4.94 (FreeBSD)) (envelope-from ) id 1lRx8k-000J8U-Ms for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 15:13:38 +0200 Received: (nullmailer pid 3770 invoked by uid 10006); Thu, 01 Apr 2021 13:13:38 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 1 Apr 2021 15:13:36 +0200 Message-Id: <20210401131337.3684-14-arne@rfc2549.org> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20210401131337.3684-1-arne@rfc2549.org> References: <20210401131337.3684-1-arne@rfc2549.org> X-Spam-Report: Spam Filtering performed by mx.sourceforge.net. See http://spamassassin.org/tag/ for more details. 0.0 URIBL_BLOCKED ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [URIs: rfc2549.org] 0.2 HEADER_FROM_DIFFERENT_DOMAINS From and EnvelopeFrom 2nd level mail domains are different 0.0 SPF_NONE SPF: sender does not publish an SPF Record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record X-Headers-End: 1lRx8s-0036an-Ij Subject: [Openvpn-devel] [PATCH 13/14] log file descriptor in more socket related error messages X-BeenThere: openvpn-devel@lists.sourceforge.net X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-getmail-retrieved-from-mailbox: Inbox This add the fd to the epoll event error message and the x_check_status message. This helps debugging when thing go wrong with event handling. Also add logging when ep_del fails to remove a socket from the structure. In constract to ep_ctl that has this as a FATAL message (M_ERR), we only log here since the code has been ignoring the status forever there might be corner cases where a FATAL message could trigger an unintened regression. Signed-off-by: Arne Schwabe --- src/openvpn/error.c | 8 ++++---- src/openvpn/event.c | 8 ++++++-- 2 files changed, 10 insertions(+), 6 deletions(-) diff --git a/src/openvpn/error.c b/src/openvpn/error.c index e6f7ff0ff..4eebf41a9 100644 --- a/src/openvpn/error.c +++ b/src/openvpn/error.c @@ -690,15 +690,15 @@ x_check_status(int status, { if (extended_msg) { - msg(x_cs_info_level, "%s %s [%s]: %s (code=%d)", description, + msg(x_cs_info_level, "%s %s [%s]: %s (fd=%d,code=%d)", description, sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "", - extended_msg, strerror(my_errno), my_errno); + extended_msg, strerror(my_errno), my_errno, sock ? sock->sd : -1); } else { - msg(x_cs_info_level, "%s %s: %s (code=%d)", description, + msg(x_cs_info_level, "%s %s: %s (fd=%d,code=%d)", description, sock ? proto2ascii(sock->info.proto, sock->info.af, true) : "", - strerror(my_errno), my_errno); + strerror(my_errno), my_errno, sock ? sock->sd : -1); } if (x_cs_err_delay_ms) diff --git a/src/openvpn/event.c b/src/openvpn/event.c index 49dfa861c..14a25155c 100644 --- a/src/openvpn/event.c +++ b/src/openvpn/event.c @@ -555,7 +555,10 @@ ep_del(struct event_set *es, event_t event) ASSERT(!eps->fast); CLEAR(ev); - epoll_ctl(eps->epfd, EPOLL_CTL_DEL, event, &ev); + if (epoll_ctl(eps->epfd, EPOLL_CTL_DEL, event, &ev) < 0) + { + msg(M_WARN|M_ERRNO, "EVENT: epoll_ctl EPOLL_CTL_DEL failed, sd=%d", (int)event); + } } static void @@ -844,7 +847,8 @@ po_wait(struct event_set *es, const struct timeval *tv, struct event_set_return } else if (pfdp->revents) { - msg(D_EVENT_ERRORS, "Error: poll: unknown revents=0x%04x", (unsigned int)pfdp->revents); + msg(D_EVENT_ERRORS, "Error: poll: unknown revents=0x%04x for fd=%d", + (unsigned int)pfdp->revents, pfdp->fd); } ++pfdp; }