[netfilter-cvslog] r6924 - trunk/iptables/extensions
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Tue Jul 24 07:58:56 CEST 2007
Author: yasuyuki at netfilter.org
Date: 2007-07-24 07:58:56 +0200 (Tue, 24 Jul 2007)
New Revision: 6924
Modified:
trunk/iptables/extensions/libip6t_CONNMARK.c
trunk/iptables/extensions/libip6t_CONNSECMARK.c
trunk/iptables/extensions/libip6t_HL.c
trunk/iptables/extensions/libip6t_LOG.c
trunk/iptables/extensions/libip6t_MARK.c
trunk/iptables/extensions/libip6t_NFQUEUE.c
trunk/iptables/extensions/libip6t_REJECT.c
trunk/iptables/extensions/libip6t_SECMARK.c
trunk/iptables/extensions/libip6t_TCPMSS.c
trunk/iptables/extensions/libip6t_ah.c
trunk/iptables/extensions/libip6t_condition.c
trunk/iptables/extensions/libip6t_connmark.c
trunk/iptables/extensions/libip6t_dst.c
trunk/iptables/extensions/libip6t_esp.c
trunk/iptables/extensions/libip6t_eui64.c
trunk/iptables/extensions/libip6t_frag.c
trunk/iptables/extensions/libip6t_hbh.c
trunk/iptables/extensions/libip6t_hl.c
trunk/iptables/extensions/libip6t_icmp6.c
trunk/iptables/extensions/libip6t_ipv6header.c
trunk/iptables/extensions/libip6t_length.c
trunk/iptables/extensions/libip6t_limit.c
trunk/iptables/extensions/libip6t_mac.c
trunk/iptables/extensions/libip6t_mark.c
trunk/iptables/extensions/libip6t_mh.c
trunk/iptables/extensions/libip6t_multiport.c
trunk/iptables/extensions/libip6t_owner.c
trunk/iptables/extensions/libip6t_physdev.c
trunk/iptables/extensions/libip6t_policy.c
trunk/iptables/extensions/libip6t_rt.c
trunk/iptables/extensions/libip6t_standard.c
trunk/iptables/extensions/libip6t_state.c
trunk/iptables/extensions/libip6t_tcp.c
trunk/iptables/extensions/libip6t_udp.c
Log:
Replaces ip6t_entry_* with xt_entry_* in matches/targets
Modified: trunk/iptables/extensions/libip6t_CONNMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_CONNMARK.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_CONNMARK.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -58,7 +58,7 @@
/* Initialize the target. */
static void
-init(struct ip6t_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 ip6t_entry *entry,
- struct ip6t_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 ip6t_ip6 *ip,
- const struct ip6t_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 ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+save(const struct ip6t_ip6 *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/libip6t_CONNSECMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -31,7 +31,7 @@
};
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry, struct ip6t_entry_target **target)
+ const struct ip6t_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 ip6t_ip6 *ip,
- const struct ip6t_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 ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
{
struct xt_connsecmark_target_info *info =
(struct xt_connsecmark_target_info*)target->data;
Modified: trunk/iptables/extensions/libip6t_HL.c
===================================================================
--- trunk/iptables/extensions/libip6t_HL.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_HL.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -16,7 +16,7 @@
#define IP6T_HL_USED 1
-static void init(struct ip6t_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 ip6t_entry *entry,
- struct ip6t_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip6t_HL_info *info = (struct ip6t_HL_info *) (*target)->data;
unsigned int value;
@@ -97,7 +97,7 @@
}
static void save(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_target *target)
+ const struct xt_entry_target *target)
{
const struct ip6t_HL_info *info =
(struct ip6t_HL_info *) target->data;
@@ -118,7 +118,7 @@
}
static void print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_target *target, int numeric)
+ const struct xt_entry_target *target, int numeric)
{
const struct ip6t_HL_info *info =
(struct ip6t_HL_info *) target->data;
Modified: trunk/iptables/extensions/libip6t_LOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_LOG.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_LOG.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -44,7 +44,7 @@
/* Initialize the target. */
static void
-init(struct ip6t_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ip6t_log_info *loginfo = (struct ip6t_log_info *)t->data;
@@ -111,7 +111,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
- struct ip6t_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip6t_log_info *loginfo = (struct ip6t_log_info *)(*target)->data;
@@ -207,7 +207,7 @@
/* Prints out the targinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ip6t_log_info *loginfo
@@ -247,7 +247,7 @@
/* Saves the union ip6t_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
{
const struct ip6t_log_info *loginfo
= (const struct ip6t_log_info *)target->data;
Modified: trunk/iptables/extensions/libip6t_MARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_MARK.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_MARK.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -27,7 +27,7 @@
/* Initialize the target. */
static void
-init(struct ip6t_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
}
@@ -36,7 +36,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
- struct ip6t_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip6t_mark_target_info *markinfo
= (struct ip6t_mark_target_info *)(*target)->data;
@@ -76,7 +76,7 @@
/* Prints out the targinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ip6t_mark_target_info *markinfo =
@@ -88,7 +88,7 @@
/* Saves the union ipt_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
{
const struct ip6t_mark_target_info *markinfo =
(const struct ip6t_mark_target_info *)target->data;
Modified: trunk/iptables/extensions/libip6t_NFQUEUE.c
===================================================================
--- trunk/iptables/extensions/libip6t_NFQUEUE.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_NFQUEUE.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -14,7 +14,7 @@
#include <linux/netfilter_ipv6/ip6_tables.h>
#include <linux/netfilter_ipv4/ipt_NFQUEUE.h>
-static void init(struct ip6t_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 ip6t_entry *entry,
- struct ip6t_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 ip6t_ip6 *ip,
- const struct ip6t_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ipt_NFQ_info *tinfo =
@@ -85,7 +85,7 @@
/* Saves the union ip6t_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
{
const struct ipt_NFQ_info *tinfo =
(const struct ipt_NFQ_info *)target->data;
Modified: trunk/iptables/extensions/libip6t_REJECT.c
===================================================================
--- trunk/iptables/extensions/libip6t_REJECT.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_REJECT.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -72,7 +72,7 @@
/* Allocate and initialize the target. */
static void
-init(struct ip6t_entry_target *t, unsigned int *nfcache)
+init(struct xt_entry_target *t, unsigned int *nfcache)
{
struct ip6t_reject_info *reject = (struct ip6t_reject_info *)t->data;
@@ -86,7 +86,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
- struct ip6t_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip6t_reject_info *reject =
(struct ip6t_reject_info *)(*target)->data;
@@ -121,7 +121,7 @@
/* Prints out ipt_reject_info. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ip6t_reject_info *reject
@@ -137,7 +137,7 @@
/* Saves ipt_reject in parsable form to stdout. */
static void save(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_target *target)
+ const struct xt_entry_target *target)
{
const struct ip6t_reject_info *reject
= (const struct ip6t_reject_info *)target->data;
Modified: trunk/iptables/extensions/libip6t_SECMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_SECMARK.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_SECMARK.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -31,7 +31,7 @@
};
/* Initialize the target. */
-static void init(struct ip6t_entry_target *t, unsigned int *nfcache)
+static void init(struct xt_entry_target *t, unsigned int *nfcache)
{ }
/*
@@ -39,7 +39,7 @@
* 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 struct ip6t_entry *entry, struct xt_entry_target **target)
{
struct xt_secmark_target_info *info =
(struct xt_secmark_target_info*)(*target)->data;
@@ -86,7 +86,7 @@
}
static void print(const struct ip6t_ip6 *ip,
- const struct ip6t_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;
@@ -96,7 +96,7 @@
}
/* Saves the target info in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
{
struct xt_secmark_target_info *info =
(struct xt_secmark_target_info*)target->data;
Modified: trunk/iptables/extensions/libip6t_TCPMSS.c
===================================================================
--- trunk/iptables/extensions/libip6t_TCPMSS.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_TCPMSS.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -12,7 +12,7 @@
#include <linux/netfilter_ipv6/ip6t_TCPMSS.h>
struct mssinfo {
- struct ip6t_entry_target t;
+ struct xt_entry_target t;
struct ip6t_tcpmss_info mss;
};
@@ -35,7 +35,7 @@
/* Initialize the target. */
static void
-init(struct ip6t_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 ip6t_entry *entry,
- struct ip6t_entry_target **target)
+ struct xt_entry_target **target)
{
struct ip6t_tcpmss_info *mssinfo
= (struct ip6t_tcpmss_info *)(*target)->data;
@@ -89,7 +89,7 @@
/* Prints out the targinfo. */
static void
print(const struct ip6t_ip6 *ip6,
- const struct ip6t_entry_target *target,
+ const struct xt_entry_target *target,
int numeric)
{
const struct ip6t_tcpmss_info *mssinfo =
@@ -102,7 +102,7 @@
/* Saves the union ip6t_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_target *target)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
{
const struct ip6t_tcpmss_info *mssinfo =
(const struct ip6t_tcpmss_info *)target->data;
Modified: trunk/iptables/extensions/libip6t_ah.c
===================================================================
--- trunk/iptables/extensions/libip6t_ah.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_ah.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -72,7 +72,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_ah *ahinfo = (struct ip6t_ah *)m->data;
@@ -87,7 +87,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_ah *ahinfo = (struct ip6t_ah *)(*match)->data;
@@ -158,7 +158,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_ah *ah = (struct ip6t_ah *)match->data;
@@ -177,7 +177,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_ah *ahinfo = (struct ip6t_ah *)match->data;
Modified: trunk/iptables/extensions/libip6t_condition.c
===================================================================
--- trunk/iptables/extensions/libip6t_condition.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_condition.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -27,7 +27,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry, unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct condition6_info *info =
(struct condition6_info *) (*match)->data;
@@ -65,7 +65,7 @@
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct condition6_info *info =
(const struct condition6_info *) match->data;
@@ -76,7 +76,7 @@
static void
save(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match)
+ const struct xt_entry_match *match)
{
const struct condition6_info *info =
(const struct condition6_info *) match->data;
Modified: trunk/iptables/extensions/libip6t_connmark.c
===================================================================
--- trunk/iptables/extensions/libip6t_connmark.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_connmark.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -46,7 +46,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_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 ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_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 ip6t_ip6 *ip,
- const struct ip6t_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 ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
struct ipt_connmark_info *info = (struct ipt_connmark_info *)match->data;
Modified: trunk/iptables/extensions/libip6t_dst.c
===================================================================
--- trunk/iptables/extensions/libip6t_dst.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_dst.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -118,7 +118,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_opts *optinfo = (struct ip6t_opts *)m->data;
@@ -134,7 +134,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_opts *optinfo = (struct ip6t_opts *)(*match)->data;
@@ -204,7 +204,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_opts *optinfo = (struct ip6t_opts *)match->data;
@@ -228,7 +228,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_opts *optinfo = (struct ip6t_opts *)match->data;
Modified: trunk/iptables/extensions/libip6t_esp.c
===================================================================
--- trunk/iptables/extensions/libip6t_esp.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_esp.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -70,7 +70,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_esp *espinfo = (struct ip6t_esp *)m->data;
@@ -85,7 +85,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_esp *espinfo = (struct ip6t_esp *)(*match)->data;
@@ -130,7 +130,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_esp *esp = (struct ip6t_esp *)match->data;
@@ -143,7 +143,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_esp *espinfo = (struct ip6t_esp *)match->data;
Modified: trunk/iptables/extensions/libip6t_eui64.c
===================================================================
--- trunk/iptables/extensions/libip6t_eui64.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_eui64.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -32,7 +32,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
return 0;
}
@@ -45,14 +45,14 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
printf("eui64 ");
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
}
Modified: trunk/iptables/extensions/libip6t_frag.c
===================================================================
--- trunk/iptables/extensions/libip6t_frag.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_frag.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -78,7 +78,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_frag *fraginfo = (struct ip6t_frag *)m->data;
@@ -95,7 +95,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_frag *fraginfo = (struct ip6t_frag *)(*match)->data;
@@ -181,7 +181,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_frag *frag = (struct ip6t_frag *)match->data;
@@ -213,7 +213,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_frag *fraginfo = (struct ip6t_frag *)match->data;
Modified: trunk/iptables/extensions/libip6t_hbh.c
===================================================================
--- trunk/iptables/extensions/libip6t_hbh.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_hbh.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -117,7 +117,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_opts *optinfo = (struct ip6t_opts *)m->data;
@@ -133,7 +133,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_opts *optinfo = (struct ip6t_opts *)(*match)->data;
@@ -201,7 +201,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_opts *optinfo = (struct ip6t_opts *)match->data;
@@ -221,7 +221,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_opts *optinfo = (struct ip6t_opts *)match->data;
Modified: trunk/iptables/extensions/libip6t_hl.c
===================================================================
--- trunk/iptables/extensions/libip6t_hl.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_hl.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -27,7 +27,7 @@
static int parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry, unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_hl_info *info = (struct ip6t_hl_info *) (*match)->data;
u_int8_t value;
@@ -90,7 +90,7 @@
}
static void print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
static const char *op[] = {
@@ -106,7 +106,7 @@
}
static void save(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match)
+ const struct xt_entry_match *match)
{
static const char *op[] = {
[IP6T_HL_EQ] = "eq",
Modified: trunk/iptables/extensions/libip6t_icmp6.c
===================================================================
--- trunk/iptables/extensions/libip6t_icmp6.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_icmp6.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -145,7 +145,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_icmp *icmpv6info = (struct ip6t_icmp *)m->data;
@@ -158,7 +158,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_icmp *icmpv6info = (struct ip6t_icmp *)(*match)->data;
@@ -222,7 +222,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ip6t_icmp *icmpv6 = (struct ip6t_icmp *)match->data;
@@ -238,7 +238,7 @@
}
/* Saves the match in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_icmp *icmpv6 = (struct ip6t_icmp *)match->data;
Modified: trunk/iptables/extensions/libip6t_ipv6header.c
===================================================================
--- trunk/iptables/extensions/libip6t_ipv6header.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_ipv6header.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -155,7 +155,7 @@
};
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_ipv6header_info *info = (struct ip6t_ipv6header_info *)m->data;
@@ -187,7 +187,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_ipv6header_info *info = (struct ip6t_ipv6header_info *)(*match)->data;
@@ -255,7 +255,7 @@
/* Prints out the match */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ip6t_ipv6header_info *info = (const struct ip6t_ipv6header_info *)match->data;
@@ -280,7 +280,7 @@
/* Saves the match */
static void
save(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match)
+ const struct xt_entry_match *match)
{
const struct ip6t_ipv6header_info *info = (const struct ip6t_ipv6header_info *)match->data;
Modified: trunk/iptables/extensions/libip6t_length.c
===================================================================
--- trunk/iptables/extensions/libip6t_length.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_length.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -70,7 +70,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_length_info *info = (struct ip6t_length_info *)(*match)->data;
@@ -118,7 +118,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
printf("length ");
@@ -127,7 +127,7 @@
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
printf("--length ");
print_length((struct ip6t_length_info *)match->data);
Modified: trunk/iptables/extensions/libip6t_limit.c
===================================================================
--- trunk/iptables/extensions/libip6t_limit.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_limit.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -74,7 +74,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_rateinfo *r = (struct ip6t_rateinfo *)m->data;
@@ -95,7 +95,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_rateinfo *r = (struct ip6t_rateinfo *)(*match)->data;
unsigned int num;
@@ -157,7 +157,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ip6t_rateinfo *r = (struct ip6t_rateinfo *)match->data;
@@ -166,7 +166,7 @@
}
/* FIXME: Make minimalist: only print rate if not default --RR */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
struct ip6t_rateinfo *r = (struct ip6t_rateinfo *)match->data;
Modified: trunk/iptables/extensions/libip6t_mac.c
===================================================================
--- trunk/iptables/extensions/libip6t_mac.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_mac.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -58,7 +58,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_mac_info *macinfo = (struct ip6t_mac_info *)(*match)->data;
@@ -99,7 +99,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
printf("MAC ");
@@ -111,7 +111,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
if (((struct ip6t_mac_info *)match->data)->invert)
printf("! ");
Modified: trunk/iptables/extensions/libip6t_mark.c
===================================================================
--- trunk/iptables/extensions/libip6t_mark.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_mark.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -31,7 +31,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_mark_info *markinfo = (struct ip6t_mark_info *)(*match)->data;
@@ -78,7 +78,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ip6t_mark_info *info = (struct ip6t_mark_info *)match->data;
@@ -93,7 +93,7 @@
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
struct ip6t_mark_info *info = (struct ip6t_mark_info *)match->data;
Modified: trunk/iptables/extensions/libip6t_mh.c
===================================================================
--- trunk/iptables/extensions/libip6t_mh.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_mh.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -67,7 +67,7 @@
print_types_all();
}
-static void init(struct ip6t_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_mh *mhinfo = (struct ip6t_mh *)m->data;
@@ -128,7 +128,7 @@
static int parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_mh *mhinfo = (struct ip6t_mh *)(*match)->data;
@@ -196,7 +196,7 @@
}
static void print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ip6t_mh *mhinfo = (struct ip6t_mh *)match->data;
@@ -210,8 +210,7 @@
mhinfo->invflags & ~IP6T_MH_INV_MASK);
}
-static void save(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_mh *mhinfo = (struct ip6t_mh *)match->data;
Modified: trunk/iptables/extensions/libip6t_multiport.c
===================================================================
--- trunk/iptables/extensions/libip6t_multiport.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_multiport.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -130,7 +130,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
}
@@ -155,7 +155,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
const char *proto;
struct ip6t_multiport *multiinfo
@@ -280,7 +280,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ip6t_multiport *multiinfo
@@ -358,7 +358,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_multiport *multiinfo
= (const struct ip6t_multiport *)match->data;
Modified: trunk/iptables/extensions/libip6t_owner.c
===================================================================
--- trunk/iptables/extensions/libip6t_owner.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_owner.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -53,7 +53,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_owner_info *ownerinfo = (struct ip6t_owner_info *)(*match)->data;
@@ -200,7 +200,7 @@
/* Prints out the matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ip6t_owner_info *info = (struct ip6t_owner_info *)match->data;
@@ -216,7 +216,7 @@
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
struct ip6t_owner_info *info = (struct ip6t_owner_info *)match->data;
Modified: trunk/iptables/extensions/libip6t_physdev.c
===================================================================
--- trunk/iptables/extensions/libip6t_physdev.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_physdev.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -35,7 +35,7 @@
};
static void
-init(struct ip6t_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 ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_physdev_info *info =
(struct ip6t_physdev_info*)(*match)->data;
@@ -122,7 +122,7 @@
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
struct ip6t_physdev_info *info =
@@ -148,7 +148,7 @@
printf(" ");
}
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
struct ip6t_physdev_info *info =
(struct ip6t_physdev_info*)match->data;
Modified: trunk/iptables/extensions/libip6t_policy.c
===================================================================
--- trunk/iptables/extensions/libip6t_policy.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_policy.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -133,7 +133,7 @@
/* End duplicated code from ip6tables.c */
-static void init(struct ip6t_entry_match *m, unsigned int *nfcache)
+static void init(struct xt_entry_match *m, unsigned int *nfcache)
{
*nfcache |= NFC_UNKNOWN;
}
@@ -168,7 +168,7 @@
static int parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_policy_info *info = (void *)(*match)->data;
struct ip6t_policy_elem *e = &info->pol[info->len];
@@ -428,7 +428,7 @@
}
static void print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match,
+ const struct xt_entry_match *match,
int numeric)
{
const struct ip6t_policy_info *info = (void *)match->data;
@@ -445,7 +445,7 @@
printf("\n");
}
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_policy_info *info = (void *)match->data;
unsigned int i;
Modified: trunk/iptables/extensions/libip6t_rt.c
===================================================================
--- trunk/iptables/extensions/libip6t_rt.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_rt.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -139,7 +139,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_rt *rtinfo = (struct ip6t_rt *)m->data;
@@ -158,7 +158,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_rt *rtinfo = (struct ip6t_rt *)(*match)->data;
@@ -278,7 +278,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_rt *rtinfo = (struct ip6t_rt *)match->data;
@@ -304,7 +304,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_rt *rtinfo = (struct ip6t_rt *)match->data;
Modified: trunk/iptables/extensions/libip6t_standard.c
===================================================================
--- trunk/iptables/extensions/libip6t_standard.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_standard.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -22,7 +22,7 @@
/* Initialize the target. */
static void
-init(struct ip6t_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 ip6t_entry *entry,
- struct ip6t_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 ip6t_ip6 *ip6, const struct ip6t_entry_target *target)
+save(const struct ip6t_ip6 *ip6, const struct xt_entry_target *target)
{
}
Modified: trunk/iptables/extensions/libip6t_state.c
===================================================================
--- trunk/iptables/extensions/libip6t_state.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_state.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -67,7 +67,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_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 ip6t_ip6 *ip,
- const struct ip6t_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 ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
struct ipt_state_info *sinfo = (struct ipt_state_info *)match->data;
Modified: trunk/iptables/extensions/libip6t_tcp.c
===================================================================
--- trunk/iptables/extensions/libip6t_tcp.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_tcp.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -131,7 +131,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_tcp *tcpinfo = (struct ip6t_tcp *)m->data;
@@ -149,7 +149,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_tcp *tcpinfo = (struct ip6t_tcp *)(*match)->data;
@@ -318,7 +318,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_tcp *tcp = (struct ip6t_tcp *)match->data;
@@ -341,7 +341,7 @@
}
/* Saves the union ipt_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_tcp *tcpinfo = (struct ip6t_tcp *)match->data;
Modified: trunk/iptables/extensions/libip6t_udp.c
===================================================================
--- trunk/iptables/extensions/libip6t_udp.c 2007-07-24 05:57:28 UTC (rev 6923)
+++ trunk/iptables/extensions/libip6t_udp.c 2007-07-24 05:58:56 UTC (rev 6924)
@@ -55,7 +55,7 @@
/* Initialize the match. */
static void
-init(struct ip6t_entry_match *m, unsigned int *nfcache)
+init(struct xt_entry_match *m, unsigned int *nfcache)
{
struct ip6t_udp *udpinfo = (struct ip6t_udp *)m->data;
@@ -71,7 +71,7 @@
parse(int c, char **argv, int invert, unsigned int *flags,
const struct ip6t_entry *entry,
unsigned int *nfcache,
- struct ip6t_entry_match **match)
+ struct xt_entry_match **match)
{
struct ip6t_udp *udpinfo = (struct ip6t_udp *)(*match)->data;
@@ -157,7 +157,7 @@
/* Prints out the union ipt_matchinfo. */
static void
print(const struct ip6t_ip6 *ip,
- const struct ip6t_entry_match *match, int numeric)
+ const struct xt_entry_match *match, int numeric)
{
const struct ip6t_udp *udp = (struct ip6t_udp *)match->data;
@@ -174,7 +174,7 @@
}
/* Saves the union ipt_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match)
+static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
{
const struct ip6t_udp *udpinfo = (struct ip6t_udp *)match->data;
More information about the netfilter-cvslog
mailing list