Fixes warning on compilation of ip6tables matches/targets

This changes the type of arguments as follows
- ip6t_ip6 * -> void *
- ip6t_entry * -> void *

diff --git a/extensions/libip6t_CONNMARK.c b/extensions/libip6t_CONNMARK.c
index 86b8e0f743b96040fbdb7a530c9c636b9f1269c0..69d3a5aa199cdce5d9e2bfa5ce39a229fc3711f8 100644 (file)
--- a/extensions/libip6t_CONNMARK.c
+++ b/extensions/libip6t_CONNMARK.c
@@ -66,7 +66,7 @@ init(struct xt_entry_target *t, unsigned int *nfcache)
    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 @@ print_mask(const char *text, unsigned long mask)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;

diff --git a/extensions/libip6t_CONNSECMARK.c b/extensions/libip6t_CONNSECMARK.c
index dc6a02f02b3b20b25f66da220ba8d8ec65ab859e..805492c5d2547fd8380022a0842e14a1f60716a6 100644 (file)
--- a/extensions/libip6t_CONNSECMARK.c
+++ b/extensions/libip6t_CONNSECMARK.c
@@ -31,7 +31,7 @@ static struct option opts[] = {
 };
 
 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_connsecmark(struct xt_connsecmark_target_info *info)
        }
 }
 
-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 @@ static void print(const struct ip6t_ip6 *ip,
        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;

diff --git a/extensions/libip6t_HL.c b/extensions/libip6t_HL.c
index fc6ba3433fd657cb5f9c4cf9469cdfbe24cd214a..33bab71492e19b61f2039c9052e1edfc88213ac0 100644 (file)
--- a/extensions/libip6t_HL.c
+++ b/extensions/libip6t_HL.c
@@ -31,7 +31,7 @@ static void help(void)
 }
 
 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 @@ static void final_check(unsigned int flags)
                                "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 @@ static void save(const struct ip6t_ip6 *ip,
        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 =

diff --git a/extensions/libip6t_LOG.c b/extensions/libip6t_LOG.c
index ad65bd5c2f7e9dc3352d18cfad5c415d14dbdec4..7fdbc0c83dcd6604d98fe7f353b2ce5a2906fa61 100644 (file)
--- a/extensions/libip6t_LOG.c
+++ b/extensions/libip6t_LOG.c
@@ -110,7 +110,7 @@ parse_level(const char *level)
    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 @@ static void final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;

diff --git a/extensions/libip6t_MARK.c b/extensions/libip6t_MARK.c
index e5b7c70e882f43c5fd0d501dd66b1e79d8b4467c..0ca405954bd6ff1599607dfb42a91bbe77673fd9 100644 (file)
--- a/extensions/libip6t_MARK.c
+++ b/extensions/libip6t_MARK.c
@@ -35,7 +35,7 @@ init(struct xt_entry_target *t, unsigned int *nfcache)
    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 @@ print_mark(unsigned long mark)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;

diff --git a/extensions/libip6t_NFLOG.c b/extensions/libip6t_NFLOG.c
index 2c0cd3d5d300e81f370e1e56a1b52eb63d23553b..9f4ebaa5bec72921ec7d90ef57c7c8690fca27d6 100644 (file)
--- a/extensions/libip6t_NFLOG.c
+++ b/extensions/libip6t_NFLOG.c
@@ -40,7 +40,7 @@ static void init(struct ip6t_entry_target *t, unsigned int *nfcache)
 }
 
 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 @@ static void nflog_print(const struct xt_nflog_info *info, char *prefix)
                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 @@ static void print(const struct ip6t_ip6 *ip, const struct xt_entry_target *targe
        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;
 

diff --git a/extensions/libip6t_NFQUEUE.c b/extensions/libip6t_NFQUEUE.c
index e1f17ab5d196fe30fcb87c60fd375f1b36610cc3..afc3a6e894243ce9228d3019c5caabe0f5350089 100644 (file)
--- a/extensions/libip6t_NFQUEUE.c
+++ b/extensions/libip6t_NFQUEUE.c
@@ -47,7 +47,7 @@ parse_num(const char *s, struct ipt_NFQ_info *tinfo)
 
 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 @@ final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;

diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index 5b3c7bfb74d676cab60817fa0fc727bdaceb7c26..ffc9680e72caa613959044fea0a6d082d0bd2c05 100644 (file)
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -85,7 +85,7 @@ init(struct xt_entry_target *t, unsigned int *nfcache)
    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 @@ static void final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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

diff --git a/extensions/libip6t_SECMARK.c b/extensions/libip6t_SECMARK.c
index 88fbf5990104d7ffac3b1c498af0c40749f79a79..16961a3e64485f890657e140dc7165fa23922ad3 100644 (file)
--- a/extensions/libip6t_SECMARK.c
+++ b/extensions/libip6t_SECMARK.c
@@ -39,7 +39,7 @@ static void init(struct xt_entry_target *t, unsigned int *nfcache)
  * 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_secmark(struct xt_secmark_target_info *info)
        }
 }
 
