[Openvpn-devel,4/5] Remove explicit setting of peer_id to false

Message ID 20201023113431.26691-4-arne@rfc2549.org
State Accepted
Headers show
Series
  • [Openvpn-devel,1/5] Inline function tls_get_peer_info
Related show

Commit Message

Arne Schwabe Oct. 23, 2020, 11:34 a.m.
Almost everywhere in OpenVPN we rely on zero initialisation to
initialise all bool attributes to false.

ret is cleared by ALLOC_OBJ_CLEAR(ret, struct tls_multi);

Having this one variable treated different is a bit confusing.

Signed-off-by: Arne Schwabe <arne@rfc2549.org>
---
 src/openvpn/ssl.c | 3 ---
 1 file changed, 3 deletions(-)

Comments

Gert Doering Oct. 24, 2020, 8:01 p.m. | #1
Acked-by: Gert Doering <gert@greenie.muc.de>

I can see why this initalization was put there, initially, to 
make clear "P_DATA_V2 is not enabled by default" - but since we do
not do this for all other "do not enable this $bool by default"
initializations either, it is indeed an oddball and confuses more
than it helps.

(If Lev yells at me that he really likes this particular line I
can put it back, though :-) )

Your patch has been applied to the master branch.

commit 0d4ca79d4fc3c42b3970190f96781ed4f2552b32
Author: Arne Schwabe
Date:   Fri Oct 23 13:34:30 2020 +0200

     Remove explicit setting of peer_id to false

     Signed-off-by: Arne Schwabe <arne@rfc2549.org>
     Acked-by: Gert Doering <gert@greenie.muc.de>
     Message-Id: <20201023113431.26691-4-arne@rfc2549.org>
     URL: https://www.mail-archive.com/openvpn-devel@lists.sourceforge.net/msg21218.html
     Signed-off-by: Gert Doering <gert@greenie.muc.de>


--
kind regards,

Gert Doering

Patch

diff --git a/src/openvpn/ssl.c b/src/openvpn/ssl.c
index 7a3eb146..f6f06fa9 100644
--- a/src/openvpn/ssl.c
+++ b/src/openvpn/ssl.c
@@ -1219,9 +1219,6 @@  tls_multi_init(struct tls_options *tls_options)
     ret->key_scan[1] = &ret->session[TM_ACTIVE].key[KS_LAME_DUCK];
     ret->key_scan[2] = &ret->session[TM_LAME_DUCK].key[KS_LAME_DUCK];
 
-    /* By default not use P_DATA_V2 */
-    ret->use_peer_id = false;
-
     return ret;
 }