From efa1d8e417ae5b685c206853aaa0e7f762574585 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sat, 16 May 2015 14:59:57 +0200 Subject: src: Use stdint types everywhere Signed-off-by: Felix Janda Signed-off-by: Pablo Neira Ayuso --- include/libnfnetlink/libnfnetlink.h | 25 +++++++++++++------------ 1 file changed, 13 insertions(+), 12 deletions(-) (limited to 'include/libnfnetlink/libnfnetlink.h') diff --git a/include/libnfnetlink/libnfnetlink.h b/include/libnfnetlink/libnfnetlink.h index 1d8c49d..cd0be3d 100644 --- a/include/libnfnetlink/libnfnetlink.h +++ b/include/libnfnetlink/libnfnetlink.h @@ -15,6 +15,7 @@ #define aligned_u64 unsigned long long __attribute__((aligned(8))) #endif +#include #include /* for sa_family_t */ #include #include @@ -55,7 +56,7 @@ struct nfnlhdr { struct nfnl_callback { int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data); void *data; - u_int16_t attr_count; + uint16_t attr_count; }; struct nfnl_handle; @@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(void); extern int nfnl_close(struct nfnl_handle *); extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *, - u_int8_t, u_int8_t, + uint8_t, uint8_t, unsigned int); extern void nfnl_subsys_close(struct nfnl_subsys_handle *); @@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfnl_handle *nfnlh, const struct iovec *iov, unsigned int num, unsigned int flags); extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *, - unsigned int, u_int8_t, u_int16_t, u_int16_t, - u_int16_t); + unsigned int, uint8_t, uint16_t, uint16_t, + uint16_t); extern __attribute__((deprecated)) int nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t, unsigned, struct nlmsghdr *, @@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *, /* receiving */ extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len); extern int nfnl_callback_register(struct nfnl_subsys_handle *, - u_int8_t type, struct nfnl_callback *cb); -extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type); + uint8_t type, struct nfnl_callback *cb); +extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type); extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len); /* parsing */ @@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle *h, struct nlmsghdr *nlh); /* nfnl attribute handling functions */ extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int); -extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t); -extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t); -extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t); +extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t); +extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t); +extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t); extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int); -extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t); -extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t); +extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t); +extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t); extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); #define nfnl_parse_nested(tb, max, nfa) \ nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa))) @@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int); ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; }) extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa, - u_int16_t type, u_int32_t len, + uint16_t type, uint32_t len, unsigned char *val); extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h, unsigned int size); -- cgit v1.2.3