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>
43 lines
882 B
C
43 lines
882 B
C
/*
|
|
* if_alg: User-space algorithm interface
|
|
*
|
|
* Copyright (c) 2010 Herbert Xu <herbert@gondor.apana.org.au>
|
|
*
|
|
* 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_IF_ALG_H
|
|
#define _LINUX_IF_ALG_H
|
|
|
|
#include <linux/types.h>
|
|
|
|
struct sockaddr_alg {
|
|
__u16 salg_family;
|
|
__u8 salg_type[14];
|
|
__u32 salg_feat;
|
|
__u32 salg_mask;
|
|
__u8 salg_name[64];
|
|
};
|
|
|
|
struct af_alg_iv {
|
|
__u32 ivlen;
|
|
__u8 iv[0];
|
|
};
|
|
|
|
/* Socket options */
|
|
#define ALG_SET_KEY 1
|
|
#define ALG_SET_IV 2
|
|
#define ALG_SET_OP 3
|
|
#define ALG_SET_AEAD_ASSOCLEN 4
|
|
#define ALG_SET_AEAD_AUTHSIZE 5
|
|
|
|
/* Operations */
|
|
#define ALG_OP_DECRYPT 0
|
|
#define ALG_OP_ENCRYPT 1
|
|
|
|
#endif /* _LINUX_IF_ALG_H */
|