From 97051dbde31e30c4b3a36e6d314d114decd38389 Mon Sep 17 00:00:00 2001 From: Jozsef Kadlecsik Date: Mon, 4 Oct 2010 12:46:07 +0200 Subject: Take into account the compile time setting of the default hash size --- ChangeLog | 3 +++ Makefile | 1 + ipset_iphash.c | 2 +- ipset_ipporthash.c | 2 +- ipset_ipportiphash.c | 2 +- ipset_ipportnethash.c | 2 +- ipset_nethash.c | 2 +- 7 files changed, 9 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6eac89b..51fce1f 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,6 @@ + - Take into account the compile time setting of the default hash size + (reported by Dash Four) + 4.4 - Manpage fix to make it clear how ipset works on setlist type of sets (John Brendler, bugzilla id 640) diff --git a/Makefile b/Makefile index 36f700c..402babe 100644 --- a/Makefile +++ b/Makefile @@ -65,6 +65,7 @@ endif ABI_FLAGS:= CFLAGS:=$(ABI_FLAGS) $(COPT_FLAGS) $(WARN_FLAGS) -Ikernel/include -I. # -g -DIPSET_DEBUG +CFLAGS+=-DIP_NF_SET_HASHSIZE=$(IP_NF_SET_HASHSIZE) SH_CFLAGS:=$(CFLAGS) -fPIC LDFLAGS:=$(ABI_FLAGS) SETTYPES:=ipmap portmap macipmap diff --git a/ipset_iphash.c b/ipset_iphash.c index 0bc5bd1..0a02d90 100644 --- a/ipset_iphash.c +++ b/ipset_iphash.c @@ -39,7 +39,7 @@ iphash_create_init(void *data) DP("create INIT"); /* Default create parameters */ - mydata->hashsize = 1024; + mydata->hashsize = IP_NF_SET_HASHSIZE; mydata->probes = 8; mydata->resize = 50; diff --git a/ipset_ipporthash.c b/ipset_ipporthash.c index 9249b2a..5c114d0 100644 --- a/ipset_ipporthash.c +++ b/ipset_ipporthash.c @@ -39,7 +39,7 @@ ipporthash_create_init(void *data) DP("create INIT"); /* Default create parameters */ - mydata->hashsize = 1024; + mydata->hashsize = IP_NF_SET_HASHSIZE; mydata->probes = 8; mydata->resize = 50; } diff --git a/ipset_ipportiphash.c b/ipset_ipportiphash.c index 49861bf..ab54f64 100644 --- a/ipset_ipportiphash.c +++ b/ipset_ipportiphash.c @@ -39,7 +39,7 @@ ipportiphash_create_init(void *data) DP("create INIT"); /* Default create parameters */ - mydata->hashsize = 1024; + mydata->hashsize = IP_NF_SET_HASHSIZE; mydata->probes = 8; mydata->resize = 50; } diff --git a/ipset_ipportnethash.c b/ipset_ipportnethash.c index 3a60bf1..8b05e4d 100644 --- a/ipset_ipportnethash.c +++ b/ipset_ipportnethash.c @@ -39,7 +39,7 @@ ipportnethash_create_init(void *data) DP("create INIT"); /* Default create parameters */ - mydata->hashsize = 1024; + mydata->hashsize = IP_NF_SET_HASHSIZE; mydata->probes = 8; mydata->resize = 50; } diff --git a/ipset_nethash.c b/ipset_nethash.c index c7891cf..7de5a29 100644 --- a/ipset_nethash.c +++ b/ipset_nethash.c @@ -38,7 +38,7 @@ nethash_create_init(void *data) DP("create INIT"); /* Default create parameters */ - mydata->hashsize = 1024; + mydata->hashsize = IP_NF_SET_HASHSIZE; mydata->probes = 4; mydata->resize = 50; } -- cgit v1.2.3