* libnetfilter_conntrack updates
@ 2012-05-19 22:08 Jan Engelhardt
2012-05-19 22:08 ` [PATCH 1/4] build: remove unused LDFLAGS Jan Engelhardt
` (4 more replies)
0 siblings, 5 replies; 6+ messages in thread
From: Jan Engelhardt @ 2012-05-19 22:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
The following changes since commit 6fdd30fe6de1311022ae9e17304dd72f4958bbb8:
build: bump version to 1.0.1 (2012-05-18 01:24:29 +0200)
are available in the git repository at:
git://git.inai.de/libnetfilter_conntrack master
Jan Engelhardt (4):
build: remove unused LDFLAGS
qa: change an if to elseif
build: remove unused -DLIBNETFILTER_CONNTRACK_DIR
Update .gitignore
configure.ac | 5 -----
qa/.gitignore | 2 ++
qa/Makefile.am | 4 ----
qa/ct_events_reliable.c | 2 +-
utils/.gitignore | 1 +
utils/Makefile.am | 20 --------------------
6 files changed, 4 insertions(+), 30 deletions(-)
^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 1/4] build: remove unused LDFLAGS
2012-05-19 22:08 libnetfilter_conntrack updates Jan Engelhardt
@ 2012-05-19 22:08 ` Jan Engelhardt
2012-05-19 22:08 ` [PATCH 2/4] qa: change an if to elseif Jan Engelhardt
` (3 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2012-05-19 22:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: Jan Engelhardt <jengelh@medozas.de>
"-ldl" is not needed since the programs themselves never use functions
from libdl. Also, -dynamic is not required at all.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
qa/Makefile.am | 4 ----
utils/Makefile.am | 20 --------------------
2 files changed, 0 insertions(+), 24 deletions(-)
diff --git a/qa/Makefile.am b/qa/Makefile.am
index cb49aa4..b4daf92 100644
--- a/qa/Makefile.am
+++ b/qa/Makefile.am
@@ -4,16 +4,12 @@ check_PROGRAMS = test_api test_filter ct_stress ct_events_reliable
test_api_SOURCES = test_api.c
test_api_LDADD = ../src/libnetfilter_conntrack.la
-test_api_LDFLAGS = -dynamic -ldl
test_filter_SOURCES = test_filter.c
test_filter_LDADD = ../src/libnetfilter_conntrack.la
-test_filter_LDFLAGS = -dynamic -ldl
ct_stress_SOURCES = ct_stress.c
ct_stress_LDADD = ../src/libnetfilter_conntrack.la
-ct_stress_LDFLAGS = -dynamic -ldl
ct_events_reliable_SOURCES = ct_events_reliable.c
ct_events_reliable_LDADD = ../src/libnetfilter_conntrack.la
-ct_events_reliable_LDFLAGS = -dynamic -ldl
diff --git a/utils/Makefile.am b/utils/Makefile.am
index 35a7e0a..2fe5ea7 100644
--- a/utils/Makefile.am
+++ b/utils/Makefile.am
@@ -12,80 +12,60 @@ check_PROGRAMS = expect_dump expect_create expect_get expect_delete \
conntrack_grp_create_SOURCES = conntrack_grp_create.c
conntrack_grp_create_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_grp_create_LDFLAGS = -dynamic -ldl
conntrack_create_SOURCES = conntrack_create.c
conntrack_create_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_create_LDFLAGS = -dynamic -ldl
conntrack_get_SOURCES = conntrack_get.c
conntrack_get_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_get_LDFLAGS = -dynamic -ldl
conntrack_create_nat_SOURCES = conntrack_create_nat.c
conntrack_create_nat_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_create_nat_LDFLAGS = -dynamic -ldl
conntrack_update_SOURCES = conntrack_update.c
conntrack_update_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_update_LDFLAGS = -dynamic -ldl
conntrack_delete_SOURCES = conntrack_delete.c
conntrack_delete_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_delete_LDFLAGS = -dynamic -ldl
conntrack_dump_SOURCES = conntrack_dump.c
conntrack_dump_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_dump_LDFLAGS = -dynamic -ldl
conntrack_dump_filter_SOURCES = conntrack_dump_filter.c
conntrack_dump_filter_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_dump_filter_LDFLAGS = -dynamic -ldl
conntrack_flush_SOURCES = conntrack_flush.c
conntrack_flush_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_flush_LDFLAGS = -dynamic -ldl
conntrack_events_SOURCES = conntrack_events.c
conntrack_events_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_events_LDFLAGS = -dynamic -ldl
conntrack_filter_SOURCES = conntrack_filter.c
conntrack_filter_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_filter_LDFLAGS = -dynamic -ldl
conntrack_master_SOURCES = conntrack_master.c
conntrack_master_LDADD = ../src/libnetfilter_conntrack.la
-conntrack_master_LDFLAGS = -dynamic -ldl
expect_dump_SOURCES = expect_dump.c
expect_dump_LDADD = ../src/libnetfilter_conntrack.la
-expect_dump_LDFLAGS = -dynamic -ldl
expect_create_SOURCES = expect_create.c
expect_create_LDADD = ../src/libnetfilter_conntrack.la
-expect_create_LDFLAGS = -dynamic -ldl
expect_create_userspace_SOURCES = expect_create_userspace.c
expect_create_userspace_LDADD = ../src/libnetfilter_conntrack.la
-expect_create_userspace_LDFLAGS = -dynamic -ldl
expect_get_SOURCES = expect_get.c
expect_get_LDADD = ../src/libnetfilter_conntrack.la
-expect_get_LDFLAGS = -dynamic -ldl
expect_delete_SOURCES = expect_delete.c
expect_delete_LDADD = ../src/libnetfilter_conntrack.la
-expect_delete_LDFLAGS = -dynamic -ldl
expect_flush_SOURCES = expect_flush.c
expect_flush_LDADD = ../src/libnetfilter_conntrack.la
-expect_flush_LDFLAGS = -dynamic -ldl
expect_events_SOURCES = expect_events.c
expect_events_LDADD = ../src/libnetfilter_conntrack.la
-expect_events_LDFLAGS = -dynamic -ldl
ctexp_events_SOURCES = ctexp_events.c
ctexp_events_LDADD = ../src/libnetfilter_conntrack.la
-ctexp_events_LDFLAGS = -dynamic -ldl
--
1.7.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 2/4] qa: change an if to elseif
2012-05-19 22:08 libnetfilter_conntrack updates Jan Engelhardt
2012-05-19 22:08 ` [PATCH 1/4] build: remove unused LDFLAGS Jan Engelhardt
@ 2012-05-19 22:08 ` Jan Engelhardt
2012-05-19 22:08 ` [PATCH 3/4] build: remove unused -DLIBNETFILTER_CONNTRACK_DIR Jan Engelhardt
` (2 subsequent siblings)
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2012-05-19 22:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: Jan Engelhardt <jengelh@medozas.de>
The compiler is probably smart enough to see that the type cannot
change, but make an "else" out of it, just for fun.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
qa/ct_events_reliable.c | 2 +-
1 files changed, 1 insertions(+), 1 deletions(-)
diff --git a/qa/ct_events_reliable.c b/qa/ct_events_reliable.c
index 1c8e194..b51d0e5 100644
--- a/qa/ct_events_reliable.c
+++ b/qa/ct_events_reliable.c
@@ -15,7 +15,7 @@ static int event_cb(enum nf_conntrack_msg_type type,
{
if (type == NFCT_T_NEW)
new++;
- if (type == NFCT_T_UPDATE)
+ else if (type == NFCT_T_UPDATE)
update++;
else if (type == NFCT_T_DESTROY)
destroy++;
--
1.7.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/4] build: remove unused -DLIBNETFILTER_CONNTRACK_DIR
2012-05-19 22:08 libnetfilter_conntrack updates Jan Engelhardt
2012-05-19 22:08 ` [PATCH 1/4] build: remove unused LDFLAGS Jan Engelhardt
2012-05-19 22:08 ` [PATCH 2/4] qa: change an if to elseif Jan Engelhardt
@ 2012-05-19 22:08 ` Jan Engelhardt
2012-05-19 22:08 ` [PATCH 4/4] Update .gitignore Jan Engelhardt
2012-05-20 20:17 ` libnetfilter_conntrack updates Pablo Neira Ayuso
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2012-05-19 22:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: Jan Engelhardt <jengelh@medozas.de>
CFLAGS must not be overriden if not set (it belongs to the user).
Since -DLIBNETFILTER_CONNTRACK_DIR is unused however, remove it
altogether.
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
configure.ac | 5 -----
1 files changed, 0 insertions(+), 5 deletions(-)
diff --git a/configure.ac b/configure.ac
index 4a78294..ba7a6f3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -59,11 +59,6 @@ int main()
],[AC_MSG_RESULT(no)],[AC_MSG_RESULT(no)])
fi
-if test ! -z "$libdir"; then
- MODULE_DIR="\\\"$libdir/libnetfilter_conntrack/\\\""
- CFLAGS="$CFLAGS -DLIBNETFILTER_CONNTRACK_DIR=$MODULE_DIR"
-fi
-
dnl Output the makefile
AC_CONFIG_FILES([Makefile src/Makefile include/Makefile utils/Makefile
qa/Makefile include/libnetfilter_conntrack/Makefile
--
1.7.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 4/4] Update .gitignore
2012-05-19 22:08 libnetfilter_conntrack updates Jan Engelhardt
` (2 preceding siblings ...)
2012-05-19 22:08 ` [PATCH 3/4] build: remove unused -DLIBNETFILTER_CONNTRACK_DIR Jan Engelhardt
@ 2012-05-19 22:08 ` Jan Engelhardt
2012-05-20 20:17 ` libnetfilter_conntrack updates Pablo Neira Ayuso
4 siblings, 0 replies; 6+ messages in thread
From: Jan Engelhardt @ 2012-05-19 22:08 UTC (permalink / raw)
To: pablo; +Cc: netfilter-devel
From: Jan Engelhardt <jengelh@medozas.de>
Signed-off-by: Jan Engelhardt <jengelh@medozas.de>
---
qa/.gitignore | 2 ++
utils/.gitignore | 1 +
2 files changed, 3 insertions(+), 0 deletions(-)
diff --git a/qa/.gitignore b/qa/.gitignore
index c6d43bb..5e22175 100644
--- a/qa/.gitignore
+++ b/qa/.gitignore
@@ -1,2 +1,4 @@
+/ct_events_reliable
+/ct_stress
/test_api
/test_filter
diff --git a/utils/.gitignore b/utils/.gitignore
index 04897ba..63dfcb2 100644
--- a/utils/.gitignore
+++ b/utils/.gitignore
@@ -2,6 +2,7 @@
/conntrack_create_nat
/conntrack_delete
/conntrack_dump
+/conntrack_dump_filter
/conntrack_events
/conntrack_filter
/conntrack_flush
--
1.7.7
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: libnetfilter_conntrack updates
2012-05-19 22:08 libnetfilter_conntrack updates Jan Engelhardt
` (3 preceding siblings ...)
2012-05-19 22:08 ` [PATCH 4/4] Update .gitignore Jan Engelhardt
@ 2012-05-20 20:17 ` Pablo Neira Ayuso
4 siblings, 0 replies; 6+ messages in thread
From: Pablo Neira Ayuso @ 2012-05-20 20:17 UTC (permalink / raw)
To: Jan Engelhardt; +Cc: netfilter-devel
On Sun, May 20, 2012 at 12:08:08AM +0200, Jan Engelhardt wrote:
>
> The following changes since commit 6fdd30fe6de1311022ae9e17304dd72f4958bbb8:
>
> build: bump version to 1.0.1 (2012-05-18 01:24:29 +0200)
>
> are available in the git repository at:
> git://git.inai.de/libnetfilter_conntrack master
Pulled, thanks a lot Jan.
^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-05-20 20:17 UTC | newest]
Thread overview: 6+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-05-19 22:08 libnetfilter_conntrack updates Jan Engelhardt
2012-05-19 22:08 ` [PATCH 1/4] build: remove unused LDFLAGS Jan Engelhardt
2012-05-19 22:08 ` [PATCH 2/4] qa: change an if to elseif Jan Engelhardt
2012-05-19 22:08 ` [PATCH 3/4] build: remove unused -DLIBNETFILTER_CONNTRACK_DIR Jan Engelhardt
2012-05-19 22:08 ` [PATCH 4/4] Update .gitignore Jan Engelhardt
2012-05-20 20:17 ` libnetfilter_conntrack updates Pablo Neira Ayuso
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.