19 files changed, 49 insertions, 26 deletions

diff --git a/utils/conntrack_create.c b/utils/conntrack_create.c
index a168d2c..7140b97 100644
--- a/utils/conntrack_create.c
+++ b/utils/conntrack_create.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_create_nat.c b/utils/conntrack_create_nat.c
index 3cc65df..f7426ee 100644
--- a/utils/conntrack_create_nat.c
+++ b/utils/conntrack_create_nat.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_delete.c b/utils/conntrack_delete.c
index 227319f..b3204dd 100644
--- a/utils/conntrack_delete.c
+++ b/utils/conntrack_delete.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_dump.c b/utils/conntrack_dump.c
index a15acc1..a36e753 100644
--- a/utils/conntrack_dump.c
+++ b/utils/conntrack_dump.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -16,12 +17,11 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int32_t family = AF_INET;
 	struct nfct_handle *h;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, 0);
 	if (!h) {
diff --git a/utils/conntrack_events.c b/utils/conntrack_events.c
index 1f115e2..f5e72c7 100644
--- a/utils/conntrack_events.c
+++ b/utils/conntrack_events.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -20,13 +21,10 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
-	u_int8_t family = AF_INET;
 	struct nfct_handle *h;
-	struct nf_conntrack *ct;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, NFCT_ALL_CT_GROUPS);
 	if (!h) {
diff --git a/utils/conntrack_filter.c b/utils/conntrack_filter.c
index b05c37c..a3eeebc 100644
--- a/utils/conntrack_filter.c
+++ b/utils/conntrack_filter.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -21,14 +23,11 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
-	u_int8_t family = AF_INET;
 	struct nfct_handle *h;
 	struct nfct_filter *filter;
-	struct nf_conntrack *ct;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, NF_NETLINK_CONNTRACK_NEW | 
 				 NF_NETLINK_CONNTRACK_UPDATE);
diff --git a/utils/conntrack_flush.c b/utils/conntrack_flush.c
index 92aac86..36437e2 100644
--- a/utils/conntrack_flush.c
+++ b/utils/conntrack_flush.c
@@ -1,15 +1,15 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int8_t family = AF_INET;
 	struct nfct_handle *h;
-	char buf[1024];
 
 	h = nfct_open(CONNTRACK, 0);
 	if (!h) {
diff --git a/utils/conntrack_get.c b/utils/conntrack_get.c
index 33c836b..7d7badd 100644
--- a/utils/conntrack_get.c
+++ b/utils/conntrack_get.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -17,7 +19,7 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_grp_create.c b/utils/conntrack_grp_create.c
index b77d155..b47d09a 100644
--- a/utils/conntrack_grp_create.c
+++ b/utils/conntrack_grp_create.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_master.c b/utils/conntrack_master.c
index d1552a4..d08219a 100644
--- a/utils/conntrack_master.c
+++ b/utils/conntrack_master.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/conntrack_update.c b/utils/conntrack_update.c
index 0256b7a..24545ca 100644
--- a/utils/conntrack_update.c
+++ b/utils/conntrack_update.c
@@ -1,11 +1,13 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/ctexp_events.c b/utils/ctexp_events.c
index ec459e4..c53d026 100644
--- a/utils/ctexp_events.c
+++ b/utils/ctexp_events.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
diff --git a/utils/expect_create.c b/utils/expect_create.c
index 9e3c7fb..912ab8e 100644
--- a/utils/expect_create.c
+++ b/utils/expect_create.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -10,7 +12,7 @@
  * Therefore, make sure you have load nf_conntrack_ftp before executing it. 
  */
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_create_userspace.c b/utils/expect_create_userspace.c
index 67e7b2a..0e910e6 100644
--- a/utils/expect_create_userspace.c
+++ b/utils/expect_create_userspace.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 #include <libnetfilter_conntrack/libnetfilter_conntrack_tcp.h>
@@ -10,7 +12,7 @@
  * a Linux kernel >= 2.6.37.
  */
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_delete.c b/utils/expect_delete.c
index d6b56f1..18f4a79 100644
--- a/utils/expect_delete.c
+++ b/utils/expect_delete.c
@@ -1,10 +1,12 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_dump.c b/utils/expect_dump.c
index fa25bad..b227e1a 100644
--- a/utils/expect_dump.c
+++ b/utils/expect_dump.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -16,7 +17,7 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int8_t family = AF_INET;
diff --git a/utils/expect_events.c b/utils/expect_events.c
index 89426f4..8adacb6 100644
--- a/utils/expect_events.c
+++ b/utils/expect_events.c
@@ -1,5 +1,6 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
@@ -20,7 +21,7 @@ static int event_cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;
diff --git a/utils/expect_flush.c b/utils/expect_flush.c
index 4e28c1c..1ae69c9 100644
--- a/utils/expect_flush.c
+++ b/utils/expect_flush.c
@@ -1,10 +1,11 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
-int main()
+int main(void)
 {
 	int ret;
 	u_int8_t family = AF_INET;
diff --git a/utils/expect_get.c b/utils/expect_get.c
index cda5a3b..fc7e116 100644
--- a/utils/expect_get.c
+++ b/utils/expect_get.c
@@ -1,6 +1,8 @@
 #include <stdio.h>
 #include <stdlib.h>
+#include <string.h>
 #include <errno.h>
+#include <arpa/inet.h>
 
 #include <libnetfilter_conntrack/libnetfilter_conntrack.h>
 
@@ -16,7 +18,7 @@ static int cb(enum nf_conntrack_msg_type type,
 	return NFCT_CB_CONTINUE;
 }
 
-int main()
+int main(void)
 {
 	int ret;
 	struct nfct_handle *h;