From: Florian Westphal <fw@strlen.de>
To: <netfilter-devel@vger.kernel.org>
Cc: Florian Westphal <fw@strlen.de>
Subject: [PATCH 3/4] psd: reduce size of struct host
Date: Thu, 14 Jun 2012 22:13:33 +0200 [thread overview]
Message-ID: <1339704814-1605-4-git-send-email-fw@strlen.de> (raw)
In-Reply-To: <1339704814-1605-1-git-send-email-fw@strlen.de>
We can use u16, saving 8 bytes total (weight cant't exceed PSD_MAX_RATE,
10000). Also re-format comments & struct initializers.
no functional changes.
---
extensions/libxt_psd.c | 24 ++++++++++++------------
extensions/xt_psd.c | 16 ++++++++--------
2 files changed, 20 insertions(+), 20 deletions(-)
diff --git a/extensions/libxt_psd.c b/extensions/libxt_psd.c
index e60178b..483c69a 100644
--- a/extensions/libxt_psd.c
+++ b/extensions/libxt_psd.c
@@ -137,19 +137,19 @@ static void psd_mt_save(const void *ip, const struct xt_entry_match *match)
}
static struct xtables_match psd_mt_reg = {
- .name = "psd",
- .version = XTABLES_VERSION,
- .revision = 1,
- .family = NFPROTO_IPV4,
- .size = XT_ALIGN(sizeof(struct xt_psd_info)),
+ .name = "psd",
+ .version = XTABLES_VERSION,
+ .revision = 1,
+ .family = NFPROTO_IPV4,
+ .size = XT_ALIGN(sizeof(struct xt_psd_info)),
.userspacesize = XT_ALIGN(sizeof(struct xt_psd_info)),
- .help = psd_mt_help,
- .init = psd_mt_init,
- .parse = psd_mt_parse,
- .final_check = psd_mt_final_check,
- .print = psd_mt_print,
- .save = psd_mt_save,
- .extra_opts = psd_mt_opts,
+ .help = psd_mt_help,
+ .init = psd_mt_init,
+ .parse = psd_mt_parse,
+ .final_check = psd_mt_final_check,
+ .print = psd_mt_print,
+ .save = psd_mt_save,
+ .extra_opts = psd_mt_opts,
};
static __attribute__((constructor)) void psd_mt_ldr(void)
diff --git a/extensions/xt_psd.c b/extensions/xt_psd.c
index f3fa336..00ff1d4 100644
--- a/extensions/xt_psd.c
+++ b/extensions/xt_psd.c
@@ -53,13 +53,13 @@ struct port {
* Information we keep per each source address.
*/
struct host {
- struct host *next; /* Next entry with the same hash */
- unsigned long timestamp; /* Last update time */
- struct in_addr src_addr; /* Source address */
- struct in_addr dest_addr; /* Destination address */
- unsigned short src_port; /* Source port */
- int count; /* Number of ports in the list */
- int weight; /* Total weight of ports in the list */
+ struct host *next; /* Next entry with the same hash */
+ unsigned long timestamp; /* Last update time */
+ struct in_addr src_addr; /* Source address */
+ struct in_addr dest_addr; /* Destination address */
+ __be16 src_port; /* Source port */
+ u16 weight; /* Total weight of ports in the list */
+ u8 count; /* Number of ports in the list */
struct port ports[SCAN_MAX_COUNT - 1]; /* List of ports */
};
@@ -70,7 +70,7 @@ static struct {
spinlock_t lock;
struct host list[LIST_SIZE]; /* List of source addresses */
struct host *hash[HASH_SIZE]; /* Hash: pointers into the list */
- int index; /* Oldest entry to be replaced */
+ int index; /* Oldest entry to be replaced */
} state;
/*
--
1.7.3.4
next prev parent reply other threads:[~2012-06-14 20:14 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-06-14 20:13 [xt-addons][PATCH 0/4] psd match cleanup patches Florian Westphal
2012-06-14 20:13 ` [PATCH 1/4] psd: rip out scanlogd leftovers Florian Westphal
2012-06-14 20:13 ` [PATCH 2/4] psd: add basic validation of userspace matchinfo data Florian Westphal
2012-06-14 20:13 ` Florian Westphal [this message]
2012-06-14 20:13 ` [PATCH 4/4] psd: move defines to user/kernelspace part where possible Florian Westphal
2012-06-21 17:13 ` [xt-addons][PATCH 0/4] psd match cleanup patches Jan Engelhardt
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1339704814-1605-4-git-send-email-fw@strlen.de \
--to=fw@strlen.de \
--cc=netfilter-devel@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).