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>
59 lines
1.2 KiB
C
59 lines
1.2 KiB
C
#ifndef __UNIX_DIAG_H__
|
|
#define __UNIX_DIAG_H__
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct unix_diag_req {
|
|
__u8 sdiag_family;
|
|
__u8 sdiag_protocol;
|
|
__u16 pad;
|
|
__u32 udiag_states;
|
|
__u32 udiag_ino;
|
|
__u32 udiag_show;
|
|
__u32 udiag_cookie[2];
|
|
};
|
|
|
|
#define UDIAG_SHOW_NAME 0x00000001 /* show name (not path) */
|
|
#define UDIAG_SHOW_VFS 0x00000002 /* show VFS inode info */
|
|
#define UDIAG_SHOW_PEER 0x00000004 /* show peer socket info */
|
|
#define UDIAG_SHOW_ICONS 0x00000008 /* show pending connections */
|
|
#define UDIAG_SHOW_RQLEN 0x00000010 /* show skb receive queue len */
|
|
#define UDIAG_SHOW_MEMINFO 0x00000020 /* show memory info of a socket */
|
|
|
|
struct unix_diag_msg {
|
|
__u8 udiag_family;
|
|
__u8 udiag_type;
|
|
__u8 udiag_state;
|
|
__u8 pad;
|
|
|
|
__u32 udiag_ino;
|
|
__u32 udiag_cookie[2];
|
|
};
|
|
|
|
enum {
|
|
/* UNIX_DIAG_NONE, standard nl API requires this attribute! */
|
|
UNIX_DIAG_NAME,
|
|
UNIX_DIAG_VFS,
|
|
UNIX_DIAG_PEER,
|
|
UNIX_DIAG_ICONS,
|
|
UNIX_DIAG_RQLEN,
|
|
UNIX_DIAG_MEMINFO,
|
|
UNIX_DIAG_SHUTDOWN,
|
|
|
|
__UNIX_DIAG_MAX,
|
|
};
|
|
|
|
#define UNIX_DIAG_MAX (__UNIX_DIAG_MAX - 1)
|
|
|
|
struct unix_diag_vfs {
|
|
__u32 udiag_vfs_ino;
|
|
__u32 udiag_vfs_dev;
|
|
};
|
|
|
|
struct unix_diag_rqlen {
|
|
__u32 udiag_rqueue;
|
|
__u32 udiag_wqueue;
|
|
};
|
|
|
|
#endif
|