Merge remote-tracking branch 'origin/stg-2.409' into ticket37

[stg.git] / projects / stargazer / plugins / capture / ipq_linux / libipq.h

diff --git a/projects/stargazer/plugins/capture/ipq_linux/libipq.h b/projects/stargazer/plugins/capture/ipq_linux/libipq.h
index c55a4e52f1446de598802fedb7de884aecf7ffdc..17d4c9cbfeff0e85ef6ac80a5aba43f3c071ad21 100644 (file)
--- a/projects/stargazer/plugins/capture/ipq_linux/libipq.h
+++ b/projects/stargazer/plugins/capture/ipq_linux/libipq.h
@@ -31,12 +31,10 @@
 #include <asm/types.h>
 #include <linux/netlink.h>
 
 #include <asm/types.h>
 #include <linux/netlink.h>
 

+#include <linux/netfilter_ipv4/ip_queue.h>

 #ifdef KERNEL_64_USERSPACE_32
 #ifdef KERNEL_64_USERSPACE_32

-#include "ip_queue_64.h"

 typedef u_int64_t ipq_id_t;
 #else
 typedef u_int64_t ipq_id_t;
 #else

-#include <linux/netfilter_ipv4/ip_queue.h>
-#endif

 typedef unsigned long ipq_id_t;
 #endif
 
 typedef unsigned long ipq_id_t;
 #endif
 


@@ -73,16 +71,12 @@ ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf);
 
 int ipq_message_type(const unsigned char *buf);
 
 
 int ipq_message_type(const unsigned char *buf);
 

-int ipq_get_msgerr(const unsigned char *buf);
-

 int ipq_set_verdict(const struct ipq_handle *h,
                     ipq_id_t id,
                     unsigned int verdict,
                     size_t data_len,
                     unsigned char *buf);
 
 int ipq_set_verdict(const struct ipq_handle *h,
                     ipq_id_t id,
                     unsigned int verdict,
                     size_t data_len,
                     unsigned char *buf);
 

-int ipq_ctl(const struct ipq_handle *h, int request, ...);
-

 char *ipq_errstr(void);
 //void ipq_perror(const char *s);
 
 char *ipq_errstr(void);
 //void ipq_perror(const char *s);