From f6a589a59ea88c895d35a595c3d0580495dbc548 Mon Sep 17 00:00:00 2001 From: Samuel Thibault Date: Tue, 8 Aug 2023 18:39:48 +0200 Subject: libbpf: Fix long / int confusion In network terms, long is 32bit, i.e. an int for us. --- libbpf/bpf_impl.h | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'libbpf/bpf_impl.h') diff --git a/libbpf/bpf_impl.h b/libbpf/bpf_impl.h index 2b092b7e..76ce4e6c 100644 --- a/libbpf/bpf_impl.h +++ b/libbpf/bpf_impl.h @@ -59,17 +59,17 @@ typedef filter_t *filter_array_t; #ifndef BPF_ALIGN #define EXTRACT_SHORT(p) ((u_short)ntohs(*(u_short *)p)) -#define EXTRACT_LONG(p) (ntohl(*(u_long *)p)) +#define EXTRACT_LONG(p) (ntohl(*(u_int *)p)) #else #define EXTRACT_SHORT(p)\ ((u_short)\ ((u_short)*((u_char *)p+0)<<8|\ (u_short)*((u_char *)p+1)<<0)) #define EXTRACT_LONG(p)\ - ((u_long)*((u_char *)p+0)<<24|\ - (u_long)*((u_char *)p+1)<<16|\ - (u_long)*((u_char *)p+2)<<8|\ - (u_long)*((u_char *)p+3)<<0) + ((u_int)*((u_char *)p+0)<<24|\ + (u_int)*((u_char *)p+1)<<16|\ + (u_int)*((u_char *)p+2)<<8|\ + (u_int)*((u_char *)p+3)<<0) #endif #define HASH_ITERATE(head, elt) (elt) = (net_hash_entry_t) (head); do { -- cgit v1.2.3