Unifies libip[6]t_TCPMSS.c into libxt_TCPMSS.c

diff --git a/extensions/Makefile b/extensions/Makefile
index 0a46256f6023980044b44680816996c4ff5965b1..5690da3568f0e36718e1bdf45f9bb26c3ceb8dca 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 connlimit connmark conntrack ecn hashlimit helper icmp iprange owner policy realm 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 owner policy state CONNMARK HL LOG NFQUEUE MARK TCPMSS TRACE
-PFX_EXT_SLIB:=comment dscp esp length limit mac mark multiport physdev pkttype sctp standard tcp tcpmss udp NOTRACK
+PF_EXT_SLIB:=ah addrtype connlimit connmark conntrack ecn hashlimit helper icmp iprange owner policy realm state tos ttl unclean CLASSIFY CONNMARK DNAT DSCP ECN LOG MARK MASQUERADE MIRROR NETMAP NFQUEUE REDIRECT REJECT SAME SNAT TOS TTL TRACE ULOG
+PF6_EXT_SLIB:=connlimit connmark eui64 hl icmp6 owner policy state CONNMARK HL LOG NFQUEUE MARK TRACE
+PFX_EXT_SLIB:=comment dscp esp length limit mac mark multiport physdev pkttype sctp standard tcp tcpmss udp NOTRACK TCPMSS
 
 ifeq ($(DO_SELINUX), 1)
 PF_EXT_SE_SLIB:=SECMARK CONNSECMARK

