--- ../patch-o-matic-ng/patchlets/ipp2p/iptables/extensions/libipt_ipp2p.c.orig	2006-03-29 10:59:21.000000000 +0200
+++ ../patch-o-matic-ng/patchlets/ipp2p/iptables/extensions/libipt_ipp2p.c	2008-03-13 23:49:28.000000000 +0100
@@ -44,32 +44,29 @@
 }
 
 static struct option opts[] = {
-        { "ipp2p", 0, 0, '1' },
-        { "edk", 0, 0, '2' },	
-	{ "dc", 0, 0, '7' },
-	{ "gnu", 0, 0, '9' },
-	{ "kazaa", 0, 0, 'a' },
-	{ "bit", 0, 0, 'b' },
-	{ "apple", 0, 0, 'c' },	
-	{ "soul", 0, 0, 'd' },	
-	{ "winmx", 0, 0, 'e' },	
-	{ "ares", 0, 0, 'f' },
-	{ "mute", 0, 0, 'g' },
-	{ "waste", 0, 0, 'h' },
-	{ "xdcc", 0, 0, 'i' },
-	{ "debug", 0, 0, 'j' },
-        {0}
+	{ .name = "ipp2p", .has_arg = 0, .flag = 0, .val = '1' },
+	{ .name = "edk", .has_arg = 0, .flag = 0, .val = '2' },
+	{ .name = "dc", .has_arg = 0, .flag = 0, .val = '7' },
+	{ .name = "gnu", .has_arg = 0, .flag = 0, .val = '9' },
+	{ .name = "kazaa", .has_arg = 0, .flag = 0, .val = 'a' },
+	{ .name = "bit", .has_arg = 0, .flag = 0, .val = 'b' },
+	{ .name = "apple", .has_arg = 0, .flag = 0, .val = 'c' },
+	{ .name = "soul", .has_arg = 0, .flag = 0, .val = 'd' },
+	{ .name = "winmx", .has_arg = 0, .flag = 0, .val = 'e' },
+	{ .name = "ares", .has_arg = 0, .flag = 0, .val = 'f' },
+	{ .name = "mute", .has_arg = 0, .flag = 0, .val = 'g' },
+	{ .name = "waste", .has_arg = 0, .flag = 0, .val = 'h' },
+	{ .name = "xdcc", .has_arg = 0, .flag = 0, .val = 'i' },
+	{ .name = "debug", .has_arg = 0, .flag = 0, .val = 'j' },
+	{ .name = NULL }
 };
 
-	
 
 static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m)
 {
     struct ipt_p2p_info *info = (struct ipt_p2p_info *)m->data;
 
-    *nfcache |= NFC_UNKNOWN;
-
     /*init the module with default values*/
     info->cmd = 0;
     info->debug = 0;
@@ -79,9 +76,8 @@
 
 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_p2p_info *info = (struct ipt_p2p_info *)(*match)->data;
     
@@ -315,8 +311,8 @@
 
 
 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_p2p_info *info = (struct ipt_p2p_info *)match->data;
@@ -347,7 +343,7 @@
 
 
 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_p2p_info *info = (struct ipt_p2p_info *)match->data;
     
@@ -376,7 +372,7 @@
 
 
 static 
-struct iptables_match ipp2p= 
+struct xtables_match ipp2p= 
 { 
     .next           = NULL,
     .name           = "ipp2p",