mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 19:02:41 +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>
65 lines
1.4 KiB
C
65 lines
1.4 KiB
C
#ifndef __NETLINK_DIAG_H__
|
|
#define __NETLINK_DIAG_H__
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct netlink_diag_req {
|
|
__u8 sdiag_family;
|
|
__u8 sdiag_protocol;
|
|
__u16 pad;
|
|
__u32 ndiag_ino;
|
|
__u32 ndiag_show;
|
|
__u32 ndiag_cookie[2];
|
|
};
|
|
|
|
struct netlink_diag_msg {
|
|
__u8 ndiag_family;
|
|
__u8 ndiag_type;
|
|
__u8 ndiag_protocol;
|
|
__u8 ndiag_state;
|
|
|
|
__u32 ndiag_portid;
|
|
__u32 ndiag_dst_portid;
|
|
__u32 ndiag_dst_group;
|
|
__u32 ndiag_ino;
|
|
__u32 ndiag_cookie[2];
|
|
};
|
|
|
|
struct netlink_diag_ring {
|
|
__u32 ndr_block_size;
|
|
__u32 ndr_block_nr;
|
|
__u32 ndr_frame_size;
|
|
__u32 ndr_frame_nr;
|
|
};
|
|
|
|
enum {
|
|
/* NETLINK_DIAG_NONE, standard nl API requires this attribute! */
|
|
NETLINK_DIAG_MEMINFO,
|
|
NETLINK_DIAG_GROUPS,
|
|
NETLINK_DIAG_RX_RING,
|
|
NETLINK_DIAG_TX_RING,
|
|
NETLINK_DIAG_FLAGS,
|
|
|
|
__NETLINK_DIAG_MAX,
|
|
};
|
|
|
|
#define NETLINK_DIAG_MAX (__NETLINK_DIAG_MAX - 1)
|
|
|
|
#define NDIAG_PROTO_ALL ((__u8) ~0)
|
|
|
|
#define NDIAG_SHOW_MEMINFO 0x00000001 /* show memory info of a socket */
|
|
#define NDIAG_SHOW_GROUPS 0x00000002 /* show groups of a netlink socket */
|
|
/* deprecated since 4.6 */
|
|
#define NDIAG_SHOW_RING_CFG 0x00000004 /* show ring configuration */
|
|
#define NDIAG_SHOW_FLAGS 0x00000008 /* show flags of a netlink socket */
|
|
|
|
/* flags */
|
|
#define NDIAG_FLAG_CB_RUNNING 0x00000001
|
|
#define NDIAG_FLAG_PKTINFO 0x00000002
|
|
#define NDIAG_FLAG_BROADCAST_ERROR 0x00000004
|
|
#define NDIAG_FLAG_NO_ENOBUFS 0x00000008
|
|
#define NDIAG_FLAG_LISTEN_ALL_NSID 0x00000010
|
|
#define NDIAG_FLAG_CAP_ACK 0x00000020
|
|
|
|
#endif
|