mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 17:15:45 +00:00
596b1c94aa
iproute2 contains a bunch of kernel headers, including uapi ones. Android's libc uses uapi headers almost directly, and uses a script to fix kernel types that don't match what userspace expects. For example: https://issuetracker.google.com/36987220 reports that our struct ip_mreq_source contains "__be32 imr_multiaddr" rather than "struct in_addr imr_multiaddr". The script addresses this by replacing the uapi struct definition with a #include <bits/ip_mreq.h> which contains the traditional userspace definition. Unfortunately, when we compile iproute2, this definition conflicts with the one in iproute2's linux/in.h. Historically we've just solved this problem by running "git rm" on all the iproute2 include/linux headers that break Android's libc. However, deleting the files in this way makes it harder to keep up with upstream, because every upstream change to an include file causes a merge conflict with the delete. This patch fixes the problem by moving the iproute2 linux headers from include/linux to include/uapi/linux. Tested: compiles on ubuntu trusty (glibc) Signed-off-by: Elliott Hughes <enh@google.com> Signed-off-by: Lorenzo Colitti <lorenzo@google.com>
71 lines
1.2 KiB
C
71 lines
1.2 KiB
C
#ifndef _LWTUNNEL_H_
|
|
#define _LWTUNNEL_H_
|
|
|
|
#include <linux/types.h>
|
|
|
|
enum lwtunnel_encap_types {
|
|
LWTUNNEL_ENCAP_NONE,
|
|
LWTUNNEL_ENCAP_MPLS,
|
|
LWTUNNEL_ENCAP_IP,
|
|
LWTUNNEL_ENCAP_ILA,
|
|
LWTUNNEL_ENCAP_IP6,
|
|
LWTUNNEL_ENCAP_SEG6,
|
|
LWTUNNEL_ENCAP_BPF,
|
|
LWTUNNEL_ENCAP_SEG6_LOCAL,
|
|
__LWTUNNEL_ENCAP_MAX,
|
|
};
|
|
|
|
#define LWTUNNEL_ENCAP_MAX (__LWTUNNEL_ENCAP_MAX - 1)
|
|
|
|
enum lwtunnel_ip_t {
|
|
LWTUNNEL_IP_UNSPEC,
|
|
LWTUNNEL_IP_ID,
|
|
LWTUNNEL_IP_DST,
|
|
LWTUNNEL_IP_SRC,
|
|
LWTUNNEL_IP_TTL,
|
|
LWTUNNEL_IP_TOS,
|
|
LWTUNNEL_IP_FLAGS,
|
|
LWTUNNEL_IP_PAD,
|
|
__LWTUNNEL_IP_MAX,
|
|
};
|
|
|
|
#define LWTUNNEL_IP_MAX (__LWTUNNEL_IP_MAX - 1)
|
|
|
|
enum lwtunnel_ip6_t {
|
|
LWTUNNEL_IP6_UNSPEC,
|
|
LWTUNNEL_IP6_ID,
|
|
LWTUNNEL_IP6_DST,
|
|
LWTUNNEL_IP6_SRC,
|
|
LWTUNNEL_IP6_HOPLIMIT,
|
|
LWTUNNEL_IP6_TC,
|
|
LWTUNNEL_IP6_FLAGS,
|
|
LWTUNNEL_IP6_PAD,
|
|
__LWTUNNEL_IP6_MAX,
|
|
};
|
|
|
|
#define LWTUNNEL_IP6_MAX (__LWTUNNEL_IP6_MAX - 1)
|
|
|
|
enum {
|
|
LWT_BPF_PROG_UNSPEC,
|
|
LWT_BPF_PROG_FD,
|
|
LWT_BPF_PROG_NAME,
|
|
__LWT_BPF_PROG_MAX,
|
|
};
|
|
|
|
#define LWT_BPF_PROG_MAX (__LWT_BPF_PROG_MAX - 1)
|
|
|
|
enum {
|
|
LWT_BPF_UNSPEC,
|
|
LWT_BPF_IN,
|
|
LWT_BPF_OUT,
|
|
LWT_BPF_XMIT,
|
|
LWT_BPF_XMIT_HEADROOM,
|
|
__LWT_BPF_MAX,
|
|
};
|
|
|
|
#define LWT_BPF_MAX (__LWT_BPF_MAX - 1)
|
|
|
|
#define LWT_BPF_MAX_HEADROOM 256
|
|
|
|
#endif /* _LWTUNNEL_H_ */
|