From patchwork Wed Aug 17 10:12:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lev Stipakov X-Patchwork-Id: 2690 Return-Path: Delivered-To: patchwork@openvpn.net Delivered-To: patchwork@openvpn.net Received: from director8.mail.ord1d.rsapps.net ([172.27.255.1]) by backend30.mail.ord1d.rsapps.net with LMTP id 4QruK9Al/mJlNQAAIUCqbw (envelope-from ) for ; Thu, 18 Aug 2022 07:43:12 -0400 Received: from proxy14.mail.iad3a.rsapps.net ([172.27.255.1]) by director8.mail.ord1d.rsapps.net with LMTP id mNZbK9Al/mKkUgAAfY0hYg (envelope-from ) for ; Thu, 18 Aug 2022 07:43:12 -0400 Received: from smtp32.gate.iad3a ([172.27.255.1]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) by proxy14.mail.iad3a.rsapps.net with LMTPS id iDiQItsl/mLeIAAA1+b4IQ (envelope-from ) for ; Thu, 18 Aug 2022 07:43:23 -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: smtp32.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: a1c4d27e-1eea-11ed-aef0-5254001741cc-1-1 Received: from [192.26.174.232] ([192.26.174.232:47969] helo=mail.blinkt.de) by smtp32.gate.iad3a.rsapps.net (envelope-from ) (ecelerity 4.2.38.62370 r(:)) with ESMTPS (cipher=DHE-RSA-AES256-GCM-SHA384) id 81/AE-18013-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-0000SO-W6 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: <4b6a0a01-393e-aeae-3beb-9d0274a38f7a@rfc2549.org> Received: from mail.blinkt.de ([unix socket]) by mail.blinkt.de (Cyrus 3.4.4) with LMTPA; Wed, 17 Aug 2022 22:14:03 +0200 X-Cyrus-Session-Id: mail.blinkt.de-1660767243-84941-2-15731830967242645407 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 1oOPQQ-000M5y-KE for arne@rfc2549.org; Wed, 17 Aug 2022 22:14:03 +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 1oOPPR-0007wI-Ej; Wed, 17 Aug 2022 20:13:01 +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 1oOPPQ-0007w4-7a for openvpn-devel@lists.sourceforge.net; Wed, 17 Aug 2022 20:13:00 +0000 Received: from mail-lf1-f46.google.com ([209.85.167.46]) by sfi-mx-2.v28.lw.sourceforge.com with esmtps (TLS1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.95) id 1oOPPH-0002Hv-Tz for openvpn-devel@lists.sourceforge.net; Wed, 17 Aug 2022 20:12:59 +0000 Received: by mail-lf1-f46.google.com with SMTP id x19so20387630lfq.7 for ; Wed, 17 Aug 2022 13:12:51 -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:references:in-reply-to :message-id:date:subject:cc:to:from:x-gm-message-state:from:to:cc; bh=dJwjeVVUAia5rKJFH+d2M5zxvTHuD0FX7ogEeV2C+Q4=; b=z2DykEqaOlMfofCt7mFJyM0Y5xf3E5tSzY/4ygdVybGlNxaV7Pt/eUwt7KK/llJycq 03VW0LANypmFaCV2aIng8HjEPYooimiAWVZJSM81dy0t4NUdI3+5CkaomJ7+lIYpb0+C EAmqS/P1l5bhvcbow/fG9LfMMY/mtEVclYG2H33KB2ahbLU2lGcqShsun4t+sAtu1SdG EQyb25klpi1XAO39534G2yOgEQvnczzy2lysF1iUVGNwz5Zvtl3H8KE3N1VpannMb2lf bIDM2qggLGibS57ti3Pp809r2kB7UKQkvu+Xb1eY8zIRp65P7zOHaRaUwjlUcmlDeqyr rcPQ== X-Gm-Message-State: ACgBeo2ix6oN9YbSOuI8TYF+T49y91a50/YJNByKDyarLY8ZV7WmJ/rb 8x1yuLFFqZ1QH7GFAKC55f/lKono6vyYSUcl X-Google-Smtp-Source: AA6agR4YUkEHeEMgAtq91uE1edyKBcD64Bjdv9nXfoTN4YWSyD4Lb1F0J343l/RH5BWbWfXhM6ocAg== X-Received: by 2002:ac2:4e66:0:b0:48c:e34c:69b4 with SMTP id y6-20020ac24e66000000b0048ce34c69b4mr8871566lfs.85.1660767164990; Wed, 17 Aug 2022 13:12:44 -0700 (PDT) Received: from LAPTOP-4L3N7KFS.localdomain (148122135023.sia.telenor.net. [148.122.135.23]) by smtp.gmail.com with ESMTPSA id h13-20020a2ea48d000000b0025e040510e7sm2375712lji.74.2022.08.17.13.12.44 (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Wed, 17 Aug 2022 13:12:44 -0700 (PDT) From: Lev Stipakov To: openvpn-devel@lists.sourceforge.net Date: Wed, 17 Aug 2022 22:12:23 +0200 Message-Id: <20220817201223.302-1-lstipakov@gmail.com> X-Mailer: git-send-email 2.34.1 In-Reply-To: References: MIME-Version: 1.0 X-Headers-End: 1oOPPH-0002Hv-Tz Subject: [Openvpn-devel] [PATCH v2] 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 Acked-by: Gert Doering --- v2: also do "return 0" in dco_p2p_add_new_peer() src/openvpn/dco.h | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/openvpn/dco.h b/src/openvpn/dco.h index 6b5c016a..e063853c 100644 --- a/src/openvpn/dco.h +++ b/src/openvpn/dco.h @@ -292,10 +292,10 @@ 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; + return 0; } static inline int @@ -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