aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorJamal Hadi Salim <hadi@cyberus.ca>2007-05-04 15:55:39 -0400
committerDavid S. Miller <davem@davemloft.net>2007-05-04 15:55:39 -0400
commit5a6d34162f5c6f522f857df274f1c8240f161e11 (patch)
tree537d305eef465617944821a1df59da3523a640df /include
parentaf11e31609d93765c1b22611592543e028f7aa54 (diff)
[XFRM] SPD info TLV aggregation
Aggregate the SPD info TLVs. Signed-off-by: Jamal Hadi Salim <hadi@cyberus.ca> Signed-off-by: Patrick McHardy <kaber@trash.net> Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include')
-rw-r--r--include/linux/xfrm.h39
-rw-r--r--include/net/xfrm.h24
2 files changed, 28 insertions, 35 deletions
diff --git a/include/linux/xfrm.h b/include/linux/xfrm.h
index c237fe3af8ce..b58adc52448d 100644
--- a/include/linux/xfrm.h
+++ b/include/linux/xfrm.h
@@ -288,36 +288,29 @@ struct xfrmu_sadhinfo {
288 __u32 sadhmcnt; /* max allowed hash bkts */ 288 __u32 sadhmcnt; /* max allowed hash bkts */
289}; 289};
290 290
291/* SPD Table filter flags */
292enum xfrm_spd_ftype_t {
293 XFRM_SPD_UNSPEC,
294 XFRM_SPD_HMASK=1,
295 XFRM_SPD_HMAX=2,
296 XFRM_SPD_ICNT=4,
297 XFRM_SPD_OCNT=8,
298 XFRM_SPD_FCNT=16,
299 XFRM_SPD_ISCNT=32,
300 XFRM_SPD_OSCNT=64,
301 XFRM_SPD_FSCNT=128,
302 __XFRM_SPD_MAX
303
304#define XFRM_SPD_MAX (__XFRM_SPD_MAX - 1)
305};
306enum xfrm_spdattr_type_t { 291enum xfrm_spdattr_type_t {
307 XFRMA_SPD_UNSPEC, 292 XFRMA_SPD_UNSPEC,
308 XFRMA_SPDHMASK, 293 XFRMA_SPD_INFO,
309 XFRMA_SPDHMAX, 294 XFRMA_SPD_HINFO,
310 XFRMA_SPDICNT,
311 XFRMA_SPDOCNT,
312 XFRMA_SPDFCNT,
313 XFRMA_SPDISCNT,
314 XFRMA_SPDOSCNT,
315 XFRMA_SPDFSCNT,
316 __XFRMA_SPD_MAX 295 __XFRMA_SPD_MAX
317 296
318#define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1) 297#define XFRMA_SPD_MAX (__XFRMA_SPD_MAX - 1)
319}; 298};
320 299
300struct xfrmu_spdinfo {
301 __u32 incnt;
302 __u32 outcnt;
303 __u32 fwdcnt;
304 __u32 inscnt;
305 __u32 outscnt;
306 __u32 fwdscnt;
307};
308
309struct xfrmu_spdhinfo {
310 __u32 spdhcnt;
311 __u32 spdhmcnt;
312};
313
321struct xfrm_usersa_info { 314struct xfrm_usersa_info {
322 struct xfrm_selector sel; 315 struct xfrm_selector sel;
323 struct xfrm_id id; 316 struct xfrm_id id;
diff --git a/include/net/xfrm.h b/include/net/xfrm.h
index d0d7db51d3fc..39ef925d39dd 100644
--- a/include/net/xfrm.h
+++ b/include/net/xfrm.h
@@ -416,17 +416,6 @@ struct xfrm_audit
416 u32 secid; 416 u32 secid;
417}; 417};
418 418
419struct xfrm_spdinfo
420{
421 u32 incnt;
422 u32 outcnt;
423 u32 fwdcnt;
424 u32 inscnt;
425 u32 outscnt;
426 u32 fwdscnt;
427 u32 spdhcnt;
428 u32 spdhmcnt;
429};
430#ifdef CONFIG_AUDITSYSCALL 419#ifdef CONFIG_AUDITSYSCALL
431extern void xfrm_audit_log(uid_t auid, u32 secid, int type, int result, 420extern void xfrm_audit_log(uid_t auid, u32 secid, int type, int result,
432 struct xfrm_policy *xp, struct xfrm_state *x); 421 struct xfrm_policy *xp, struct xfrm_state *x);
@@ -963,11 +952,22 @@ struct xfrmk_sadinfo {
963 u32 sadcnt; /* current running count */ 952 u32 sadcnt; /* current running count */
964}; 953};
965 954
955struct xfrmk_spdinfo {
956 u32 incnt;
957 u32 outcnt;
958 u32 fwdcnt;
959 u32 inscnt;
960 u32 outscnt;
961 u32 fwdscnt;
962 u32 spdhcnt;
963 u32 spdhmcnt;
964};
965
966extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq); 966extern struct xfrm_state *xfrm_find_acq_byseq(u32 seq);
967extern int xfrm_state_delete(struct xfrm_state *x); 967extern int xfrm_state_delete(struct xfrm_state *x);
968extern void xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info); 968extern void xfrm_state_flush(u8 proto, struct xfrm_audit *audit_info);
969extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si); 969extern void xfrm_sad_getinfo(struct xfrmk_sadinfo *si);
970extern void xfrm_spd_getinfo(struct xfrm_spdinfo *si); 970extern void xfrm_spd_getinfo(struct xfrmk_spdinfo *si);
971extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq); 971extern int xfrm_replay_check(struct xfrm_state *x, __be32 seq);
972extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq); 972extern void xfrm_replay_advance(struct xfrm_state *x, __be32 seq);
973extern void xfrm_replay_notify(struct xfrm_state *x, int event); 973extern void xfrm_replay_notify(struct xfrm_state *x, int event);