-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 @@ static void print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;

diff --git a/extensions/libip6t_TCPMSS.c b/extensions/libip6t_TCPMSS.c
index 1f4b32beb88aef611e34a1a75f878275c9097b08..f93a5a3bd4f1a6a513821115aaa560debb32c15e 100644 (file)
--- a/extensions/libip6t_TCPMSS.c
+++ b/extensions/libip6t_TCPMSS.c
@@ -43,7 +43,7 @@ init(struct xt_entry_target *t, unsigned int *nfcache)
    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 @@ final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip6,
 
 /* 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;

diff --git a/extensions/libip6t_ah.c b/extensions/libip6t_ah.c
index 5f1013de803ce5fbbe10551af36fd2cec8852233..2379f21abd7f19686c96a721b9f509d0692f4eb0 100644 (file)
--- a/extensions/libip6t_ah.c
+++ b/extensions/libip6t_ah.c
@@ -85,7 +85,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_len(const char *name, u_int32_t len, int invert)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_condition.c b/extensions/libip6t_condition.c
index 8cb4ec05bde649b767fb0de5b30c0f71878b9626..633eef19bfbebb3f35de8ad10d9e5a6aa34093ce 100644 (file)
--- a/extensions/libip6t_condition.c
+++ b/extensions/libip6t_condition.c
@@ -26,7 +26,7 @@ static struct option opts[] = {
 
 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 @@ final_check(unsigned int flags)
 
 
 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 @@ print(const struct ip6t_ip6 *ip,
 
 
 static void
-save(const struct ip6t_ip6 *ip,
+save(const void *ip,
                 const struct xt_entry_match *match)
 {
        const struct condition6_info *info =

diff --git a/extensions/libip6t_connmark.c b/extensions/libip6t_connmark.c
index 9900af4a0c889fea1ba22624e942002345e6af7b..0a67c3a2b5ed581783e5870343c7d57d17ac92b0 100644 (file)
--- a/extensions/libip6t_connmark.c
+++ b/extensions/libip6t_connmark.c
@@ -56,7 +56,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;
 

diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index 4b0cd3e1490cbd6a3a82b17f8bd640e2a09e9af5..8c9455b1f56921071b2b5cf4043fbdfd31777d0f 100644 (file)
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -132,7 +132,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_options(int optsnr, u_int16_t *optsp)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_esp.c b/extensions/libip6t_esp.c
index 9b031b73870a77ae23929c6654f11bb06d76e1c6..04cc54686bacd146b0faabfac2a40c3d76a63910 100644 (file)
--- a/extensions/libip6t_esp.c
+++ b/extensions/libip6t_esp.c
@@ -83,7 +83,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_spis(const char *name, u_int32_t min, u_int32_t max,
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_eui64.c b/extensions/libip6t_eui64.c
index 494f17aa59926e8e8ddf640a7acfc83107421798..0d22df7cee9519649afea8132ccd94b4f26b48a7 100644 (file)
--- a/extensions/libip6t_eui64.c
+++ b/extensions/libip6t_eui64.c
@@ -30,7 +30,7 @@ static struct option opts[] = {
    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 @@ static void final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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)
 {
 
 }

diff --git a/extensions/libip6t_frag.c b/extensions/libip6t_frag.c
index 44661e9cd4f18f7cef3d4af2409b3efd06d58666..fcdee1b6c8754725e1631d5e32f4c209affc6204 100644 (file)
--- a/extensions/libip6t_frag.c
+++ b/extensions/libip6t_frag.c
@@ -93,7 +93,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_ids(const char *name, u_int32_t min, u_int32_t max,
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_hashlimit.c b/extensions/libip6t_hashlimit.c
index 70d2ff3c129387de17fba5c2a24d16bcdf5dcc47..9f820fc831b0832d73c7846bdddab1caf9e2e878 100644 (file)
--- a/extensions/libip6t_hashlimit.c
+++ b/extensions/libip6t_hashlimit.c
@@ -151,7 +151,7 @@ static int parse_mode(struct xt_hashlimit_info *r, char *optarg)
    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 @@ static void print_mode(const struct xt_hashlimit_info *r, char separator)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;

diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index 24a0485d9dafe206131e1305f26be7d5a5b38b00..4312399ebca16c20dbc49092a580de15798b4185 100644 (file)
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -131,7 +131,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_options(int optsnr, u_int16_t *optsp)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_hl.c b/extensions/libip6t_hl.c
index 4a4d3c52ce3c6b737b926e4e578123776498e61f..58b9fcfd93d612ca1a3cf088002dab1b826a30e2 100644 (file)
--- a/extensions/libip6t_hl.c
+++ b/extensions/libip6t_hl.c
@@ -26,7 +26,7 @@ static void help(void)
 }
 
 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 @@ static void final_check(unsigned int flags)
                        "`--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 @@ static void print(const struct ip6t_ip6 *ip,
        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[] = {

diff --git a/extensions/libip6t_icmp6.c b/extensions/libip6t_icmp6.c
index ac7e7997765b6297c14caf9fff04e139c6cbd3c4..bc150c28c84c07a6483529df73a3bdf33007a031 100644 (file)
--- a/extensions/libip6t_icmp6.c
+++ b/extensions/libip6t_icmp6.c
@@ -156,7 +156,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ static void print_icmpv6type(u_int8_t type,
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_ipv6header.c b/extensions/libip6t_ipv6header.c
index d0bc93dec55e0cdbe8619b4acbe79ce8d2a71209..858e0293e9718ea8f97e42c67b6f123d5b326a91 100644 (file)
--- a/extensions/libip6t_ipv6header.c
+++ b/extensions/libip6t_ipv6header.c
@@ -185,7 +185,7 @@ parse_header(const char *flags) {
 /* 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 @@ print_header(u_int8_t flags){
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* Saves the match */
 static void
