[1/4] ipsec: move ipsec sad name length into .h
diff mbox series

Message ID 4697977e04cf3622d1752e171956709a3eff6e10.1576080741.git.vladimir.medvedkin@intel.com
State Superseded, archived
Delegated to: akhil goyal
Headers show
Series
  • [1/4] ipsec: move ipsec sad name length into .h
Related show

Checks

Context Check Description
ci/Intel-compilation success Compilation OK
ci/iol-intel-Performance success Performance Testing PASS
ci/iol-mellanox-Performance success Performance Testing PASS
ci/iol-testing success Testing PASS
ci/checkpatch success coding style OK

Commit Message

Medvedkin, Vladimir Dec. 11, 2019, 4:13 p.m. UTC
Move IPSEC_SAD_NAMESIZE into public header
and rename it to RTE_IPSEC_SAD_NAMESIZE

Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
---
 lib/librte_ipsec/ipsec_sad.c     | 20 ++++++++++----------
 lib/librte_ipsec/rte_ipsec_sad.h |  2 ++
 2 files changed, 12 insertions(+), 10 deletions(-)

Comments

Medvedkin, Vladimir Dec. 11, 2019, 4:43 p.m. UTC | #1
Self NACK for series

Forgot cover letter, will resend again.

On 11/12/2019 16:13, Vladimir Medvedkin wrote:
> Move IPSEC_SAD_NAMESIZE into public header
> and rename it to RTE_IPSEC_SAD_NAMESIZE
>
> Signed-off-by: Vladimir Medvedkin <vladimir.medvedkin@intel.com>
> ---
>   lib/librte_ipsec/ipsec_sad.c     | 20 ++++++++++----------
>   lib/librte_ipsec/rte_ipsec_sad.h |  2 ++
>   2 files changed, 12 insertions(+), 10 deletions(-)
>
> diff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/librte_ipsec/ipsec_sad.c
> index db2c44c..2c994ed 100644
> --- a/lib/librte_ipsec/ipsec_sad.c
> +++ b/lib/librte_ipsec/ipsec_sad.c
> @@ -20,7 +20,6 @@
>    * indicate presence of entries with the same SPI in DIP and DIP+SIP tables.
>    */
>   
> -#define IPSEC_SAD_NAMESIZE	64
>   #define SAD_PREFIX		"SAD_"
>   /* "SAD_<name>" */
>   #define SAD_FORMAT		SAD_PREFIX "%s"
> @@ -34,7 +33,7 @@ struct hash_cnt {
>   };
>   
>   struct rte_ipsec_sad {
> -	char name[IPSEC_SAD_NAMESIZE];
> +	char name[RTE_IPSEC_SAD_NAMESIZE];
>   	struct rte_hash	*hash[RTE_IPSEC_SAD_KEY_TYPE_MASK];
>   	/* Array to track number of more specific rules
>   	 * (spi_dip or spi_dip_sip). Used only in add/delete
> @@ -231,7 +230,7 @@ struct rte_ipsec_sad *
>   rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
>   {
>   	char hash_name[RTE_HASH_NAMESIZE];
> -	char sad_name[IPSEC_SAD_NAMESIZE];
> +	char sad_name[RTE_IPSEC_SAD_NAMESIZE];
>   	struct rte_tailq_entry *te;
>   	struct rte_ipsec_sad_list *sad_list;
>   	struct rte_ipsec_sad *sad, *tmp_sad = NULL;
> @@ -249,8 +248,8 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
>   		return NULL;
>   	}
>   
> -	ret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
> -	if (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {
> +	ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
> +	if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE) {
>   		rte_errno = ENAMETOOLONG;
>   		return NULL;
>   	}
> @@ -326,7 +325,8 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
>   	/* guarantee there's no existing */
>   	TAILQ_FOREACH(te, sad_list, next) {
>   		tmp_sad = (struct rte_ipsec_sad *)te->data;
> -		if (strncmp(sad_name, tmp_sad->name, IPSEC_SAD_NAMESIZE) == 0)
> +		if (strncmp(sad_name, tmp_sad->name,
> +				RTE_IPSEC_SAD_NAMESIZE) == 0)
>   			break;
>   	}
>   	if (te != NULL) {
> @@ -354,14 +354,14 @@ rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
>   struct rte_ipsec_sad *
>   rte_ipsec_sad_find_existing(const char *name)
>   {
> -	char sad_name[IPSEC_SAD_NAMESIZE];
> +	char sad_name[RTE_IPSEC_SAD_NAMESIZE];
>   	struct rte_ipsec_sad *sad = NULL;
>   	struct rte_tailq_entry *te;
>   	struct rte_ipsec_sad_list *sad_list;
>   	int ret;
>   
> -	ret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
> -	if (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {
> +	ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
> +	if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE) {
>   		rte_errno = ENAMETOOLONG;
>   		return NULL;
>   	}
> @@ -372,7 +372,7 @@ rte_ipsec_sad_find_existing(const char *name)
>   	rte_mcfg_tailq_read_lock();
>   	TAILQ_FOREACH(te, sad_list, next) {
>   		sad = (struct rte_ipsec_sad *) te->data;
> -		if (strncmp(sad_name, sad->name, IPSEC_SAD_NAMESIZE) == 0)
> +		if (strncmp(sad_name, sad->name, RTE_IPSEC_SAD_NAMESIZE) == 0)
>   			break;
>   	}
>   	rte_mcfg_tailq_read_unlock();
> diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/librte_ipsec/rte_ipsec_sad.h
> index 8386f73..dcc8224 100644
> --- a/lib/librte_ipsec/rte_ipsec_sad.h
> +++ b/lib/librte_ipsec/rte_ipsec_sad.h
> @@ -47,6 +47,8 @@ union rte_ipsec_sad_key {
>   	struct rte_ipsec_sadv6_key	v6;
>   };
>   
> +/** Max number of characters in SAD name. */
> +#define RTE_IPSEC_SAD_NAMESIZE		64
>   /** Flag to create SAD with ipv6 dip and sip addresses */
>   #define RTE_IPSEC_SAD_FLAG_IPV6			0x1
>   /** Flag to support reader writer concurrency */

Patch
diff mbox series

diff --git a/lib/librte_ipsec/ipsec_sad.c b/lib/librte_ipsec/ipsec_sad.c
index db2c44c..2c994ed 100644
--- a/lib/librte_ipsec/ipsec_sad.c
+++ b/lib/librte_ipsec/ipsec_sad.c
@@ -20,7 +20,6 @@ 
  * indicate presence of entries with the same SPI in DIP and DIP+SIP tables.
  */
 
-#define IPSEC_SAD_NAMESIZE	64
 #define SAD_PREFIX		"SAD_"
 /* "SAD_<name>" */
 #define SAD_FORMAT		SAD_PREFIX "%s"
@@ -34,7 +33,7 @@  struct hash_cnt {
 };
 
 struct rte_ipsec_sad {
-	char name[IPSEC_SAD_NAMESIZE];
+	char name[RTE_IPSEC_SAD_NAMESIZE];
 	struct rte_hash	*hash[RTE_IPSEC_SAD_KEY_TYPE_MASK];
 	/* Array to track number of more specific rules
 	 * (spi_dip or spi_dip_sip). Used only in add/delete
@@ -231,7 +230,7 @@  struct rte_ipsec_sad *
 rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
 {
 	char hash_name[RTE_HASH_NAMESIZE];
-	char sad_name[IPSEC_SAD_NAMESIZE];
+	char sad_name[RTE_IPSEC_SAD_NAMESIZE];
 	struct rte_tailq_entry *te;
 	struct rte_ipsec_sad_list *sad_list;
 	struct rte_ipsec_sad *sad, *tmp_sad = NULL;
@@ -249,8 +248,8 @@  rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
 		return NULL;
 	}
 
-	ret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
-	if (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {
+	ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
+	if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE) {
 		rte_errno = ENAMETOOLONG;
 		return NULL;
 	}
@@ -326,7 +325,8 @@  rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
 	/* guarantee there's no existing */
 	TAILQ_FOREACH(te, sad_list, next) {
 		tmp_sad = (struct rte_ipsec_sad *)te->data;
-		if (strncmp(sad_name, tmp_sad->name, IPSEC_SAD_NAMESIZE) == 0)
+		if (strncmp(sad_name, tmp_sad->name,
+				RTE_IPSEC_SAD_NAMESIZE) == 0)
 			break;
 	}
 	if (te != NULL) {
@@ -354,14 +354,14 @@  rte_ipsec_sad_create(const char *name, const struct rte_ipsec_sad_conf *conf)
 struct rte_ipsec_sad *
 rte_ipsec_sad_find_existing(const char *name)
 {
-	char sad_name[IPSEC_SAD_NAMESIZE];
+	char sad_name[RTE_IPSEC_SAD_NAMESIZE];
 	struct rte_ipsec_sad *sad = NULL;
 	struct rte_tailq_entry *te;
 	struct rte_ipsec_sad_list *sad_list;
 	int ret;
 
-	ret = snprintf(sad_name, IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
-	if (ret < 0 || ret >= IPSEC_SAD_NAMESIZE) {
+	ret = snprintf(sad_name, RTE_IPSEC_SAD_NAMESIZE, SAD_FORMAT, name);
+	if (ret < 0 || ret >= RTE_IPSEC_SAD_NAMESIZE) {
 		rte_errno = ENAMETOOLONG;
 		return NULL;
 	}
@@ -372,7 +372,7 @@  rte_ipsec_sad_find_existing(const char *name)
 	rte_mcfg_tailq_read_lock();
 	TAILQ_FOREACH(te, sad_list, next) {
 		sad = (struct rte_ipsec_sad *) te->data;
-		if (strncmp(sad_name, sad->name, IPSEC_SAD_NAMESIZE) == 0)
+		if (strncmp(sad_name, sad->name, RTE_IPSEC_SAD_NAMESIZE) == 0)
 			break;
 	}
 	rte_mcfg_tailq_read_unlock();
diff --git a/lib/librte_ipsec/rte_ipsec_sad.h b/lib/librte_ipsec/rte_ipsec_sad.h
index 8386f73..dcc8224 100644
--- a/lib/librte_ipsec/rte_ipsec_sad.h
+++ b/lib/librte_ipsec/rte_ipsec_sad.h
@@ -47,6 +47,8 @@  union rte_ipsec_sad_key {
 	struct rte_ipsec_sadv6_key	v6;
 };
 
+/** Max number of characters in SAD name. */
+#define RTE_IPSEC_SAD_NAMESIZE		64
 /** Flag to create SAD with ipv6 dip and sip addresses */
 #define RTE_IPSEC_SAD_FLAG_IPV6			0x1
 /** Flag to support reader writer concurrency */