diff options
| author | Jamal Hadi Salim <hadi@cyberus.ca> | 2006-03-20 22:15:11 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2006-03-20 22:15:11 -0500 |
| commit | f8cd54884e675dfaf0c86cc7c088adb6ca9d7638 (patch) | |
| tree | 7850e8ebebf1f8543c96acdd7c197003b3b4d54c /include/linux | |
| parent | f5539eb8caa52a9198079df767cc1bb5494e69e3 (diff) | |
[IPSEC]: Sync series - core changes
This patch provides the core functionality needed for sync events
for ipsec. Derived work of Krisztian KOVACS <hidden@balabit.hu>
Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/sysctl.h | 2 | ||||
| -rw-r--r-- | include/linux/xfrm.h | 30 |
2 files changed, 32 insertions, 0 deletions
diff --git a/include/linux/sysctl.h b/include/linux/sysctl.h index 6e8880ea49e7..b686548f32e0 100644 --- a/include/linux/sysctl.h +++ b/include/linux/sysctl.h | |||
| @@ -261,6 +261,8 @@ enum | |||
| 261 | NET_CORE_DEV_WEIGHT=17, | 261 | NET_CORE_DEV_WEIGHT=17, |
| 262 | NET_CORE_SOMAXCONN=18, | 262 | NET_CORE_SOMAXCONN=18, |
| 263 | NET_CORE_BUDGET=19, | 263 | NET_CORE_BUDGET=19, |
| 264 | NET_CORE_AEVENT_ETIME=20, | ||
| 265 | NET_CORE_AEVENT_RSEQTH=21, | ||
| 264 | }; | 266 | }; |
| 265 | 267 | ||
| 266 | /* /proc/sys/net/ethernet */ | 268 | /* /proc/sys/net/ethernet */ |
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h index 82fbb758e28f..b54a12940ef6 100644 --- a/include/linux/xfrm.h +++ b/include/linux/xfrm.h | |||
| @@ -156,6 +156,10 @@ enum { | |||
| 156 | XFRM_MSG_FLUSHPOLICY, | 156 | XFRM_MSG_FLUSHPOLICY, |
| 157 | #define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY | 157 | #define XFRM_MSG_FLUSHPOLICY XFRM_MSG_FLUSHPOLICY |
| 158 | 158 | ||
| 159 | XFRM_MSG_NEWAE, | ||
| 160 | #define XFRM_MSG_NEWAE XFRM_MSG_NEWAE | ||
| 161 | XFRM_MSG_GETAE, | ||
| 162 | #define XFRM_MSG_GETAE XFRM_MSG_GETAE | ||
| 159 | __XFRM_MSG_MAX | 163 | __XFRM_MSG_MAX |
| 160 | }; | 164 | }; |
| 161 | #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1) | 165 | #define XFRM_MSG_MAX (__XFRM_MSG_MAX - 1) |
| @@ -194,6 +198,21 @@ struct xfrm_encap_tmpl { | |||
| 194 | xfrm_address_t encap_oa; | 198 | xfrm_address_t encap_oa; |
| 195 | }; | 199 | }; |
| 196 | 200 | ||
| 201 | /* AEVENT flags */ | ||
| 202 | enum xfrm_ae_ftype_t { | ||
| 203 | XFRM_AE_UNSPEC, | ||
| 204 | XFRM_AE_RTHR=1, /* replay threshold*/ | ||
| 205 | XFRM_AE_RVAL=2, /* replay value */ | ||
| 206 | XFRM_AE_LVAL=4, /* lifetime value */ | ||
| 207 | XFRM_AE_ETHR=8, /* expiry timer threshold */ | ||
| 208 | XFRM_AE_CR=16, /* Event cause is replay update */ | ||
| 209 | XFRM_AE_CE=32, /* Event cause is timer expiry */ | ||
| 210 | XFRM_AE_CU=64, /* Event cause is policy update */ | ||
| 211 | __XFRM_AE_MAX | ||
| 212 | |||
| 213 | #define XFRM_AE_MAX (__XFRM_AE_MAX - 1) | ||
| 214 | }; | ||
| 215 | |||
| 197 | /* Netlink message attributes. */ | 216 | /* Netlink message attributes. */ |
| 198 | enum xfrm_attr_type_t { | 217 | enum xfrm_attr_type_t { |
| 199 | XFRMA_UNSPEC, | 218 | XFRMA_UNSPEC, |
| @@ -205,6 +224,10 @@ enum xfrm_attr_type_t { | |||
| 205 | XFRMA_SA, | 224 | XFRMA_SA, |
| 206 | XFRMA_POLICY, | 225 | XFRMA_POLICY, |
| 207 | XFRMA_SEC_CTX, /* struct xfrm_sec_ctx */ | 226 | XFRMA_SEC_CTX, /* struct xfrm_sec_ctx */ |
| 227 | XFRMA_LTIME_VAL, | ||
| 228 | XFRMA_REPLAY_VAL, | ||
| 229 | XFRMA_REPLAY_THRESH, | ||
| 230 | XFRMA_ETIMER_THRESH, | ||
| 208 | __XFRMA_MAX | 231 | __XFRMA_MAX |
| 209 | 232 | ||
| 210 | #define XFRMA_MAX (__XFRMA_MAX - 1) | 233 | #define XFRMA_MAX (__XFRMA_MAX - 1) |
| @@ -235,6 +258,11 @@ struct xfrm_usersa_id { | |||
| 235 | __u8 proto; | 258 | __u8 proto; |
| 236 | }; | 259 | }; |
| 237 | 260 | ||
| 261 | struct xfrm_aevent_id { | ||
| 262 | __u32 flags; | ||
| 263 | struct xfrm_usersa_id sa_id; | ||
| 264 | }; | ||
| 265 | |||
| 238 | struct xfrm_userspi_info { | 266 | struct xfrm_userspi_info { |
| 239 | struct xfrm_usersa_info info; | 267 | struct xfrm_usersa_info info; |
| 240 | __u32 min; | 268 | __u32 min; |
| @@ -306,6 +334,8 @@ enum xfrm_nlgroups { | |||
| 306 | #define XFRMNLGRP_SA XFRMNLGRP_SA | 334 | #define XFRMNLGRP_SA XFRMNLGRP_SA |
| 307 | XFRMNLGRP_POLICY, | 335 | XFRMNLGRP_POLICY, |
| 308 | #define XFRMNLGRP_POLICY XFRMNLGRP_POLICY | 336 | #define XFRMNLGRP_POLICY XFRMNLGRP_POLICY |
| 337 | XFRMNLGRP_AEVENTS, | ||
| 338 | #define XFRMNLGRP_AEVENTS XFRMNLGRP_AEVENTS | ||
| 309 | __XFRMNLGRP_MAX | 339 | __XFRMNLGRP_MAX |
| 310 | }; | 340 | }; |
| 311 | #define XFRMNLGRP_MAX (__XFRMNLGRP_MAX - 1) | 341 | #define XFRMNLGRP_MAX (__XFRMNLGRP_MAX - 1) |
