PATCHES AGAIN...

@@ -100,36 +100,36 @@
 = { 'n', 's', 'd', 'p', 'j', 'v', 'x', 'i', 'o', '0', 'c'};
 
 static struct option original_opts[] = {
-	{ "append", 1, 0, 'A' },
-	{ "delete", 1, 0,  'D' },
-	{ "insert", 1, 0,  'I' },
-	{ "replace", 1, 0,  'R' },
-	{ "list", 2, 0,  'L' },
-	{ "flush", 2, 0,  'F' },
-	{ "zero", 2, 0,  'Z' },
-	{ "new-chain", 1, 0,  'N' },
-	{ "delete-chain", 2, 0,  'X' },
-	{ "rename-chain", 1, 0,  'E' },
-	{ "policy", 1, 0,  'P' },
-	{ "source", 1, 0, 's' },
-	{ "destination", 1, 0,  'd' },
-	{ "src", 1, 0,  's' }, /* synonym */
-	{ "dst", 1, 0,  'd' }, /* synonym */
-	{ "protocol", 1, 0,  'p' },
-	{ "in-interface", 1, 0, 'i' },
-	{ "jump", 1, 0, 'j' },
-	{ "table", 1, 0, 't' },
-	{ "match", 1, 0, 'm' },
-	{ "numeric", 0, 0, 'n' },
-	{ "out-interface", 1, 0, 'o' },
-	{ "verbose", 0, 0, 'v' },
-	{ "exact", 0, 0, 'x' },
-	{ "version", 0, 0, 'V' },
-	{ "help", 2, 0, 'h' },
-	{ "line-numbers", 0, 0, '0' },
-	{ "modprobe", 1, 0, 'M' },
-	{ "set-counters", 1, 0, 'c' },
-	{ 0 }
+	{ .name = "append", .has_arg = 1, .flag = 0, .val = 'A' },
+	{ .name = "delete", .has_arg = 1, .flag = 0, .val = 'D' },
+	{ .name = "insert", .has_arg = 1, .flag = 0, .val = 'I' },
+	{ .name = "replace", .has_arg = 1, .flag = 0, .val = 'R' },
+	{ .name = "list", .has_arg = 2, .flag = 0, .val = 'L' },
+	{ .name = "flush", .has_arg = 2, .flag = 0, .val = 'F' },
+	{ .name = "zero", .has_arg = 2, .flag = 0, .val = 'Z' },
+	{ .name = "new-chain", .has_arg = 1, .flag = 0, .val = 'N' },
+	{ .name = "delete-chain", .has_arg = 2, .flag = 0, .val = 'X' },
+	{ .name = "rename-chain", .has_arg = 1, .flag = 0, .val = 'E' },
+	{ .name = "policy", .has_arg = 1, .flag = 0, .val = 'P' },
+	{ .name = "source", .has_arg = 1, .flag = 0, .val = 's' },
+	{ .name = "destination", .has_arg = 1, .flag = 0, .val = 'd' },
+	{ .name = "src", .has_arg = 1, .flag = 0, .val = 's' }, /* synonym */
+	{ .name = "dst", .has_arg = 1, .flag = 0, .val = 'd' }, /* synonym */
+	{ .name = "protocol", .has_arg = 1, .flag = 0, .val = 'p' },
+	{ .name = "in-interface", .has_arg = 1, .flag = 0, .val = 'i' },
+	{ .name = "jump", .has_arg = 1, .flag = 0, .val = 'j' },
+	{ .name = "table", .has_arg = 1, .flag = 0, .val = 't' },
+	{ .name = "match", .has_arg = 1, .flag = 0, .val = 'm' },
+	{ .name = "numeric", .has_arg = 0, .flag = 0, .val = 'n' },
+	{ .name = "out-interface", .has_arg = 1, .flag = 0, .val = 'o' },
+	{ .name = "verbose", .has_arg = 0, .flag = 0, .val = 'v' },
+	{ .name = "exact", .has_arg = 0, .flag = 0, .val = 'x' },
+	{ .name = "version", .has_arg = 0, .flag = 0, .val = 'V' },
+	{ .name = "help", .has_arg = 2, .flag = 0, .val = 'h' },
+	{ .name = "line-numbers", .has_arg = 0, .flag = 0, .val = '0' },
+	{ .name = "modprobe", .has_arg = 1, .flag = 0, .val = 'M' },
+	{ .name = "set-counters", .has_arg = 1, .flag = 0, .val = 'c' },
+	{ .name = NULL }
 };
 
 /* we need this for ip6tables-restore. ip6tables-restore.c sets line to the

@@ -576,7 +576,7 @@
 
 	if (invert) {
 		unsigned int i;
-		for (i = 0; 1 << i != option; i++);
+		for (i = 0; (unsigned int)(1 << i) != option; i++);
 
 		if (!inverse_for_options[i])
 			exit_error(PARAMETER_PROBLEM,

@@ -29,14 +29,14 @@
 
 /* Keeping track of external matches and targets.  */
 static struct option options[] = {
-	{ "binary", 0, 0, 'b' },
-	{ "counters", 0, 0, 'c' },
-	{ "verbose", 0, 0, 'v' },
-	{ "test", 0, 0, 't' },
-	{ "help", 0, 0, 'h' },
-	{ "noflush", 0, 0, 'n'},
-	{ "modprobe", 1, 0, 'M'},
-	{ 0 }
+	{ .name = "binary", .has_arg = 0, .flag = 0, .val = 'b' },
+	{ .name = "counters", .has_arg = 0, .flag = 0, .val = 'c' },
+	{ .name = "verbose", .has_arg = 0, .flag = 0, .val = 'v' },
+	{ .name = "test", .has_arg = 0, .flag = 0, .val = 't' },
+	{ .name = "help", .has_arg = 0, .flag = 0, .val = 'h' },
+	{ .name = "noflush", .has_arg = 0, .flag = 0, .val = 'n'},
+	{ .name = "modprobe", .has_arg = 1, .flag = 0, .val = 'M'},
+	{ .name = NULL }
 };
 
 static void print_usage(const char *name, const char *version) __attribute__((noreturn));

