Skip to contentSkip to conversation

Make ENABLE_OCC no longer depend on !ENABLE_SMALL

PATCH In review Gert Doering 2 participants 5 messages Mar 19, 2017 – Mar 20, 2017 1 message not in the archive

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]...

Gert Doering

author
#1 lore raw

PATCH 1/1 Make ENABLE_OCC no longer depend on !ENABLE_SMALL

OCC is useful functionality which (according to LEDE devs) adds only about 3k to the binary size - and if the embedded router folks can afford this trade-off, everyone else can :-)

Inspired by https://git.lede-project.org/?p=source.git;a=commit;h=b613c96d94bcdcda7abb3be68ea1c281ce5fbb47

Signed-off-by Gert Doering <[email protected]...>
---
 src/openvpn/syshead.h | 2 --
 1 file changed, 2 deletions(-)
src/openvpn/syshead.h +0 -2
index a1b6047..f445864 100644
@@ -589,9 +589,7 @@ socket_defined(const socket_descriptor_t sd)
 /*
  * Should we include OCC (options consistency check) code?
  */
-#ifndef ENABLE_SMALL
 #define ENABLE_OCC
-#endif
 
 /*
  * Should we include NTLM proxy functionality
Signature · 1 line
2.10.2
#2 lore raw

Hi,

Quoted 17 lines · Gert Doering

OCC is useful functionality which (according to LEDE devs) adds only about 3k to the binary size - and if the embedded router folks can afford this trade-off, everyone else can :-)

Inspired by https://git.lede-project.org/?p=source.git;a=commit;h=b613c96d94bcdcda7abb3be68ea1c281ce5fbb47

Signed-off-by Gert Doering <[email protected]...>
---
 src/openvpn/syshead.h | 2 --
 1 file changed, 2 deletions(-)
src/openvpn/syshead.h +0 -0
index a1b6047..f445864 100644

src/openvpn/syshead.h socket_defined(const socket_descriptor_t sd) · line 595

Quoted 9 lines
src/openvpn/syshead.h +0 -2
@@ -589,9 +589,7 @@ socket_defined(const socket_descriptor_t sd)
 /*
  * Should we include OCC (options consistency check) code?
  */
-#ifndef ENABLE_SMALL
 #define ENABLE_OCC
-#endif
 
 /*
  * Should we include NTLM proxy functionality

If we unconditionally enable OCC, should we not just rip out #ifdef ENABLE_OCC everywhere?

-Steffan

author
#3 lore raw

Hi,

Quoted 8 lines · Steffan Karger
Quoted 8 lines
src/openvpn/syshead.h +0 -2
@@ -589,9 +589,7 @@ socket_defined(const socket_descriptor_t sd)
 /*
  * Should we include OCC (options consistency check) code?
  */
-#ifndef ENABLE_SMALL
 #define ENABLE_OCC
-#endif
Quoted 6 lines

src/openvpn/syshead.h socket_defined(const socket_descriptor_t sd) · line 595

Quoted 3 lines
src/openvpn/syshead.h +0 -0
 /*
  * Should we include NTLM proxy functionality

If we unconditionally enable OCC, should we not just rip out #ifdef ENABLE_OCC everywhere?

We certainly could, but someone who still wants "no OCC! smaaall!" still has the option to turn it off...

We might revisit that, though - there's "the option checking code", which indeed brings in quite a bit of code that might be considered optional, but there is also stuff in sig.c that makes --explicit-exit-notify depend on ENABLE_OCC, and I'd consider that as something quite important...

gert

Signature · 4 lines
USENET is *not* the non-clickable part of WWW!
                                                           //www.muc.de/~gert/
Gert Doering - Munich, Germany                             [email protected]...
fax: +49-89-35655025                        [email protected]...
#4 lore raw
Quoted 16 lines · Gert Doering
Quoted 8 lines · Steffan Karger
Quoted 8 lines
src/openvpn/syshead.h +0 -2
@@ -589,9 +589,7 @@ socket_defined(const socket_descriptor_t sd)
 /*
  * Should we include OCC (options consistency check) code?
  */
-#ifndef ENABLE_SMALL
 #define ENABLE_OCC
-#endif
Quoted 6 lines

src/openvpn/syshead.h socket_defined(const socket_descriptor_t sd) · line 595

Quoted 3 lines
src/openvpn/syshead.h +0 -0
 /*
  * Should we include NTLM proxy functionality

If we unconditionally enable OCC, should we not just rip out #ifdef ENABLE_OCC everywhere?

Quoted 8 lines

We certainly could, but someone who still wants "no OCC! smaaall!" still has the option to turn it off...

We might revisit that, though - there's "the option checking code", which indeed brings in quite a bit of code that might be considered optional, but there is also stuff in sig.c that makes --explicit-exit-notify depend on ENABLE_OCC, and I'd consider that as something quite important...

Ok, let's revisit that later. This patch doesn't hurt if we decide to rip out more later, and would be good to get into 2.4.1, so ACK.

-Steffan

author
#5 lore raw
In reply to Gert Doering

Patch has been applied to the master and release/2.4 branch.

commit 363af65178b8bbb482df958d6570c8763aee5d1d (master) commit 037669f3dd05d725d34f43e85eb2aad5f18ec90c (release/2.4)

Author: Gert Doering
Date:   Sun Mar 19 19:41:35 2017 +0100
     Make ENABLE_OCC no longer depend on !ENABLE_SMALL

     Signed-off-by: Gert Doering <[email protected]...>
     Acked-by: Steffan Karger <[email protected]...>
     Message-Id: <[email protected]...>
     URL: https://www.mail-archive.com/[email protected]/msg14281.html
     Signed-off-by: Gert Doering <[email protected]...>

--
kind regards,

Gert Doering