mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 07:20:19 +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>
81 lines
1.6 KiB
C
81 lines
1.6 KiB
C
#ifndef __PACKET_DIAG_H__
|
|
#define __PACKET_DIAG_H__
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct packet_diag_req {
|
|
__u8 sdiag_family;
|
|
__u8 sdiag_protocol;
|
|
__u16 pad;
|
|
__u32 pdiag_ino;
|
|
__u32 pdiag_show;
|
|
__u32 pdiag_cookie[2];
|
|
};
|
|
|
|
#define PACKET_SHOW_INFO 0x00000001 /* Basic packet_sk information */
|
|
#define PACKET_SHOW_MCLIST 0x00000002 /* A set of packet_diag_mclist-s */
|
|
#define PACKET_SHOW_RING_CFG 0x00000004 /* Rings configuration parameters */
|
|
#define PACKET_SHOW_FANOUT 0x00000008
|
|
#define PACKET_SHOW_MEMINFO 0x00000010
|
|
#define PACKET_SHOW_FILTER 0x00000020
|
|
|
|
struct packet_diag_msg {
|
|
__u8 pdiag_family;
|
|
__u8 pdiag_type;
|
|
__u16 pdiag_num;
|
|
|
|
__u32 pdiag_ino;
|
|
__u32 pdiag_cookie[2];
|
|
};
|
|
|
|
enum {
|
|
/* PACKET_DIAG_NONE, standard nl API requires this attribute! */
|
|
PACKET_DIAG_INFO,
|
|
PACKET_DIAG_MCLIST,
|
|
PACKET_DIAG_RX_RING,
|
|
PACKET_DIAG_TX_RING,
|
|
PACKET_DIAG_FANOUT,
|
|
PACKET_DIAG_UID,
|
|
PACKET_DIAG_MEMINFO,
|
|
PACKET_DIAG_FILTER,
|
|
|
|
__PACKET_DIAG_MAX,
|
|
};
|
|
|
|
#define PACKET_DIAG_MAX (__PACKET_DIAG_MAX - 1)
|
|
|
|
struct packet_diag_info {
|
|
__u32 pdi_index;
|
|
__u32 pdi_version;
|
|
__u32 pdi_reserve;
|
|
__u32 pdi_copy_thresh;
|
|
__u32 pdi_tstamp;
|
|
__u32 pdi_flags;
|
|
|
|
#define PDI_RUNNING 0x1
|
|
#define PDI_AUXDATA 0x2
|
|
#define PDI_ORIGDEV 0x4
|
|
#define PDI_VNETHDR 0x8
|
|
#define PDI_LOSS 0x10
|
|
};
|
|
|
|
struct packet_diag_mclist {
|
|
__u32 pdmc_index;
|
|
__u32 pdmc_count;
|
|
__u16 pdmc_type;
|
|
__u16 pdmc_alen;
|
|
__u8 pdmc_addr[32]; /* MAX_ADDR_LEN */
|
|
};
|
|
|
|
struct packet_diag_ring {
|
|
__u32 pdr_block_size;
|
|
__u32 pdr_block_nr;
|
|
__u32 pdr_frame_size;
|
|
__u32 pdr_frame_nr;
|
|
__u32 pdr_retire_tmo;
|
|
__u32 pdr_sizeof_priv;
|
|
__u32 pdr_features;
|
|
};
|
|
|
|
#endif
|