Message ID | 20220516161641.15321-1-vincent@systemli.org |
---|---|
State | Accepted |
Delegated to: | Pablo Neira |
Headers | show |
Series | treewide: use uint* instead of u_int* | expand |
On Mon, May 16, 2022 at 06:16:41PM +0200, vincent@systemli.org wrote: [...] > diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h > index 3cd13292..48c368f5 100644 > --- a/include/libipq/libipq.h > +++ b/include/libipq/libipq.h > @@ -48,19 +48,19 @@ typedef unsigned long ipq_id_t; > struct ipq_handle > { > int fd; > - u_int8_t blocking; > + uint8_t blocking; > struct sockaddr_nl local; > struct sockaddr_nl peer; > }; > > -struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); > +struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol); Might this break API compatibility? ABI won't change, but I suppose users would have to include stdint.h prior to this header. Are we safe if we change the include from sys/types.h to stdint.h in line 27 of that file? [...] > diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h > index 250f5029..f83ad10a 100644 > --- a/include/linux/netfilter_arp/arpt_mangle.h > +++ b/include/linux/netfilter_arp/arpt_mangle.h > @@ -13,7 +13,7 @@ struct arpt_mangle > union { > struct in_addr tgt_ip; > } u_t; > - u_int8_t flags; > + uint8_t flags; > int target; > }; This is a kernel-header. The type was changed to __u8 in kernel repo, so we should use that instead. Thanks, Phil
On Tuesday 2022-05-17 10:10, Phil Sutter wrote: >> +++ b/include/libipq/libipq.h >> - u_int8_t blocking; >> + uint8_t blocking; > >Might this break API compatibility? ABI won't change, but I suppose >users would have to include stdint.h prior to this header. Are we safe >if we change the include from sys/types.h to stdint.h in line 27 of that >file? Always include what you use, so yeah, libipq.h should include stdint.h.
On Tue, May 17, 2022 at 10:14:10AM +0200, Jan Engelhardt wrote: > On Tuesday 2022-05-17 10:10, Phil Sutter wrote: > >> +++ b/include/libipq/libipq.h > > >> - u_int8_t blocking; > >> + uint8_t blocking; > > > >Might this break API compatibility? ABI won't change, but I suppose > >users would have to include stdint.h prior to this header. Are we safe > >if we change the include from sys/types.h to stdint.h in line 27 of that > >file? > > Always include what you use, so yeah, libipq.h should include stdint.h. Thanks. Patch pushed with the two changes I suggested. Thanks, Phil
Thanks for pushing. Sorry, for being absent. On 5/18/22 15:21, Phil Sutter wrote: > On Tue, May 17, 2022 at 10:14:10AM +0200, Jan Engelhardt wrote: >> On Tuesday 2022-05-17 10:10, Phil Sutter wrote: >>>> +++ b/include/libipq/libipq.h >>>> - u_int8_t blocking; >>>> + uint8_t blocking; >>> Might this break API compatibility? ABI won't change, but I suppose >>> users would have to include stdint.h prior to this header. Are we safe >>> if we change the include from sys/types.h to stdint.h in line 27 of that >>> file? >> Always include what you use, so yeah, libipq.h should include stdint.h. > Thanks. Patch pushed with the two changes I suggested. > > Thanks, Phil
diff --git a/extensions/libxt_conntrack.c b/extensions/libxt_conntrack.c index 64018ce1..234085c5 100644 --- a/extensions/libxt_conntrack.c +++ b/extensions/libxt_conntrack.c @@ -778,7 +778,7 @@ matchinfo_print(const void *ip, const struct xt_entry_match *match, int numeric, static void conntrack_dump_ports(const char *prefix, const char *opt, - u_int16_t port_low, u_int16_t port_high) + uint16_t port_low, uint16_t port_high) { if (port_high == 0 || port_low == port_high) printf(" %s%s %u", prefix, opt, port_low); diff --git a/include/libipq/libipq.h b/include/libipq/libipq.h index 3cd13292..48c368f5 100644 --- a/include/libipq/libipq.h +++ b/include/libipq/libipq.h @@ -48,19 +48,19 @@ typedef unsigned long ipq_id_t; struct ipq_handle { int fd; - u_int8_t blocking; + uint8_t blocking; struct sockaddr_nl local; struct sockaddr_nl peer; }; -struct ipq_handle *ipq_create_handle(u_int32_t flags, u_int32_t protocol); +struct ipq_handle *ipq_create_handle(uint32_t flags, uint32_t protocol); int ipq_destroy_handle(struct ipq_handle *h); ssize_t ipq_read(const struct ipq_handle *h, unsigned char *buf, size_t len, int timeout); -int ipq_set_mode(const struct ipq_handle *h, u_int8_t mode, size_t len); +int ipq_set_mode(const struct ipq_handle *h, uint8_t mode, size_t len); ipq_packet_msg_t *ipq_get_packet(const unsigned char *buf); diff --git a/include/libiptc/libxtc.h b/include/libiptc/libxtc.h index 37010188..a1d16ef9 100644 --- a/include/libiptc/libxtc.h +++ b/include/libiptc/libxtc.h @@ -10,7 +10,7 @@ extern "C" { #endif #ifndef XT_MIN_ALIGN -/* xt_entry has pointers and u_int64_t's in it, so if you align to +/* xt_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 XT_MIN_ALIGN (__alignof__(struct xt_entry)) diff --git a/include/linux/netfilter_arp/arpt_mangle.h b/include/linux/netfilter_arp/arpt_mangle.h index 250f5029..f83ad10a 100644 --- a/include/linux/netfilter_arp/arpt_mangle.h +++ b/include/linux/netfilter_arp/arpt_mangle.h @@ -13,7 +13,7 @@ struct arpt_mangle union { struct in_addr tgt_ip; } u_t; - u_int8_t flags; + uint8_t flags; int target; }; diff --git a/iptables/xshared.c b/iptables/xshared.c index a8512d38..9b5e5b5b 100644 --- a/iptables/xshared.c +++ b/iptables/xshared.c @@ -1025,7 +1025,7 @@ static const int inverse_for_options[NUMBER_OF_OPT] = }; void -set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, +set_option(unsigned int *options, unsigned int option, uint16_t *invflg, bool invert) { if (*options & option) diff --git a/iptables/xshared.h b/iptables/xshared.h index 14568bb0..f8212988 100644 --- a/iptables/xshared.h +++ b/iptables/xshared.h @@ -80,7 +80,7 @@ struct xtables_target; #define IPT_INV_ARPHRD 0x0800 void -set_option(unsigned int *options, unsigned int option, u_int16_t *invflg, +set_option(unsigned int *options, unsigned int option, uint16_t *invflg, bool invert); /** diff --git a/libipq/ipq_create_handle.3 b/libipq/ipq_create_handle.3 index 11ef95c4..ebe46daa 100644 --- a/libipq/ipq_create_handle.3 +++ b/libipq/ipq_create_handle.3 @@ -24,7 +24,7 @@ ipq_create_handle, ipq_destroy_handle \(em create and destroy libipq handles. .br .B #include <libipq.h> .sp -.BI "struct ipq_handle *ipq_create_handle(u_int32_t " flags ", u_int32_t " protocol ");" +.BI "struct ipq_handle *ipq_create_handle(uint32_t " flags ", uint32_t " protocol ");" .br .BI "int ipq_destroy_handle(struct ipq_handle *" h ); .SH DESCRIPTION diff --git a/libipq/ipq_set_mode.3 b/libipq/ipq_set_mode.3 index 0edd3c00..e206886c 100644 --- a/libipq/ipq_set_mode.3 +++ b/libipq/ipq_set_mode.3 @@ -24,7 +24,7 @@ ipq_set_mode \(em set the ip_queue queuing mode .br .B #include <libipq.h> .sp -.BI "int ipq_set_mode(const struct ipq_handle *" h ", u_int8_t " mode ", size_t " range ); +.BI "int ipq_set_mode(const struct ipq_handle *" h ", uint8_t " mode ", size_t " range ); .SH DESCRIPTION The .B ipq_set_mode