--- fwsync/driver/fwsync.h	2022/06/29 19:44:58	1.2
+++ fwsync/driver/fwsync.h	2022/08/18 11:30:27	1.9
@@ -24,9 +24,15 @@
 #include <sys/priority.h>
 #include <sys/taskqueue.h>
 #include <sys/queue.h>
+#include <sys/tree.h>
 #include <sys/mutex.h>
 #include <sys/uio.h>
 #include <sys/poll.h>
+
+#include <netinet/libalias/alias.h>
+#include <netinet/libalias/alias_local.h>
+#include <netinet/libalias/alias_db.h>
+
 #include <net/if.h>
 #include <net/if_var.h>
 #include <net/if_dl.h>
@@ -34,28 +40,15 @@
 #include <netinet/ip.h>
 #include <netinet/ip_var.h>
 #include <netinet/udp.h>
-
-#define IPFW_INTERNAL
-
 #include <netinet/ip_fw.h>
+
 #include <netpfil/ipfw/ip_fw_private.h>
 
 #include "fwsync_proto.h"
+#include "fwsync_utils.h"
 #include "fwsync_workers.h"
 
-#if 0
-#include <sys/uio.h>
-#include <sys/rwlock.h>
-#include <sys/tree.h>
-#include <sys/ioccom.h>
 
-#include <sys/event.h>
-#include <sys/selinfo.h>
-#include <sys/fcntl.h>
-#include <sys/syslog.h>
-#endif
-
-
 #define IFT_FWSYNC	0xfc
 
 #define DRV_NAME	"fwsync"
@@ -175,9 +168,10 @@ extern struct fwsync_context fws_ctx;
 extern struct cfg_sync fws_cfg;
 extern struct task fws_sndpkt_task;
 extern struct taskqueue *fws_tq;
-extern struct mtx fws_mtx_c, fws_mtx_e;
+extern struct callout fws_co;
+extern struct mtx fws_mtx_c, fws_mtx_e, fws_mtx_u, fws_mtx_n;
 extern struct mbuf *fws_sndpkt;
-extern fwsync_sndpkt_t fwsync_sndpkt; 
+extern fwsync_sndpkt_t fwsync_sndpkt, fwsync_updpkt, fwsync_natpkt; 
 
 int fwsync_cfg(struct ip_fw_chain *ch, ip_fw3_opheader *op3, struct sockopt_data *sd);
 int fwsync_destroy(struct ip_fw_chain *ch, ip_fw3_opheader *op3, struct sockopt_data *sd);