mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 11:20:56 +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>
22 lines
738 B
C
22 lines
738 B
C
#ifndef _LINUX_SOCKET_H
|
|
#define _LINUX_SOCKET_H
|
|
|
|
/*
|
|
* Desired design of maximum size and alignment (see RFC2553)
|
|
*/
|
|
#define _K_SS_MAXSIZE 128 /* Implementation specific max size */
|
|
#define _K_SS_ALIGNSIZE (__alignof__ (struct sockaddr *))
|
|
/* Implementation specific desired alignment */
|
|
|
|
typedef unsigned short __kernel_sa_family_t;
|
|
|
|
struct __kernel_sockaddr_storage {
|
|
__kernel_sa_family_t ss_family; /* address family */
|
|
/* Following field(s) are implementation specific */
|
|
char __data[_K_SS_MAXSIZE - sizeof(unsigned short)];
|
|
/* space to achieve desired size, */
|
|
/* _SS_MAXSIZE value minus size of ss_family */
|
|
} __attribute__ ((aligned(_K_SS_ALIGNSIZE))); /* force desired alignment */
|
|
|
|
#endif /* _LINUX_SOCKET_H */
|