diff options
author | Felix Janda <felix.janda@posteo.de> | 2015-06-24 19:53:34 +0200 |
---|---|---|
committer | Eric Leblond <eric@regit.org> | 2015-06-26 09:12:55 +0200 |
commit | c9337b31f756cae85299c8275b21088ce02885e2 (patch) | |
tree | 21a2161706fd42a7ba3c330e9ec0485f40ecd42b /filter | |
parent | 8a6ddd1cb2b55c234f1a97f7e5d996f24f46b6f8 (diff) |
Use stdint types everywhere
Signed-off-by: Felix Janda <felix.janda@posteo.de>
Diffstat (limited to 'filter')
-rw-r--r-- | filter/raw2packet/ulogd_raw2packet_BASE.c | 35 | ||||
-rw-r--r-- | filter/ulogd_filter_HWHDR.c | 6 | ||||
-rw-r--r-- | filter/ulogd_filter_IP2HBIN.c | 4 | ||||
-rw-r--r-- | filter/ulogd_filter_IP2STR.c | 2 | ||||
-rw-r--r-- | filter/ulogd_filter_MARK.c | 4 | ||||
-rw-r--r-- | filter/ulogd_filter_PWSNIFF.c | 4 |
6 files changed, 28 insertions, 27 deletions
diff --git a/filter/raw2packet/ulogd_raw2packet_BASE.c b/filter/raw2packet/ulogd_raw2packet_BASE.c index ad894fc..8a6180c 100644 --- a/filter/raw2packet/ulogd_raw2packet_BASE.c +++ b/filter/raw2packet/ulogd_raw2packet_BASE.c @@ -44,6 +44,7 @@ #include <ulogd/ipfix_protocol.h> #include <netinet/if_ether.h> #include <string.h> +#include <linux/types.h> enum input_keys { INKEY_RAW_PCKT, @@ -538,7 +539,7 @@ static struct ulogd_key iphdr_rets[] = { ***********************************************************************/ static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, - u_int32_t len) + uint32_t len) { struct ulogd_key *ret = pi->output.keys; @@ -573,7 +574,7 @@ static int _interp_tcp(struct ulogd_pluginstance *pi, struct tcphdr *tcph, ***********************************************************************/ static int _interp_udp(struct ulogd_pluginstance *pi, struct udphdr *udph, - u_int32_t len) + uint32_t len) { struct ulogd_key *ret = pi->output.keys; @@ -602,7 +603,7 @@ typedef struct sctphdr { } __attribute__((packed)) sctp_sctphdr_t; static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, - u_int32_t len) + uint32_t len) { struct ulogd_key *ret = pi->output.keys; @@ -625,7 +626,7 @@ static int _interp_sctp(struct ulogd_pluginstance *pi, struct sctphdr *sctph, ***********************************************************************/ static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, - u_int32_t len) + uint32_t len) { struct ulogd_key *ret = pi->output.keys; @@ -663,7 +664,7 @@ static int _interp_icmp(struct ulogd_pluginstance *pi, struct icmphdr *icmph, ***********************************************************************/ static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph, - u_int32_t len) + uint32_t len) { struct ulogd_key *ret = pi->output.keys; @@ -691,7 +692,7 @@ static int _interp_icmpv6(struct ulogd_pluginstance *pi, struct icmp6_hdr *icmph * IPSEC HEADER ***********************************************************************/ static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, - u_int32_t len) + uint32_t len) { #if 0 struct ulogd_key *ret = pi->output.keys; @@ -711,14 +712,14 @@ static int _interp_ahesp(struct ulogd_pluginstance *pi, void *protoh, * IP HEADER ***********************************************************************/ -static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) +static int _interp_iphdr(struct ulogd_pluginstance *pi, uint32_t len) { struct ulogd_key *ret = pi->output.keys; struct iphdr *iph = ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); - void *nexthdr = (u_int32_t *)iph + iph->ihl; + void *nexthdr = (uint32_t *)iph + iph->ihl; - if (len < sizeof(struct iphdr) || len <= (u_int32_t)(iph->ihl * 4)) + if (len < sizeof(struct iphdr) || len <= (uint32_t)(iph->ihl * 4)) return ULOGD_IRET_OK; len -= iph->ihl * 4; @@ -759,7 +760,7 @@ static int _interp_iphdr(struct ulogd_pluginstance *pi, u_int32_t len) * IPv6 HEADER ***********************************************************************/ -static int ip6_ext_hdr(u_int8_t nexthdr) +static int ip6_ext_hdr(uint8_t nexthdr) { switch (nexthdr) { case IPPROTO_HOPOPTS: @@ -774,12 +775,12 @@ static int ip6_ext_hdr(u_int8_t nexthdr) } } -static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, u_int32_t len) +static int _interp_ipv6hdr(struct ulogd_pluginstance *pi, uint32_t len) { struct ulogd_key *ret = pi->output.keys; struct ip6_hdr *ipv6h = ikey_get_ptr(&pi->input.keys[INKEY_RAW_PCKT]); unsigned int ptr, hdrlen = 0; - u_int8_t curhdr; + uint8_t curhdr; int fragment = 0; if (len < sizeof(struct ip6_hdr)) @@ -889,7 +890,7 @@ out: /*********************************************************************** * ARP HEADER ***********************************************************************/ -static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) +static int _interp_arp(struct ulogd_pluginstance *pi, uint32_t len) { struct ulogd_key *ret = pi->output.keys; const struct ether_arp *arph = @@ -914,9 +915,9 @@ static int _interp_arp(struct ulogd_pluginstance *pi, u_int32_t len) * ETHER HEADER ***********************************************************************/ -static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) +static int _interp_bridge(struct ulogd_pluginstance *pi, uint32_t len) { - const u_int16_t proto = + const uint16_t proto = ikey_get_u16(&pi->input.keys[INKEY_OOB_PROTOCOL]); switch (proto) { @@ -938,8 +939,8 @@ static int _interp_bridge(struct ulogd_pluginstance *pi, u_int32_t len) static int _interp_pkt(struct ulogd_pluginstance *pi) { - u_int32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); - u_int8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); + uint32_t len = ikey_get_u32(&pi->input.keys[INKEY_RAW_PCKTLEN]); + uint8_t family = ikey_get_u8(&pi->input.keys[INKEY_OOB_FAMILY]); struct ulogd_key *ret = pi->output.keys; okey_set_u16(&ret[KEY_OOB_PROTOCOL], diff --git a/filter/ulogd_filter_HWHDR.c b/filter/ulogd_filter_HWHDR.c index 3b095c9..10c95c4 100644 --- a/filter/ulogd_filter_HWHDR.c +++ b/filter/ulogd_filter_HWHDR.c @@ -143,10 +143,10 @@ static void *hwhdr_get_daddr(struct ulogd_key *inp) return ikey_get_ptr(&inp[KEY_RAW_MAC]); } -static u_int16_t hwhdr_get_len(struct ulogd_key *inp) +static uint16_t hwhdr_get_len(struct ulogd_key *inp) { void *len = ikey_get_ptr(&inp[KEY_RAW_MAC]) + 2 * ETH_ALEN; - return ntohs(*(u_int16_t *) len); + return ntohs(*(uint16_t *) len); } static int parse_ethernet(struct ulogd_key *ret, struct ulogd_key *inp) { @@ -171,7 +171,7 @@ static int interp_mac2str(struct ulogd_pluginstance *pi) { struct ulogd_key *ret = pi->output.keys; struct ulogd_key *inp = pi->input.keys; - u_int16_t type = 0; + uint16_t type = 0; if (pp_is_valid(inp, KEY_OOB_PROTOCOL)) okey_set_u16(&ret[KEY_MAC_PROTOCOL], diff --git a/filter/ulogd_filter_IP2HBIN.c b/filter/ulogd_filter_IP2HBIN.c index 4fd3ff1..087e824 100644 --- a/filter/ulogd_filter_IP2HBIN.c +++ b/filter/ulogd_filter_IP2HBIN.c @@ -116,8 +116,8 @@ static int interp_ip2hbin(struct ulogd_pluginstance *pi) { struct ulogd_key *ret = pi->output.keys; struct ulogd_key *inp = pi->input.keys; - u_int8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); - u_int8_t convfamily = family; + uint8_t family = ikey_get_u8(&inp[KEY_OOB_FAMILY]); + uint8_t convfamily = family; int i; switch (family) { diff --git a/filter/ulogd_filter_IP2STR.c b/filter/ulogd_filter_IP2STR.c index 732e1ef..66324b0 100644 --- a/filter/ulogd_filter_IP2STR.c +++ b/filter/ulogd_filter_IP2STR.c @@ -168,7 +168,7 @@ static int ip2str(struct ulogd_key *inp, int index, int oindex) } switch (convfamily) { - u_int32_t ip; + uint32_t ip; case AF_INET6: inet_ntop(AF_INET6, ikey_get_u128(&inp[index]), diff --git a/filter/ulogd_filter_MARK.c b/filter/ulogd_filter_MARK.c index 7807f63..149725d 100644 --- a/filter/ulogd_filter_MARK.c +++ b/filter/ulogd_filter_MARK.c @@ -73,14 +73,14 @@ static int interp_mark(struct ulogd_pluginstance *pi) if (pp_is_valid(inp, KEY_CT_MARK)) { if ((ikey_get_u32(&inp[KEY_CT_MARK]) & pi->config_kset->ces[MARK_MASK].u.value) != - (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value + (uint32_t) pi->config_kset->ces[MARK_MARK].u.value ) { return ULOGD_IRET_STOP; } } else if (pp_is_valid(inp, KEY_OOB_MARK)) { if ((ikey_get_u32(&inp[KEY_OOB_MARK]) & pi->config_kset->ces[MARK_MASK].u.value) != - (u_int32_t) pi->config_kset->ces[MARK_MARK].u.value + (uint32_t) pi->config_kset->ces[MARK_MARK].u.value ) { return ULOGD_IRET_STOP; } diff --git a/filter/ulogd_filter_PWSNIFF.c b/filter/ulogd_filter_PWSNIFF.c index a3e2b42..934ff0e 100644 --- a/filter/ulogd_filter_PWSNIFF.c +++ b/filter/ulogd_filter_PWSNIFF.c @@ -39,7 +39,7 @@ #define PORT_POP3 110 #define PORT_FTP 21 -static u_int16_t pwsniff_ports[] = { +static uint16_t pwsniff_ports[] = { PORT_POP3, PORT_FTP, /* feel free to include any other ports here, provided that their @@ -72,7 +72,7 @@ static int interp_pwsniff(struct ulogd_pluginstance *pi) return ULOGD_IRET_STOP; iph = (struct iphdr *) pi->input.keys[0].u.value.ptr; - protoh = (u_int32_t *)iph + iph->ihl; + protoh = (uint32_t *)iph + iph->ihl; tcph = protoh; tcplen = ntohs(iph->tot_len) - iph->ihl * 4; |