git.droids-corp.org
/
dpdk.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
test/ipsec: fix a typo in function name
[dpdk.git]
/
app
/
test
/
test_ipsec.c
diff --git
a/app/test/test_ipsec.c
b/app/test/test_ipsec.c
index
0667dd0
..
9e14472
100644
(file)
--- a/
app/test/test_ipsec.c
+++ b/
app/test/test_ipsec.c
@@
-237,7
+237,7
@@
fill_crypto_xform(struct ipsec_unitest_params *ut_params,
}
static int
}
static int
-check_cryptodev_capablity(const struct ipsec_unitest_params *ut,
+check_cryptodev_capab
i
lity(const struct ipsec_unitest_params *ut,
uint8_t dev_id)
{
struct rte_cryptodev_sym_capability_idx cap_idx;
uint8_t dev_id)
{
struct rte_cryptodev_sym_capability_idx cap_idx;
@@
-302,7
+302,7
@@
testsuite_setup(void)
/* Find first valid crypto device */
for (i = 0; i < nb_devs; i++) {
/* Find first valid crypto device */
for (i = 0; i < nb_devs; i++) {
- rc = check_cryptodev_capablity(ut_params, i);
+ rc = check_cryptodev_capab
i
lity(ut_params, i);
if (rc == 0) {
ts_params->valid_dev = i;
ts_params->valid_dev_found = 1;
if (rc == 0) {
ts_params->valid_dev = i;
ts_params->valid_dev_found = 1;
@@
-452,8
+452,10
@@
ut_teardown(void)
for (i = 0; i < BURST_SIZE; i++) {
/* free crypto operation structure */
for (i = 0; i < BURST_SIZE; i++) {
/* free crypto operation structure */
- if (ut_params->cop[i])
+ if (ut_params->cop[i])
{
rte_crypto_op_free(ut_params->cop[i]);
rte_crypto_op_free(ut_params->cop[i]);
+ ut_params->cop[i] = NULL;
+ }
/*
* free mbuf - both obuf and ibuf are usually the same,
/*
* free mbuf - both obuf and ibuf are usually the same,
@@
-463,17
+465,17
@@
ut_teardown(void)
if (ut_params->obuf[i]) {
rte_pktmbuf_free(ut_params->obuf[i]);
if (ut_params->ibuf[i] == ut_params->obuf[i])
if (ut_params->obuf[i]) {
rte_pktmbuf_free(ut_params->obuf[i]);
if (ut_params->ibuf[i] == ut_params->obuf[i])
- ut_params->ibuf[i] =
0
;
- ut_params->obuf[i] =
0
;
+ ut_params->ibuf[i] =
NULL
;
+ ut_params->obuf[i] =
NULL
;
}
if (ut_params->ibuf[i]) {
rte_pktmbuf_free(ut_params->ibuf[i]);
}
if (ut_params->ibuf[i]) {
rte_pktmbuf_free(ut_params->ibuf[i]);
- ut_params->ibuf[i] =
0
;
+ ut_params->ibuf[i] =
NULL
;
}
if (ut_params->testbuf[i]) {
rte_pktmbuf_free(ut_params->testbuf[i]);
}
if (ut_params->testbuf[i]) {
rte_pktmbuf_free(ut_params->testbuf[i]);
- ut_params->testbuf[i] =
0
;
+ ut_params->testbuf[i] =
NULL
;
}
}
}
}
@@
-572,7
+574,7
@@
setup_test_string_tunneled(struct rte_mempool *mpool, const char *string,
struct rte_mbuf *m = rte_pktmbuf_alloc(mpool);
uint32_t hdrlen = sizeof(struct rte_ipv4_hdr) +
sizeof(struct rte_esp_hdr);
struct rte_mbuf *m = rte_pktmbuf_alloc(mpool);
uint32_t hdrlen = sizeof(struct rte_ipv4_hdr) +
sizeof(struct rte_esp_hdr);
- uint32_t taillen = sizeof(struct esp_tail);
+ uint32_t taillen = sizeof(struct
rte_
esp_tail);
uint32_t t_len = len + hdrlen + taillen;
uint32_t padlen;
uint32_t t_len = len + hdrlen + taillen;
uint32_t padlen;
@@
-584,7
+586,7
@@
setup_test_string_tunneled(struct rte_mempool *mpool, const char *string,
padlen = RTE_ALIGN(t_len, 4) - t_len;
t_len += padlen;
padlen = RTE_ALIGN(t_len, 4) - t_len;
t_len += padlen;
- struct
esp_tail espt
= {
+ struct
rte_esp_tail espt
= {
.pad_len = padlen,
.next_proto = IPPROTO_IPIP,
};
.pad_len = padlen,
.next_proto = IPPROTO_IPIP,
};
@@
-687,11
+689,11
@@
fill_ipsec_param(uint32_t replay_win_sz, uint64_t flags)
prm->userdata = 1;
prm->flags = flags;
prm->userdata = 1;
prm->flags = flags;
- prm->replay_win_sz = replay_win_sz;
/* setup ipsec xform */
prm->ipsec_xform = ut_params->ipsec_xform;
prm->ipsec_xform.salt = (uint32_t)rte_rand();
/* setup ipsec xform */
prm->ipsec_xform = ut_params->ipsec_xform;
prm->ipsec_xform.salt = (uint32_t)rte_rand();
+ prm->ipsec_xform.replay_win_sz = replay_win_sz;
/* setup tunnel related fields */
prm->tun.hdr_len = sizeof(ipv4_outer);
/* setup tunnel related fields */
prm->tun.hdr_len = sizeof(ipv4_outer);
@@
-1169,9
+1171,11
@@
static void
destroy_sa(uint32_t j)
{
struct ipsec_unitest_params *ut = &unittest_params;
destroy_sa(uint32_t j)
{
struct ipsec_unitest_params *ut = &unittest_params;
+ struct ipsec_testsuite_params *ts = &testsuite_params;
rte_ipsec_sa_fini(ut->ss[j].sa);
rte_free(ut->ss[j].sa);
rte_ipsec_sa_fini(ut->ss[j].sa);
rte_free(ut->ss[j].sa);
+ rte_cryptodev_sym_session_clear(ts->valid_dev, ut->ss[j].crypto.ses);
rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses);
memset(&ut->ss[j], 0, sizeof(ut->ss[j]));
}
rte_cryptodev_sym_session_free(ut->ss[j].crypto.ses);
memset(&ut->ss[j], 0, sizeof(ut->ss[j]));
}