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

[Andrey V. Elsukov]

Author: ae
Date: Tue Nov 22 09:04:26 2016
New Revision: 308960
URL: https://svnweb.freebsd.org/changeset/base/308960

Log:
  Make debugging capabilities of key_allocsp() more useful.

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

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Tue Nov 22 08:56:29 2016	(r308959)
+++ projects/ipsec/sys/netipsec/key.c	Tue Nov 22 09:04:26 2016	(r308960)
@@ -690,8 +690,7 @@ key_checksockaddrs(struct sockaddr *src,
  *	others:	found and return the pointer.
  */
 struct secpolicy *
-key_allocsp(struct secpolicyindex *spidx, u_int dir, const char* where,
-    int tag)
+key_allocsp(struct secpolicyindex *spidx, u_int dir)
 {
 	SPTREE_RLOCK_TRACKER;
 	struct secpolicy *sp;
@@ -700,38 +699,26 @@ key_allocsp(struct secpolicyindex *spidx
 	IPSEC_ASSERT(dir == IPSEC_DIR_INBOUND || dir == IPSEC_DIR_OUTBOUND,
 		("invalid direction %u", dir));
 
-	KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
-		printf("DP %s from %s:%u\n", __func__, where, tag));
-
-	/* get a SP entry */
-	KEYDEBUG(KEYDEBUG_IPSEC_DATA,
-		printf("*** objects\n");
-		kdebug_secpolicyindex(spidx));
-
 	SPTREE_RLOCK();
 	TAILQ_FOREACH(sp, &V_sptree[dir], chain) {
-		KEYDEBUG(KEYDEBUG_IPSEC_DATA,
-			printf("*** in SPD\n");
-			kdebug_secpolicyindex(&sp->spidx));
-		if (key_cmpspidx_withmask(&sp->spidx, spidx))
-			goto found;
+		if (key_cmpspidx_withmask(&sp->spidx, spidx)) {
+			SP_ADDREF(sp);
+			break;
+		}
 	}
-	sp = NULL;
-found:
-	if (sp) {
-		/* sanity check */
-		KEY_CHKSPDIR(sp->spidx.dir, dir, __func__);
+	SPTREE_RUNLOCK();
 
-		/* found a SPD entry */
+	if (sp != NULL) {	/* found a SPD entry */
 		sp->lastused = time_second;
-		SP_ADDREF(sp);
+		KEYDBG(IPSEC_STAMP,
+		    printf("%s: return SP(%p)\n", __func__, sp));
+		KEYDBG(IPSEC_DATA, kdebug_secpolicy(sp));
+	} else {
+		KEYDBG(IPSEC_DATA,
+		    printf("%s: lookup failed for ", __func__);
+		    kdebug_secpolicyindex(spidx, NULL));
 	}
-	SPTREE_RUNLOCK();
-
-	KEYDEBUG(KEYDEBUG_IPSEC_STAMP,
-		printf("DP %s return SP:%p (ID=%u) refcnt %u\n", __func__,
-			sp, sp ? sp->id : 0, sp ? sp->refcnt : 0));
-	return sp;
+	return (sp);
 }
 
 /*