diff options
Diffstat (limited to 'include/netlink/netfilter')
-rw-r--r-- | include/netlink/netfilter/ct.h | 10 | ||||
-rw-r--r-- | include/netlink/netfilter/log.h | 12 | ||||
-rw-r--r-- | include/netlink/netfilter/log_msg.h | 1 | ||||
-rw-r--r-- | include/netlink/netfilter/nfnl.h | 6 | ||||
-rw-r--r-- | include/netlink/netfilter/queue.h | 12 | ||||
-rw-r--r-- | include/netlink/netfilter/queue_msg.h | 4 |
6 files changed, 22 insertions, 23 deletions
diff --git a/include/netlink/netfilter/ct.h b/include/netlink/netfilter/ct.h index 2e08228..e1f9386 100644 --- a/include/netlink/netfilter/ct.h +++ b/include/netlink/netfilter/ct.h @@ -28,7 +28,7 @@ struct nfnl_ct; extern struct nl_object_ops ct_obj_ops; extern struct nfnl_ct * nfnl_ct_alloc(void); -extern int nfnl_ct_alloc_cache(struct nl_handle *, struct nl_cache **); +extern int nfnl_ct_alloc_cache(struct nl_sock *, struct nl_cache **); extern int nfnlmsg_ct_group(struct nlmsghdr *); extern int nfnlmsg_ct_parse(struct nlmsghdr *, struct nfnl_ct **); @@ -36,19 +36,19 @@ extern int nfnlmsg_ct_parse(struct nlmsghdr *, struct nfnl_ct **); extern void nfnl_ct_get(struct nfnl_ct *); extern void nfnl_ct_put(struct nfnl_ct *); -extern int nfnl_ct_dump_request(struct nl_handle *); +extern int nfnl_ct_dump_request(struct nl_sock *); extern int nfnl_ct_build_add_request(const struct nfnl_ct *, int, struct nl_msg **); -extern int nfnl_ct_add(struct nl_handle *, const struct nfnl_ct *, int); +extern int nfnl_ct_add(struct nl_sock *, const struct nfnl_ct *, int); extern int nfnl_ct_build_delete_request(const struct nfnl_ct *, int, struct nl_msg **); -extern int nfnl_ct_delete(struct nl_handle *, const struct nfnl_ct *, int); +extern int nfnl_ct_delete(struct nl_sock *, const struct nfnl_ct *, int); extern int nfnl_ct_build_query_request(const struct nfnl_ct *, int, struct nl_msg **); -extern int nfnl_ct_query(struct nl_handle *, const struct nfnl_ct *, int); +extern int nfnl_ct_query(struct nl_sock *, const struct nfnl_ct *, int); extern void nfnl_ct_set_family(struct nfnl_ct *, uint8_t); extern uint8_t nfnl_ct_get_family(const struct nfnl_ct *); diff --git a/include/netlink/netfilter/log.h b/include/netlink/netfilter/log.h index be8dd32..2002fa8 100644 --- a/include/netlink/netfilter/log.h +++ b/include/netlink/netfilter/log.h @@ -21,7 +21,7 @@ extern "C" { #endif -struct nl_handle; +struct nl_sock; struct nlmsghdr; struct nfnl_log; @@ -84,22 +84,22 @@ extern char * nfnl_log_flags2str(unsigned int, char *, size_t); extern unsigned int nfnl_log_str2flags(const char *); extern int nfnl_log_build_pf_bind(uint8_t, struct nl_msg **); -extern int nfnl_log_pf_bind(struct nl_handle *, uint8_t); +extern int nfnl_log_pf_bind(struct nl_sock *, uint8_t); extern int nfnl_log_build_pf_unbind(uint8_t, struct nl_msg **); -extern int nfnl_log_pf_unbind(struct nl_handle *, uint8_t); +extern int nfnl_log_pf_unbind(struct nl_sock *, uint8_t); extern int nfnl_log_build_create_request(const struct nfnl_log *, struct nl_msg **); -extern int nfnl_log_create(struct nl_handle *, const struct nfnl_log *); +extern int nfnl_log_create(struct nl_sock *, const struct nfnl_log *); extern int nfnl_log_build_change_request(const struct nfnl_log *, struct nl_msg **); -extern int nfnl_log_change(struct nl_handle *, const struct nfnl_log *); +extern int nfnl_log_change(struct nl_sock *, const struct nfnl_log *); extern int nfnl_log_build_delete_request(const struct nfnl_log *, struct nl_msg **); -extern int nfnl_log_delete(struct nl_handle *, const struct nfnl_log *); +extern int nfnl_log_delete(struct nl_sock *, const struct nfnl_log *); #ifdef __cplusplus } diff --git a/include/netlink/netfilter/log_msg.h b/include/netlink/netfilter/log_msg.h index 42e1f70..63b0f64 100644 --- a/include/netlink/netfilter/log_msg.h +++ b/include/netlink/netfilter/log_msg.h @@ -21,7 +21,6 @@ extern "C" { #endif -struct nl_handle; struct nlmsghdr; struct nfnl_log_msg; diff --git a/include/netlink/netfilter/nfnl.h b/include/netlink/netfilter/nfnl.h index 123d93e..8da4ba1 100644 --- a/include/netlink/netfilter/nfnl.h +++ b/include/netlink/netfilter/nfnl.h @@ -6,7 +6,7 @@ * License as published by the Free Software Foundation version 2.1 * of the License. * - * Copyright (c) 2003-2006 Thomas Graf <tgraf@suug.ch> + * Copyright (c) 2003-2008 Thomas Graf <tgraf@suug.ch> * Copyright (c) 2007 Philip Craig <philipc@snapgear.com> * Copyright (c) 2007 Secure Computing Corporation */ @@ -23,14 +23,14 @@ extern "C" { #define NFNL_HDRLEN NLMSG_ALIGN(sizeof(struct nfgenmsg)) #define NFNLMSG_TYPE(subsys, subtype) (((subsys) << 8) | (subtype)) -extern int nfnl_connect(struct nl_handle *); +extern int nfnl_connect(struct nl_sock *); extern uint8_t nfnlmsg_subsys(struct nlmsghdr *); extern uint8_t nfnlmsg_subtype(struct nlmsghdr *); extern uint8_t nfnlmsg_family(struct nlmsghdr *); extern uint16_t nfnlmsg_res_id(struct nlmsghdr *); -extern int nfnl_send_simple(struct nl_handle *, uint8_t, uint8_t, +extern int nfnl_send_simple(struct nl_sock *, uint8_t, uint8_t, int, uint8_t, uint16_t); extern struct nl_msg * nfnlmsg_alloc_simple(uint8_t, uint8_t, int, uint8_t, uint16_t); diff --git a/include/netlink/netfilter/queue.h b/include/netlink/netfilter/queue.h index d480135..491b361 100644 --- a/include/netlink/netfilter/queue.h +++ b/include/netlink/netfilter/queue.h @@ -18,7 +18,7 @@ extern "C" { #endif -struct nl_handle; +struct nl_sock; struct nlmsghdr; struct nfnl_queue; @@ -60,24 +60,24 @@ extern int nfnl_queue_test_copy_range(const struct nfnl_queue *); extern uint32_t nfnl_queue_get_copy_range(const struct nfnl_queue *); extern int nfnl_queue_build_pf_bind(uint8_t, struct nl_msg **); -extern int nfnl_queue_pf_bind(struct nl_handle *, uint8_t); +extern int nfnl_queue_pf_bind(struct nl_sock *, uint8_t); extern int nfnl_queue_build_pf_unbind(uint8_t, struct nl_msg **); -extern int nfnl_queue_pf_unbind(struct nl_handle *, uint8_t); +extern int nfnl_queue_pf_unbind(struct nl_sock *, uint8_t); extern int nfnl_queue_build_create_request(const struct nfnl_queue *, struct nl_msg **); -extern int nfnl_queue_create(struct nl_handle *, +extern int nfnl_queue_create(struct nl_sock *, const struct nfnl_queue *); extern int nfnl_queue_build_change_request(const struct nfnl_queue *, struct nl_msg **); -extern int nfnl_queue_change(struct nl_handle *, +extern int nfnl_queue_change(struct nl_sock *, const struct nfnl_queue *); extern int nfnl_queue_build_delete_request(const struct nfnl_queue *, struct nl_msg **); -extern int nfnl_queue_delete(struct nl_handle *, +extern int nfnl_queue_delete(struct nl_sock *, const struct nfnl_queue *); #ifdef __cplusplus diff --git a/include/netlink/netfilter/queue_msg.h b/include/netlink/netfilter/queue_msg.h index f8f034c..95a5d65 100644 --- a/include/netlink/netfilter/queue_msg.h +++ b/include/netlink/netfilter/queue_msg.h @@ -18,7 +18,7 @@ extern "C" { #endif -struct nl_handle; +struct nl_sock; struct nlmsghdr; struct nfnl_queue_msg; @@ -91,7 +91,7 @@ extern int nfnl_queue_msg_test_verdict(const struct nfnl_queue_msg *); extern unsigned int nfnl_queue_msg_get_verdict(const struct nfnl_queue_msg *); extern struct nl_msg * nfnl_queue_msg_build_verdict(const struct nfnl_queue_msg *); -extern int nfnl_queue_msg_send_verdict(struct nl_handle *, +extern int nfnl_queue_msg_send_verdict(struct nl_sock *, const struct nfnl_queue_msg *); #ifdef __cplusplus |