|
 |
05e71a |
From 5bee10734107bd4365fa9aff634c1b492634f454 Mon Sep 17 00:00:00 2001
|
|
|
05e71a |
From: Felix Janda <felix.janda@posteo.de>
|
|
|
05e71a |
Date: Sat, 16 May 2015 12:22:39 +0200
|
|
|
05e71a |
Subject: [PATCH] extensions: Use stdint types
|
|
|
05e71a |
|
|
|
05e71a |
Signed-off-by: Felix Janda <felix.janda@posteo.de>
|
|
|
05e71a |
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
|
05e71a |
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
|
05e71a |
---
|
|
|
05e71a |
extensions/ebt_ip6.c | 4 ++--
|
|
|
05e71a |
extensions/ebt_limit.c | 10 +++++-----
|
|
|
05e71a |
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
05e71a |
|
|
|
05e71a |
diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c
|
|
|
05e71a |
index e3e0956e00f01..dd48547b0010b 100644
|
|
|
05e71a |
--- a/extensions/ebt_ip6.c
|
|
|
05e71a |
+++ b/extensions/ebt_ip6.c
|
|
|
05e71a |
@@ -53,8 +53,8 @@ static const struct option opts[] =
|
|
|
05e71a |
|
|
|
05e71a |
struct icmpv6_names {
|
|
|
05e71a |
const char *name;
|
|
|
05e71a |
- u_int8_t type;
|
|
|
05e71a |
- u_int8_t code_min, code_max;
|
|
|
05e71a |
+ uint8_t type;
|
|
|
05e71a |
+ uint8_t code_min, code_max;
|
|
|
05e71a |
};
|
|
|
05e71a |
|
|
|
05e71a |
static const struct icmpv6_names icmpv6_codes[] = {
|
|
|
05e71a |
diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c
|
|
|
05e71a |
index ee40e5ccc9172..d189a09aa7cab 100644
|
|
|
05e71a |
--- a/extensions/ebt_limit.c
|
|
|
05e71a |
+++ b/extensions/ebt_limit.c
|
|
|
05e71a |
@@ -59,11 +59,11 @@ static void print_help(void)
|
|
|
05e71a |
" default %u\n", EBT_LIMIT_BURST);
|
|
|
05e71a |
}
|
|
|
05e71a |
|
|
|
05e71a |
-static int parse_rate(const char *rate, u_int32_t *val)
|
|
|
05e71a |
+static int parse_rate(const char *rate, uint32_t *val)
|
|
|
05e71a |
{
|
|
|
05e71a |
const char *delim;
|
|
|
05e71a |
- u_int32_t r;
|
|
|
05e71a |
- u_int32_t mult = 1; /* Seconds by default. */
|
|
|
05e71a |
+ uint32_t r;
|
|
|
05e71a |
+ uint32_t mult = 1; /* Seconds by default. */
|
|
|
05e71a |
|
|
|
05e71a |
delim = strchr(rate, '/');
|
|
|
05e71a |
if (delim) {
|
|
|
05e71a |
@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry,
|
|
|
05e71a |
struct rates
|
|
|
05e71a |
{
|
|
|
05e71a |
const char *name;
|
|
|
05e71a |
- u_int32_t mult;
|
|
|
05e71a |
+ uint32_t mult;
|
|
|
05e71a |
};
|
|
|
05e71a |
|
|
|
05e71a |
static struct rates g_rates[] =
|
|
|
05e71a |
@@ -162,7 +162,7 @@ static struct rates g_rates[] =
|
|
|
05e71a |
{ "sec", EBT_LIMIT_SCALE }
|
|
|
05e71a |
};
|
|
|
05e71a |
|
|
|
05e71a |
-static void print_rate(u_int32_t period)
|
|
|
05e71a |
+static void print_rate(uint32_t period)
|
|
|
05e71a |
{
|
|
|
05e71a |
unsigned int i;
|
|
|
05e71a |
|
|
|
05e71a |
--
|
|
|
05e71a |
2.21.0
|
|
|
05e71a |
|