src: avoid use of _init

Xtables-addons's extensions will always be built as modules, so it is
safe to use __attribute__((constructor)).

diff --git a/extensions/libxt_CHAOS.c b/extensions/libxt_CHAOS.c
index e6e62123d43888da737070c8a522974cb285c299..1fdcbf3b00ac192b4c55a4820716362b0b5fde4f 100644 (file)
--- a/extensions/libxt_CHAOS.c
+++ b/extensions/libxt_CHAOS.c
@@ -106,8 +106,7 @@ static struct xtables_target chaos_tg_reg = {
        .extra_opts    = chaos_tg_opts,
 };
 
-void _init(void);
-void _init(void)
+static __attribute__((constructor)) void chaos_tg_ldr(void)
 {
        xtables_register_target(&chaos_tg_reg);
 }

diff --git a/extensions/libxt_DELUDE.c b/extensions/libxt_DELUDE.c
index 8c7085ed6ce215afad22c2e2b40c609bcf142134..42c8ef0db3b57a011f87a9ba3ff73300a658bf7b 100644 (file)
--- a/extensions/libxt_DELUDE.c
+++ b/extensions/libxt_DELUDE.c
@@ -41,8 +41,7 @@ static struct xtables_target delude_tg_reg = {
        .final_check   = delude_tg_check,
 };
 
-void _init(void);
-void _init(void)
+static __attribute__((constructor)) void delude_tg_ldr(void)
 {
        xtables_register_target(&delude_tg_reg);
 }

