conntrack: consolidate all conntrack header includes into conntrack.h

Consolidate all conntrack header includes into conntrack.h as this is more clean. Signed-off-by: Daniel Borkmann <dborkman@redhat.com>
netsniff-ng · Jul 8, 2013 · ca6a079 · ca6a079
1 parent e6660d3
commit ca6a079
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 4 deletions.
diff --git a/conntrack.h b/conntrack.h
@@ -0,0 +1,9 @@
+#ifndef CONNTRACK_H
+#define CONNTRACK_H
+
+#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack_dccp.h>
+#include <libnetfilter_conntrack/libnetfilter_conntrack_sctp.h>
+
+#endif /* CONNTRACK_H */
diff --git a/flowtop.c b/flowtop.c
@@ -15,10 +15,6 @@
 #include <signal.h>
 #include <netdb.h>
 #include <ctype.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_dccp.h>
-#include <libnetfilter_conntrack/libnetfilter_conntrack_sctp.h>
 #include <netinet/in.h>
 #include <curses.h>
 #include <dirent.h>
@@ -29,6 +25,7 @@
 
 #include "die.h"
 #include "xmalloc.h"
+#include "conntrack.h"
 #include "ioops.h"
 #include "str.h"
 #include "sig.h"