Added the code for xid matching. (The code is not yet enabled)

[ipfw.git] / glue.h

diff --git a/glue.h b/glue.h
index d3571a4..ff7ef07 100644 (file)
--- a/glue.h
+++ b/glue.h
@@ -86,7 +86,7 @@ enum sopt_dir { SOPT_GET, SOPT_SET };
                                 * so early include this file (to be solved) */
 #include <linux/list.h>
 #include <linux/in.h>          /* struct in_addr */
-#include <linux/in6.h>         /* struct in_addr */
+#include <linux/in6.h>         /* struct in6_addr */
 #include <linux/icmp.h>
 /*
  * LIST_HEAD in queue.h conflict with linux/list.h
@@ -206,10 +206,13 @@ struct clockinfo {
         int     profhz;         /* profiling clock frequency */
 };
 
-
-/*
- * linux does not have heapsort
+/* 
+ * linux does not have a reentrant version of qsort,
+ * so we the FreeBSD stdlib version.
  */
+void
+qsort_r(void *a, size_t n, size_t es, void *thunk,
+       int cmp_t(void *, const void *, const void *));
 #define heapsort(_a, _b, _c, _d)       qsort(_a, _b, _c, _d)
 
 #define setprogname(x) /* not present in linux */
@@ -260,6 +263,7 @@ enum ipfw_msg_type {
        IP_FW_FLUSH,
        IP_FW_ZERO,
        IP_FW_GET,
+       IP_FW_DYN_GET,
        IP_FW_RESETLOG,
 
        IP_FW_NAT_CFG,