From patchwork Thu Apr 1 02:13:25 2021 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Arne Schwabe X-Patchwork-Id: 1692 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director15.mail.ord1d.rsapps.net ([172.30.191.6]) by backend30.mail.ord1d.rsapps.net with LMTP id YJV0MUHHZWBeFAAAIUCqbw (envelope-from ) for ; Thu, 01 Apr 2021 09:14:41 -0400 Received: from proxy14.mail.ord1d.rsapps.net ([172.30.191.6]) by director15.mail.ord1d.rsapps.net with LMTP id ONH8MEHHZWA0BwAAIcMcQg (envelope-from ) for ; Thu, 01 Apr 2021 09:14:41 -0400 Received: from smtp9.gate.ord1d ([172.30.191.6]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy14.mail.ord1d.rsapps.net with LMTPS id EGBSEELHZWB5YAAAtEH5vw (envelope-from ) for ; Thu, 01 Apr 2021 09:14:42 -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: smtp9.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: 375f0732-92ec-11eb-b2c6-525400bd3b1f-1-1 Received: from [216.105.38.7] ([216.105.38.7:52840] helo=lists.sourceforge.net) by smtp9.gate.ord1d.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id B0/66-05275-047C5606; Thu, 01 Apr 2021 09:14:41 -0400 Received: from [127.0.0.1] (helo=sfs-ml-1.v29.lw.sourceforge.com) by sfs-ml-1.v29.lw.sourceforge.com with esmtp (Exim 4.90_1) (envelope-from ) id 1lRx90-0000Ob-5D; Thu, 01 Apr 2021 13:13:54 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-1.v29.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.90_1) (envelope-from ) id 1lRx8w-0000Nj-65 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=5QHpLaFJWRGHQdWzUDyMHJ/h5dVFieZecoeBuFvSAxo=; b=UwLxb8oo1pFyfCI9dMFLnnGvly H1HGeGc/8p3zFPXV3EmQWsSeE9ymZHFvK7TF5OB1o8vIeEXnedM4YntU/L9AmCKdKPEjAwX0oqoXQ mmz2biYs4g8Zvju5CDFZOTH9IYJxPuWhRJMkvj/UAErbnn00CL6j1/onP65JkuxHAbOo=; 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=5QHpLaFJWRGHQdWzUDyMHJ/h5dVFieZecoeBuFvSAxo=; b=SOp5wccolQ+eOnJMFdLnc9gLPn qSzjXR064yHjUdDJf3Kpxr3Zl/nGjOdIpQ8GsGOpURfrEw+sLMR+vuRAN9qcrDhpL5MB1P8pVGdxk Gw8I7cWVsbJT4QC+GPiZaCoP9ZN315zfzIUFV+QX31ymMnNLeMuzisiXI+6ro2WL9vxk=; Received: from mail.blinkt.de ([192.26.174.232]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLSv1.2:ECDHE-RSA-AES256-GCM-SHA384:256) (Exim 4.92.3) id 1lRx8q-0003Ui-40 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 1lRx8j-000J7x-Qe for openvpn-devel@lists.sourceforge.net; Thu, 01 Apr 2021 15:13:37 +0200 Received: (nullmailer pid 3735 invoked by uid 10006); Thu, 01 Apr 2021 13:13:37 -0000 From: Arne Schwabe To: openvpn-devel@lists.sourceforge.net Date: Thu, 1 Apr 2021 15:13:25 +0200 Message-Id: <20210401131337.3684-3-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: 1lRx8q-0003Ui-40 Subject: [Openvpn-devel] [PATCH 02/14] Remove superflous ifdefs around enum like defines 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 The variables are not used without the configured options but the ifdef around them does not help readibility either. Signed-off-by: Arne Schwabe Acked-by: Gert Doering --- src/openvpn/mtcp.c | 5 ----- src/openvpn/mudp.c | 2 -- src/openvpn/openvpn.h | 4 ---- 3 files changed, 11 deletions(-) diff --git a/src/openvpn/mtcp.c b/src/openvpn/mtcp.c index 22c824aaa..7d2a69b99 100644 --- a/src/openvpn/mtcp.c +++ b/src/openvpn/mtcp.c @@ -59,13 +59,8 @@ #define MTCP_SOCKET ((void *)1) #define MTCP_TUN ((void *)2) #define MTCP_SIG ((void *)3) /* Only on Windows */ -#ifdef ENABLE_MANAGEMENT #define MTCP_MANAGEMENT ((void *)4) -#endif - -#ifdef ENABLE_ASYNC_PUSH #define MTCP_FILE_CLOSE_WRITE ((void *)5) -#endif #define MTCP_N ((void *)16) /* upper bound on MTCP_x */ diff --git a/src/openvpn/mudp.c b/src/openvpn/mudp.c index e95a7ac81..5af1081fc 100644 --- a/src/openvpn/mudp.c +++ b/src/openvpn/mudp.c @@ -195,12 +195,10 @@ multi_process_io_udp(struct multi_context *m) { strcat(buf, "TW/"); } -#ifdef ENABLE_ASYNC_PUSH else if (status & FILE_CLOSED) { strcat(buf, "FC/"); } -#endif printf("IO %s\n", buf); #endif /* ifdef MULTI_DEBUG_EVENT_LOOP */ diff --git a/src/openvpn/openvpn.h b/src/openvpn/openvpn.h index 3cef26381..1063351d3 100644 --- a/src/openvpn/openvpn.h +++ b/src/openvpn/openvpn.h @@ -252,13 +252,9 @@ struct context_2 #define TUN_WRITE (1<<3) #define ES_ERROR (1<<4) #define ES_TIMEOUT (1<<5) -#ifdef ENABLE_MANAGEMENT #define MANAGEMENT_READ (1<<6) #define MANAGEMENT_WRITE (1<<7) -#endif -#ifdef ENABLE_ASYNC_PUSH #define FILE_CLOSED (1<<8) -#endif unsigned int event_set_status;