--- ../patch-o-matic-ng/patchlets/ROUTE/iptables/extensions/libipt_ROUTE.c.orig 2006-12-12 11:34:45.000000000 +0100 +++ ../patch-o-matic-ng/patchlets/ROUTE/iptables/extensions/libipt_ROUTE.c 2008-03-10 15:04:02.000000000 +0100 @@ -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;