| 1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677 |
- --- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h 2010-05-09 23:31:56.000000000 +0200
- +++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2014-04-10 07:47:04.000000000 +0200
- @@ -15,6 +15,7 @@
- #define aligned_u64 unsigned long long __attribute__((aligned(8)))
- #endif
-
- +#include <stdint.h>
- #include <sys/socket.h> /* for sa_family_t */
- #include <linux/netlink.h>
- #include <libnfnetlink/linux_nfnetlink.h>
- @@ -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(voi
- 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 nfn
- 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
-
- /* 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
- ({ (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);
|
