diff options
| author | Martin Willi <martin@strongswan.org> | 2015-12-07 10:55:25 +0100 |
|---|---|---|
| committer | Tobias Brunner <tobias@strongswan.org> | 2016-09-30 14:51:58 +0200 |
| commit | dbff6373e104123c51a71033ba6f9fe874a980fa (patch) | |
| tree | 6f9e63a890b1a4fe5ca23e3bb24a4b669b54fb44 | |
| parent | 21c898a1f96b6e45f4470f52fb25b9d168395691 (diff) | |
| download | strongswan-dbff6373e104123c51a71033ba6f9fe874a980fa.tar.bz2 strongswan-dbff6373e104123c51a71033ba6f9fe874a980fa.tar.xz | |
include: Update xfrm.h to Linux v4.3
We strip the newly introduced <linux/in6.h> include, as this clashes with the
<netinet/in6.h> include.
| -rw-r--r-- | src/include/linux/xfrm.h | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/src/include/linux/xfrm.h b/src/include/linux/xfrm.h index 22e61fdf7..02d5125a5 100644 --- a/src/include/linux/xfrm.h +++ b/src/include/linux/xfrm.h @@ -84,6 +84,8 @@ struct xfrm_replay_state { __u32 bitmap; }; +#define XFRMA_REPLAY_ESN_MAX 4096 + struct xfrm_replay_state_esn { unsigned int bmp_len; __u32 oseq; @@ -295,6 +297,9 @@ enum xfrm_attr_type_t { XFRMA_MARK, /* struct xfrm_mark */ XFRMA_TFCPAD, /* __u32 */ XFRMA_REPLAY_ESN_VAL, /* struct xfrm_replay_esn */ + XFRMA_SA_EXTRA_FLAGS, /* __u32 */ + XFRMA_PROTO, /* __u8 */ + XFRMA_ADDRESS_FILTER, /* struct xfrm_address_filter */ __XFRMA_MAX #define XFRMA_MAX (__XFRMA_MAX - 1) @@ -323,6 +328,8 @@ enum xfrm_spdattr_type_t { XFRMA_SPD_UNSPEC, XFRMA_SPD_INFO, XFRMA_SPD_HINFO, + XFRMA_SPD_IPV4_HTHRESH, + XFRMA_SPD_IPV6_HTHRESH, __XFRMA_SPD_MAX #define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1) @@ -342,6 +349,11 @@ struct xfrmu_spdhinfo { __u32 spdhmcnt; }; +struct xfrmu_spdhthresh { + __u8 lbits; + __u8 rbits; +}; + struct xfrm_usersa_info { struct xfrm_selector sel; struct xfrm_id id; @@ -365,6 +377,8 @@ struct xfrm_usersa_info { #define XFRM_STATE_ESN 128 }; +#define XFRM_SA_XFLAG_DONT_ENCAP_DSCP 1 + struct xfrm_usersa_id { xfrm_address_t daddr; __be32 spi; @@ -469,6 +483,14 @@ struct xfrm_user_mapping { __be16 new_sport; }; +struct xfrm_address_filter { + xfrm_address_t saddr; + xfrm_address_t daddr; + __u16 family; + __u8 splen; + __u8 dplen; +}; + #ifndef __KERNEL__ /* backwards compatibility for userspace */ #define XFRMGRP_ACQUIRE 1 |