svn commit: r309001 - projects/ipsec/sys/netipsec

[Andrey V. Elsukov]

Author: ae
Date: Tue Nov 22 14:03:09 2016
New Revision: 309001
URL: https://svnweb.freebsd.org/changeset/base/309001

Log:
  Modify key_getsavbyspi() to use SPI hash.

Modified:
  projects/ipsec/sys/netipsec/key.c

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Tue Nov 22 13:58:24 2016	(r309000)
+++ projects/ipsec/sys/netipsec/key.c	Tue Nov 22 14:03:09 2016	(r309001)
@@ -2802,41 +2802,27 @@ key_checkspidup(uint32_t spi)
 }
 
 /*
- * search SAD litmited alive SA, protocol, SPI.
+ * Search SA by SPI.
  * OUT:
  *	NULL	: not found
- *	others	: found, pointer to a SA.
+ *	others	: found, referenced pointer to a SA.
  */
 static struct secasvar *
-key_getsavbyspi(struct secashead *sah, u_int32_t spi)
+key_getsavbyspi(uint32_t spi)
 {
+	SAHTREE_RLOCK_TRACKER;
 	struct secasvar *sav;
-	u_int stateidx, state;
-
-	sav = NULL;
-	SAHTREE_LOCK_ASSERT();
-	/* search all status */
-	for (stateidx = 0;
-	     stateidx < _ARRAYLEN(saorder_state_alive);
-	     stateidx++) {
-
-		state = saorder_state_alive[stateidx];
-		LIST_FOREACH(sav, &sah->savtree[state], chain) {
-
-			/* sanity check */
-			if (sav->state != state) {
-				ipseclog((LOG_DEBUG, "%s: "
-				    "invalid sav->state (queue: %d SA: %d)\n",
-				    __func__, state, sav->state));
-				continue;
-			}
 
-			if (sav->spi == spi)
-				return sav;
-		}
+	/* Assume SPI is in network byte order */
+	SAHTREE_RLOCK();
+	LIST_FOREACH(sav, SAVHASH_HASH(spi), spihash) {
+		if (sav->spi != spi)
+			continue;
+		SAV_ADDREF(sav);
+		break;
 	}
-
-	return NULL;
+	SAHTREE_RUNLOCK();
+	return (sav);
 }
 
 /*