diff mbox series

[Openvpn-devel,v2] dco.h: fix return type when DCO is not enabled

Message ID 20220817201223.302-1-lstipakov@gmail.com
State Accepted
Headers show
Series [Openvpn-devel,v2] dco.h: fix return type when DCO is not enabled | expand

Commit Message

Lev Stipakov Aug. 17, 2022, 10:12 a.m. UTC 
From: Lev Stipakov <lev@openvpn.net>

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 <lev@openvpn.net>
---
 v2: also do "return 0" in dco_p2p_add_new_peer()

 src/openvpn/dco.h | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Gert Doering Aug. 18, 2022, 4:12 a.m. UTC | #1 
Acked-by: Gert Doering <gert@greenie.muc.de>

Test compiled on Linux and FreeBSD, just to be sure.

Your patch has been applied to the master branch.

commit 329cb7ed2cb8503e99bed5bf3499f2194536d6ce
Author: Lev Stipakov
Date:   Wed Aug 17 22:12:23 2022 +0200

     dco.h: fix return type when DCO is not enabled

     Signed-off-by: Lev Stipakov <lev@openvpn.net>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20220817201223.302-1-lstipakov@gmail.com>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg24968.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering
diff mbox series

Patch

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