@@ -96,7 +96,7 @@
  * returns true if argument added, false otherwise */
 static int add_argv(char *what) {
 	DEBUGP("add_argv: %s\n", what);
-	if (what && ((newargc + 1) < sizeof(newargv)/sizeof(char *))) {
+	if (what && (((unsigned int)(newargc + 1)) < sizeof(newargv)/sizeof(char *))) {
 		newargv[newargc] = strdup(what);
 		newargc++;
 		return 1;

@@ -24,11 +24,11 @@
 static int binary = 0, counters = 0;
 
 static struct option options[] = {
-	{ "binary", 0, 0, 'b' },
-	{ "counters", 0, 0, 'c' },
-	{ "dump", 0, 0, 'd' },
-	{ "table", 1, 0, 't' },
-	{ 0 }
+	{ .name = "binary", .has_arg = 0, .flag = 0, .val = 'b' },
+	{ .name = "counters", .has_arg = 0, .flag = 0, .val = 'c' },
+	{ .name = "dump", .has_arg = 0, .flag = 0, .val = 'd' },
+	{ .name = "table", .has_arg = 1, .flag = 0, .val = 't' },
+	{ .name = NULL }
 };
 
 

121 lines not on this page · raw message

114 lines not on this page · raw message

@@ -18,6 +18,8 @@
 #include <linux/netfilter_ipv4/ip_tables.h>
 #include <linux/netfilter_ipv4/ipt_ipv4options.h>
 
+#include <linux/version.h>
+
 MODULE_LICENSE("GPL");
 MODULE_AUTHOR("Fabrice Marie <[email protected]>");
 

@@ -32,7 +34,11 @@
       int *hotdrop)
 {
 	const struct ipt_ipv4options_info *info = matchinfo;   /* match info for rule */
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,22)
+	const struct iphdr *iph = ip_hdr(skb);
+#else
 	const struct iphdr *iph = skb->nh.iph;
+#endif
 	const struct ip_options *opt;
 
 	if (iph->ihl * 4 == sizeof(struct iphdr)) {

@@ -110,13 +116,17 @@
 	   const void *ip,
 	   const struct xt_match *match,
 	   void *matchinfo,
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,19)
 	   unsigned int matchsize,
+#endif
 	   unsigned int hook_mask)
 {
 	const struct ipt_ipv4options_info *info = matchinfo;   /* match info for rule */
 	/* Check the size */
+#if LINUX_VERSION_CODE < KERNEL_VERSION(2,6,17)
 	if (matchsize != IPT_ALIGN(sizeof(struct ipt_ipv4options_info)))
 		return 0;
+#endif
 	/* Now check the coherence of the data ... */
 	if (((info->options & IPT_IPV4OPTION_MATCH_ANY_OPT) == IPT_IPV4OPTION_MATCH_ANY_OPT) &&
 	    (((info->options & IPT_IPV4OPTION_DONT_MATCH_SRR) == IPT_IPV4OPTION_DONT_MATCH_SRR) ||

@@ -154,8 +164,15 @@
 	return 1;
 }
 
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+static struct xt_match ipv4options_match = { 
+#else
 static struct ipt_match ipv4options_match = { 
+#endif    
 	.name = "ipv4options",
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+	.family = AF_INET,
+#endif    
 	.match = match,
 	.matchsize = sizeof(struct ipt_ipv4options_info),
 	.checkentry = checkentry,

@@ -164,12 +181,20 @@
 
 static int __init init(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+	return xt_register_match(&ipv4options_match);
+#else
 	return ipt_register_match(&ipv4options_match);
+#endif    
 }
 
 static void __exit fini(void)
 {
+#if LINUX_VERSION_CODE >= KERNEL_VERSION(2,6,21)
+	xt_unregister_match(&ipv4options_match);
+#else
 	ipt_unregister_match(&ipv4options_match);
+#endif    
 }
 
 module_init(init);

97 lines not on this page · raw message

182 lines not on this page · raw message

153 lines not on this page · raw message

129 lines not on this page · raw message

@@ -116,7 +116,7 @@
 static char u32_buffer[65536];
 static DEFINE_SPINLOCK(u32_lock);
 
-static int
+static bool
 match(const struct sk_buff *skb,
       const struct net_device *in,
       const struct net_device *out,

@@ -124,7 +124,7 @@
       const void *matchinfo,
       int offset,
       unsigned int protoff,
-      int *hotdrop)
+      bool *hotdrop)
 {
 	const struct ipt_u32 *data = matchinfo;
 	int testind, i;

@@ -201,16 +201,13 @@
 	return 1;
 }
 
-static int
+static bool
 checkentry(const char *tablename,
            const void *ip,
            const struct xt_match *match,
            void *matchinfo,
-           unsigned int matchsize,
            unsigned int hook_mask)
 {
-	if (matchsize != IPT_ALIGN(sizeof(struct ipt_u32)))
-		return 0;
 	return 1;
 }
 

78 lines not on this page · raw message

@@ -26,15 +26,15 @@
 
 /* Keeping track of external matches and targets.  */
 static struct option options[] = {
-	{ "binary", 0, 0, 'b' },
-	{ "counters", 0, 0, 'c' },
-	{ "verbose", 0, 0, 'v' },
-	{ "test", 0, 0, 't' },
-	{ "help", 0, 0, 'h' },
-	{ "noflush", 0, 0, 'n'},
-	{ "modprobe", 1, 0, 'M'},
-	{ "table", 1, 0, 'T'},
-	{ 0 }
+	{ .name = "binary", .has_arg = 0, .flag = 0, .val = 'b' },
+	{ .name = "counters", .has_arg = 0, .flag = 0, .val = 'c' },
+	{ .name = "verbose", .has_arg = 0, .flag = 0, .val = 'v' },
+	{ .name = "test", .has_arg = 0, .flag = 0, .val = 't' },
+	{ .name = "help", .has_arg = 0, .flag = 0, .val = 'h' },
+	{ .name = "noflush", .has_arg = 0, .flag = 0, .val = 'n'},
+	{ .name = "modprobe", .has_arg = 1, .flag = 0, .val = 'M'},
+	{ .name = "table", .has_arg = 1, .flag = 0, .val = 'T'},
+	{ .name = NULL }
 };
 
 static void print_usage(const char *name, const char *version) __attribute__((noreturn));

@@ -95,7 +95,7 @@
  * returns true if argument added, false otherwise */
 static int add_argv(char *what) {
 	DEBUGP("add_argv: %s\n", what);
-	if (what && ((newargc + 1) < sizeof(newargv)/sizeof(char *))) {
+	if (what && (((unsigned int)(newargc + 1)) < sizeof(newargv)/sizeof(char *))) {
 		newargv[newargc] = strdup(what);
 		newargc++;
 		return 1;

@@ -23,11 +23,11 @@
 static int binary = 0, counters = 0;
 
 static struct option options[] = {
-	{ "binary", 0, 0, 'b' },
-	{ "counters", 0, 0, 'c' },
-	{ "dump", 0, 0, 'd' },
-	{ "table", 1, 0, 't' },
-	{ 0 }
+	{ .name = "binary", .has_arg = 0, .flag = 0, .val = 'b' },
+	{ .name = "counters", .has_arg = 0, .flag = 0, .val = 'c' },
+	{ .name = "dump", .has_arg = 0, .flag = 0, .val = 'd' },
+	{ .name = "table", .has_arg = 1, .flag = 0, .val = 't' },
+	{ .name = NULL }
 };
 
 #define IP_PARTS_NATIVE(n)			\

@@ -38,17 +38,17 @@
 }
 
 static struct option opts[] = {
-	{ "oif", 1, 0, '1' },
-	{ "iif", 1, 0, '2' },
-	{ "gw", 1, 0, '3' },
-	{ "continue", 0, 0, '4' },
-	{ "tee", 0, 0, '5' },
-	{ 0 }
+	{ .name = "oif", .has_arg = 1, .flag = 0, .val = '1' },
+	{ .name = "iif", .has_arg = 1, .flag = 0, .val = '2' },
+	{ .name = "gw", .has_arg = 1, .flag = 0, .val = '3' },
+	{ .name = "continue", .has_arg = 0, .flag = 0, .val = '4' },
+	{ .name = "tee", .has_arg = 0, .flag = 0, .val = '5' },
+	{ .name = NULL }
 };
 
 /* Initialize the target. */
 static void
-init(struct ip6t_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ip6t_route_target_info *route_info = 
 		(struct ip6t_route_target_info*)t->data;

@@ -73,8 +73,8 @@
    ate an option */
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const struct ip6t_entry *entry,
-      struct ip6t_entry_target **target)
+      const void *entry,
+      struct xt_entry_target **target)
 {
 	struct ip6t_route_target_info *route_info = 
 		(struct ip6t_route_target_info*)(*target)->data;

@@ -166,8 +166,8 @@
 
 /* Prints out the targinfo. */
 static void
-print(const struct ip6t_ip6 *ip,
-      const struct ip6t_entry_target *target,
+print(const void *ip,
+      const struct xt_entry_target *target,
       int numeric)
 {
 	const struct ip6t_route_target_info *route_info

@@ -195,8 +195,8 @@
 }
 
 
-static void save(const struct ip6t_ip6 *ip, 
-		 const struct ip6t_entry_target *target)
+static void save(const void *ip, 
+		 const struct xt_entry_target *target)
 {
 	const struct ip6t_route_target_info *route_info
 		= (const struct ip6t_route_target_info *)target->data;

@@ -220,7 +220,7 @@
 }
 
 
-static struct ip6tables_target route = { 
+static struct xtables_target route = { 
 	.name 		= "ROUTE",
 	.version	= IPTABLES_VERSION,
 	.size		= IP6T_ALIGN(sizeof(struct ip6t_route_target_info)),

@@ -30,14 +30,12 @@
 
 /* Initialize the target. */
 static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
     struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)t->data;
 
     accountinfo->table_nr = -1;
 
-    /* Can't cache this */
-    *nfcache |= NFC_UNKNOWN;
 }
 
 #define IPT_ACCOUNT_OPT_ADDR 0x01

@@ -47,8 +45,8 @@
    ate an option */
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const struct ipt_entry *entry,
-      struct ipt_entry_target **target)
+      const void *entry,
+      struct xt_entry_target **target)
 {
     struct ipt_acc_info *accountinfo = (struct ipt_acc_info *)(*target)->data;
     struct in_addr *addrs = NULL, mask;

@@ -65,7 +63,7 @@
                             opts[0].name);
 
         //loginfo->level = parse_level(optarg);
-        parse_hostnetworkmask(optarg, &addrs, &mask, &naddrs);
+        ipparse_hostnetworkmask(optarg, &addrs, &mask, &naddrs);
         
         if (naddrs > 1)
                 exit_error(PARAMETER_PROBLEM, "multiple IP addresses not allowed");

@@ -108,8 +106,8 @@
                     opts[0].name, opts[1].name);
 }
 
-static void print_it(const struct ipt_ip *ip,
-                     const struct ipt_entry_target *target, char do_prefix)
+static void print_it(const void *ip,
+                     const struct xt_entry_target *target, char do_prefix)
 {
     const struct ipt_acc_info *accountinfo
         = (const struct ipt_acc_info *)target->data;

@@ -123,12 +121,11 @@
 	printf("--");
     printf("%s ", opts[0].name);
     
-    a.s_addr = accountinfo->net_ip;	
-    printf("%s", addr_to_dotted(&a));
+    a.s_addr = accountinfo->net_ip;
+    printf("%s", ipaddr_to_numeric(&a));
     a.s_addr = accountinfo->net_mask;
-    printf("%s", mask_to_dotted(&a));
+    printf("%s", ipmask_to_numeric(&a));
 
-    printf(" ");
     if (do_prefix)
 	printf("--");
 

@@ -137,8 +134,8 @@
 
 /* Prints out the targinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_target *target,
+print(const void *ip,
+      const struct xt_entry_target *target,
       int numeric)
 {
     print_it (ip, target, 0);

@@ -146,13 +143,13 @@
 
 /* Saves the union ipt_targinfo in parsable form to stdout. */
 static void
-save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save(const void *ip, const struct xt_entry_target *target)
 {
     print_it(ip, target, 1);
 }
 
 static
-struct iptables_target account
+struct xtables_target account
 = {
     .next          = NULL,
     .name          = "ACCOUNT",

@@ -6,7 +6,6 @@
 #include <stddef.h>
 #include <getopt.h>
 #include <iptables.h>
-#include <linux/netfilter_ipv4/ip_conntrack.h>
 #include <linux/netfilter_ipv4/ipt_connlimit.h>
 
 /* Function which prints out usage message. */

@@ -21,18 +20,17 @@
 }
 
 static struct option opts[] = {
-	{ "connlimit-above", 1, 0, '1' },
-	{ "connlimit-mask",  1, 0, '2' },
-	{0}
+	{ .name = "connlimit-above", .has_arg = true, .flag = 0, .val = '1' },
+	{ .name = "connlimit-mask", .has_arg = true, .flag = 0, .val = '2' },
+	{ .name = 0 }
 };
 
 /* 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 struct ipt_entry *entry,
-      unsigned int *nfcache,
-      struct ipt_entry_match **match)
+      const void *entry,
+      struct xt_entry_match **match)
 {
 	struct ipt_connlimit_info *info = (struct ipt_connlimit_info*)(*match)->data;
 	int i;

@@ -94,8 +92,8 @@
 
 /* Prints out the matchinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_match *match,
+print(const void *ip,
+      const struct xt_entry_match *match,
       int numeric)
 {
 	struct ipt_connlimit_info *info = (struct ipt_connlimit_info*)match->data;

@@ -105,7 +103,7 @@
 }
 
 /* Saves the matchinfo in parsable form to stdout. */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const void *ip, const struct xt_entry_match *match)
 {
 	struct ipt_connlimit_info *info = (struct ipt_connlimit_info*)match->data;
 

@@ -19,7 +19,7 @@
 #define IPT_OR_MASK_USED     4
 
 struct ipmarkinfo {
-	struct ipt_entry_target t;
+	struct xt_entry_target t;
 	struct ipt_ipmark_target_info ipmark;
 };
 

@@ -37,15 +37,15 @@
 }
 
 static struct option opts[] = {
-	{ "addr", 1, 0, '1' },
-	{ "and-mask", 1, 0, '2' },
-	{ "or-mask", 1, 0, '3' },
-	{ 0 }
+	{ .name = "addr", .has_arg = 1, .flag = 0, .val = '1' },
+	{ .name = "and-mask", .has_arg = 1, .flag = 0, .val = '2' },
+	{ .name = "or-mask", .has_arg = 1, .flag = 0, .val = '3' },
+	{ .name = NULL }
 };
 
 /* Initialize the target. */
 static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ipt_ipmark_target_info *ipmarkinfo =
 		(struct ipt_ipmark_target_info *)t->data;

@@ -59,8 +59,8 @@
    ate an option */
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const struct ipt_entry *entry,
-      struct ipt_entry_target **target)
+      const void *entry,
+      struct xt_entry_target **target)
 {
 	struct ipt_ipmark_target_info *ipmarkinfo
 		= (struct ipt_ipmark_target_info *)(*target)->data;

@@ -116,8 +116,8 @@
 
 /* Prints out the targinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_target *target,
+print(const void *ip,
+      const struct xt_entry_target *target,
       int numeric)
 {
 	const struct ipt_ipmark_target_info *ipmarkinfo =

@@ -132,7 +132,7 @@
 
 /* Saves the union ipt_targinfo in parsable form to stdout. */
 static void
-save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save(const void *ip, const struct xt_entry_target *target)
 {
 	const struct ipt_ipmark_target_info *ipmarkinfo =
 		(const struct ipt_ipmark_target_info *)target->data;

@@ -147,7 +147,7 @@
 	  printf("--or-mask 0x%lx ", ipmarkinfo->ormask);
 }
 
-static struct iptables_target ipmark = { 
+static struct xtables_target ipmark = { 
 	.next		= NULL,
 	.name		= "IPMARK",
 	.version	= IPTABLES_VERSION,

85 lines not on this page · raw message

@@ -25,22 +25,22 @@
 }
 
 static struct option opts[] = {
-	{ "ssrr", 0, 0, '1' },
-	{ "lsrr", 0, 0, '2' },
-	{ "no-srr", 0, 0, '3'},
-	{ "rr", 0, 0, '4'},
-	{ "ts", 0, 0, '5'},
-	{ "ra", 0, 0, '6'},
-	{ "any-opt", 0, 0, '7'},
-	{0}
+	{ .name = "ssrr", .has_arg = 0, .flag = 0, .val = '1' },
+	{ .name = "lsrr", .has_arg = 0, .flag = 0, .val = '2' },
+	{ .name = "no-srr", .has_arg = 0, .flag = 0, .val = '3'},
+	{ .name = "rr", .has_arg = 0, .flag = 0, .val = '4'},
+	{ .name = "ts", .has_arg = 0, .flag = 0, .val = '5'},
+	{ .name = "ra", .has_arg = 0, .flag = 0, .val = '6'},
+	{ .name = "any-opt", .has_arg = 0, .flag = 0, .val = '7'},
+	{ .name = NULL }
 };
 
 /* 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 struct ipt_entry *entry,
-      struct ipt_entry_match **match)
+      const void *entry,
+      struct xt_entry_match **match)
 {
 	struct ipt_ipv4options_info *info = (struct ipt_ipv4options_info *)(*match)->data;
 

@@ -225,8 +225,8 @@
 
 /* Prints out the matchinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_match *match,
+print(const void *ip,
+      const struct xt_entry_match *match,
       int numeric)
 {
 	struct ipt_ipv4options_info *info = ((struct ipt_ipv4options_info *)match->data);

@@ -260,7 +260,7 @@
 
 /* Saves the data in parsable form to stdout. */
 static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const void *ip, const struct xt_entry_match *match)
 {
 	struct ipt_ipv4options_info *info = ((struct ipt_ipv4options_info *)match->data);
 

@@ -290,7 +290,7 @@
 	printf(" ");
 }
 
-static struct iptables_match ipv4options_struct = { 
+static struct xtables_match ipv4options_struct = { 
 	.next		= NULL,
 	.name		= "ipv4options",
 	.version	= IPTABLES_VERSION,

@@ -20,15 +20,15 @@
 }
 
 static struct option opts[] = {
-	{ 0 }
+	{ .name = NULL }
 };
 
 /* 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 struct ipt_entry *entry,
-      struct ipt_entry_target **target)
+      const void *entry,
+      struct xt_entry_target **target)
 {
 	return 0;
 }

@@ -40,8 +40,8 @@
 
 /* Prints out the targinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_target *target,
+print(const void *ip,
+      const struct xt_entry_target *target,
       int numeric)
 {
 	/* nothing to print, we don't take option... */

@@ -49,12 +49,12 @@
 
 /* Saves the stuff in parsable form to stdout. */
 static void
-save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save(const void *ip, const struct xt_entry_target *target)
 {
 	/* nothing to print, we don't take option... */
 }
 
-static struct iptables_target IPV4OPTSSTRIP = { 
+static struct xtables_target IPV4OPTSSTRIP = { 
 	.next		= NULL,
 	.name		= "IPV4OPTSSTRIP",
 	.version	= IPTABLES_VERSION,

@@ -39,17 +39,17 @@
 }
 
 static struct option opts[] = {
-	{ "oif", 1, 0, '1' },
-	{ "iif", 1, 0, '2' },
-	{ "gw", 1, 0, '3' },
-	{ "continue", 0, 0, '4' },
-	{ "tee", 0, 0, '5' },
-	{ 0 }
+	{ .name = "oif", .has_arg = 1, .flag = 0, .val = '1' },
+	{ .name = "iif", .has_arg = 1, .flag = 0, .val = '2' },
+	{ .name = "gw", .has_arg = 1, .flag = 0, .val = '3' },
+	{ .name = "continue", .has_arg = 0, .flag = 0, .val = '4' },
+	{ .name = "tee", .has_arg = 0, .flag = 0, .val = '5' },
+	{ .name = NULL }
 };
 
 /* Initialize the target. */
 static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t)
 {
 	struct ipt_route_target_info *route_info = 
 		(struct ipt_route_target_info*)t->data;

@@ -71,8 +71,8 @@
    ate an option */
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const struct ipt_entry *entry,
-      struct ipt_entry_target **target)
+      const void *entry,
+      struct xt_entry_target **target)
 {
 	struct ipt_route_target_info *route_info = 
 		(struct ipt_route_target_info*)(*target)->data;

@@ -189,8 +189,8 @@
 
 /* Prints out the targinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_target *target,
+print(const void *ip,
+      const struct xt_entry_target *target,
       int numeric)
 {
 	const struct ipt_route_target_info *route_info

@@ -218,8 +218,8 @@
 }
 
 
-static void save(const struct ipt_ip *ip, 
-		 const struct ipt_entry_target *target)
+static void save(const void *ip, 
+		 const struct xt_entry_target *target)
 {
 	const struct ipt_route_target_info *route_info
 		= (const struct ipt_route_target_info *)target->data;

@@ -35,9 +35,9 @@
 }
 
 static const struct option SET_opts[] = {
-	{"add-set",   1, 0, '1'},
-	{"del-set",   1, 0, '2'},
-	{0}
+	{ .name = "add-set", .has_arg = 1, .flag = 0, .val = '1'},
+	{ .name = "del-set", .has_arg = 1, .flag = 0, .val = '2'},
+	{ .name = NULL }
 };
 
 /* Initialize the target. */

@@ -35,9 +35,9 @@
 }
 
 static const struct option SET_opts[] = {
-	{"add-set",   1, 0, '1'},
-	{"del-set",   1, 0, '2'},
-	{0}
+	{ .name = "add-set", .has_arg = 1, .flag = 0, .val = '1'},
+	{ .name = "del-set", .has_arg = 1, .flag = 0, .val = '2'},
+	{ .name = NULL }
 };
 
 /* Initialize the target. */

@@ -67,7 +67,7 @@
 		exit_error(OTHER_PROBLEM,
 			   "Incorrect return size from kernel during ipset lookup, "
 			   "(want %ld, got %ld)\n",
-			   sizeof(struct ip_set_req_get_set), size);
+			   (long int)sizeof(struct ip_set_req_get_set), (long int)size);
 	if (req.set.index == IP_SET_INVALID_ID)
 		exit_error(PARAMETER_PROBLEM,
 			   "Set %s doesn't exist.\n", setname);

@@ -93,7 +93,7 @@
 		exit_error(OTHER_PROBLEM,
 			   "Incorrect return size from kernel during ipset lookup, "
 			   "(want %ld, got %ld)\n",
-			   sizeof(struct ip_set_req_get_set), size);
+			   (long int)sizeof(struct ip_set_req_get_set), (long int)size);
 	if (req.set.name[0] == '\0')
 		exit_error(PARAMETER_PROBLEM,
 			   "Set id %i in kernel doesn't exist.\n", index);

