mirror of
https://git.proxmox.com/git/mirror_iproute2
synced 2025-10-05 17:15:45 +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>
41 lines
863 B
C
41 lines
863 B
C
/*
|
|
* SR-IPv6 implementation
|
|
*
|
|
* Author:
|
|
* David Lebrun <david.lebrun@uclouvain.be>
|
|
*
|
|
*
|
|
* This program is free software; you can redistribute it and/or
|
|
* modify it under the terms of the GNU General Public License
|
|
* as published by the Free Software Foundation; either version
|
|
* 2 of the License, or (at your option) any later version.
|
|
*/
|
|
|
|
#ifndef _LINUX_SEG6_IPTUNNEL_H
|
|
#define _LINUX_SEG6_IPTUNNEL_H
|
|
|
|
#include <linux/seg6.h> /* For struct ipv6_sr_hdr. */
|
|
|
|
enum {
|
|
SEG6_IPTUNNEL_UNSPEC,
|
|
SEG6_IPTUNNEL_SRH,
|
|
__SEG6_IPTUNNEL_MAX,
|
|
};
|
|
#define SEG6_IPTUNNEL_MAX (__SEG6_IPTUNNEL_MAX - 1)
|
|
|
|
struct seg6_iptunnel_encap {
|
|
int mode;
|
|
struct ipv6_sr_hdr srh[0];
|
|
};
|
|
|
|
#define SEG6_IPTUN_ENCAP_SIZE(x) ((sizeof(*x)) + (((x)->srh->hdrlen + 1) << 3))
|
|
|
|
enum {
|
|
SEG6_IPTUN_MODE_INLINE,
|
|
SEG6_IPTUN_MODE_ENCAP,
|
|
SEG6_IPTUN_MODE_L2ENCAP,
|
|
};
|
|
|
|
|
|
#endif
|