diff --git a/extensions/libxt_DHCPADDR.c b/extensions/libxt_DHCPADDR.c
index 4171e5a8abad14f084b48e4d98e9f8a9427ba3ef..28cbb40ba5b271ed6a6aa2ebe9e7223025d53bb6 100644 (file)
--- a/extensions/libxt_DHCPADDR.c
+++ b/extensions/libxt_DHCPADDR.c
@@ -95,7 +95,7 @@ static struct xtables_target dhcpaddr_tg_reg = {
        .extra_opts    = dhcpaddr_tg_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void dhcpaddr_tg_ldr(void)
 {
        xtables_register_target(&dhcpaddr_tg_reg);
 }

diff --git a/extensions/libxt_ECHO.c b/extensions/libxt_ECHO.c
index c3454f2d18c5553a5b022244bd657e2a806ea4c5..39b9183686a3cca4dfc2d50ef1ff53d6ecaea298 100644 (file)
--- a/extensions/libxt_ECHO.c
+++ b/extensions/libxt_ECHO.c
@@ -37,7 +37,7 @@ static struct xtables_target echo_tg_reg = {
        .final_check   = echo_tg_check,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void echo_tg_ldr(void)
 {
        xtables_register_target(&echo_tg_reg);
 }

diff --git a/extensions/libxt_IPMARK.c b/extensions/libxt_IPMARK.c
index fa1a6dc793ec750a4f3b6530ba9c599a02e891a3..f440758d472d8079981714cb9c3f3a5ddd99fb46 100644 (file)
--- a/extensions/libxt_IPMARK.c
+++ b/extensions/libxt_IPMARK.c
@@ -68,7 +68,7 @@ static int ipmark_tg_parse(int c, char **argv, int invert, unsigned int *flags,
                        exit_error(PARAMETER_PROBLEM, "Bad addr value `%s' - should be `src' or `dst'", optarg);
                *flags |= FL_ADDR_USED;
                return true;
-       
+
        case '2':
                param_act(P_ONLY_ONCE, "IPMARK", "and-mask", *flags & FL_AND_MASK_USED);
                param_act(P_NO_INVERT, "IPMARK", "and-mask", invert);
@@ -175,7 +175,7 @@ static struct xtables_target ipmark_tg6_reg = {
        .extra_opts    = ipmark_tg_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void ipmark_tg_ldr(void)
 {
        xtables_register_target(&ipmark_tg4_reg);
        xtables_register_target(&ipmark_tg6_reg);

diff --git a/extensions/libxt_LOGMARK.c b/extensions/libxt_LOGMARK.c
index a92e2eb5457df34689218d91ab856dc7ecae4c9f..42659d9ec6623e6768a408ef165dc8886fd1707c 100644 (file)
--- a/extensions/libxt_LOGMARK.c
+++ b/extensions/libxt_LOGMARK.c
@@ -111,8 +111,7 @@ static struct xtables_target logmark_tg_reg = {
        .extra_opts    = logmark_tg_opts,
 };
 
-void _init(void);
-void _init(void)
+static __attribute__((constructor)) void logmark_tg_ldr(void)
 {
        xtables_register_target(&logmark_tg_reg);
 }

diff --git a/extensions/libxt_SYSRQ.c b/extensions/libxt_SYSRQ.c
index 6041805a6536fae2e6f11e47ed74f83d2e37cb1b..8f97bc182704337678c4aec7225d587d4123aeba 100644 (file)
--- a/extensions/libxt_SYSRQ.c
+++ b/extensions/libxt_SYSRQ.c
@@ -43,7 +43,7 @@ static struct xtables_target sysrq_tg6_reg = {
        .final_check   = sysrq_tg_check,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void sysrq_tg_ldr(void)
 {
        xtables_register_target(&sysrq_tg4_reg);
        xtables_register_target(&sysrq_tg6_reg);

diff --git a/extensions/libxt_TARPIT.c b/extensions/libxt_TARPIT.c
index f7edb24194635c904e23e9c7ed5c7cc36df2b958..0e072b27675970f25011523575e2be32a972d70a 100644 (file)
--- a/extensions/libxt_TARPIT.c
+++ b/extensions/libxt_TARPIT.c
@@ -32,7 +32,7 @@ static struct xtables_target tarpit_tg_reg = {
        .final_check   = tarpit_tg_check,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void tarpit_tg_ldr(void)
 {
        xtables_register_target(&tarpit_tg_reg);
 }

diff --git a/extensions/libxt_TEE.c b/extensions/libxt_TEE.c
index 408c0ae46193e600b21ae6bf89f2c90060922c3f..18638b8c8eee7285c428f38678b4347c95599996 100644 (file)
--- a/extensions/libxt_TEE.c
+++ b/extensions/libxt_TEE.c
@@ -108,7 +108,7 @@ static struct xtables_target tee_tg_reg = {
        .extra_opts    = tee_tg_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void tee_tg_ldr(void)
 {
        xtables_register_target(&tee_tg_reg);
 }

diff --git a/extensions/libxt_condition.c b/extensions/libxt_condition.c
index ba8eacfbe8db1facf4e7601b76edded907a63ce1..18b1ca3072060cd6cb094a648168f572fc19c739 100644 (file)
--- a/extensions/libxt_condition.c
+++ b/extensions/libxt_condition.c
@@ -92,7 +92,7 @@ static struct xtables_match condition_mt_reg = {
        .extra_opts     = condition_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void condition_mt_ldr(void)
 {
        xtables_register_match(&condition_mt_reg);
 }

diff --git a/extensions/libxt_dhcpaddr.c b/extensions/libxt_dhcpaddr.c
index ac4da32f68b69ed2b0d9ad22560cf35247f8fb4b..089a7228deda45ec8c42049600844f30ee100363 100644 (file)
--- a/extensions/libxt_dhcpaddr.c
+++ b/extensions/libxt_dhcpaddr.c
@@ -96,7 +96,7 @@ static struct xtables_match dhcpaddr_mt_reg = {
        .extra_opts    = dhcpaddr_mt_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void dhcpaddr_mt_ldr(void)
 {
        xtables_register_match(&dhcpaddr_mt_reg);
 }

diff --git a/extensions/libxt_fuzzy.c b/extensions/libxt_fuzzy.c
index 8ed2649d82721b3f7227665fac2d78944019d101..a588ed3b53ec6c0da82f846702944313bb55466f 100644 (file)
--- a/extensions/libxt_fuzzy.c
+++ b/extensions/libxt_fuzzy.c
@@ -112,7 +112,7 @@ static struct xtables_match fuzzy_mt_reg = {
        .extra_opts    = fuzzy_mt_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void fuzzy_mt_ldr(void)
 {
        xtables_register_match(&fuzzy_mt_reg);
 }

diff --git a/extensions/libxt_geoip.c b/extensions/libxt_geoip.c
index 2f83e53e67da2ee1d4e3c273794a3e7d0b3a6000..f0927e3ca8e43abd3f947773940e1a29af6d1f61 100644 (file)
--- a/extensions/libxt_geoip.c
+++ b/extensions/libxt_geoip.c
@@ -272,7 +272,7 @@ static struct xtables_match geoip_match = {
         .extra_opts    = geoip_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void geoip_mt_ldr(void)
 {
        xtables_register_match(&geoip_match);
 }

diff --git a/extensions/libxt_ipp2p.c b/extensions/libxt_ipp2p.c
index bc22191d877932e7863707d255ca1b7d5bf98bf1..eb0d1f01c453dc61acdca7c2394fe197e32eb489 100644 (file)
--- a/extensions/libxt_ipp2p.c
+++ b/extensions/libxt_ipp2p.c
@@ -242,7 +242,7 @@ static struct xtables_match ipp2p_mt_reg = {
        .extra_opts    = ipp2p_mt_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void ipp2p_mt_ldr(void)
 {
        xtables_register_match(&ipp2p_mt_reg);
 }

diff --git a/extensions/libxt_portscan.c b/extensions/libxt_portscan.c
index 1be9e40d82e23f8795e17ec7a5e403f6e6079135..f460e5a9d206b62b0ca7891427fc3451b514cd4d 100644 (file)
--- a/extensions/libxt_portscan.c
+++ b/extensions/libxt_portscan.c
@@ -116,8 +116,7 @@ static struct xtables_match portscan_mt_reg = {
        .extra_opts    = portscan_mt_opts,
 };
 
-void _init(void);
-void _init(void)
+static __attribute__((constructor)) void portscan_mt_ldr(void)
 {
        xtables_register_match(&portscan_mt_reg);
 }

diff --git a/extensions/libxt_quota2.c b/extensions/libxt_quota2.c
index 5fb2bd420f63c1dcbde5c4bfe4e46c9460de4db4..de7a5f41bd615a51892d7e90a7556ec5f42352a3 100644 (file)
--- a/extensions/libxt_quota2.c
+++ b/extensions/libxt_quota2.c
@@ -133,7 +133,7 @@ static struct xtables_match quota_mt2_reg = {
        .extra_opts    = quota_mt2_opts,
 };
 
-static void _init(void)
+static __attribute__((constructor)) void quota2_mt_ldr(void)
 {
        xtables_register_match(&quota_mt2_reg);
 }