summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTobias Klauser <tklauser@distanz.ch>2014-06-13 11:10:38 +0200
committerTobias Klauser <tklauser@distanz.ch>2014-06-13 11:10:38 +0200
commitf3322c651a75948c2a562be6cda62b4fc2bf0a89 (patch)
tree515f468c478c8be2e4c560904aaca4e42d213f8b
parent7a78872dc5fa22c834d12e1f909c4fdf68da1879 (diff)
flowtop: Include netlink dissector to fix build temporarily
flowtop links in the dissector modules just for the TC/UDP port lookup feature. Since dissector.h now includes libnl headers, we also need to include the libnl CFLAGS for flowtop build and thus also make it depend on libnl. The real fix for this in the future would be to extract the port lookup from dissector_eth.c and the just link in this module into flowtop instead of the entire dissector stuff. Signed-off-by: Tobias Klauser <tklauser@distanz.ch>
-rwxr-xr-xconfigure1
-rw-r--r--flowtop/Makefile4
2 files changed, 4 insertions, 1 deletions
diff --git a/configure b/configure
index d9cebff..7d3da70 100755
--- a/configure
+++ b/configure
@@ -178,6 +178,7 @@ EOF
MISSING_DEFS=1
tools_remove "trafgen"
tools_remove "netsniff-ng"
+ tools_remove "flowtop"
else
echo "[YES]"
fi
diff --git a/flowtop/Makefile b/flowtop/Makefile
index 03f628e..fcef59e 100644
--- a/flowtop/Makefile
+++ b/flowtop/Makefile
@@ -21,6 +21,7 @@ flowtop-objs = xmalloc.o \
hash.o \
dissector_eth.o \
dissector_80211.o \
+ dissector_netlink.o \
dissector.o \
proto_none.o \
tprintf.o \
@@ -31,7 +32,8 @@ ifeq ($(CONFIG_GEOIP), 1)
flowtop-objs += geoip.o
endif
-flowtop-eflags = $(shell pkg-config --cflags ncurses)
+flowtop-eflags = $(shell pkg-config --cflags ncurses) \
+ $(shell pkg-config --cflags libnl-3.0)
flowtop-confs = tcp.conf \
udp.conf \