@@ -12,13 +12,13 @@
 }
 
 static struct option opts[] = {
-	{ 0 }
+	{ .name = 0 }
 };
 
 static int
 parse(int c, char **argv, int invert, unsigned int *flags,
-      const struct ipt_entry *entry,
-      struct ipt_entry_target **target)
+      const void *entry,
+      struct xt_entry_target **target)
 {
 	return 0;
 }

@@ -28,13 +28,13 @@
 }
 
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_target *target,
+print(const void *ip,
+      const struct xt_entry_target *target,
       int numeric)
 {
 }
 
-static void save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+static void save(const void *ip, const struct xt_entry_target *target)
 {
 }
 

118 lines not on this page · raw message

@@ -33,8 +33,8 @@
 
 /* defined in /usr/include/getopt.h maybe in man getopt */
 static struct option opts[] = {
-	{ "u32", 1, 0, '1' },
-	{ 0 }
+	{ .name = "u32", .has_arg = 1, .flag = 0, .val = '1' },
+	{ .name = NULL }
 };
 
 /* shared printing code */

@@ -92,8 +92,8 @@
 /* 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 struct ipt_entry *entry,
-      struct ipt_entry_match **match)
+      const void *entry,
+      struct xt_entry_match **match)
 {
 	struct ipt_u32 *data = (struct ipt_u32 *)(*match)->data;
 	char *arg = argv[optind-1]; /* the argument string */

