Code Review
/
vpp.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
fib: fib api updates
[vpp.git]
/
src
/
vnet
/
ipsec
/
ipsec_sa.h
diff --git
a/src/vnet/ipsec/ipsec_sa.h
b/src/vnet/ipsec/ipsec_sa.h
index
661b54a
..
53035aa
100644
(file)
--- a/
src/vnet/ipsec/ipsec_sa.h
+++ b/
src/vnet/ipsec/ipsec_sa.h
@@
-71,8
+71,6
@@
typedef enum
IPSEC_PROTOCOL_ESP = 1
} ipsec_protocol_t;
IPSEC_PROTOCOL_ESP = 1
} ipsec_protocol_t;
-#define IPSEC_N_PROTOCOLS (IPSEC_PROTOCOL_ESP+1)
-
#define IPSEC_KEY_MAX_LEN 128
typedef struct ipsec_key_t_
{
#define IPSEC_KEY_MAX_LEN 128
typedef struct ipsec_key_t_
{
@@
-124,6
+122,7
@@
typedef struct
u32 last_seq;
u32 last_seq_hi;
u64 replay_window;
u32 last_seq;
u32 last_seq_hi;
u64 replay_window;
+ dpo_id_t dpo;
vnet_crypto_key_index_t crypto_key_index;
vnet_crypto_key_index_t integ_key_index;
vnet_crypto_key_index_t crypto_key_index;
vnet_crypto_key_index_t integ_key_index;
@@
-131,8
+130,6
@@
typedef struct
vnet_crypto_op_id_t crypto_dec_op_id:16;
vnet_crypto_op_id_t integ_op_id:16;
vnet_crypto_op_id_t crypto_dec_op_id:16;
vnet_crypto_op_id_t integ_op_id:16;
- dpo_id_t dpo[IPSEC_N_PROTOCOLS];
-
/* data accessed by dataplane code should be above this comment */
CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
/* data accessed by dataplane code should be above this comment */
CLIB_CACHE_LINE_ALIGN_MARK (cacheline1);
@@
-214,8
+211,6
@@
extern void ipsec_sa_set_integ_alg (ipsec_sa_t * sa,
ipsec_integ_alg_t integ_alg);
extern u8 ipsec_is_sa_used (u32 sa_index);
ipsec_integ_alg_t integ_alg);
extern u8 ipsec_is_sa_used (u32 sa_index);
-extern int ipsec_set_sa_key (u32 id,
- const ipsec_key_t * ck, const ipsec_key_t * ik);
extern u32 ipsec_get_sa_index_by_sa_id (u32 sa_id);
typedef walk_rc_t (*ipsec_sa_walk_cb_t) (ipsec_sa_t * sa, void *ctx);
extern u32 ipsec_get_sa_index_by_sa_id (u32 sa_id);
typedef walk_rc_t (*ipsec_sa_walk_cb_t) (ipsec_sa_t * sa, void *ctx);
@@
-297,13
+292,13
@@
ipsec_sa_anti_replay_check (ipsec_sa_t * sa, u32 * seqp)
}
always_inline void
}
always_inline void
-ipsec_sa_anti_replay_advance (ipsec_sa_t * sa, u32
*
seqp)
+ipsec_sa_anti_replay_advance (ipsec_sa_t * sa, u32 seqp)
{
u32 pos, seq;
if (PREDICT_TRUE (sa->flags & IPSEC_SA_FLAG_USE_ANTI_REPLAY) == 0)
return;
{
u32 pos, seq;
if (PREDICT_TRUE (sa->flags & IPSEC_SA_FLAG_USE_ANTI_REPLAY) == 0)
return;
- seq = clib_host_to_net_u32 (
*
seqp);
+ seq = clib_host_to_net_u32 (seqp);
if (PREDICT_TRUE (sa->flags & IPSEC_SA_FLAG_USE_ESN))
{
int wrap = sa->seq_hi - sa->last_seq_hi;
if (PREDICT_TRUE (sa->flags & IPSEC_SA_FLAG_USE_ESN))
{
int wrap = sa->seq_hi - sa->last_seq_hi;