Use stdint types
PATCH 1/2 Use stdint types
Signed-off-by Felix Janda <[email protected]>
--- arptables.c | 8 ++++---- include/arptables.h | 7 ++++--- include/libarptc/libarptc.h | 2 +- libarptc/libarptc.c | 4 ++-- libarptc/libarptc_incl.c | 2 +- 5 files changed, 12 insertions(+), 11 deletions(-)
arptables.c +4 -4
@@ -230,7 +230,7 @@ extern void dump_entries(const arptc_handle_t handle);/etc/protocols */ struct pprot {char *name; -u_int8_t num; +uint8_t num; };/* Primitive headers... */
@@ -926,7 +926,7 @@ mask_to_dotted(const struct in_addr *mask) {int i;static char buf[20 ]; -u_int32_t maskaddr, bits; +uint32_t maskaddr, bits; maskaddr =ntohl (mask->s_addr);
@@ -968,7 +968,7 @@ string_to_number(const char *s, unsigned int min, unsigned int max, }static void -set_option (unsigned int *options,unsigned int option,u_int16_t *invflg, +set_option (unsigned int *options,unsigned int option,uint16_t *invflg,int invert) {if (*options & option)
@@ -1108,7 +1108,7 @@ register_target(struct arptables_target *me) }static void -print_num (u_int64_t number,unsigned int format) +print_num (uint64_t number,unsigned int format) {if (format &FMT_KILOMEGAGIGA ) {if (number >99999 ) {
include/arptables.h +4 -3
@@ -1,6 +1,7 @@#ifndef _ARPTABLES_USER_H#define _ARPTABLES_USER_H +#include <stdint.h> #include "arptables_common.h" #include "libarptc/libarptc.h"
@@ -33,7 +34,7 @@ struct arptables_matchsize_t userspacesize;/* Revision of target (0 by default). */ -u_int8_t revision; +uint8_t revision;/* Function which prints out usage message. */ void (*help)(void );
@@ -85,7 +86,7 @@ struct arptables_targetsize_t userspacesize;/* Revision of target (0 by default). */ -u_int8_t revision; +uint8_t revision;/* Function which prints out usage message. */ void (*help)(void );
@@ -132,7 +133,7 @@ extern char *mask_to_dotted(const struct in_addr *mask);extern void parse_hostnetworkmask (const char *name,struct in_addr **addrpp,struct in_addr *maskp,unsigned int *naddrs); -extern u_int16_t parse_protocol (const char *s); +extern uint16_t parse_protocol (const char *s);extern int do_command (int argc,char *argv[],char **table,arptc_handle_t *handle);
include/libarptc/libarptc.h +1 -1
@@ -7,7 +7,7 @@#include <linux/netfilter_arp/arp_tables.h> #ifndef ARPT_MIN_ALIGN -/* arpt_entry has pointers and u_int64_t's in it, so if you align to +/* arpt_entry has pointers and uint64_t's in it, so if you align to it, you'll also align to any crazy matches and targets someone might write */ #define ARPT_MIN_ALIGN (__alignof__(struct arpt_entry))
libarptc/libarptc.c +2 -2
@@ -256,8 +256,8 @@ unconditional(const struct arpt_arp *arp) {unsigned int i; -for (i =0 ; i <sizeof (*arp)/sizeof (u_int32_t); i++) -if (((u_int32_t *)arp)[i]) +for (i =0 ; i <sizeof (*arp)/sizeof (uint32_t ); i++) +if (((uint32_t *)arp)[i])return 0 ;return 1 ;
libarptc/libarptc_incl.c +1 -1
@@ -1688,7 +1688,7 @@ TC_COMMIT(TC_HANDLE_T *handle)/* Kernel will think that pointer should be 64-bits, and get padding. So we accomodate here (assumption: alignment of `counters' is on 64-bit boundary). */ -u_int64_t *kernptr = (u_int64_t *)&newcounters->counters; +uint64_t *kernptr = (uint64_t *)&newcounters->counters;if ((unsigned long )&newcounters->counters %8 !=0 ) {fprintf (stderr,"counters alignment incorrect! Mail rusty!\n" );
Signature · 1 line
2.3.6
Pablo Neira Ayuso
maintainerAlso applied these two patches for arptables, thanks.