X-Git-Url: http://git.onelab.eu/?a=blobdiff_plain;f=glue.h;h=a3548bdf49bf63e7be2955a316f1f27c98ac1441;hb=ecbf629b486a76fa4817cc73270af411eada5a1a;hp=d3571a4b8aafca0953b44a172f63b3074da9b393;hpb=2395d8ca6a6f18acc76e328b6cb43af6786dbcaf;p=ipfw.git

diff --git a/glue.h b/glue.h
index d3571a4..a3548bd 100644
--- a/glue.h
+++ b/glue.h
@@ -23,7 +23,6 @@
  * SUCH DAMAGE.
  */
 /*
- *
  * $Id$
  *
  * glue code to adapt the FreeBSD version to linux and windows,
@@ -86,7 +85,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,11 +205,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.
  */
-#define heapsort(_a, _b, _c, _d)	qsort(_a, _b, _c, _d)
+void
+qsort_r(void *a, size_t n, size_t es, void *thunk,
+	int cmp_t(void *, const void *, const void *));
 
 #define setprogname(x)	/* not present in linux */
 
@@ -260,6 +261,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,