summaryrefslogtreecommitdiffstats
path: root/extensions
diff options
context:
space:
mode:
Diffstat (limited to 'extensions')
-rw-r--r--extensions/libip6t_REJECT.c1
-rw-r--r--extensions/libip6t_dst.c25
-rw-r--r--extensions/libip6t_hbh.c25
-rw-r--r--extensions/libip6t_rt.c4
-rw-r--r--extensions/libipt_recent.c2
5 files changed, 8 insertions, 49 deletions
diff --git a/extensions/libip6t_REJECT.c b/extensions/libip6t_REJECT.c
index b8b9732..8c4cc7f 100644
--- a/extensions/libip6t_REJECT.c
+++ b/extensions/libip6t_REJECT.c
@@ -110,6 +110,7 @@ parse(int c, char **argv, int invert, unsigned int *flags,
exit_error(PARAMETER_PROBLEM, "unknown reject type `%s'",optarg);
default:
/* Fall through */
+ break;
}
return 0;
}
diff --git a/extensions/libip6t_dst.c b/extensions/libip6t_dst.c
index 8ec3912..b132701 100644
--- a/extensions/libip6t_dst.c
+++ b/extensions/libip6t_dst.c
@@ -185,27 +185,6 @@ final_check(unsigned int flags)
}
static void
-print_nums(const char *name, u_int32_t min, u_int32_t max,
- int invert)
-{
- const char *inv = invert ? "!" : "";
-
- if (min != 0 || max != 0xFFFFFFFF || invert) {
- printf("%s", name);
- if (min == max) {
- printf(":%s", inv);
- printf("%u", min);
- } else {
- printf("s:%s", inv);
- printf("%u",min);
- printf(":");
- printf("%u",max);
- }
- printf(" ");
- }
-}
-
-static void
print_options(int optsnr, u_int16_t *optsp)
{
unsigned int i;
@@ -234,7 +213,7 @@ print(const struct ip6t_ip6 *ip,
printf(" ");
}
if (optinfo->flags & IP6T_OPTS_OPTS) printf("opts ");
- print_options(optinfo->optsnr, optinfo->opts);
+ print_options(optinfo->optsnr, (u_int16_t *)optinfo->opts);
if (optinfo->flags & IP6T_OPTS_NSTRICT) printf("not-strict ");
if (optinfo->invflags & ~IP6T_OPTS_INV_MASK)
printf("Unknown invflags: 0x%X ",
@@ -253,7 +232,7 @@ static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match
}
if (optinfo->flags & IP6T_OPTS_OPTS) printf("--%s-opts ", LNAME);
- print_options(optinfo->optsnr, optinfo->opts);
+ print_options(optinfo->optsnr, (u_int16_t *)optinfo->opts);
if (optinfo->flags & IP6T_OPTS_NSTRICT) printf("--%s-not-strict ", LNAME);
}
diff --git a/extensions/libip6t_hbh.c b/extensions/libip6t_hbh.c
index 43b4316..d0acd42 100644
--- a/extensions/libip6t_hbh.c
+++ b/extensions/libip6t_hbh.c
@@ -185,27 +185,6 @@ final_check(unsigned int flags)
}
static void
-print_nums(const char *name, u_int32_t min, u_int32_t max,
- int invert)
-{
- const char *inv = invert ? "!" : "";
-
- if (min != 0 || max != 0xFFFFFFFF || invert) {
- printf("%s", name);
- if (min == max) {
- printf(":%s", inv);
- printf("%u", min);
- } else {
- printf("s:%s", inv);
- printf("%u",min);
- printf(":");
- printf("%u",max);
- }
- printf(" ");
- }
-}
-
-static void
print_options(int optsnr, u_int16_t *optsp)
{
unsigned int i;
@@ -234,7 +213,7 @@ print(const struct ip6t_ip6 *ip,
printf(" ");
}
if (optinfo->flags & IP6T_OPTS_OPTS) printf("opts ");
- print_options(optinfo->optsnr, optinfo->opts);
+ print_options(optinfo->optsnr, (u_int16_t *)optinfo->opts);
if (optinfo->flags & IP6T_OPTS_NSTRICT) printf("not-strict ");
if (optinfo->invflags & ~IP6T_OPTS_INV_MASK)
printf("Unknown invflags: 0x%X ",
@@ -253,7 +232,7 @@ static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match
}
if (optinfo->flags & IP6T_OPTS_OPTS) printf("--%s-opts ", LNAME);
- print_options(optinfo->optsnr, optinfo->opts);
+ print_options(optinfo->optsnr, (u_int16_t *)optinfo->opts);
if (optinfo->flags & IP6T_OPTS_NSTRICT) printf("--%s-not-strict ", LNAME);
}
diff --git a/extensions/libip6t_rt.c b/extensions/libip6t_rt.c
index b407be1..06cab16 100644
--- a/extensions/libip6t_rt.c
+++ b/extensions/libip6t_rt.c
@@ -296,7 +296,7 @@ print(const struct ip6t_ip6 *ip,
}
if (rtinfo->flags & IP6T_RT_RES) printf("reserved ");
if (rtinfo->flags & IP6T_RT_FST) printf("0-addrs ");
- print_addresses(rtinfo->addrnr, rtinfo->addrs);
+ print_addresses(rtinfo->addrnr, (struct in6_addr *)rtinfo->addrs);
if (rtinfo->flags & IP6T_RT_FST_NSTRICT) printf("0-not-strict ");
if (rtinfo->invflags & ~IP6T_RT_INV_MASK)
printf("Unknown invflags: 0x%X ",
@@ -336,7 +336,7 @@ static void save(const struct ip6t_ip6 *ip, const struct ip6t_entry_match *match
if (rtinfo->flags & IP6T_RT_RES) printf("--rt-0-res ");
if (rtinfo->flags & IP6T_RT_FST) printf("--rt-0-addrs ");
- print_addresses(rtinfo->addrnr, rtinfo->addrs);
+ print_addresses(rtinfo->addrnr, (struct in6_addr *)rtinfo->addrs);
if (rtinfo->flags & IP6T_RT_FST_NSTRICT) printf("--rt-0-not-strict ");
}
diff --git a/extensions/libipt_recent.c b/extensions/libipt_recent.c
index 5b48cd3..cda0f32 100644
--- a/extensions/libipt_recent.c
+++ b/extensions/libipt_recent.c
@@ -23,7 +23,7 @@ help(void)
" the last 'seconds' seconds.\n"
" --hitcount hits For check and update commands above.\n"
" Specifies that the match will only occur if source address seen hits times.\n"
-" May be used in conjunction with the seconds option.\n",
+" May be used in conjunction with the seconds option.\n"
" --rttl For check and update commands above.\n"
" Specifies that the match will only occur if the source address and the TTL\n"
" match between this packet and the one which was set.\n"