libxtables: Unexport init_extensions*() declarations
Phil Sutter
reviewerPATCH 1/1 libxtables: Unexport init_extensions*() declarations
The functions are used for static builds to initialize extensions after libxtables init. Regular library users should not need them, but the empty declarations introduced in #else case (and therefore present in user's env) may clash with existing symbol names.
Avoid problems and guard the whole block declaring the function prototypes and mangling extensions' _init functions by XTABLES_INTERNAL.
--- include/xtables.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)
include/xtables.h +22 -22
@@ -585,27 +585,6 @@ static inline void xtables_print_mark_mask(unsigned int mark,xtables_print_val_mask (mark, mask,NULL ); } -#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) -# ifdef _INIT -# undef _init -# define _init _INIT -# endif -extern void init_extensions (void ); -extern void init_extensions4 (void ); -extern void init_extensions6 (void ); -extern void init_extensionsa (void ); -extern void init_extensionsb (void ); -#else -# define _init __attribute__((constructor)) _INIT -# define EMPTY_FUNC_DEF (x) static inline void x(void) {} - EMPTY_FUNC_DEF(init_extensions) - EMPTY_FUNC_DEF(init_extensions4) - EMPTY_FUNC_DEF(init_extensions6) - EMPTY_FUNC_DEF(init_extensionsa) - EMPTY_FUNC_DEF(init_extensionsb) -# undef EMPTY_FUNC_DEF -#endif -extern const struct xtables_pprot xtables_chain_protos[];extern uint16_t xtables_parse_protocol (const char *s);
@@ -663,9 +642,30 @@ void xtables_announce_chain(const char *name);# define ARRAY_SIZE (x) (sizeof(x) / sizeof(*(x)))# endif +#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +# ifdef _INIT +# undef _init +# define _init _INIT +# endif +extern void init_extensions (void ); +extern void init_extensions4 (void ); +extern void init_extensions6 (void ); +extern void init_extensionsa (void ); +extern void init_extensionsb (void ); +#else +# define _init __attribute__((constructor)) _INIT +# define EMPTY_FUNC_DEF (x) static inline void x(void) {} + EMPTY_FUNC_DEF(init_extensions) + EMPTY_FUNC_DEF(init_extensions4) + EMPTY_FUNC_DEF(init_extensions6) + EMPTY_FUNC_DEF(init_extensionsa) + EMPTY_FUNC_DEF(init_extensionsb) +# undef EMPTY_FUNC_DEF +#endif +extern void _init (void ); -#endif +#endif /* XTABLES_INTERNAL */ #ifdef __cplusplus }/* extern "C" */
Signature · 1 line
2.34.1
Thanks. You can also put my whole Name: Nick Hainke <[email protected]>.
I will test it again. :) I had a longer discussion with another OpenWrt member, why everything is done in OpenWrt as it is. Not sure what will happen in future with firewall3.
Bests
Nick
Quoted 79 lines · Phil Sutter
The functions are used for static builds to initialize extensions after libxtables init. Regular library users should not need them, but the empty declarations introduced in #else case (and therefore present in user's env) may clash with existing symbol names.
Avoid problems and guard the whole block declaring the function prototypes and mangling extensions'
_initfunctions byXTABLES_INTERNAL.Reported-by Nick <[email protected]>Fixes 6c689b639cf8e ("Simplify static build extension loading")Signed-off-by Phil Sutter <[email protected]>--- include/xtables.h | 44 ++++++++++++++++++++++---------------------- 1 file changed, 22 insertions(+), 22 deletions(-)include/xtables.h +22
-22@@ -585,27 +585,6 @@ static inline void xtables_print_mark_mask(unsigned int mark,xtables_print_val_mask (mark, mask,NULL ); } -#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) -# ifdef _INIT -# undef _init -# define _init _INIT -# endif -extern void init_extensions (void ); -extern void init_extensions4 (void ); -extern void init_extensions6 (void ); -extern void init_extensionsa (void ); -extern void init_extensionsb (void ); -#else -# define _init __attribute__((constructor)) _INIT -# define EMPTY_FUNC_DEF (x) static inline void x(void) {} - EMPTY_FUNC_DEF(init_extensions) - EMPTY_FUNC_DEF(init_extensions4) - EMPTY_FUNC_DEF(init_extensions6) - EMPTY_FUNC_DEF(init_extensionsa) - EMPTY_FUNC_DEF(init_extensionsb) -# undef EMPTY_FUNC_DEF -#endif -extern const struct xtables_pprot xtables_chain_protos[];extern uint16_t xtables_parse_protocol (const char *s);@@ -663,9 +642,30 @@ void xtables_announce_chain(const char *name);# define ARRAY_SIZE (x) (sizeof(x) / sizeof(*(x)))# endif +#if defined(ALL_INCLUSIVE ) || defined(NO_SHARED_LIBS ) +# ifdef _INIT +# undef _init +# define _init _INIT +# endif +extern void init_extensions (void ); +extern void init_extensions4 (void ); +extern void init_extensions6 (void ); +extern void init_extensionsa (void ); +extern void init_extensionsb (void ); +#else +# define _init __attribute__((constructor)) _INIT +# define EMPTY_FUNC_DEF (x) static inline void x(void) {} + EMPTY_FUNC_DEF(init_extensions) + EMPTY_FUNC_DEF(init_extensions4) + EMPTY_FUNC_DEF(init_extensions6) + EMPTY_FUNC_DEF(init_extensionsa) + EMPTY_FUNC_DEF(init_extensionsb) +# undef EMPTY_FUNC_DEF +#endif +extern void _init (void ); -#endif +#endif /* XTABLES_INTERNAL */ #ifdef __cplusplus }/* extern "C" */
The patch works for me. Thanks.
Bests
Nick
Quoted 82 lines · Nick
Thanks. You can also put my whole Name: Nick Hainke <[email protected]>.
I will test it again. :) I had a longer discussion with another OpenWrt member, why everything is done in OpenWrt as it is. Not sure what will happen in future with firewall3.Bests
NickQuoted 75 lines · Phil Sutter
The functions are used for static builds to initialize extensions after libxtables init. Regular library users should not need them, but the empty declarations introduced in #else case (and therefore present in user's env) may clash with existing symbol names.
Avoid problems and guard the whole block declaring the function prototypes and mangling extensions'
_initfunctions byXTABLES_INTERNAL.Reported-by Nick <[email protected]>Fixes 6c689b639cf8e ("Simplify static build extension loading")Signed-off-by Phil Sutter <[email protected]>---
include/xtables.h| 44 ++++++++++++++++++++++----------------------1 file changed, 22 insertions(+), 22 deletions(-)include/xtables.h +0
-20@@ -585,27 +585,6 @@ static inline void xtables_print_mark_mask(unsigned int mark, xtables_print_val_mask(mark, mask, NULL); } -#if defined(ALL_INCLUSIVE) || defined(NO_SHARED_LIBS) -# ifdef _INIT -# undef _init -# define _init _INIT -# endif - extern void init_extensions(void); - extern void init_extensions4(void); - extern void init_extensions6(void); - extern void init_extensionsa(void); - extern void init_extensionsb(void); -#else -# define _init __attribute__((constructor)) _INIT -# define EMPTY_FUNC_DEF(x) static inline void x(void) {} - EMPTY_FUNC_DEF(init_extensions) - EMPTY_FUNC_DEF(init_extensions4) - EMPTY_FUNC_DEF(init_extensions6) - EMPTY_FUNC_DEF(init_extensionsa) - EMPTY_FUNC_DEF(init_extensionsb) -# undef EMPTY_FUNC_DEF -#endif - extern const struct xtables_pprot xtables_chain_protos[]; extern uint16_t xtables_parse_protocol(const char *s);@@ -663,9 +642,30 @@ void
xtables_announce_chain(const char *name); # defineARRAY_SIZE(x)(sizeof(x) / sizeof(*(x))) # endif
+#ifdefined(ALL_INCLUSIVE)||defined(NO_SHARED_LIBS)include/xtables.h +20
-0+# ifdef _INIT +# undef _init +# define _init _INIT +# endif + extern void init_extensions(void); + extern void init_extensions4(void); + extern void init_extensions6(void); + extern void init_extensionsa(void); + extern void init_extensionsb(void); +#else +# define _init __attribute__((constructor)) _INIT +# define EMPTY_FUNC_DEF(x) static inline void x(void) {} + EMPTY_FUNC_DEF(init_extensions) + EMPTY_FUNC_DEF(init_extensions4) + EMPTY_FUNC_DEF(init_extensions6) + EMPTY_FUNC_DEF(init_extensionsa) + EMPTY_FUNC_DEF(init_extensionsb) +# undef EMPTY_FUNC_DEF +#endif +extern void
_init(void);
-#endif
+#endif /*XTABLES_INTERNAL*/
#ifdef__cplusplus
} /* extern "C" */