--- ../patch-o-matic-ng/patchlets/ROUTE/iptables/extensions/libip6t_ROUTE.c.orig	2006-12-12 11:34:45.000000000 +0100
+++ ../patch-o-matic-ng/patchlets/ROUTE/iptables/extensions/libip6t_ROUTE.c	2008-03-14 08:48:04.000000000 +0100
@@ -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)),