mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 07:24:33 +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>
33 lines
873 B
C
33 lines
873 B
C
#ifndef _LINUX_IN_ROUTE_H
|
|
#define _LINUX_IN_ROUTE_H
|
|
|
|
/* IPv4 routing cache flags */
|
|
|
|
#define RTCF_DEAD RTNH_F_DEAD
|
|
#define RTCF_ONLINK RTNH_F_ONLINK
|
|
|
|
/* Obsolete flag. About to be deleted */
|
|
#define RTCF_NOPMTUDISC RTM_F_NOPMTUDISC
|
|
|
|
#define RTCF_NOTIFY 0x00010000
|
|
#define RTCF_DIRECTDST 0x00020000 /* unused */
|
|
#define RTCF_REDIRECTED 0x00040000
|
|
#define RTCF_TPROXY 0x00080000 /* unused */
|
|
|
|
#define RTCF_FAST 0x00200000 /* unused */
|
|
#define RTCF_MASQ 0x00400000 /* unused */
|
|
#define RTCF_SNAT 0x00800000 /* unused */
|
|
#define RTCF_DOREDIRECT 0x01000000
|
|
#define RTCF_DIRECTSRC 0x04000000
|
|
#define RTCF_DNAT 0x08000000
|
|
#define RTCF_BROADCAST 0x10000000
|
|
#define RTCF_MULTICAST 0x20000000
|
|
#define RTCF_REJECT 0x40000000 /* unused */
|
|
#define RTCF_LOCAL 0x80000000
|
|
|
|
#define RTCF_NAT (RTCF_DNAT|RTCF_SNAT)
|
|
|
|
#define RT_TOS(tos) ((tos)&IPTOS_TOS_MASK)
|
|
|
|
#endif /* _LINUX_IN_ROUTE_H */
|