[PATCH nft] statement: avoid huge rodata array

[PATCH nft] statement: avoid huge rodata array

[Florian Westphal]

commit b259d1a ('src: operational limit match') creates huge
array, increasing nft binary size from ~240k to ~5m on x86_64.

Use switch statement instead.

Signed-off-by: Florian Westphal <fw@strlen.de>
---
 src/statement.c | 23 ++++++++++++++---------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/src/statement.c b/src/statement.c
index 658dc5f..f201919 100644
--- a/src/statement.c
+++ b/src/statement.c
@@ -142,18 +142,23 @@ struct stmt *log_stmt_alloc(const struct location *loc)
 	return stmt_alloc(loc, &log_stmt_ops);
 }
 
+static const char *get_unit(uint64_t u)
+{
+	switch (u) {
+	case 1: return "seconds";
+	case 60: return "minute";
+	case 60 * 60: return "hour";
+	case 60 * 60 * 24: return "day";
+	case 60 * 60 * 24 * 7: return "week";
+	}
+
+	return "error";
+}
+
 static void limit_stmt_print(const struct stmt *stmt)
 {
-	static const char *units[] = {
-		[1]			= "second",
-		[1 * 60]		= "minute",
-		[1 * 60 * 60]		= "hour",
-		[1 * 60 * 60 * 24]	= "day",
-		[1 * 60 * 60 * 24 * 7]	= "week",
-	};
-
 	printf("limit rate %" PRIu64 "/%s",
-	       stmt->limit.rate, units[stmt->limit.unit]);
+	       stmt->limit.rate, get_unit(stmt->limit.unit));
 }
 
 static const struct stmt_ops limit_stmt_ops = {
-- 
1.8.1.5

Re: [PATCH nft] statement: avoid huge rodata array

[Florian Westphal]

Florian Westphal <fw@strlen.de> wrote:
> commit b259d1a ('src: operational limit match') creates huge
> array, increasing nft binary size from ~240k to ~5m on x86_64.
> 
> Use switch statement instead.

Applied,

> +static const char *get_unit(uint64_t u)
> +{
> +	switch (u) {
> +	case 1: return "seconds";

... after changing this to 'second', spotted by Phil Oester.

Re: [PATCH nft] statement: avoid huge rodata array

[Pablo Neira Ayuso]

On Tue, Oct 22, 2013 at 03:12:41PM +0200, Florian Westphal wrote:
> Florian Westphal <fw@strlen.de> wrote:
> > commit b259d1a ('src: operational limit match') creates huge
> > array, increasing nft binary size from ~240k to ~5m on x86_64.
> > 
> > Use switch statement instead.
> 
> Applied,
> 
> > +static const char *get_unit(uint64_t u)
> > +{
> > +	switch (u) {
> > +	case 1: return "seconds";
> 
> ... after changing this to 'second', spotted by Phil Oester.

Please, push a patch to change libnftables to 'second'. Thanks!

Re: [PATCH nft] statement: avoid huge rodata array

[Pablo Neira Ayuso]

On Tue, Oct 22, 2013 at 02:35:02PM +0200, Florian Westphal wrote:
> commit b259d1a ('src: operational limit match') creates huge
> array, increasing nft binary size from ~240k to ~5m on x86_64.
> 
> Use switch statement instead.

Thanks Florian.

Applied a similar patch for libnftables:

http://git.netfilter.org/libnftables/commit/?id=cc9d2851135901d11e21b1a0332e83119124d083