mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-06 00:23:53 +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>
39 lines
664 B
C
39 lines
664 B
C
#ifndef __SOCK_DIAG_H__
|
|
#define __SOCK_DIAG_H__
|
|
|
|
#include <linux/types.h>
|
|
|
|
#define SOCK_DIAG_BY_FAMILY 20
|
|
#define SOCK_DESTROY 21
|
|
|
|
struct sock_diag_req {
|
|
__u8 sdiag_family;
|
|
__u8 sdiag_protocol;
|
|
};
|
|
|
|
enum {
|
|
SK_MEMINFO_RMEM_ALLOC,
|
|
SK_MEMINFO_RCVBUF,
|
|
SK_MEMINFO_WMEM_ALLOC,
|
|
SK_MEMINFO_SNDBUF,
|
|
SK_MEMINFO_FWD_ALLOC,
|
|
SK_MEMINFO_WMEM_QUEUED,
|
|
SK_MEMINFO_OPTMEM,
|
|
SK_MEMINFO_BACKLOG,
|
|
SK_MEMINFO_DROPS,
|
|
|
|
SK_MEMINFO_VARS,
|
|
};
|
|
|
|
enum sknetlink_groups {
|
|
SKNLGRP_NONE,
|
|
SKNLGRP_INET_TCP_DESTROY,
|
|
SKNLGRP_INET_UDP_DESTROY,
|
|
SKNLGRP_INET6_TCP_DESTROY,
|
|
SKNLGRP_INET6_UDP_DESTROY,
|
|
__SKNLGRP_MAX,
|
|
};
|
|
#define SKNLGRP_MAX (__SKNLGRP_MAX - 1)
|
|
|
|
#endif /* __SOCK_DIAG_H__ */
|