-save(const struct ip6t_ip6 *ip,
+save(const void *ip,
      const struct xt_entry_match *match)
 {
 

diff --git a/extensions/libip6t_length.c b/extensions/libip6t_length.c
index 4c77fee8d36ae53b1677e0ae1a4fac7f12c97c74..d89f0280aac710c3112c93c6b25b13c4e49c0146 100644 (file)
--- a/extensions/libip6t_length.c
+++ b/extensions/libip6t_length.c
@@ -68,7 +68,7 @@ parse_lengths(const char *s, struct ip6t_length_info *info)
    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 @@ print_length(struct ip6t_length_info *info)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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);

diff --git a/extensions/libip6t_limit.c b/extensions/libip6t_limit.c
index 2a5a9b283e1dca8e9d1d354befef38384818a3df..c1f7014350a70ac039253fea78552d0b3911c479 100644 (file)
--- a/extensions/libip6t_limit.c
+++ b/extensions/libip6t_limit.c
@@ -93,7 +93,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ static void print_rate(u_int32_t period)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_mac.c b/extensions/libip6t_mac.c
index b50b0c90d945d6d109b03e9fbffdade3234dd41e..77a639042fa5a6f3d57324466065ac18d8b53a6b 100644 (file)
--- a/extensions/libip6t_mac.c
+++ b/extensions/libip6t_mac.c
@@ -56,7 +56,7 @@ parse_mac(const char *mac, struct ip6t_mac_info *info)
    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 @@ static void final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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("! ");

diff --git a/extensions/libip6t_mark.c b/extensions/libip6t_mark.c
index bcdaadaceb6608491d208d580f3b1c424eb43f01..9b801a4ed4c97c87f427039d831e53452208ad50 100644 (file)
--- a/extensions/libip6t_mark.c
+++ b/extensions/libip6t_mark.c
@@ -29,7 +29,7 @@ static struct option opts[] = {
    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 @@ final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;
 

diff --git a/extensions/libip6t_mh.c b/extensions/libip6t_mh.c
index 7ea8f89295ce1c6aa466520b265dc4dbbe426d3a..3ae1cd44e68cbdd76eea9972f7ced35af55ba4b9 100644 (file)
--- a/extensions/libip6t_mh.c
+++ b/extensions/libip6t_mh.c
@@ -126,7 +126,7 @@ static void parse_mh_types(const char *mhtype, u_int8_t *types)
 #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_types(u_int8_t min, u_int8_t max, int invert, int numeric)
        }
 }
 
