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

[Andrey V. Elsukov]

Author: ae
Date: Tue Nov 22 11:56:58 2016
New Revision: 308992
URL: https://svnweb.freebsd.org/changeset/base/308992

Log:
  Use key_sp2mbuf() in key_spdexpire(). Also add debug code.

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

Modified: projects/ipsec/sys/netipsec/key.c
==============================================================================
--- projects/ipsec/sys/netipsec/key.c	Tue Nov 22 11:52:32 2016	(r308991)
+++ projects/ipsec/sys/netipsec/key.c	Tue Nov 22 11:56:58 2016	(r308992)
@@ -2377,15 +2377,16 @@ key_getspreqmsglen(struct secpolicy *sp)
 static int
 key_spdexpire(struct secpolicy *sp)
 {
-	struct mbuf *result = NULL, *m;
-	int len;
-	int error = -1;
 	struct sadb_lifetime *lt;
-
-	/* XXX: Why do we lock ? */
+	struct mbuf *result = NULL, *m;
+	int len, error = -1;
 
 	IPSEC_ASSERT(sp != NULL, ("null secpolicy"));
 
+	KEYDBG(KEY_STAMP,
+	    printf("%s: SP(%p)\n", __func__, sp));
+	KEYDBG(KEY_DATA, kdebug_secpolicy(sp));
+
 	/* set msg header */
 	m = key_setsadbmsg(SADB_X_SPDEXPIRE, 0, 0, 0, 0, 0);
 	if (!m) {
@@ -2446,7 +2447,7 @@ key_spdexpire(struct secpolicy *sp)
 	m_cat(result, m);
 
 	/* set secpolicy */
-	m = key_sp2msg(sp);
+	m = key_sp2mbuf(sp);
 	if (!m) {
 		error = ENOBUFS;
 		goto fail;