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

[Andrey V. Elsukov]

Author: ae
Date: Thu Nov 24 09:00:18 2016
New Revision: 309089
URL: https://svnweb.freebsd.org/changeset/base/309089

Log:
  Use IPSEC_ADDRSTRLEN instead of INET6_ADDRSTRLEN, also use key_freesav
  instead of macro.

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

Modified: projects/ipsec/sys/netipsec/ipsec_input.c
==============================================================================
--- projects/ipsec/sys/netipsec/ipsec_input.c	Thu Nov 24 08:38:21 2016	(r309088)
+++ projects/ipsec/sys/netipsec/ipsec_input.c	Thu Nov 24 09:00:18 2016	(r309089)
@@ -117,10 +117,10 @@ static void ipsec4_common_ctlinput(int, 
 int
 ipsec_common_input(struct mbuf *m, int skip, int protoff, int af, int sproto)
 {
-	char buf[INET6_ADDRSTRLEN];
+	char buf[IPSEC_ADDRSTRLEN];
 	union sockaddr_union dst_address;
 	struct secasvar *sav;
-	u_int32_t spi;
+	uint32_t spi;
 	int error;
 #ifdef INET
 #ifdef IPSEC_NAT_T
@@ -224,7 +224,7 @@ ipsec_common_input(struct mbuf *m, int s
 		    __func__, ipsec_address(&dst_address, buf, sizeof(buf)),
 		    (u_long) ntohl(spi), sproto));
 		IPSEC_ISTAT(sproto, noxform);
-		KEY_FREESAV(&sav);
+		key_freesav(&sav);
 		m_freem(m);
 		return ENXIO;
 	}