[netfilter-cvslog] r6923 - trunk/iptables/extensions
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Tue Jul 24 07:57:29 CEST 2007
Author: yasuyuki at netfilter.org
Date: 2007-07-24 07:57:28 +0200 (Tue, 24 Jul 2007)
New Revision: 6923
Modified:
trunk/iptables/extensions/libipt_CLASSIFY.c
trunk/iptables/extensions/libipt_CLUSTERIP.c
trunk/iptables/extensions/libipt_CONNMARK.c
trunk/iptables/extensions/libipt_CONNSECMARK.c
trunk/iptables/extensions/libipt_DNAT.c
trunk/iptables/extensions/libipt_DSCP.c
trunk/iptables/extensions/libipt_ECN.c
trunk/iptables/extensions/libipt_LOG.c
trunk/iptables/extensions/libipt_MARK.c
trunk/iptables/extensions/libipt_MASQUERADE.c
trunk/iptables/extensions/libipt_MIRROR.c
trunk/iptables/extensions/libipt_NETMAP.c
trunk/iptables/extensions/libipt_NFQUEUE.c
trunk/iptables/extensions/libipt_NOTRACK.c
trunk/iptables/extensions/libipt_REDIRECT.c
trunk/iptables/extensions/libipt_REJECT.c
trunk/iptables/extensions/libipt_SAME.c
trunk/iptables/extensions/libipt_SECMARK.c
trunk/iptables/extensions/libipt_SET.c
trunk/iptables/extensions/libipt_SNAT.c
trunk/iptables/extensions/libipt_TCPMSS.c
trunk/iptables/extensions/libipt_TOS.c
trunk/iptables/extensions/libipt_TTL.c
trunk/iptables/extensions/libipt_ULOG.c
trunk/iptables/extensions/libipt_addrtype.c
trunk/iptables/extensions/libipt_ah.c
trunk/iptables/extensions/libipt_comment.c
trunk/iptables/extensions/libipt_condition.c
trunk/iptables/extensions/libipt_connbytes.c
trunk/iptables/extensions/libipt_connmark.c
trunk/iptables/extensions/libipt_connrate.c
trunk/iptables/extensions/libipt_conntrack.c
trunk/iptables/extensions/libipt_dccp.c
trunk/iptables/extensions/libipt_dscp.c
trunk/iptables/extensions/libipt_ecn.c
trunk/iptables/extensions/libipt_esp.c
trunk/iptables/extensions/libipt_hashlimit.c
trunk/iptables/extensions/libipt_helper.c
trunk/iptables/extensions/libipt_icmp.c
trunk/iptables/extensions/libipt_iprange.c
trunk/iptables/extensions/libipt_length.c
trunk/iptables/extensions/libipt_limit.c
trunk/iptables/extensions/libipt_mac.c
trunk/iptables/extensions/libipt_mark.c
trunk/iptables/extensions/libipt_multiport.c
trunk/iptables/extensions/libipt_owner.c
trunk/iptables/extensions/libipt_physdev.c
trunk/iptables/extensions/libipt_pkttype.c
trunk/iptables/extensions/libipt_policy.c
trunk/iptables/extensions/libipt_quota.c
trunk/iptables/extensions/libipt_realm.c
trunk/iptables/extensions/libipt_recent.c
trunk/iptables/extensions/libipt_sctp.c
trunk/iptables/extensions/libipt_set.c
trunk/iptables/extensions/libipt_standard.c
trunk/iptables/extensions/libipt_state.c
trunk/iptables/extensions/libipt_statistic.c
trunk/iptables/extensions/libipt_string.c
trunk/iptables/extensions/libipt_tcp.c
trunk/iptables/extensions/libipt_tcpmss.c
trunk/iptables/extensions/libipt_tos.c
trunk/iptables/extensions/libipt_ttl.c
trunk/iptables/extensions/libipt_udp.c
trunk/iptables/extensions/libipt_unclean.c
Log:
Replaces ipt_entry_* with xt_entry_* in matches/targets
Modified: trunk/iptables/extensions/libipt_CLASSIFY.c
===================================================================
--- trunk/iptables/extensions/libipt_CLASSIFY.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_CLASSIFY.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -28,7 +28,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -48,7 +48,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_classify_target_info *clinfo
= (struct ipt_classify_target_info *)(*target)->data;
@@ -88,7 +88,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_classify_target_info *clinfo =
@@ -99,7 +99,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_classify_target_info *clinfo =
(const struct ipt_classify_target_info *)target->data;
Modified: trunk/iptables/extensions/libipt_CLUSTERIP.c
===================================================================
--- trunk/iptables/extensions/libipt_CLUSTERIP.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_CLUSTERIP.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -55,7 +55,7 @@
};
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -86,7 +86,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_clusterip_tgt_info *cipinfo
= (struct ipt_clusterip_tgt_info *)(*target)->data;
@@ -208,7 +208,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_clusterip_tgt_info *cipinfo =
@@ -229,7 +229,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_clusterip_tgt_info *cipinfo =
(const struct ipt_clusterip_tgt_info *)target->data;
Modified: trunk/iptables/extensions/libipt_CONNMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_CONNMARK.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_CONNMARK.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -30,7 +30,7 @@
#if 0
struct markinfo {
- struct ipt_entry_target t;
+ struct xt_entry_target t;
struct ipt_connmark_target_info mark;
};
#endif
@@ -58,7 +58,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -67,7 +67,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_connmark_target_info *markinfo
= (struct ipt_connmark_target_info *)(*target)->data;
@@ -145,7 +145,7 @@
/* Prints out the target info. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_connmark_target_info *markinfo =
@@ -174,7 +174,7 @@
/* Saves the target into in parsable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_connmark_target_info *markinfo =
(const struct ipt_connmark_target_info *)target->data;
Modified: trunk/iptables/extensions/libipt_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_CONNSECMARK.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_CONNSECMARK.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -31,7 +31,7 @@
};
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ipt_entry *entry, struct ipt_entry_target **target)
+ const struct ipt_entry *entry, struct xt_entry_target **target)
{
struct xt_connsecmark_target_info *info =
(struct xt_connsecmark_target_info*)(*target)->data;
@@ -87,7 +87,7 @@
}
static void print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target, int numeric)
+ const struct xt_entry_target *target, int numeric)
{
struct xt_connsecmark_target_info *info =
(struct xt_connsecmark_target_info*)(target)->data;
@@ -96,7 +96,7 @@
print_connsecmark(info);
}
-static void save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+static void save(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct xt_connsecmark_target_info *info =
(struct xt_connsecmark_target_info*)target->data;
Modified: trunk/iptables/extensions/libipt_DNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_DNAT.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_DNAT.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -15,7 +15,7 @@
to. */
struct ipt_natinfo
{
- struct ipt_entry_target t;
+ struct xt_entry_target t;
struct ip_nat_multi_range mr;
};
@@ -58,7 +58,7 @@
}
/* Ranges expected in network order. */
-static struct ipt_entry_target *
+static struct xt_entry_target *
parse_to(char *arg, int portok, struct ipt_natinfo *info)
{
struct ip_nat_range range;
@@ -142,7 +142,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_natinfo *info = (void *)*target;
int portok;
@@ -216,7 +216,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
struct ipt_natinfo *info = (void *)target;
@@ -233,7 +233,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct ipt_natinfo *info = (void *)target;
unsigned int i = 0;
Modified: trunk/iptables/extensions/libipt_DSCP.c
===================================================================
--- trunk/iptables/extensions/libipt_DSCP.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_DSCP.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -22,7 +22,7 @@
#include "libipt_dscp_helper.c"
-static void init(struct ipt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -79,7 +79,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_DSCP_info *dinfo
= (struct ipt_DSCP_info *)(*target)->data;
@@ -124,7 +124,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_DSCP_info *dinfo =
@@ -135,7 +135,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_DSCP_info *dinfo =
(const struct ipt_DSCP_info *)target->data;
Modified: trunk/iptables/extensions/libipt_ECN.c
===================================================================
--- trunk/iptables/extensions/libipt_ECN.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_ECN.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -17,7 +17,7 @@
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_ipv4/ipt_ECN.h>
-static void init(struct ipt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -48,7 +48,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
unsigned int result;
struct ipt_ECN_info *einfo
@@ -115,7 +115,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_ECN_info *einfo =
@@ -141,7 +141,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_ECN_info *einfo =
(const struct ipt_ECN_info *)target->data;
Modified: trunk/iptables/extensions/libipt_LOG.c
===================================================================
--- trunk/iptables/extensions/libipt_LOG.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_LOG.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -44,7 +44,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ipt_log_info *loginfo = (struct ipt_log_info *)t->data;
@@ -111,7 +111,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_log_info *loginfo = (struct ipt_log_info *)(*target)->data;
@@ -207,7 +207,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_log_info *loginfo
@@ -247,7 +247,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_log_info *loginfo
= (const struct ipt_log_info *)target->data;
Modified: trunk/iptables/extensions/libipt_MARK.c
===================================================================
--- trunk/iptables/extensions/libipt_MARK.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_MARK.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -31,7 +31,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -40,7 +40,7 @@
static int
parse_v0(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_mark_target_info *markinfo
= (struct ipt_mark_target_info *)(*target)->data;
@@ -82,7 +82,7 @@
static int
parse_v1(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_mark_target_info_v1 *markinfo
= (struct ipt_mark_target_info_v1 *)(*target)->data;
@@ -121,7 +121,7 @@
/* Prints out the targinfo. */
static void
print_v0(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_mark_target_info *markinfo =
@@ -132,7 +132,7 @@
/* Saves the union ipt_targinfo in parsable form to stdout. */
static void
-save_v0(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save_v0(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_mark_target_info *markinfo =
(const struct ipt_mark_target_info *)target->data;
@@ -144,7 +144,7 @@
/* Prints out the targinfo. */
static void
print_v1(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_mark_target_info_v1 *markinfo =
@@ -166,7 +166,7 @@
/* Saves the union ipt_targinfo in parsable form to stdout. */
static void
-save_v1(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save_v1(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_mark_target_info_v1 *markinfo =
(const struct ipt_mark_target_info_v1 *)target->data;
Modified: trunk/iptables/extensions/libipt_MASQUERADE.c
===================================================================
--- trunk/iptables/extensions/libipt_MASQUERADE.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_MASQUERADE.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -31,7 +31,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
@@ -79,7 +79,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
int portok;
struct ip_nat_multi_range *mr
@@ -122,7 +122,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
struct ip_nat_multi_range *mr
@@ -143,7 +143,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct ip_nat_multi_range *mr
= (struct ip_nat_multi_range *)target->data;
Modified: trunk/iptables/extensions/libipt_MIRROR.c
===================================================================
--- trunk/iptables/extensions/libipt_MIRROR.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_MIRROR.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -22,7 +22,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -31,7 +31,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
return 0;
}
Modified: trunk/iptables/extensions/libipt_NETMAP.c
===================================================================
--- trunk/iptables/extensions/libipt_NETMAP.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_NETMAP.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -56,7 +56,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
@@ -119,7 +119,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip_nat_multi_range *mr
= (struct ip_nat_multi_range *)(*target)->data;
@@ -150,7 +150,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
struct ip_nat_multi_range *mr
@@ -171,7 +171,7 @@
/* Saves the targinfo in parsable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
printf("--%s ", opts[0].name);
print(ip, target, 0);
Modified: trunk/iptables/extensions/libipt_NFQUEUE.c
===================================================================
--- trunk/iptables/extensions/libipt_NFQUEUE.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_NFQUEUE.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -14,7 +14,7 @@
#include <linux/netfilter_ipv4/ip_tables.h>
#include <linux/netfilter_ipv4/ipt_NFQUEUE.h>
-static void init(struct ipt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -48,7 +48,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_NFQ_info *tinfo
= (struct ipt_NFQ_info *)(*target)->data;
@@ -75,7 +75,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_NFQ_info *tinfo =
@@ -85,7 +85,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_NFQ_info *tinfo =
(const struct ipt_NFQ_info *)target->data;
Modified: trunk/iptables/extensions/libipt_NOTRACK.c
===================================================================
--- trunk/iptables/extensions/libipt_NOTRACK.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_NOTRACK.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -22,7 +22,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -31,7 +31,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
return 0;
}
Modified: trunk/iptables/extensions/libipt_REDIRECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REDIRECT.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_REDIRECT.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -30,7 +30,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ip_nat_multi_range *mr = (struct ip_nat_multi_range *)t->data;
@@ -81,7 +81,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip_nat_multi_range *mr
= (struct ip_nat_multi_range *)(*target)->data;
@@ -131,7 +131,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
struct ip_nat_multi_range *mr
@@ -151,7 +151,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct ip_nat_multi_range *mr
= (struct ip_nat_multi_range *)target->data;
Modified: trunk/iptables/extensions/libipt_REJECT.c
===================================================================
--- trunk/iptables/extensions/libipt_REJECT.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_REJECT.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -87,7 +87,7 @@
/* Allocate and initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ipt_reject_info *reject = (struct ipt_reject_info *)t->data;
@@ -101,7 +101,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_reject_info *reject = (struct ipt_reject_info *)(*target)->data;
unsigned int limit = sizeof(reject_table)/sizeof(struct reject_names);
@@ -140,7 +140,7 @@
/* Prints out ipt_reject_info. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_reject_info *reject
@@ -155,7 +155,7 @@
}
/* Saves ipt_reject in parsable form to stdout. */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+static void save(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_reject_info *reject
= (const struct ipt_reject_info *)target->data;
Modified: trunk/iptables/extensions/libipt_SAME.c
===================================================================
--- trunk/iptables/extensions/libipt_SAME.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_SAME.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -38,7 +38,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ipt_same_info *mr = (struct ipt_same_info *)t->data;
@@ -90,7 +90,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_same_info *mr
= (struct ipt_same_info *)(*target)->data;
@@ -149,7 +149,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
int count;
@@ -185,7 +185,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
int count;
struct ipt_same_info *mr
Modified: trunk/iptables/extensions/libipt_SECMARK.c
===================================================================
--- trunk/iptables/extensions/libipt_SECMARK.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_SECMARK.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -29,7 +29,7 @@
};
/* Initialize the target. */
-static void init(struct ipt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{ }
/*
@@ -37,7 +37,7 @@
* 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 struct ipt_entry *entry, struct xt_entry_target **target)
{
struct xt_secmark_target_info *info =
(struct xt_secmark_target_info*)(*target)->data;
@@ -84,7 +84,7 @@
}
static void print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target, int numeric)
+ const struct xt_entry_target *target, int numeric)
{
struct xt_secmark_target_info *info =
(struct xt_secmark_target_info*)(target)->data;
@@ -94,7 +94,7 @@
}
/* Saves the target info in parsable form to stdout. */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+static void save(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct xt_secmark_target_info *info =
(struct xt_secmark_target_info*)target->data;
Modified: trunk/iptables/extensions/libipt_SET.c
===================================================================
--- trunk/iptables/extensions/libipt_SET.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_SET.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -41,7 +41,7 @@
};
/* Initialize the target. */
-static void init(struct ipt_entry_target *target, unsigned int *nfcache)
+static void init(struct xt_entry_target *target, unsigned int *nfcache)
{
struct ipt_set_info_target *info =
(struct ipt_set_info_target *) target->data;
@@ -85,7 +85,7 @@
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 struct ipt_entry *entry, struct xt_entry_target **target)
{
struct ipt_set_info_target *myinfo =
(struct ipt_set_info_target *) (*target)->data;
@@ -137,7 +137,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target, int numeric)
+ const struct xt_entry_target *target, int numeric)
{
struct ipt_set_info_target *info =
(struct ipt_set_info_target *) target->data;
@@ -148,7 +148,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct ipt_set_info_target *info =
(struct ipt_set_info_target *) target->data;
Modified: trunk/iptables/extensions/libipt_SNAT.c
===================================================================
--- trunk/iptables/extensions/libipt_SNAT.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_SNAT.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -15,7 +15,7 @@
to. */
struct ipt_natinfo
{
- struct ipt_entry_target t;
+ struct xt_entry_target t;
struct ip_nat_multi_range mr;
};
@@ -58,7 +58,7 @@
}
/* Ranges expected in network order. */
-static struct ipt_entry_target *
+static struct xt_entry_target *
parse_to(char *arg, int portok, struct ipt_natinfo *info)
{
struct ip_nat_range range;
@@ -142,7 +142,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_natinfo *info = (void *)*target;
int portok;
@@ -218,7 +218,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
struct ipt_natinfo *info = (void *)target;
@@ -235,7 +235,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
struct ipt_natinfo *info = (void *)target;
unsigned int i = 0;
Modified: trunk/iptables/extensions/libipt_TCPMSS.c
===================================================================
--- trunk/iptables/extensions/libipt_TCPMSS.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_TCPMSS.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -12,7 +12,7 @@
#include <linux/netfilter_ipv4/ipt_TCPMSS.h>
struct mssinfo {
- struct ipt_entry_target t;
+ struct xt_entry_target t;
struct ipt_tcpmss_info mss;
};
@@ -35,7 +35,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -44,7 +44,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_tcpmss_info *mssinfo
= (struct ipt_tcpmss_info *)(*target)->data;
@@ -89,7 +89,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_tcpmss_info *mssinfo =
@@ -102,7 +102,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_tcpmss_info *mssinfo =
(const struct ipt_tcpmss_info *)target->data;
Modified: trunk/iptables/extensions/libipt_TOS.c
===================================================================
--- trunk/iptables/extensions/libipt_TOS.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_TOS.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -9,7 +9,7 @@
#include <linux/netfilter_ipv4/ipt_TOS.h>
struct tosinfo {
- struct ipt_entry_target t;
+ struct xt_entry_target t;
struct ipt_tos_target_info tos;
};
@@ -54,7 +54,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -87,7 +87,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_tos_target_info *tosinfo
= (struct ipt_tos_target_info *)(*target)->data;
@@ -134,7 +134,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_tos_target_info *tosinfo =
@@ -145,7 +145,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 struct ipt_ip *ip, const struct xt_entry_target *target)
{
const struct ipt_tos_target_info *tosinfo =
(const struct ipt_tos_target_info *)target->data;
Modified: trunk/iptables/extensions/libipt_TTL.c
===================================================================
--- trunk/iptables/extensions/libipt_TTL.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_TTL.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -16,7 +16,7 @@
#define IPT_TTL_USED 1
-static void init(struct ipt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -32,7 +32,7 @@
static int parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
struct ipt_TTL_info *info = (struct ipt_TTL_info *) (*target)->data;
unsigned int value;
@@ -97,7 +97,7 @@
}
static void save(const struct ipt_ip *ip,
- const struct ipt_entry_target *target)
+ const struct xt_entry_target *target)
{
const struct ipt_TTL_info *info =
(struct ipt_TTL_info *) target->data;
@@ -118,7 +118,7 @@
}
static void print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target, int numeric)
+ const struct xt_entry_target *target, int numeric)
{
const struct ipt_TTL_info *info =
(struct ipt_TTL_info *) target->data;
Modified: trunk/iptables/extensions/libipt_ULOG.c
===================================================================
--- trunk/iptables/extensions/libipt_ULOG.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_ULOG.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -53,7 +53,7 @@
};
/* Initialize the target. */
-static void init(struct ipt_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ipt_ulog_info *loginfo = (struct ipt_ulog_info *) t->data;
@@ -71,7 +71,7 @@
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)
+ struct xt_entry_target **target)
{
struct ipt_ulog_info *loginfo =
(struct ipt_ulog_info *) (*target)->data;
@@ -157,7 +157,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)
+ const struct xt_entry_target *target)
{
const struct ipt_ulog_info *loginfo
= (const struct ipt_ulog_info *) target->data;
@@ -179,7 +179,7 @@
/* Prints out the targinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_target *target, int numeric)
+ const struct xt_entry_target *target, int numeric)
{
const struct ipt_ulog_info *loginfo
= (const struct ipt_ulog_info *) target->data;
Modified: trunk/iptables/extensions/libipt_addrtype.c
===================================================================
--- trunk/iptables/extensions/libipt_addrtype.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_addrtype.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -83,7 +83,7 @@
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)
+ struct xt_entry_match **match)
{
struct ipt_addrtype_info *info =
(struct ipt_addrtype_info *) (*match)->data;
@@ -138,7 +138,7 @@
}
static void print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_addrtype_info *info =
@@ -160,7 +160,7 @@
}
static void save(const struct ipt_ip *ip,
- const struct ipt_entry_match *match)
+ const struct xt_entry_match *match)
{
const struct ipt_addrtype_info *info =
(struct ipt_addrtype_info *) match->data;
Modified: trunk/iptables/extensions/libipt_ah.c
===================================================================
--- trunk/iptables/extensions/libipt_ah.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_ah.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -68,7 +68,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_ah *ahinfo = (struct ipt_ah *)m->data;
@@ -83,7 +83,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_ah *ahinfo = (struct ipt_ah *)(*match)->data;
@@ -135,7 +135,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ipt_ah *ah = (struct ipt_ah *)match->data;
@@ -148,7 +148,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_ah *ahinfo = (struct ipt_ah *)match->data;
Modified: trunk/iptables/extensions/libipt_comment.c
===================================================================
--- trunk/iptables/extensions/libipt_comment.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_comment.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -47,7 +47,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_comment_info *commentinfo = (struct ipt_comment_info *)(*match)->data;
@@ -80,7 +80,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_comment_info *commentinfo = (struct ipt_comment_info *)match->data;
@@ -91,7 +91,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_comment_info *commentinfo = (struct ipt_comment_info *)match->data;
Modified: trunk/iptables/extensions/libipt_condition.c
===================================================================
--- trunk/iptables/extensions/libipt_condition.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_condition.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -27,7 +27,7 @@
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)
+ struct xt_entry_match **match)
{
struct condition_info *info =
(struct condition_info *) (*match)->data;
@@ -65,7 +65,7 @@
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct condition_info *info =
(const struct condition_info *) match->data;
@@ -76,7 +76,7 @@
static void
save(const struct ipt_ip *ip,
- const struct ipt_entry_match *match)
+ const struct xt_entry_match *match)
{
const struct condition_info *info =
(const struct condition_info *) match->data;
Modified: trunk/iptables/extensions/libipt_connbytes.c
===================================================================
--- trunk/iptables/extensions/libipt_connbytes.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_connbytes.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -51,7 +51,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_connbytes_info *sinfo = (struct ipt_connbytes_info *)(*match)->data;
unsigned long i;
@@ -147,7 +147,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_connbytes_info *sinfo = (struct ipt_connbytes_info *)match->data;
@@ -167,7 +167,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_connbytes_info *sinfo = (struct ipt_connbytes_info *)match->data;
Modified: trunk/iptables/extensions/libipt_connmark.c
===================================================================
--- trunk/iptables/extensions/libipt_connmark.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_connmark.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -46,7 +46,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
/* Can't cache this. */
*nfcache |= NFC_UNKNOWN;
@@ -58,7 +58,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_connmark_info *markinfo = (struct ipt_connmark_info *)(*match)->data;
@@ -107,7 +107,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_connmark_info *info = (struct ipt_connmark_info *)match->data;
@@ -120,7 +120,7 @@
/* Saves the matchinfo in parsable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_connmark_info *info = (struct ipt_connmark_info *)match->data;
Modified: trunk/iptables/extensions/libipt_connrate.c
===================================================================
--- trunk/iptables/extensions/libipt_connrate.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_connrate.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -78,7 +78,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_connrate_info *sinfo = (struct ipt_connrate_info *)(*match)->data;
u_int32_t tmp;
@@ -139,7 +139,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_connrate_info *sinfo = (struct ipt_connrate_info *)match->data;
@@ -150,7 +150,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_connrate_info *sinfo = (struct ipt_connrate_info *)match->data;
Modified: trunk/iptables/extensions/libipt_conntrack.c
===================================================================
--- trunk/iptables/extensions/libipt_conntrack.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_conntrack.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -169,7 +169,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_conntrack_info *sinfo = (struct ipt_conntrack_info *)(*match)->data;
char *protocol = NULL;
@@ -412,7 +412,7 @@
/* Saves the matchinfo in parsable form to stdout. */
static void
-matchinfo_print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric, const char *optpfx)
+matchinfo_print(const struct ipt_ip *ip, const struct xt_entry_match *match, int numeric, const char *optpfx)
{
struct ipt_conntrack_info *sinfo = (struct ipt_conntrack_info *)match->data;
@@ -492,14 +492,14 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
matchinfo_print(ip, match, numeric, "");
}
/* 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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
matchinfo_print(ip, match, 1, "--");
}
Modified: trunk/iptables/extensions/libipt_dccp.c
===================================================================
--- trunk/iptables/extensions/libipt_dccp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_dccp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -26,7 +26,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m,
+init(struct xt_entry_match *m,
unsigned int *nfcache)
{
struct ipt_dccp_info *einfo = (struct ipt_dccp_info *)m->data;
@@ -136,7 +136,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_dccp_info *einfo
= (struct ipt_dccp_info *)(*match)->data;
@@ -280,7 +280,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_dccp_info *einfo =
@@ -315,7 +315,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)
+ const struct xt_entry_match *match)
{
const struct ipt_dccp_info *einfo =
(const struct ipt_dccp_info *)match->data;
Modified: trunk/iptables/extensions/libipt_dscp.c
===================================================================
--- trunk/iptables/extensions/libipt_dscp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_dscp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -77,7 +77,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_dscp_info *dinfo
= (struct ipt_dscp_info *)(*match)->data;
@@ -132,7 +132,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_dscp_info *dinfo =
@@ -143,7 +143,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_dscp_info *dinfo =
(const struct ipt_dscp_info *)match->data;
Modified: trunk/iptables/extensions/libipt_ecn.c
===================================================================
--- trunk/iptables/extensions/libipt_ecn.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_ecn.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -37,7 +37,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
unsigned int result;
struct ipt_ecn_info *einfo
@@ -98,7 +98,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_ecn_info *einfo =
@@ -127,7 +127,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_ecn_info *einfo =
(const struct ipt_ecn_info *)match->data;
Modified: trunk/iptables/extensions/libipt_esp.c
===================================================================
--- trunk/iptables/extensions/libipt_esp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_esp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -71,7 +71,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_esp *espinfo = (struct ipt_esp *)m->data;
@@ -86,7 +86,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_esp *espinfo = (struct ipt_esp *)(*match)->data;
@@ -138,7 +138,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ipt_esp *esp = (struct ipt_esp *)match->data;
@@ -151,7 +151,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_esp *espinfo = (struct ipt_esp *)match->data;
Modified: trunk/iptables/extensions/libipt_hashlimit.c
===================================================================
--- trunk/iptables/extensions/libipt_hashlimit.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_hashlimit.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -96,7 +96,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_hashlimit_info *r = (struct ipt_hashlimit_info *)m->data;
@@ -153,7 +153,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_hashlimit_info *r =
(struct ipt_hashlimit_info *)(*match)->data;
@@ -305,7 +305,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_hashlimit_info *r =
@@ -325,7 +325,7 @@
}
/* FIXME: Make minimalist: only print rate if not default --RR */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_hashlimit_info *r =
(struct ipt_hashlimit_info *)match->data;
Modified: trunk/iptables/extensions/libipt_helper.c
===================================================================
--- trunk/iptables/extensions/libipt_helper.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_helper.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -30,7 +30,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_helper_info *info = (struct ipt_helper_info *)(*match)->data;
@@ -65,7 +65,7 @@
/* Prints out the info. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_helper_info *info = (struct ipt_helper_info *)match->data;
@@ -75,7 +75,7 @@
/* Saves the union ipt_info in parsable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_helper_info *info = (struct ipt_helper_info *)match->data;
Modified: trunk/iptables/extensions/libipt_icmp.c
===================================================================
--- trunk/iptables/extensions/libipt_icmp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_icmp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -169,7 +169,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_icmp *icmpinfo = (struct ipt_icmp *)m->data;
@@ -183,7 +183,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_icmp *icmpinfo = (struct ipt_icmp *)(*match)->data;
@@ -247,7 +247,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_icmp *icmp = (struct ipt_icmp *)match->data;
@@ -263,7 +263,7 @@
}
/* Saves the match in parsable form to stdout. */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_icmp *icmp = (struct ipt_icmp *)match->data;
Modified: trunk/iptables/extensions/libipt_iprange.c
===================================================================
--- trunk/iptables/extensions/libipt_iprange.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_iprange.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -58,7 +58,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_iprange_info *info = (struct ipt_iprange_info *)(*match)->data;
@@ -123,7 +123,7 @@
/* Prints out the info. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_iprange_info *info = (struct ipt_iprange_info *)match->data;
@@ -144,7 +144,7 @@
/* Saves the union ipt_info in parsable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_iprange_info *info = (struct ipt_iprange_info *)match->data;
Modified: trunk/iptables/extensions/libipt_length.c
===================================================================
--- trunk/iptables/extensions/libipt_length.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_length.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -68,7 +68,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_length_info *info = (struct ipt_length_info *)(*match)->data;
@@ -116,7 +116,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
printf("length ");
@@ -125,7 +125,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
printf("--length ");
print_length((struct ipt_length_info *)match->data);
Modified: trunk/iptables/extensions/libipt_limit.c
===================================================================
--- trunk/iptables/extensions/libipt_limit.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_limit.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -74,7 +74,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_rateinfo *r = (struct ipt_rateinfo *)m->data;
@@ -95,7 +95,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_rateinfo *r = (struct ipt_rateinfo *)(*match)->data;
unsigned int num;
@@ -157,7 +157,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_rateinfo *r = (struct ipt_rateinfo *)match->data;
@@ -166,7 +166,7 @@
}
/* FIXME: Make minimalist: only print rate if not default --RR */
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_rateinfo *r = (struct ipt_rateinfo *)match->data;
Modified: trunk/iptables/extensions/libipt_mac.c
===================================================================
--- trunk/iptables/extensions/libipt_mac.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_mac.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -58,7 +58,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_mac_info *macinfo = (struct ipt_mac_info *)(*match)->data;
@@ -99,7 +99,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
printf("MAC ");
@@ -111,7 +111,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
if (((struct ipt_mac_info *)match->data)->invert)
printf("! ");
Modified: trunk/iptables/extensions/libipt_mark.c
===================================================================
--- trunk/iptables/extensions/libipt_mark.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_mark.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -31,7 +31,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_mark_info *markinfo = (struct ipt_mark_info *)(*match)->data;
@@ -78,7 +78,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_mark_info *info = (struct ipt_mark_info *)match->data;
@@ -93,7 +93,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_mark_info *info = (struct ipt_mark_info *)match->data;
Modified: trunk/iptables/extensions/libipt_multiport.c
===================================================================
--- trunk/iptables/extensions/libipt_multiport.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_multiport.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -132,7 +132,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
}
@@ -162,7 +162,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
const char *proto;
struct ipt_multiport *multiinfo
@@ -212,7 +212,7 @@
parse_v1(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
const char *proto;
struct ipt_multiport_v1 *multiinfo
@@ -287,7 +287,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_multiport *multiinfo
@@ -323,7 +323,7 @@
static void
print_v1(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_multiport_v1 *multiinfo
@@ -365,7 +365,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_multiport *multiinfo
= (const struct ipt_multiport *)match->data;
@@ -393,7 +393,7 @@
}
static void save_v1(const struct ipt_ip *ip,
- const struct ipt_entry_match *match)
+ const struct xt_entry_match *match)
{
const struct ipt_multiport_v1 *multiinfo
= (const struct ipt_multiport_v1 *)match->data;
Modified: trunk/iptables/extensions/libipt_owner.c
===================================================================
--- trunk/iptables/extensions/libipt_owner.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_owner.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -55,7 +55,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_owner_info *ownerinfo = (struct ipt_owner_info *)(*match)->data;
@@ -201,7 +201,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_owner_info *info = (struct ipt_owner_info *)match->data;
@@ -217,7 +217,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_owner_info *info = (struct ipt_owner_info *)match->data;
Modified: trunk/iptables/extensions/libipt_physdev.c
===================================================================
--- trunk/iptables/extensions/libipt_physdev.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_physdev.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -35,7 +35,7 @@
};
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
}
@@ -43,7 +43,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_physdev_info *info =
(struct ipt_physdev_info*)(*match)->data;
@@ -122,7 +122,7 @@
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_physdev_info *info =
@@ -148,7 +148,7 @@
printf(" ");
}
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_physdev_info *info =
(struct ipt_physdev_info*)match->data;
Modified: trunk/iptables/extensions/libipt_pkttype.c
===================================================================
--- trunk/iptables/extensions/libipt_pkttype.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_pkttype.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -88,7 +88,7 @@
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)
+ struct xt_entry_match **match)
{
struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)(*match)->data;
@@ -131,7 +131,7 @@
printf("%d ", info->pkttype); /* in case we didn't find an entry in named-packtes */
}
-static void print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric)
+static void print(const struct ipt_ip *ip, const struct xt_entry_match *match, int numeric)
{
struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)match->data;
@@ -139,7 +139,7 @@
print_pkttype(info);
}
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_pkttype_info *info = (struct ipt_pkttype_info *)match->data;
Modified: trunk/iptables/extensions/libipt_policy.c
===================================================================
--- trunk/iptables/extensions/libipt_policy.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_policy.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -93,7 +93,7 @@
{ }
};
-static void init(struct ipt_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m, unsigned int *nfcache)
{
*nfcache |= NFC_UNKNOWN;
}
@@ -128,7 +128,7 @@
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)
+ struct xt_entry_match **match)
{
struct ipt_policy_info *info = (void *)(*match)->data;
struct ipt_policy_elem *e = &info->pol[info->len];
@@ -388,7 +388,7 @@
}
static void print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_policy_info *info = (void *)match->data;
@@ -403,7 +403,7 @@
}
}
-static void save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+static void save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_policy_info *info = (void *)match->data;
unsigned int i;
Modified: trunk/iptables/extensions/libipt_quota.c
===================================================================
--- trunk/iptables/extensions/libipt_quota.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_quota.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -27,7 +27,7 @@
/* print matchinfo */
static void
-print(const struct ipt_ip *ip, const struct ipt_entry_match *match, int numeric)
+print(const struct ipt_ip *ip, const struct xt_entry_match *match, int numeric)
{
struct xt_quota_info *q = (struct xt_quota_info *) match->data;
printf("quota: %llu bytes", (unsigned long long) q->quota);
@@ -35,7 +35,7 @@
/* save matchinfo */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct xt_quota_info *q = (struct xt_quota_info *) match->data;
printf("--quota %llu ", (unsigned long long) q->quota);
@@ -61,7 +61,7 @@
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)
+ unsigned int *nfcache, struct xt_entry_match **match)
{
struct xt_quota_info *info = (struct xt_quota_info *) (*match)->data;
Modified: trunk/iptables/extensions/libipt_realm.c
===================================================================
--- trunk/iptables/extensions/libipt_realm.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_realm.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -158,7 +158,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_realm_info *realminfo = (struct ipt_realm_info *)(*match)->data;
int id;
@@ -216,7 +216,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_realm_info *ri = (struct ipt_realm_info *) match->data;
@@ -231,7 +231,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_realm_info *ri = (struct ipt_realm_info *) match->data;
Modified: trunk/iptables/extensions/libipt_recent.c
===================================================================
--- trunk/iptables/extensions/libipt_recent.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_recent.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -68,7 +68,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *match, unsigned int *nfcache)
+init(struct xt_entry_match *match, unsigned int *nfcache)
{
struct ipt_recent_info *info = (struct ipt_recent_info *)(match)->data;
@@ -86,7 +86,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_recent_info *info = (struct ipt_recent_info *)(*match)->data;
switch (c) {
@@ -176,7 +176,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_recent_info *info = (struct ipt_recent_info *)match->data;
@@ -199,7 +199,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_recent_info *info = (struct ipt_recent_info *)match->data;
Modified: trunk/iptables/extensions/libipt_sctp.c
===================================================================
--- trunk/iptables/extensions/libipt_sctp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_sctp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -43,7 +43,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m,
+init(struct xt_entry_match *m,
unsigned int *nfcache)
{
int i;
@@ -265,7 +265,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_sctp_info *einfo
= (struct ipt_sctp_info *)(*match)->data;
@@ -459,7 +459,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_sctp_info *einfo =
@@ -493,7 +493,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)
+ const struct xt_entry_match *match)
{
const struct ipt_sctp_info *einfo =
(const struct ipt_sctp_info *)match->data;
Modified: trunk/iptables/extensions/libipt_set.c
===================================================================
--- trunk/iptables/extensions/libipt_set.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_set.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -38,7 +38,7 @@
};
/* Initialize the match. */
-static void init(struct ipt_entry_match *match, unsigned int *nfcache)
+static void init(struct xt_entry_match *match, unsigned int *nfcache)
{
struct ipt_set_info_match *info =
(struct ipt_set_info_match *) match->data;
@@ -52,7 +52,7 @@
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)
+ unsigned int *nfcache, struct xt_entry_match **match)
{
struct ipt_set_info_match *myinfo =
(struct ipt_set_info_match *) (*match)->data;
@@ -127,7 +127,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
struct ipt_set_info_match *info =
(struct ipt_set_info_match *) match->data;
@@ -137,7 +137,7 @@
/* Saves the matchinfo in parsable form to stdout. */
static void save(const struct ipt_ip *ip,
- const struct ipt_entry_match *match)
+ const struct xt_entry_match *match)
{
struct ipt_set_info_match *info =
(struct ipt_set_info_match *) match->data;
Modified: trunk/iptables/extensions/libipt_standard.c
===================================================================
--- trunk/iptables/extensions/libipt_standard.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_standard.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -22,7 +22,7 @@
/* Initialize the target. */
static void
-init(struct ipt_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -31,7 +31,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
- struct ipt_entry_target **target)
+ struct xt_entry_target **target)
{
return 0;
}
@@ -43,7 +43,7 @@
/* Saves the targinfo in parsable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_target *target)
+save(const struct ipt_ip *ip, const struct xt_entry_target *target)
{
}
Modified: trunk/iptables/extensions/libipt_state.c
===================================================================
--- trunk/iptables/extensions/libipt_state.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_state.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -67,7 +67,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_state_info *sinfo = (struct ipt_state_info *)(*match)->data;
@@ -125,7 +125,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ipt_state_info *sinfo = (struct ipt_state_info *)match->data;
@@ -135,7 +135,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct ipt_state_info *sinfo = (struct ipt_state_info *)match->data;
Modified: trunk/iptables/extensions/libipt_statistic.c
===================================================================
--- trunk/iptables/extensions/libipt_statistic.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_statistic.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -37,7 +37,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
double prob;
@@ -147,7 +147,7 @@
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct xt_statistic_info *info = (struct xt_statistic_info *)match->data;
@@ -158,7 +158,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
struct xt_statistic_info *info = (struct xt_statistic_info *)match->data;
Modified: trunk/iptables/extensions/libipt_string.c
===================================================================
--- trunk/iptables/extensions/libipt_string.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_string.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -54,7 +54,7 @@
};
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_string_info *i = (struct ipt_string_info *) m->data;
@@ -172,7 +172,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_string_info *stringinfo = (struct ipt_string_info *)(*match)->data;
@@ -290,7 +290,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_string_info *info =
@@ -313,7 +313,7 @@
/* Saves the union ipt_matchinfo in parseable form to stdout. */
static void
-save(const struct ipt_ip *ip, const struct ipt_entry_match *match)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_string_info *info =
(const struct ipt_string_info*) match->data;
Modified: trunk/iptables/extensions/libipt_tcp.c
===================================================================
--- trunk/iptables/extensions/libipt_tcp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_tcp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -131,7 +131,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_tcp *tcpinfo = (struct ipt_tcp *)m->data;
@@ -149,7 +149,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_tcp *tcpinfo = (struct ipt_tcp *)(*match)->data;
@@ -318,7 +318,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ipt_tcp *tcp = (struct ipt_tcp *)match->data;
@@ -341,7 +341,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_tcp *tcpinfo = (struct ipt_tcp *)match->data;
Modified: trunk/iptables/extensions/libipt_tcpmss.c
===================================================================
--- trunk/iptables/extensions/libipt_tcpmss.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_tcpmss.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -62,7 +62,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_tcpmss_match_info *mssinfo =
(struct ipt_tcpmss_match_info *)(*match)->data;
@@ -109,7 +109,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_tcpmss_match_info *mssinfo =
@@ -122,7 +122,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_tcpmss_match_info *mssinfo =
(const struct ipt_tcpmss_match_info *)match->data;
Modified: trunk/iptables/extensions/libipt_tos.c
===================================================================
--- trunk/iptables/extensions/libipt_tos.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_tos.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -78,7 +78,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_tos_info *tosinfo = (struct ipt_tos_info *)(*match)->data;
@@ -129,7 +129,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_tos_info *info = (const struct ipt_tos_info *)match->data;
@@ -142,7 +142,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)
+save(const struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_tos_info *info = (const struct ipt_tos_info *)match->data;
Modified: trunk/iptables/extensions/libipt_ttl.c
===================================================================
--- trunk/iptables/extensions/libipt_ttl.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_ttl.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -26,7 +26,7 @@
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)
+ struct xt_entry_match **match)
{
struct ipt_ttl_info *info = (struct ipt_ttl_info *) (*match)->data;
unsigned int value;
@@ -93,7 +93,7 @@
}
static void print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ipt_ttl_info *info =
@@ -118,7 +118,7 @@
}
static void save(const struct ipt_ip *ip,
- const struct ipt_entry_match *match)
+ const struct xt_entry_match *match)
{
const struct ipt_ttl_info *info =
(struct ipt_ttl_info *) match->data;
Modified: trunk/iptables/extensions/libipt_udp.c
===================================================================
--- trunk/iptables/extensions/libipt_udp.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_udp.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -55,7 +55,7 @@
/* Initialize the match. */
static void
-init(struct ipt_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ipt_udp *udpinfo = (struct ipt_udp *)m->data;
@@ -71,7 +71,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
struct ipt_udp *udpinfo = (struct ipt_udp *)(*match)->data;
@@ -157,7 +157,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ipt_ip *ip,
- const struct ipt_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ipt_udp *udp = (struct ipt_udp *)match->data;
@@ -174,7 +174,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 struct ipt_ip *ip, const struct xt_entry_match *match)
{
const struct ipt_udp *udpinfo = (struct ipt_udp *)match->data;
Modified: trunk/iptables/extensions/libipt_unclean.c
===================================================================
--- trunk/iptables/extensions/libipt_unclean.c 2007-07-24 05:55:12 UTC (rev 6922)
+++ trunk/iptables/extensions/libipt_unclean.c 2007-07-24 05:57:28 UTC (rev 6923)
@@ -23,7 +23,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ipt_entry *entry,
unsigned int *nfcache,
- struct ipt_entry_match **match)
+ struct xt_entry_match **match)
{
return 0;
}
More information about the netfilter-cvslog
mailing list