diff --git a/extensions/libip6t_TCPMSS.c b/extensions/libip6t_TCPMSS.c
deleted file mode 100644 (file)
index f93a5a3..0000000
--- a/extensions/libip6t_TCPMSS.c
+++ /dev/null
@@ -1,134 +0,0 @@
-/* Shared library add-on to iptables to add TCPMSS target support.
- *
- * Copyright (c) 2000 Marc Boucher
-*/
-#include <stdio.h>
-#include <string.h>
-#include <stdlib.h>
-#include <getopt.h>
-
-#include <ip6tables.h>
-#include <linux/netfilter_ipv6/ip6_tables.h>
-#include <linux/netfilter_ipv6/ip6t_TCPMSS.h>
-
-struct mssinfo {
-       struct xt_entry_target t;
-       struct ip6t_tcpmss_info mss;
-};
-
-/* Function which prints out usage message. */
-static void
-help(void)
-{
-       printf(
-"TCPMSS target v%s mutually-exclusive options:\n"
-"  --set-mss value               explicitly set MSS option to specified value\n"
-"  --clamp-mss-to-pmtu           automatically clamp MSS value to (path_MTU - 60)\n",
-IPTABLES_VERSION);
-}
-
-static struct option opts[] = {
-       { "set-mss", 1, 0, '1' },
-       { "clamp-mss-to-pmtu", 0, 0, '2' },
-       { 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)
-{
-       struct ip6t_tcpmss_info *mssinfo
-               = (struct ip6t_tcpmss_info *)(*target)->data;
-
-       switch (c) {
-               unsigned int mssval;
-
-       case '1':
-               if (*flags)
-                       exit_error(PARAMETER_PROBLEM,
-                                  "TCPMSS target: Only one option may be specified");
-               if (string_to_number(optarg, 0, 65535 - 60, &mssval) == -1)
-                       exit_error(PARAMETER_PROBLEM, "Bad TCPMSS value `%s'", optarg);
-
-               mssinfo->mss = mssval;
-               *flags = 1;
-               break;
-
-       case '2':
-               if (*flags)
-                       exit_error(PARAMETER_PROBLEM,
-                                  "TCPMSS target: Only one option may be specified");
-               mssinfo->mss = IP6T_TCPMSS_CLAMP_PMTU;
-               *flags = 1;
-               break;
-
-       default:
-               return 0;
-       }
-
-       return 1;
-}
-
-static void
-final_check(unsigned int flags)
-{
-       if (!flags)
-               exit_error(PARAMETER_PROBLEM,
-                          "TCPMSS target: At least one parameter is required");
-}
-
-/* Prints out the targinfo. */
-static void
-print(const void *ip6,
-      const struct xt_entry_target *target,
-      int numeric)
-{
-       const struct ip6t_tcpmss_info *mssinfo =
-               (const struct ip6t_tcpmss_info *)target->data;
-       if(mssinfo->mss == IP6T_TCPMSS_CLAMP_PMTU)
-               printf("TCPMSS clamp to PMTU ");
-       else
-               printf("TCPMSS set %u ", mssinfo->mss);
-}
-
-/* Saves the union ip6t_targinfo in parsable form to stdout. */
-static void
-save(const void *ip, const struct xt_entry_target *target)
-{
-       const struct ip6t_tcpmss_info *mssinfo =
-               (const struct ip6t_tcpmss_info *)target->data;
-
-       if(mssinfo->mss == IP6T_TCPMSS_CLAMP_PMTU)
-               printf("--clamp-mss-to-pmtu ");
-       else
-               printf("--set-mss %u ", mssinfo->mss);
-}
-
-static struct ip6tables_target mss = {
-       .next           = NULL,
-       .name           = "TCPMSS",
-       .version        = IPTABLES_VERSION,
-       .size           = IP6T_ALIGN(sizeof(struct ip6t_tcpmss_info)),
-       .userspacesize  = IP6T_ALIGN(sizeof(struct ip6t_tcpmss_info)),
-       .help           = &help,
-       .init           = &init,
-       .parse          = &parse,
-       .final_check    = &final_check,
-       .print          = &print,
-       .save           = &save,
-       .extra_opts     = opts
-};
-
-void _init(void)
-{
-       register_target6(&mss);
-}

diff --git a/extensions/libipt_TCPMSS.c b/extensions/libxt_TCPMSS.c
similarity index 55%
rename from extensions/libipt_TCPMSS.c
rename to extensions/libxt_TCPMSS.c
index 3f1855be68d1073834b80a9ffc016a2af59ebb47..d5b6c1f0ad613dc7ab5528bd90ba16702df00032 100644 (file)
--- a/extensions/libipt_TCPMSS.c
+++ b/extensions/libxt_TCPMSS.c
@@ -7,24 +7,33 @@
 #include <stdlib.h>
 #include <getopt.h>
 
-#include <iptables.h>
-#include <linux/netfilter_ipv4/ip_tables.h>
-#include <linux/netfilter_ipv4/ipt_TCPMSS.h>
+#include <xtables.h>
+#include <linux/netfilter/x_tables.h>
+#include <linux/netfilter/xt_TCPMSS.h>
 
 struct mssinfo {
        struct xt_entry_target t;
-       struct ipt_tcpmss_info mss;
+       struct xt_tcpmss_info mss;
 };
 
 /* Function which prints out usage message. */
-static void
-help(void)
+static void __help(int hdrsize)
 {
        printf(
 "TCPMSS target v%s mutually-exclusive options:\n"
 "  --set-mss value               explicitly set MSS option to specified value\n"
-"  --clamp-mss-to-pmtu           automatically clamp MSS value to (path_MTU - 40)\n",
-IPTABLES_VERSION);
+"  --clamp-mss-to-pmtu           automatically clamp MSS value to (path_MTU - %d)\n",
+IPTABLES_VERSION, hdrsize);
+}
+
+static void help(void)
+{
+       __help(40);
+}
+
+static void help6(void)
+{
+       __help(60);
 }
 
 static struct option opts[] = {
@@ -42,12 +51,13 @@ 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,
+__parse(int c, char **argv, int invert, unsigned int *flags,
       const void *entry,
-      struct xt_entry_target **target)
+      struct xt_entry_target **target,
+      int hdrsize)
 {
-       struct ipt_tcpmss_info *mssinfo
-               = (struct ipt_tcpmss_info *)(*target)->data;
+       struct xt_tcpmss_info *mssinfo
+               = (struct xt_tcpmss_info *)(*target)->data;
 
        switch (c) {
                unsigned int mssval;
@@ -56,7 +66,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (*flags)
                        exit_error(PARAMETER_PROBLEM,
                                   "TCPMSS target: Only one option may be specified");
-               if (string_to_number(optarg, 0, 65535 - 40, &mssval) == -1)
+               if (string_to_number(optarg, 0, 65535 - hdrsize, &mssval) == -1)
                        exit_error(PARAMETER_PROBLEM, "Bad TCPMSS value `%s'", optarg);
                
                mssinfo->mss = mssval;
@@ -67,7 +77,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (*flags)
                        exit_error(PARAMETER_PROBLEM,
                                   "TCPMSS target: Only one option may be specified");
-               mssinfo->mss = IPT_TCPMSS_CLAMP_PMTU;
+               mssinfo->mss = XT_TCPMSS_CLAMP_PMTU;
                *flags = 1;
                break;
 
@@ -78,6 +88,22 @@ parse(int c, char **argv, int invert, unsigned int *flags,
        return 1;
 }
 
+static int
+parse(int c, char **argv, int invert, unsigned int *flags,
+      const void *entry,
+      struct xt_entry_target **target)
+{
+       return __parse(c, argv, invert, flags, entry, target, 40);
+}
+
+static int
+parse6(int c, char **argv, int invert, unsigned int *flags,
+      const void *entry,
+      struct xt_entry_target **target)
+{
+       return __parse(c, argv, invert, flags, entry, target, 60);
+}
+
 static void
 final_check(unsigned int flags)
 {
@@ -92,9 +118,9 @@ print(const void *ip,
       const struct xt_entry_target *target,
       int numeric)
 {
-       const struct ipt_tcpmss_info *mssinfo =
-               (const struct ipt_tcpmss_info *)target->data;
-       if(mssinfo->mss == IPT_TCPMSS_CLAMP_PMTU)
+       const struct xt_tcpmss_info *mssinfo =
+               (const struct xt_tcpmss_info *)target->data;
+       if(mssinfo->mss == XT_TCPMSS_CLAMP_PMTU)
                printf("TCPMSS clamp to PMTU ");
        else
                printf("TCPMSS set %u ", mssinfo->mss);
@@ -104,21 +130,22 @@ print(const void *ip,
 static void
 save(const void *ip, const struct xt_entry_target *target)
 {
-       const struct ipt_tcpmss_info *mssinfo =
-               (const struct ipt_tcpmss_info *)target->data;
+       const struct xt_tcpmss_info *mssinfo =
+               (const struct xt_tcpmss_info *)target->data;
 
-       if(mssinfo->mss == IPT_TCPMSS_CLAMP_PMTU)
+       if(mssinfo->mss == XT_TCPMSS_CLAMP_PMTU)
                printf("--clamp-mss-to-pmtu ");
        else
                printf("--set-mss %u ", mssinfo->mss);
 }
 
-static struct iptables_target mss = {
+static struct xtables_target mss = {
        .next           = NULL,
+       .family         = AF_INET,
        .name           = "TCPMSS",
        .version        = IPTABLES_VERSION,
-       .size           = IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
-       .userspacesize  = IPT_ALIGN(sizeof(struct ipt_tcpmss_info)),
+       .size           = XT_ALIGN(sizeof(struct xt_tcpmss_info)),
+       .userspacesize  = XT_ALIGN(sizeof(struct xt_tcpmss_info)),
        .help           = &help,
        .init           = &init,
        .parse          = &parse,
@@ -128,7 +155,24 @@ static struct iptables_target mss = {
        .extra_opts     = opts
 };
 
+static struct xtables_target mss6 = {
+       .next           = NULL,
+       .family         = AF_INET6,
+       .name           = "TCPMSS",
+       .version        = IPTABLES_VERSION,
+       .size           = XT_ALIGN(sizeof(struct xt_tcpmss_info)),
+       .userspacesize  = XT_ALIGN(sizeof(struct xt_tcpmss_info)),
+       .help           = &help6,
+       .init           = &init,
+       .parse          = &parse6,
+       .final_check    = &final_check,
+       .print          = &print,
+       .save           = &save,
+       .extra_opts     = opts
+};
+
 void _init(void)
 {
-       register_target(&mss);
+       xtables_register_target(&mss);
+       xtables_register_target(&mss6);
 }

diff --git a/include/linux/netfilter/xt_TCPMSS.h b/include/linux/netfilter/xt_TCPMSS.h
new file mode 100644 (file)
index 0000000..53a292c
--- /dev/null
+++ b/include/linux/netfilter/xt_TCPMSS.h
@@ -0,0 +1,10 @@
+#ifndef _XT_TCPMSS_H
+#define _XT_TCPMSS_H
+
+struct xt_tcpmss_info {
+       u_int16_t mss;
+};
+
+#define XT_TCPMSS_CLAMP_PMTU 0xffff
+
+#endif /* _XT_TCPMSS_H */

diff --git a/include/linux/netfilter_ipv4/ipt_TCPMSS.h b/include/linux/netfilter_ipv4/ipt_TCPMSS.h
deleted file mode 100644 (file)
index aadb395..0000000
--- a/include/linux/netfilter_ipv4/ipt_TCPMSS.h
+++ /dev/null
@@ -1,10 +0,0 @@
-#ifndef _IPT_TCPMSS_H
-#define _IPT_TCPMSS_H
-
-struct ipt_tcpmss_info {
-       u_int16_t mss;
-};
-
-#define IPT_TCPMSS_CLAMP_PMTU 0xffff
-
-#endif /*_IPT_TCPMSS_H*/