[netfilter-cvslog] r6926 - trunk/iptables/extensions
yasuyuki at netfilter.org
yasuyuki at netfilter.org
Tue Jul 24 08:03:46 CEST 2007
Author: yasuyuki at netfilter.org
Date: 2007-07-24 08:03:45 +0200 (Tue, 24 Jul 2007)
New Revision: 6926
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_NFLOG.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_hashlimit.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_owner.c
trunk/iptables/extensions/libip6t_physdev.c
trunk/iptables/extensions/libip6t_policy.c
trunk/iptables/extensions/libip6t_rt.c
trunk/iptables/extensions/libip6t_sctp.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:
Fixes warning on compilation of ip6tables matches/targets
This changes the type of arguments as follows
- ip6t_ip6 * -> void *
- ip6t_entry * -> void *
Modified: trunk/iptables/extensions/libip6t_CONNMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_CONNMARK.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_CONNMARK.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -66,7 +66,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ipt_connmark_target_info *markinfo
@@ -144,7 +144,7 @@
/* Prints out the target info. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_target *target,
int numeric)
{
@@ -174,7 +174,7 @@
/* Saves the target into in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_CONNSECMARK.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -31,7 +31,7 @@
};
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry, struct xt_entry_target **target)
+ const void *entry, struct xt_entry_target **target)
{
struct xt_connsecmark_target_info *info =
(struct xt_connsecmark_target_info*)(*target)->data;
@@ -86,7 +86,7 @@
}
}
-static void print(const struct ip6t_ip6 *ip,
+static void print(const void *ip,
const struct xt_entry_target *target, int numeric)
{
struct xt_connsecmark_target_info *info =
@@ -96,7 +96,7 @@
print_connsecmark(info);
}
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_HL.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -31,7 +31,7 @@
}
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ip6t_HL_info *info = (struct ip6t_HL_info *) (*target)->data;
@@ -96,7 +96,7 @@
"HL: You must specify an action");
}
-static void save(const struct ip6t_ip6 *ip,
+static void save(const void *ip,
const struct xt_entry_target *target)
{
const struct ip6t_HL_info *info =
@@ -117,7 +117,7 @@
printf("%u ", info->hop_limit);
}
-static void print(const struct ip6t_ip6 *ip,
+static void print(const void *ip,
const struct xt_entry_target *target, int numeric)
{
const struct ip6t_HL_info *info =
Modified: trunk/iptables/extensions/libip6t_LOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_LOG.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_LOG.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -110,7 +110,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ip6t_log_info *loginfo = (struct ip6t_log_info *)(*target)->data;
@@ -206,7 +206,7 @@
/* Prints out the targinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_target *target,
int numeric)
{
@@ -247,7 +247,7 @@
/* Saves the union ip6t_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_MARK.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -35,7 +35,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ip6t_mark_target_info *markinfo
@@ -75,7 +75,7 @@
/* Prints out the targinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_target *target,
int numeric)
{
@@ -88,7 +88,7 @@
/* Saves the union ipt_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+save(const void *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_NFLOG.c
===================================================================
--- trunk/iptables/extensions/libip6t_NFLOG.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_NFLOG.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -40,7 +40,7 @@
}
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct xt_nflog_info *info = (struct xt_nflog_info *)(*target)->data;
@@ -126,7 +126,7 @@
printf("%snflog-threshold %u ", prefix, info->threshold);
}
-static void print(const struct ip6t_ip6 *ip, const struct xt_entry_target *target,
+static void print(const void *ip, const struct xt_entry_target *target,
int numeric)
{
const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data;
@@ -134,7 +134,7 @@
nflog_print(info, "");
}
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+static void save(const void *ip, const struct xt_entry_target *target)
{
const struct xt_nflog_info *info = (struct xt_nflog_info *)target->data;
Modified: trunk/iptables/extensions/libip6t_NFQUEUE.c
===================================================================
--- trunk/iptables/extensions/libip6t_NFQUEUE.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_NFQUEUE.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -47,7 +47,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ipt_NFQ_info *tinfo
@@ -74,7 +74,7 @@
/* Prints out the targinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_target *target,
int numeric)
{
@@ -85,7 +85,7 @@
/* Saves the union ip6t_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_REJECT.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -85,7 +85,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ip6t_reject_info *reject =
@@ -120,7 +120,7 @@
/* Prints out ipt_reject_info. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_target *target,
int numeric)
{
@@ -136,7 +136,7 @@
}
/* Saves ipt_reject in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip,
+static void save(const void *ip,
const struct xt_entry_target *target)
{
const struct ip6t_reject_info *reject
Modified: trunk/iptables/extensions/libip6t_SECMARK.c
===================================================================
--- trunk/iptables/extensions/libip6t_SECMARK.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_SECMARK.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -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 xt_entry_target **target)
+ const void *entry, struct xt_entry_target **target)
{
struct xt_secmark_target_info *info =
(struct xt_secmark_target_info*)(*target)->data;
@@ -85,7 +85,7 @@
}
}
-static void print(const struct ip6t_ip6 *ip,
+static void print(const void *ip,
const struct xt_entry_target *target, int numeric)
{
struct xt_secmark_target_info *info =
@@ -96,7 +96,7 @@
}
/* Saves the target info in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_TCPMSS.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -43,7 +43,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
struct xt_entry_target **target)
{
struct ip6t_tcpmss_info *mssinfo
@@ -88,7 +88,7 @@
/* Prints out the targinfo. */
static void
-print(const struct ip6t_ip6 *ip6,
+print(const void *ip6,
const struct xt_entry_target *target,
int numeric)
{
@@ -102,7 +102,7 @@
/* Saves the union ip6t_targinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_target *target)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_ah.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -85,7 +85,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -157,7 +157,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_condition.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -26,7 +26,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry, unsigned int *nfcache,
+ const void *entry, unsigned int *nfcache,
struct xt_entry_match **match)
{
struct condition6_info *info =
@@ -64,7 +64,7 @@
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match, int numeric)
{
const struct condition6_info *info =
@@ -75,7 +75,7 @@
static void
-save(const struct ip6t_ip6 *ip,
+save(const void *ip,
const struct xt_entry_match *match)
{
const struct condition6_info *info =
Modified: trunk/iptables/extensions/libip6t_connmark.c
===================================================================
--- trunk/iptables/extensions/libip6t_connmark.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_connmark.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -56,7 +56,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -106,7 +106,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -120,7 +120,7 @@
/* Saves the matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_dst.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -132,7 +132,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -203,7 +203,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_esp.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -83,7 +83,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -129,7 +129,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_eui64.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -30,7 +30,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -44,7 +44,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -52,7 +52,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *ip, const struct xt_entry_match *match)
{
}
Modified: trunk/iptables/extensions/libip6t_frag.c
===================================================================
--- trunk/iptables/extensions/libip6t_frag.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_frag.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -93,7 +93,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -180,7 +180,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *ip, const struct xt_entry_match *match)
{
const struct ip6t_frag *fraginfo = (struct ip6t_frag *)match->data;
Modified: trunk/iptables/extensions/libip6t_hashlimit.c
===================================================================
--- trunk/iptables/extensions/libip6t_hashlimit.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_hashlimit.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -151,7 +151,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct ip6t_entry_match **match)
{
@@ -304,7 +304,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct ip6t_entry_match *match,
int numeric)
{
@@ -325,7 +325,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 void *ip, const struct ip6t_entry_match *match)
{
struct xt_hashlimit_info *r =
(struct xt_hashlimit_info *)match->data;
Modified: trunk/iptables/extensions/libip6t_hbh.c
===================================================================
--- trunk/iptables/extensions/libip6t_hbh.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_hbh.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -131,7 +131,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -200,7 +200,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_hl.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -26,7 +26,7 @@
}
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry, unsigned int *nfcache,
+ const void *entry, unsigned int *nfcache,
struct xt_entry_match **match)
{
struct ip6t_hl_info *info = (struct ip6t_hl_info *) (*match)->data;
@@ -89,7 +89,7 @@
"`--hl-eq', `--hl-lt', `--hl-gt'");
}
-static void print(const struct ip6t_ip6 *ip,
+static void print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -105,7 +105,7 @@
printf("HL match HL %s %u ", op[info->mode], info->hop_limit);
}
-static void save(const struct ip6t_ip6 *ip,
+static void save(const void *ip,
const struct xt_entry_match *match)
{
static const char *op[] = {
Modified: trunk/iptables/extensions/libip6t_icmp6.c
===================================================================
--- trunk/iptables/extensions/libip6t_icmp6.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_icmp6.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -156,7 +156,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -221,7 +221,7 @@
/* Prints out the union ipt_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -238,7 +238,7 @@
}
/* Saves the match in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_ipv6header.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -185,7 +185,7 @@
/* Parses command options; returns 0 if it ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -254,7 +254,7 @@
/* Prints out the match */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -279,7 +279,7 @@
/* Saves the match */
static void
-save(const struct ip6t_ip6 *ip,
+save(const void *ip,
const struct xt_entry_match *match)
{
Modified: trunk/iptables/extensions/libip6t_length.c
===================================================================
--- trunk/iptables/extensions/libip6t_length.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_length.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -68,7 +68,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -117,7 +117,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -127,7 +127,7 @@
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_limit.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -93,7 +93,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -156,7 +156,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -166,7 +166,7 @@
}
/* FIXME: Make minimalist: only print rate if not default --RR */
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_mac.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -56,7 +56,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -98,7 +98,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -111,7 +111,7 @@
}
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_mark.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -29,7 +29,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -77,7 +77,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -93,7 +93,7 @@
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_mh.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -126,7 +126,7 @@
#define MH_TYPES 0x01
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -195,7 +195,7 @@
}
}
-static void print(const struct ip6t_ip6 *ip,
+static void print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -210,7 +210,7 @@
mhinfo->invflags & ~IP6T_MH_INV_MASK);
}
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *ip, const struct xt_entry_match *match)
{
const struct ip6t_mh *mhinfo = (struct ip6t_mh *)match->data;
Modified: trunk/iptables/extensions/libip6t_owner.c
===================================================================
--- trunk/iptables/extensions/libip6t_owner.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_owner.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -51,7 +51,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -199,7 +199,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -216,7 +216,7 @@
/* Saves the union ip6t_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_physdev.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -41,7 +41,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -121,7 +121,7 @@
}
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -148,7 +148,7 @@
printf(" ");
}
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_policy.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -166,7 +166,7 @@
}
static int parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -427,7 +427,7 @@
printf("%sstrict ", prefix);
}
-static void print(const struct ip6t_ip6 *ip,
+static void print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -445,7 +445,7 @@
printf("\n");
}
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_rt.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -156,7 +156,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -277,7 +277,7 @@
/* Prints out the union ip6t_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *ip, const struct xt_entry_match *match)
{
const struct ip6t_rt *rtinfo = (struct ip6t_rt *)match->data;
Modified: trunk/iptables/extensions/libip6t_sctp.c
===================================================================
--- trunk/iptables/extensions/libip6t_sctp.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_sctp.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -263,7 +263,7 @@
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct ip6t_entry_match **match)
{
@@ -458,7 +458,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct ip6t_entry_match *match,
int numeric)
{
@@ -492,7 +492,7 @@
/* Saves the union xt_matchinfo in parsable form to stdout. */
static void
-save(const struct ip6t_ip6 *ip,
+save(const void *ip,
const struct ip6t_entry_match *match)
{
const struct xt_sctp_info *einfo =
Modified: trunk/iptables/extensions/libip6t_standard.c
===================================================================
--- trunk/iptables/extensions/libip6t_standard.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_standard.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -30,7 +30,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
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 xt_entry_target *target)
+save(const void *ip6, const struct xt_entry_target *target)
{
}
Modified: trunk/iptables/extensions/libip6t_state.c
===================================================================
--- trunk/iptables/extensions/libip6t_state.c 2007-07-24 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_state.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -65,7 +65,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -124,7 +124,7 @@
/* Prints out the matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
const struct xt_entry_match *match,
int numeric)
{
@@ -135,7 +135,7 @@
}
/* Saves the matchinfo in parsable form to stdout. */
-static void save(const struct ip6t_ip6 *ip, const struct xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_tcp.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -147,7 +147,7 @@
ate an option. */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -317,7 +317,7 @@
/* Prints out the union ipt_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *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 06:02:05 UTC (rev 6925)
+++ trunk/iptables/extensions/libip6t_udp.c 2007-07-24 06:03:45 UTC (rev 6926)
@@ -69,7 +69,7 @@
ate an option */
static int
parse(int c, char **argv, int invert, unsigned int *flags,
- const struct ip6t_entry *entry,
+ const void *entry,
unsigned int *nfcache,
struct xt_entry_match **match)
{
@@ -156,7 +156,7 @@
/* Prints out the union ipt_matchinfo. */
static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
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 xt_entry_match *match)
+static void save(const void *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