iptables-1.3.2-20050720

[iptables.git] / extensions / libip6t_tcp.c

diff --git a/extensions/libip6t_tcp.c b/extensions/libip6t_tcp.c
index a1a912c..a049128 100644 (file)
--- a/extensions/libip6t_tcp.c
+++ b/extensions/libip6t_tcp.c
@@ -187,7 +187,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (invert)
                        tcpinfo->invflags |= IP6T_TCP_INV_SRCPT;
                *flags |= TCP_SRC_PORTS;
-               *nfcache |= NFC_IP6_SRC_PT;
                break;
 
        case '2':
@@ -199,7 +198,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (invert)
                        tcpinfo->invflags |= IP6T_TCP_INV_DSTPT;
                *flags |= TCP_DST_PORTS;
-               *nfcache |= NFC_IP6_DST_PT;
                break;
 
        case '3':
@@ -209,7 +207,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                                   " allowed");
                parse_tcp_flags(tcpinfo, "SYN,RST,ACK", "SYN", invert);
                *flags |= TCP_FLAGS;
-               *nfcache |= NFC_IP6_TCPFLAGS;
                break;
 
        case '4':
@@ -228,7 +225,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                                invert);
                optind++;
                *flags |= TCP_FLAGS;
-               *nfcache |= NFC_IP6_TCPFLAGS;
                break;
 
        case '5':
@@ -240,7 +236,6 @@ parse(int c, char **argv, int invert, unsigned int *flags,
                if (invert)
                        tcpinfo->invflags |= IP6T_TCP_INV_OPTION;
                *flags |= TCP_OPTION;
-               *nfcache |= NFC_IP6_PROTO_UNKNOWN;
                break;
 
        default:
@@ -424,20 +419,19 @@ static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match
        }
 }
 
-static
-struct ip6tables_match tcp
-= { NULL,
-    "tcp",
-    IPTABLES_VERSION,
-    IP6T_ALIGN(sizeof(struct ip6t_tcp)),
-    IP6T_ALIGN(sizeof(struct ip6t_tcp)),
-    &help,
-    &init,
-    &parse,
-    &final_check,
-    &print,
-    &save,
-    opts };
+static struct ip6tables_match tcp = {
+       .name           = "tcp",
+       .version        = IPTABLES_VERSION,
+       .size           = IP6T_ALIGN(sizeof(struct ip6t_tcp)),
+       .userspacesize  = IP6T_ALIGN(sizeof(struct ip6t_tcp)),
+       .help           = &help,
+       .init           = &init,
+       .parse          = &parse,
+       .final_check    = &final_check,
+       .print          = &print,
+       .save           = &save,
+       .extra_opts     = opts,
+};
 
 void
 _init(void)