From patchwork Wed Aug 17 01:03:19 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2682 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.55]) by backend30.mail.ord1d.rsapps.net with LMTP id IEgWO00l/mKbMgAAIUCqbw (envelope-from ) for ; Thu, 18 Aug 2022 07:41:01 -0400 Received: from proxy13.mail.iad3a.rsapps.net ([172.27.255.55]) by director8.mail.ord1d.rsapps.net with LMTP id eNDvOk0l/mJGYQAAfY0hYg (envelope-from ) for ; Thu, 18 Aug 2022 07:41:01 -0400 Received: from smtp51.gate.iad3a ([172.27.255.55]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy13.mail.iad3a.rsapps.net with LMTPS id 2GnpM00l/mKlMAAAwhxzoA (envelope-from ) for ; Thu, 18 Aug 2022 07:41:01 -0400 X-Spam-Threshold: 95 X-Spam-Score: 0 X-Spam-Flag: NO X-Virus-Scanned: OK X-Orig-To: patchwork@openvpn.net X-Originating-Ip: [192.26.174.232] Authentication-Results: smtp51.gate.iad3a.rsapps.net; iprev=pass policy.iprev="192.26.174.232"; spf=pass smtp.mailfrom="arne@rfc2549.org" smtp.helo="mail.blinkt.de"; dkim=none (message not signed) header.d=none; dmarc=fail (p=none; dis=none) header.from=gmail.com X-Suspicious-Flag: NO X-Classification-ID: a1c61f6c-1eea-11ed-8c4e-525400aaff7b-1-1 Received: from [192.26.174.232] ([192.26.174.232:47971] helo=mail.blinkt.de) by smtp51.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 52/89-18592-D452EF26; Thu, 18 Aug 2022 07:41:01 -0400 Received: from [195.70.183.100] (helo=[192.168.12.111]) by mail.blinkt.de with esmtpsa (TLS1.3) tls TLS_AES_128_GCM_SHA256 (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oOdtT-0000SJ-WD for patchwork@openvpn.net; Thu, 18 Aug 2022 13:41:00 +0200 Resent-From: Arne Schwabe Resent-To: patchwork@openvpn.net Resent-Date: Thu, 18 Aug 2022 13:40:58 +0200 Resent-Message-ID: Received: from mail.blinkt.de ([unix socket]) by mail.blinkt.de (Cyrus 3.4.4) with LMTPA; Wed, 17 Aug 2022 13:04:30 +0200 X-Cyrus-Session-Id: mail.blinkt.de-1660734270-75585-2-4571485428397929921 X-Sieve: CMU Sieve 3.0 Received: from lists.sourceforge.net ([216.105.38.7]) by mail.blinkt.de with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95 (FreeBSD)) (envelope-from ) id 1oOGqb-000Jf4-R5 for arne@rfc2549.org; Wed, 17 Aug 2022 13:04:30 +0200 Received: from [127.0.0.1] (helo=sfs-ml-4.v29.lw.sourceforge.com) by sfs-ml-4.v29.lw.sourceforge.com with esmtp (Exim 4.95) (envelope-from ) id 1oOGpe-0005Ib-R1; Wed, 17 Aug 2022 11:03:30 +0000 Received: from [172.30.20.202] (helo=mx.sourceforge.net) by sfs-ml-4.v29.lw.sourceforge.com with esmtps (TLS1.2) tls TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384 (Exim 4.95) (envelope-from ) id 1oOGpd-0005IU-9Y for openvpn-devel@lists.sourceforge.net; Wed, 17 Aug 2022 11:03:29 +0000 Received: from mail-lf1-f46.google.com ([209.85.167.46]) by sfi-mx-1.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1oOGpY-005rOk-EI for openvpn-devel@lists.sourceforge.net; Wed, 17 Aug 2022 11:03:29 +0000 Received: by mail-lf1-f46.google.com with SMTP id u3so18528280lfk.8 for ; Wed, 17 Aug 2022 04:03:24 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=content-transfer-encoding:mime-version:message-id:date:subject:cc :to:from:x-gm-message-state:from:to:cc; bh=7rOsi+GC0UmQrKqPz2UaPJ1agXHDb3zPGpTJKJfzBMo=; b=xlrUqtGYntIUj4uHDIZH4ANZbXdzrstvxP+OqCPrfbS6mYwSIR6IXPVZigcUrs4jQ2 q6l/Ytzek66bhenau7wOuXCM1PREaA1maRP8/e8yv+InZkJAcS3TV5QgCf5p+Yr3P7M+ Gk5z4yJLrWRyHJxyNgWkhS2GkX5JeQkYmnxeSFmhpUgEGQ3RzL4yfGmC5q/br6jnDlc7 Jeur02/GDIS9Vpr/qTlwz8axcFyH9KcnFlesT+2DT+k6FHrq30gENYrBmvm4acQ7uh2n qWLXmH5cnQKqBSBivubsYND47cpu6cu/10njHKSbjAA5lPzJHlpsoBpkPOWF0uwhX+iS 69PA== X-Gm-Message-State: ACgBeo2HaqiiYpjfyykHjMaZYJe2h3SIBx+cbNoqoi77lfUbjMPQzpUB Oisk4zNYjPpwj5Ms/EbiUvajtmsl5n/WfA== X-Google-Smtp-Source: AA6agR7hu6hBumWeFDV63Biyv67CQ7YD+rM340VuxqAZ6vGHkEV9J2Qymfy1OZ61cp3sAYR+FLTUlA== X-Received: by 2002:a05:6512:1083:b0:48b:a1bb:a8b4 with SMTP id j3-20020a056512108300b0048ba1bba8b4mr7927924lfg.342.1660734197474; Wed, 17 Aug 2022 04:03:17 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain ([195.70.183.100]) by smtp.gmail.com with ESMTPSA id w28-20020a05651c119c00b00261a7425db8sm22254ljo.61.2022.08.17.04.03.16 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 04:03:16 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 17 Aug 2022 13:03:19 +0200 Message-Id: <20220817110319.195-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.34.1 MIME-Version: 1.0 X-Headers-End: 1oOGpY-005rOk-EI Subject: [Openvpn-devel] [PATCH] dco.h: fix return type when DCO is not enabled 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: , Cc: Lev Stipakov Errors-To: openvpn-devel-bounces@lists.sourceforge.net X-Spam-Bar: + X-getmail-retrieved-from-mailbox: Inbox From: Lev Stipakov The correct return type for those functions is int, so adjust return type accordingly for the cases when DCO is not defined. Signed-off-by: Lev Stipakov --- src/openvpn/dco.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index 6b5c016a..04556471 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -292,7 +292,7 @@ dco_update_keys(dco_context_t *dco, struct tls_multi *multi) ASSERT(false); } -static inline bool +static inline int dco_p2p_add_new_peer(struct context *c) { return true; @@ -310,10 +310,10 @@ dco_remove_peer(struct context *c) { } -static inline bool +static inline int dco_multi_add_new_peer(struct multi_context *m, struct multi_instance *mi) { - return true; + return 0; } static inline void