-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 @@ static void print(const struct ip6t_ip6 *ip,
                       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;
 

diff --git a/extensions/libip6t_owner.c b/extensions/libip6t_owner.c
index adbe840db54584204c9776617c954201cbd9fd3e..ff671ab2f548e4e5e14d9d92fc51715250b7eee2 100644 (file)
--- a/extensions/libip6t_owner.c
+++ b/extensions/libip6t_owner.c
@@ -51,7 +51,7 @@ static struct option opts[] = {
    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 @@ final_check(unsigned int flags)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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;
 

diff --git a/extensions/libip6t_physdev.c b/extensions/libip6t_physdev.c
index d4df6420fad28ca48dbb7cb3417f6e823459d0d0..d2a37f62255a8f72ac26fc56147a4093df3f4465 100644 (file)
--- a/extensions/libip6t_physdev.c
+++ b/extensions/libip6t_physdev.c
@@ -41,7 +41,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
 
 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 final_check(unsigned int flags)
 }
 
 static void
-print(const struct ip6t_ip6 *ip,
+print(const void *ip,
       const struct xt_entry_match *match,
       int numeric)
 {
@@ -148,7 +148,7 @@ print(const struct ip6t_ip6 *ip,
        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;

diff --git a/extensions/libip6t_policy.c b/extensions/libip6t_policy.c
index f5c6487d470e600a906c57b85dd859922bc2b734..b7062c62936248cc5ee0bc3134e2129e84d6fabe 100644 (file)
--- a/extensions/libip6t_policy.c
+++ b/extensions/libip6t_policy.c
@@ -166,7 +166,7 @@ static int parse_mode(char *s)
 }
 
 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 @@ static void print_flags(char *prefix, const struct ip6t_policy_info *info)
                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 @@ static void print(const struct ip6t_ip6 *ip,
        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;

diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index 246b2da8726342dbbd6cc338505b0e371eb262ea..a36c65aeb666030f9fbc2e5f26acfefe226bbde1 100644 (file)
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -156,7 +156,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_addresses(int addrnr, struct in6_addr *addrp)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_sctp.c b/extensions/libip6t_sctp.c
index aee707295e510d23b329eec43e9f707f49d070e0..d2896e158b01af63ed9d74a0b15f15dba20dd901 100644 (file)
--- a/extensions/libip6t_sctp.c
+++ b/extensions/libip6t_sctp.c
@@ -263,7 +263,7 @@ parse_sctp_chunks(struct xt_sctp_info *einfo,
 
 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 @@ out:
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 
 /* 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 =

diff --git a/extensions/libip6t_standard.c b/extensions/libip6t_standard.c
index 211cc8b2ff78939e3277dcc2e8db559edb807ef5..0d9f4904e1a7e0ab9eec79f9a96c69bc42c77816 100644 (file)
--- a/extensions/libip6t_standard.c
+++ b/extensions/libip6t_standard.c
@@ -30,7 +30,7 @@ init(struct xt_entry_target *t, unsigned int *nfcache)
    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 @@ static void final_check(unsigned int flags)
 
 /* 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)
 {
 }
 

diff --git a/extensions/libip6t_state.c b/extensions/libip6t_state.c
index 4bfb50be3b2f3ea7addc657528498ef7a82056ed..01647a6f12ae0d4f551514b2c179a2b1da43cf25 100644 (file)
--- a/extensions/libip6t_state.c
+++ b/extensions/libip6t_state.c
@@ -65,7 +65,7 @@ parse_states(const char *arg, struct ipt_state_info *sinfo)
    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 @@ static void print_state(unsigned int statemask)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_tcp.c b/extensions/libip6t_tcp.c
index 8e46deb8499d5b263b014775ae08e763e054815a..e0325d691afdf72955c5871581d1ebe15ac547d7 100644 (file)
--- a/extensions/libip6t_tcp.c
+++ b/extensions/libip6t_tcp.c
@@ -147,7 +147,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_flags(u_int8_t mask, u_int8_t cmp, int invert, int numeric)
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;
 

diff --git a/extensions/libip6t_udp.c b/extensions/libip6t_udp.c
index 61d824f5921aad1a271d084cecbf237d3b982335..3355de2f67ecaa194769f65b75ba31dc5ba84858 100644 (file)
--- a/extensions/libip6t_udp.c
+++ b/extensions/libip6t_udp.c
@@ -69,7 +69,7 @@ init(struct xt_entry_match *m, unsigned int *nfcache)
    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 @@ print_ports(const char *name, u_int16_t min, u_int16_t max,
 
 /* 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 @@ print(const struct ip6t_ip6 *ip,
 }
 
 /* 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;