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>
42 lines
631 B
C
42 lines
631 B
C
/* fou.h - FOU Interface */
|
|
|
|
#ifndef _LINUX_FOU_H
|
|
#define _LINUX_FOU_H
|
|
|
|
/* NETLINK_GENERIC related info
|
|
*/
|
|
#define FOU_GENL_NAME "fou"
|
|
#define FOU_GENL_VERSION 0x1
|
|
|
|
enum {
|
|
FOU_ATTR_UNSPEC,
|
|
FOU_ATTR_PORT, /* u16 */
|
|
FOU_ATTR_AF, /* u8 */
|
|
FOU_ATTR_IPPROTO, /* u8 */
|
|
FOU_ATTR_TYPE, /* u8 */
|
|
FOU_ATTR_REMCSUM_NOPARTIAL, /* flag */
|
|
|
|
__FOU_ATTR_MAX,
|
|
};
|
|
|
|
#define FOU_ATTR_MAX (__FOU_ATTR_MAX - 1)
|
|
|
|
enum {
|
|
FOU_CMD_UNSPEC,
|
|
FOU_CMD_ADD,
|
|
FOU_CMD_DEL,
|
|
FOU_CMD_GET,
|
|
|
|
__FOU_CMD_MAX,
|
|
};
|
|
|
|
enum {
|
|
FOU_ENCAP_UNSPEC,
|
|
FOU_ENCAP_DIRECT,
|
|
FOU_ENCAP_GUE,
|
|
};
|
|
|
|
#define FOU_CMD_MAX (__FOU_CMD_MAX - 1)
|
|
|
|
#endif /* _LINUX_FOU_H */
|