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>
55 lines
1.0 KiB
C
55 lines
1.0 KiB
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_H
|
|
#define _LINUX_SEG6_H
|
|
|
|
#include <linux/types.h>
|
|
#include <linux/in6.h> /* For struct in6_addr. */
|
|
|
|
/*
|
|
* SRH
|
|
*/
|
|
struct ipv6_sr_hdr {
|
|
__u8 nexthdr;
|
|
__u8 hdrlen;
|
|
__u8 type;
|
|
__u8 segments_left;
|
|
__u8 first_segment;
|
|
__u8 flags;
|
|
__u16 reserved;
|
|
|
|
struct in6_addr segments[0];
|
|
};
|
|
|
|
#define SR6_FLAG1_PROTECTED (1 << 6)
|
|
#define SR6_FLAG1_OAM (1 << 5)
|
|
#define SR6_FLAG1_ALERT (1 << 4)
|
|
#define SR6_FLAG1_HMAC (1 << 3)
|
|
|
|
#define SR6_TLV_INGRESS 1
|
|
#define SR6_TLV_EGRESS 2
|
|
#define SR6_TLV_OPAQUE 3
|
|
#define SR6_TLV_PADDING 4
|
|
#define SR6_TLV_HMAC 5
|
|
|
|
#define sr_has_hmac(srh) ((srh)->flags & SR6_FLAG1_HMAC)
|
|
|
|
struct sr6_tlv {
|
|
__u8 type;
|
|
__u8 len;
|
|
__u8 data[0];
|
|
};
|
|
|
|
#endif
|