Use stdint types everywhere

index 8a4ae2a..540f266 100644
@@ -2,6 +2,7 @@
 #define _LIBIPULOG_H
 
 #include <errno.h>
+#include <stdint.h>
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/types.h>

@@ -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);
 

index a1331de..7812877 100644
@@ -9,6 +9,7 @@
 #ifndef __LIBNETFILTER_LOG_H
 #define __LIBNETFILTER_LOG_H
 
+#include <stdint.h>
 #include <sys/types.h>
 #include <libnetfilter_log/linux_nfnetlink_log.h>
 

@@ -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),

index 64ca7f3..683e9cf 100644
@@ -20,7 +20,7 @@ struct ipulog_handle
 	struct nlmsghdr *last_nlh;
 #if 0
 	int fd;
-	u_int8_t blocking;
+	uint8_t blocking;
 	struct sockaddr_nl local;
 	struct sockaddr_nl peer;
 #endif

@@ -72,7 +72,7 @@ const char *ipulog_strerror(int errcode)
 }
 
 /* convert a netlink group (1-32) to a group_mask suitable for create_handle */
-u_int32_t ipulog_group2gmask(u_int32_t group)
+uint32_t ipulog_group2gmask(uint32_t group)
 {
 	if (group < 1 || group > 32)
 	{

@@ -83,8 +83,8 @@ u_int32_t ipulog_group2gmask(u_int32_t group)
 }
 
 /* create a ipulog handle for the reception of packets sent to gmask */
-struct ipulog_handle *ipulog_create_handle(u_int32_t gmask, 
-					   u_int32_t rcvbufsize)
+struct ipulog_handle *ipulog_create_handle(uint32_t gmask,
+					   uint32_t rcvbufsize)
 {
 	int rv;
 	struct ipulog_handle *h;

@@ -155,7 +155,7 @@ next_msg:	printf("next\n");
 	h->upmsg.hook = hdr->hook;
 
 	if (tb[NFULA_MARK-1])
-		h->upmsg.mark = ntohl(*(u_int32_t *)NFA_DATA(tb[NFULA_MARK-1]));
+		h->upmsg.mark = ntohl(*(uint32_t *)NFA_DATA(tb[NFULA_MARK-1]));
 	else
 		h->upmsg.mark = 0;
 

279 lines not on this page · raw message

index ae5da79..dd3091b 100644
@@ -9,9 +9,9 @@
 static int print_pkt(struct nflog_data *ldata)
 {
 	struct nfulnl_msg_packet_hdr *ph = nflog_get_msg_packet_hdr(ldata);
-	u_int32_t mark = nflog_get_nfmark(ldata);
-	u_int32_t indev = nflog_get_indev(ldata);
-	u_int32_t outdev = nflog_get_outdev(ldata);
+	uint32_t mark = nflog_get_nfmark(ldata);
+	uint32_t indev = nflog_get_indev(ldata);
+	uint32_t outdev = nflog_get_outdev(ldata);
 	char *prefix = nflog_get_prefix(ldata);
 	char *payload;
 	int payload_len = nflog_get_payload(ldata, &payload);