80ddfa2d29
- Add upstream changes since last release - Rename package to ebtables-legacy - Split systemd service into services sub-package - Rewrite systemd unit helper script for compatibility with ebtables-nft - Drop module unloading on service stop, this causes more harm than good - Remove save format settings, they are not effective anymore - Remove save on restart setting, restart is merely stop && start - Complete integration into alternatives - Remove needless ldconfig calls
68 lines
1.8 KiB
Diff
68 lines
1.8 KiB
Diff
From 5bee10734107bd4365fa9aff634c1b492634f454 Mon Sep 17 00:00:00 2001
|
|
From: Felix Janda <felix.janda@posteo.de>
|
|
Date: Sat, 16 May 2015 12:22:39 +0200
|
|
Subject: [PATCH] extensions: Use stdint types
|
|
|
|
Signed-off-by: Felix Janda <felix.janda@posteo.de>
|
|
Signed-off-by: Pablo Neira Ayuso <pablo@netfilter.org>
|
|
Signed-off-by: Phil Sutter <psutter@redhat.com>
|
|
---
|
|
extensions/ebt_ip6.c | 4 ++--
|
|
extensions/ebt_limit.c | 10 +++++-----
|
|
2 files changed, 7 insertions(+), 7 deletions(-)
|
|
|
|
diff --git a/extensions/ebt_ip6.c b/extensions/ebt_ip6.c
|
|
index e3e0956e00f01..dd48547b0010b 100644
|
|
--- a/extensions/ebt_ip6.c
|
|
+++ b/extensions/ebt_ip6.c
|
|
@@ -53,8 +53,8 @@ static const struct option opts[] =
|
|
|
|
struct icmpv6_names {
|
|
const char *name;
|
|
- u_int8_t type;
|
|
- u_int8_t code_min, code_max;
|
|
+ uint8_t type;
|
|
+ uint8_t code_min, code_max;
|
|
};
|
|
|
|
static const struct icmpv6_names icmpv6_codes[] = {
|
|
diff --git a/extensions/ebt_limit.c b/extensions/ebt_limit.c
|
|
index ee40e5ccc9172..d189a09aa7cab 100644
|
|
--- a/extensions/ebt_limit.c
|
|
+++ b/extensions/ebt_limit.c
|
|
@@ -59,11 +59,11 @@ static void print_help(void)
|
|
" default %u\n", EBT_LIMIT_BURST);
|
|
}
|
|
|
|
-static int parse_rate(const char *rate, u_int32_t *val)
|
|
+static int parse_rate(const char *rate, uint32_t *val)
|
|
{
|
|
const char *delim;
|
|
- u_int32_t r;
|
|
- u_int32_t mult = 1; /* Seconds by default. */
|
|
+ uint32_t r;
|
|
+ uint32_t mult = 1; /* Seconds by default. */
|
|
|
|
delim = strchr(rate, '/');
|
|
if (delim) {
|
|
@@ -151,7 +151,7 @@ static void final_check(const struct ebt_u_entry *entry,
|
|
struct rates
|
|
{
|
|
const char *name;
|
|
- u_int32_t mult;
|
|
+ uint32_t mult;
|
|
};
|
|
|
|
static struct rates g_rates[] =
|
|
@@ -162,7 +162,7 @@ static struct rates g_rates[] =
|
|
{ "sec", EBT_LIMIT_SCALE }
|
|
};
|
|
|
|
-static void print_rate(u_int32_t period)
|
|
+static void print_rate(uint32_t period)
|
|
{
|
|
unsigned int i;
|
|
|
|
--
|
|
2.21.0
|
|
|