From 42878e88e5b72d3120434564942417cae3723385 Mon Sep 17 00:00:00 2001 From: Felix Janda Date: Sat, 16 May 2015 14:01:00 +0200 Subject: src: Use stdint types everywhere Signed-off-by: Felix Janda Signed-off-by: Pablo Neira Ayuso --- include/libnetfilter_log/libipulog.h | 5 ++-- include/libnetfilter_log/libnetfilter_log.h | 39 +++++++++++++++-------------- 2 files changed, 23 insertions(+), 21 deletions(-) (limited to 'include/libnetfilter_log') diff --git a/include/libnetfilter_log/libipulog.h b/include/libnetfilter_log/libipulog.h index 1093bdd..ee7890a 100644 --- a/include/libnetfilter_log/libipulog.h +++ b/include/libnetfilter_log/libipulog.h @@ -2,6 +2,7 @@ #define _LIBIPULOG_H #include +#include #include #include #include @@ -33,9 +34,9 @@ typedef struct ulog_packet_msg { struct ipulog_handle; extern int ipulog_errno; -u_int32_t ipulog_group2gmask(u_int32_t group); +uint32_t ipulog_group2gmask(uint32_t group); -struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, u_int32_t rmem); +struct ipulog_handle *ipulog_create_handle(uint32_t gmask, uint32_t rmem); void ipulog_destroy_handle(struct ipulog_handle *h); diff --git a/include/libnetfilter_log/libnetfilter_log.h b/include/libnetfilter_log/libnetfilter_log.h index a1331de..7812877 100644 --- a/include/libnetfilter_log/libnetfilter_log.h +++ b/include/libnetfilter_log/libnetfilter_log.h @@ -9,6 +9,7 @@ #ifndef __LIBNETFILTER_LOG_H #define __LIBNETFILTER_LOG_H +#include #include #include @@ -29,19 +30,19 @@ extern struct nflog_handle *nflog_open(void); extern struct nflog_handle *nflog_open_nfnl(struct nfnl_handle *nfnlh); extern int nflog_close(struct nflog_handle *h); -extern int nflog_bind_pf(struct nflog_handle *h, u_int16_t pf); -extern int nflog_unbind_pf(struct nflog_handle *h, u_int16_t pf); +extern int nflog_bind_pf(struct nflog_handle *h, uint16_t pf); +extern int nflog_unbind_pf(struct nflog_handle *h, uint16_t pf); extern struct nflog_g_handle *nflog_bind_group(struct nflog_handle *h, - u_int16_t num); + uint16_t num); extern int nflog_unbind_group(struct nflog_g_handle *gh); extern int nflog_set_mode(struct nflog_g_handle *gh, - u_int8_t mode, unsigned int len); -extern int nflog_set_timeout(struct nflog_g_handle *gh, u_int32_t timeout); -extern int nflog_set_flags(struct nflog_g_handle *gh, u_int16_t flags); -extern int nflog_set_qthresh(struct nflog_g_handle *gh, u_int32_t qthresh); -extern int nflog_set_nlbufsiz(struct nflog_g_handle *gh, u_int32_t nlbufsiz); + uint8_t mode, unsigned int len); +extern int nflog_set_timeout(struct nflog_g_handle *gh, uint32_t timeout); +extern int nflog_set_flags(struct nflog_g_handle *gh, uint16_t flags); +extern int nflog_set_qthresh(struct nflog_g_handle *gh, uint32_t qthresh); +extern int nflog_set_nlbufsiz(struct nflog_g_handle *gh, uint32_t nlbufsiz); extern int nflog_callback_register(struct nflog_g_handle *gh, nflog_callback *cb, void *data); @@ -50,23 +51,23 @@ extern int nflog_handle_packet(struct nflog_handle *h, char *buf, int len); extern struct nfulnl_msg_packet_hdr *nflog_get_msg_packet_hdr(struct nflog_data *nfad); -extern u_int16_t nflog_get_hwtype(struct nflog_data *nfad); -extern u_int16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad); +extern uint16_t nflog_get_hwtype(struct nflog_data *nfad); +extern uint16_t nflog_get_msg_packet_hwhdrlen(struct nflog_data *nfad); extern char *nflog_get_msg_packet_hwhdr(struct nflog_data *nfad); -extern u_int32_t nflog_get_nfmark(struct nflog_data *nfad); +extern uint32_t nflog_get_nfmark(struct nflog_data *nfad); extern int nflog_get_timestamp(struct nflog_data *nfad, struct timeval *tv); -extern u_int32_t nflog_get_indev(struct nflog_data *nfad); -extern u_int32_t nflog_get_physindev(struct nflog_data *nfad); -extern u_int32_t nflog_get_outdev(struct nflog_data *nfad); -extern u_int32_t nflog_get_physoutdev(struct nflog_data *nfad); +extern uint32_t nflog_get_indev(struct nflog_data *nfad); +extern uint32_t nflog_get_physindev(struct nflog_data *nfad); +extern uint32_t nflog_get_outdev(struct nflog_data *nfad); +extern uint32_t nflog_get_physoutdev(struct nflog_data *nfad); extern struct nfulnl_msg_packet_hw *nflog_get_packet_hw(struct nflog_data *nfad); extern int nflog_get_payload(struct nflog_data *nfad, char **data); extern char *nflog_get_prefix(struct nflog_data *nfad); -extern int nflog_get_uid(struct nflog_data *nfad, u_int32_t *uid); -extern int nflog_get_gid(struct nflog_data *nfad, u_int32_t *gid); -extern int nflog_get_seq(struct nflog_data *nfad, u_int32_t *seq); -extern int nflog_get_seq_global(struct nflog_data *nfad, u_int32_t *seq); +extern int nflog_get_uid(struct nflog_data *nfad, uint32_t *uid); +extern int nflog_get_gid(struct nflog_data *nfad, uint32_t *gid); +extern int nflog_get_seq(struct nflog_data *nfad, uint32_t *seq); +extern int nflog_get_seq_global(struct nflog_data *nfad, uint32_t *seq); enum { NFLOG_XML_PREFIX = (1 << 0), -- cgit v1.2.3