--- ../patch-o-matic-ng/patchlets/u32/iptables/extensions/libipt_u32.c.orig 2008-03-10 17:03:26.000000000 +0100 +++ ../patch-o-matic-ng/patchlets/u32/iptables/extensions/libipt_u32.c 2008-03-10 17:14:57.000000000 +0100 @@ -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);