@@ -227,8 +227,8 @@
 
 /* Prints out the matchinfo. */
 static void
-print(const struct ipt_ip *ip,
-      const struct ipt_entry_match *match,
+print(const void *ip,
+      const struct xt_entry_match *match,
       int numeric)
 {
 	printf("u32 ");

@@ -236,7 +236,7 @@
 }
 
 /* Saves the union ipt_matchinfo in parsable form to stdout. */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const void *ip, const struct xt_entry_match *match)
 {
 	printf("--u32 ");
 	print_u32((struct ipt_u32 *)match->data);

@@ -918,7 +918,7 @@
 			if (t->verdict < 0) {
 				DEBUGP_C("standard, verdict=%d\n", t->verdict);
 				r->type = IPTCC_R_STANDARD;
-			} else if (t->verdict == r->offset+e->next_offset) {
+			} else if ((unsigned int)(t->verdict) == r->offset+e->next_offset) {
 				DEBUGP_C("fallthrough\n");
 				r->type = IPTCC_R_FALLTHROUGH;
 			} else {

@@ -86,9 +86,9 @@
 }
 
 static const struct option CHAOS_opts[] = {
-	{"delude", 0, NULL, 'd'},
-	{"tarpit", 0, NULL, 't'},
-	{NULL},
+	{ .name = "delude", .has_arg = 0, .flag = NULL, .val = 'd'},
+	{ .name = "tarpit", .has_arg = 0, .flag = NULL, .val = 't'},
+	{ .name = NULL }
 };
 
 static struct xtables_target CHAOS_reg = {

@@ -46,11 +46,11 @@
 }
 
 static struct option geoip_opts[] = {
-   {  "dst-cc",  1, 0, '2'  }, /* Alias for --destination-country */
-   {  "destination-country",   1, 0, '2'  },
-   {  "src-cc",  1, 0, '1'  }, /* Alias for --source-country */
-   {  "source-country",  1, 0, '1'  },
-   {  0  },
+   { .name = "dst-cc", .has_arg = 1, .flag = 0, .val = '2'  }, /* Alias for --destination-country */
+   { .name = "destination-country", .has_arg = 1, .flag = 0, .val = '2'  },
+   { .name = "src-cc", .has_arg = 1, .flag = 0, .val = '1'  }, /* Alias for --source-country */
+   { .name = "source-country", .has_arg = 1, .flag = 0, .val = '1'  },
+   { .name = NULL  }
 };
 
 /* NOT IMPLEMENTED YET

@@ -29,15 +29,13 @@
 	return;
 }
 
-static void portscan_mtinit(struct xt_entry_match *match, unsigned int *nfcache)
+static void portscan_mtinit(struct xt_entry_match *match)
 {
-	/* Cannot cache this */
-	*nfcache |= NFC_UNKNOWN;
 	return;
 }
 
 static int portscan_parse(int c, char **argv, int invert, unsigned int *flags,
-    const void *entry, unsigned int *nfcache, struct xt_entry_match **match)
+    const void *entry, struct xt_entry_match **match)
 {
 	struct xt_portscan_info *info = (void *)((*match)->data);
 

@@ -100,11 +98,11 @@
 }
 
 static const struct option portscan_opts[] = {
-	{"stealth", 0, NULL, 'x'},
-	{"synscan", 0, NULL, 's'},
-	{"cnscan",  0, NULL, 'c'},
-	{"grscan",  0, NULL, 'g'},
-	{NULL},
+	{ .name = "stealth", .has_arg = 0, .flag = NULL, .val = 'x'},
+	{ .name = "synscan", .has_arg = 0, .flag = NULL, .val = 's'},
+	{ .name = "cnscan",  .has_arg = 0, .flag = NULL, .val = 'c'},
+	{ .name = "grscan",  .has_arg = 0, .flag = NULL, .val = 'g'},
+	{ .name = NULL }
 };
 
 static struct xtables_match portscan_reg = {

@@ -152,7 +152,7 @@
 		exit_error(PARAMETER_PROBLEM, "RATEEST: no ewmalog specified");
 
 	for (info->interval = 0; info->interval <= 5; info->interval++) {
-		if (interval <= (1 << info->interval) * (TIME_UNITS_PER_SEC / 4))
+		if (interval <= (unsigned int)(1 << info->interval) * (TIME_UNITS_PER_SEC / 4))
 			break;
 	}
 

@@ -388,7 +388,7 @@
 		printf("0x%04X", chunknum);
 	}
 	else {
-		int i;
+		unsigned int i;
 
 		for (i = 0; i < ELEMCOUNT(sctp_chunk_names); i++) {
 			if (sctp_chunk_names[i].chunk_type == chunknum)

@@ -44,16 +44,17 @@
 
 /* CHAOS functions */
 static void xt_chaos_total(const struct xt_chaos_info *info,
-    struct sk_buff **pskb, const struct net_device *in,
+    struct sk_buff *pskb, const struct net_device *in,
     const struct net_device *out, unsigned int hooknum)
 {
-	const struct iphdr *iph = ip_hdr(*pskb);
+	const struct iphdr *iph = ip_hdr(pskb);
 	const int protoff       = 4 * iph->ihl;
 	const int offset        = ntohs(iph->frag_off) & IP_OFFSET;
 	const struct xt_target *destiny;
-	int hotdrop = false, ret;
+	bool hotdrop = false;
+	int ret;
 
-	ret = xm_tcp->match(*pskb, in, out, xm_tcp, &tcp_params,
+	ret = xm_tcp->match(pskb, in, out, xm_tcp, &tcp_params,
 	                    offset, protoff, &hotdrop);
 	if (!ret || hotdrop || (unsigned int)net_random() > delude_percentage)
 		return;

@@ -63,7 +64,7 @@
 	return;
 }
 
-static unsigned int xt_chaos_target(struct sk_buff **pskb,
+static unsigned int xt_chaos_target(struct sk_buff *pskb,
     const struct net_device *in, const struct net_device *out,
     unsigned int hooknum, const struct xt_target *target, const void *targinfo)
 {

@@ -76,7 +77,7 @@
 	 * -A chaos -j DROP;
 	 */
 	const struct xt_chaos_info *info = targinfo;
-	const struct iphdr *iph = ip_hdr(*pskb);
+	const struct iphdr *iph = ip_hdr(pskb);
 
 	if ((unsigned int)net_random() <= reject_percentage)
 		return xt_reject->target(pskb, in, out, hooknum, target,

@@ -90,7 +91,7 @@
 	return NF_DROP;
 }
 
-static int xt_chaos_checkentry(const char *tablename, const void *entry,
+static bool xt_chaos_checkentry(const char *tablename, const void *entry,
     const struct xt_target *target, void *targinfo, unsigned int hook_mask)
 {
 	const struct xt_chaos_info *info = targinfo;

@@ -131,7 +131,7 @@
 #endif
 		addr_type = RTN_LOCAL;
 
-	if (ip_route_me_harder(&nskb, addr_type))
+	if (ip_route_me_harder(nskb, addr_type))
 		goto free_nskb;
 
 	nskb->ip_summed = CHECKSUM_NONE;

@@ -157,14 +157,14 @@
 	kfree_skb(nskb);
 }
 
-static unsigned int xt_delude_target(struct sk_buff **pskb,
+static unsigned int xt_delude_target(struct sk_buff *pskb,
     const struct net_device *in, const struct net_device *out,
     unsigned int hooknum, const struct xt_target *target, const void *targinfo)
 {
 	/* WARNING: This code causes reentry within iptables.
 	   This means that the iptables jump stack is now crap.  We
 	   must return an absolute verdict. --RR */
-	send_reset(*pskb, hooknum);
+	send_reset(pskb, hooknum);
 	return NF_DROP;
 }
 

@@ -18,6 +18,7 @@
 #include <linux/netfilter/x_tables.h>
 #include <linux/netfilter/xt_tcpudp.h>
 #include <net/netfilter/nf_nat_rule.h>
+#include <net/net_namespace.h>
 #include "xt_portscan.h"
 #define PFX KBUILD_MODNAME ": "
 

@@ -170,10 +171,10 @@
 	return mark;
 }
 
-static int xt_portscan_match(const struct sk_buff *skb,
+static bool xt_portscan_match(const struct sk_buff *skb,
     const struct net_device *in, const struct net_device *out,
     const struct xt_match *match, const void *matchinfo, int offset,
-    unsigned int protoff, int *hotdrop)
+    unsigned int protoff, bool *hotdrop)
 {
 	const struct xt_portscan_info *info = matchinfo;
 	enum ip_conntrack_info ctstate;

@@ -206,7 +207,7 @@
 		unsigned int n;
 
 		n = xt_portscan_full(ctdata->mark & connmark_mask, ctstate,
-		    in == &loopback_dev, tcph,
+		    in == init_net.loopback_dev, tcph,
 		    skb->len - protoff - 4 * tcph->doff);
 
 		ctdata->mark = (ctdata->mark & ~connmark_mask) | n;

@@ -219,7 +220,7 @@
 	       (info->match_gr && ctdata->mark == mark_grscan);
 }
 
-static int xt_portscan_checkentry(const char *tablename, const void *entry,
+static bool xt_portscan_checkentry(const char *tablename, const void *entry,
     const struct xt_match *match, void *matchinfo, unsigned int hook_mask)
 {
 	const struct xt_portscan_info *info = matchinfo;

@@ -58,28 +58,28 @@
 
 #define SCTP_CHUNKMAP_RESET(chunkmap) 				\
 	do {							\
-		int i; 						\
+		unsigned int i; 						\
 		for (i = 0; i < ELEMCOUNT(chunkmap); i++)	\
 			chunkmap[i] = 0;			\
 	} while (0)
 
 #define SCTP_CHUNKMAP_SET_ALL(chunkmap) 			\
 	do {							\
-		int i; 						\
+		unsigned int i; 						\
 		for (i = 0; i < ELEMCOUNT(chunkmap); i++) 	\
 			chunkmap[i] = ~0;			\
 	} while (0)
 
 #define SCTP_CHUNKMAP_COPY(destmap, srcmap) 			\
 	do {							\
-		int i; 						\
+		unsigned int i; 						\
 		for (i = 0; i < ELEMCOUNT(chunkmap); i++) 	\
 			destmap[i] = srcmap[i];			\
 	} while (0)
 
 #define SCTP_CHUNKMAP_IS_CLEAR(chunkmap) 		\
 ({							\
-	int i; 						\
+	unsigned int i; 						\
 	int flag = 1;					\
 	for (i = 0; i < ELEMCOUNT(chunkmap); i++) {	\
 		if (chunkmap[i]) {			\

@@ -92,10 +92,10 @@
 
 #define SCTP_CHUNKMAP_IS_ALL_SET(chunkmap) 		\
 ({							\
-	int i; 						\
+	unsigned int i; 						\
 	int flag = 1;					\
 	for (i = 0; i < ELEMCOUNT(chunkmap); i++) {	\
-		if (chunkmap[i] != ~0) {		\
+		if (chunkmap[i] != (unsigned int)(~0)) {		\
 			flag = 0;			\
 				break;			\
 		}					\