patch-include_libnfnetlink_libnfnetlink_h 3.5 KB

1234567891011121314151617181920212223242526272829303132333435363738394041424344454647484950515253545556575859606162636465666768697071727374757677
  1. --- libnfnetlink-1.0.1.orig/include/libnfnetlink/libnfnetlink.h 2010-05-09 23:31:56.000000000 +0200
  2. +++ libnfnetlink-1.0.1/include/libnfnetlink/libnfnetlink.h 2014-04-10 07:47:04.000000000 +0200
  3. @@ -15,6 +15,7 @@
  4. #define aligned_u64 unsigned long long __attribute__((aligned(8)))
  5. #endif
  6. +#include <stdint.h>
  7. #include <sys/socket.h> /* for sa_family_t */
  8. #include <linux/netlink.h>
  9. #include <libnfnetlink/linux_nfnetlink.h>
  10. @@ -55,7 +56,7 @@ struct nfnlhdr {
  11. struct nfnl_callback {
  12. int (*call)(struct nlmsghdr *nlh, struct nfattr *nfa[], void *data);
  13. void *data;
  14. - u_int16_t attr_count;
  15. + uint16_t attr_count;
  16. };
  17. struct nfnl_handle;
  18. @@ -69,7 +70,7 @@ extern struct nfnl_handle *nfnl_open(voi
  19. extern int nfnl_close(struct nfnl_handle *);
  20. extern struct nfnl_subsys_handle *nfnl_subsys_open(struct nfnl_handle *,
  21. - u_int8_t, u_int8_t,
  22. + uint8_t, uint8_t,
  23. unsigned int);
  24. extern void nfnl_subsys_close(struct nfnl_subsys_handle *);
  25. @@ -88,8 +89,8 @@ extern int nfnl_sendiov(const struct nfn
  26. const struct iovec *iov, unsigned int num,
  27. unsigned int flags);
  28. extern void nfnl_fill_hdr(struct nfnl_subsys_handle *, struct nlmsghdr *,
  29. - unsigned int, u_int8_t, u_int16_t, u_int16_t,
  30. - u_int16_t);
  31. + unsigned int, uint8_t, uint16_t, uint16_t,
  32. + uint16_t);
  33. extern __attribute__((deprecated)) int
  34. nfnl_talk(struct nfnl_handle *, struct nlmsghdr *, pid_t,
  35. unsigned, struct nlmsghdr *,
  36. @@ -103,8 +104,8 @@ nfnl_listen(struct nfnl_handle *,
  37. /* receiving */
  38. extern ssize_t nfnl_recv(const struct nfnl_handle *h, unsigned char *buf, size_t len);
  39. extern int nfnl_callback_register(struct nfnl_subsys_handle *,
  40. - u_int8_t type, struct nfnl_callback *cb);
  41. -extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, u_int8_t type);
  42. + uint8_t type, struct nfnl_callback *cb);
  43. +extern int nfnl_callback_unregister(struct nfnl_subsys_handle *, uint8_t type);
  44. extern int nfnl_handle_packet(struct nfnl_handle *, char *buf, int len);
  45. /* parsing */
  46. @@ -180,12 +181,12 @@ extern int nfnl_query(struct nfnl_handle
  47. /* nfnl attribute handling functions */
  48. extern int nfnl_addattr_l(struct nlmsghdr *, int, int, const void *, int);
  49. -extern int nfnl_addattr8(struct nlmsghdr *, int, int, u_int8_t);
  50. -extern int nfnl_addattr16(struct nlmsghdr *, int, int, u_int16_t);
  51. -extern int nfnl_addattr32(struct nlmsghdr *, int, int, u_int32_t);
  52. +extern int nfnl_addattr8(struct nlmsghdr *, int, int, uint8_t);
  53. +extern int nfnl_addattr16(struct nlmsghdr *, int, int, uint16_t);
  54. +extern int nfnl_addattr32(struct nlmsghdr *, int, int, uint32_t);
  55. extern int nfnl_nfa_addattr_l(struct nfattr *, int, int, const void *, int);
  56. -extern int nfnl_nfa_addattr16(struct nfattr *, int, int, u_int16_t);
  57. -extern int nfnl_nfa_addattr32(struct nfattr *, int, int, u_int32_t);
  58. +extern int nfnl_nfa_addattr16(struct nfattr *, int, int, uint16_t);
  59. +extern int nfnl_nfa_addattr32(struct nfattr *, int, int, uint32_t);
  60. extern int nfnl_parse_attr(struct nfattr **, int, struct nfattr *, int);
  61. #define nfnl_parse_nested(tb, max, nfa) \
  62. nfnl_parse_attr((tb), (max), NFA_DATA((nfa)), NFA_PAYLOAD((nfa)))
  63. @@ -197,7 +198,7 @@ extern int nfnl_parse_attr(struct nfattr
  64. ({ (tail)->nfa_len = (void *) NLMSG_TAIL(nlh) - (void *) tail; })
  65. extern void nfnl_build_nfa_iovec(struct iovec *iov, struct nfattr *nfa,
  66. - u_int16_t type, u_int32_t len,
  67. + uint16_t type, uint32_t len,
  68. unsigned char *val);
  69. extern unsigned int nfnl_rcvbufsiz(const struct nfnl_handle *h,
  70. unsigned int size);