Unifies libip[6]t_standard.c into libxt_standard.c

diff --git a/extensions/Makefile b/extensions/Makefile
index d57fabefce113f3ac363e1598480a3fdebe375d7..6522b8073ff7dbf06c03419f8f7b41240478ba4f 100644 (file)
--- a/extensions/Makefile
+++ b/extensions/Makefile
@@ -5,9 +5,9 @@
 # header files are present in the include/linux directory of this iptables
 # package (HW)
 #
-PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac owner physdev pkttype policy realm sctp standard state tos ttl unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE REDIRECT REJECT SAME SNAT TCPMSS TOS TTL TRACE ULOG
-PF6_EXT_SLIB:=connlimit connmark eui64 hl icmp6 length limit mac owner physdev policy standard state CONNMARK HL LOG NFQUEUE MARK TCPMSS TRACE
-PFX_EXT_SLIB:=mark multiport tcp tcpmss udp NOTRACK
+PF_EXT_SLIB:=ah addrtype comment connlimit connmark conntrack dscp ecn esp hashlimit helper icmp iprange length limit mac owner physdev pkttype policy realm sctp state tos ttl unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE REDIRECT REJECT SAME SNAT TCPMSS TOS TTL TRACE ULOG
+PF6_EXT_SLIB:=connlimit connmark eui64 hl icmp6 length limit mac owner physdev policy state CONNMARK HL LOG NFQUEUE MARK TCPMSS TRACE
+PFX_EXT_SLIB:=mark multiport standard tcp tcpmss udp NOTRACK
 
 ifeq ($(DO_SELINUX), 1)
 PF_EXT_SE_SLIB:=SECMARK CONNSECMARK

diff --git a/extensions/libip6t_standard.c b/extensions/libip6t_standard.c
deleted file mode 100644 (file)
index 0d9f490..0000000
--- a/extensions/libip6t_standard.c
+++ /dev/null
@@ -1,66 +0,0 @@
-/* Shared library add-on to iptables for standard target support. */
-#include <stdio.h>
-#include <netdb.h>
-#include <string.h>
-#include <stdlib.h>
-#include <limits.h>
-#include <getopt.h>
-#include <ip6tables.h>
-
-/* Function which prints out usage message. */
-static void
-help(void)
-{
-       printf(
-"Standard v%s options:\n"
-"(If target is DROP, ACCEPT, RETURN or nothing)\n", IPTABLES_VERSION);
-}
-
-static struct option opts[] = {
-       {0}
-};
-
-/* Initialize the target. */
-static void
-init(struct xt_entry_target *t, unsigned int *nfcache)
-{
-}
-
-/* Function which parses command options; returns true if it
-   ate an option */
-static int
-parse(int c, char **argv, int invert, unsigned int *flags,
-      const void *entry,
-      struct xt_entry_target **target)
-{
-       return 0;
-}
-
-/* Final check; don't care. */
-static void final_check(unsigned int flags)
-{
-}
-
-/* Saves the targinfo in parsable form to stdout. */
-static void
-save(const void *ip6, const struct xt_entry_target *target)
-{
-}
-
-static struct ip6tables_target standard = {
-       .name           = "standard",
-       .version        = IPTABLES_VERSION,
-       .size           = IP6T_ALIGN(sizeof(int)),
-       .userspacesize  = IP6T_ALIGN(sizeof(int)),
-       .help           = &help,
-       .init           = &init,
-       .parse          = &parse,
-       .final_check    = &final_check,
-       .save           = &save,
-       .extra_opts     = opts,
-};
-
-void _init(void)
-{
-       register_target6(&standard);
-}

diff --git a/extensions/libipt_standard.c b/extensions/libxt_standard.c
similarity index 67%
rename from extensions/libipt_standard.c
rename to extensions/libxt_standard.c
index 2b9669706ee0f545808cf0b7a14427611438779b..02128a7e7f2e8da8a96a8a41ebec078e7c319c3b 100644 (file)
--- a/extensions/libipt_standard.c
+++ b/extensions/libxt_standard.c
@@ -5,7 +5,7 @@
 #include <stdlib.h>
 #include <limits.h>
 #include <getopt.h>
-#include <iptables.h>
+#include <xtables.h>
 
 /* Function which prints out usage message. */
 static void
@@ -48,12 +48,30 @@ save(const void *ip, const struct xt_entry_target *target)
 }
 
 static
-struct iptables_target standard = { 
+struct xtables_target standard = { 
        .next           = NULL,
+       .family         = AF_INET,
        .name           = "standard",
        .version        = IPTABLES_VERSION,
-       .size           = IPT_ALIGN(sizeof(int)),
-       .userspacesize  = IPT_ALIGN(sizeof(int)),
+       .size           = XT_ALIGN(sizeof(int)),
+       .userspacesize  = XT_ALIGN(sizeof(int)),
+       .help           = &help,
+       .init           = &init,
+       .parse          = &parse,
+       .final_check    = &final_check,
+       .print          = NULL,
+       .save           = &save,
+       .extra_opts     = opts
+};
+
+static
+struct xtables_target standard6 = { 
+       .next           = NULL,
+       .family         = AF_INET6,
+       .name           = "standard",
+       .version        = IPTABLES_VERSION,
+       .size           = XT_ALIGN(sizeof(int)),
+       .userspacesize  = XT_ALIGN(sizeof(int)),
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
@@ -65,5 +83,6 @@ struct iptables_target standard = {
 
 void _init(void)
 {
-       register_target(&standard);
+       xtables_register_target(&standard);
+       xtables_register_target(&standard6);
 }