s/ipsec_deepcopy_pcbpolicy/ipsec_copy_pcbpolicy/

(deep copy is made as necessary in ipsec.c)
kame · Jun 11, 2002 · 304adb1 · 304adb1
1 parent 90a9203
commit 304adb1
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 7 deletions.
diff --git a/freebsd3/sys/netinet/tcp_input.c b/freebsd3/sys/netinet/tcp_input.c
@@ -913,7 +913,7 @@ tcp_input(m, off, proto)
 			inp->inp_options = ip_srcroute();
 #ifdef IPSEC
 			/* copy old policy into new socket's */
-			if (ipsec_deepcopy_pcbpolicy(sotoinpcb(oso)->inp_sp,
+			if (ipsec_copy_pcbpolicy(sotoinpcb(oso)->inp_sp,
 			                      inp->inp_sp))
 				printf("tcp_input: could not copy policy\n");
 #endif

diff --git a/freebsd4/sys/netinet/tcp_syncache.c b/freebsd4/sys/netinet/tcp_syncache.c
@@ -583,7 +583,7 @@ syncache_socket(sc, lso)
 	}
 #ifdef IPSEC
 	/* copy old policy into new socket's */
-	if (ipsec_deepcopy_pcbpolicy(sotoinpcb(lso)->inp_sp, inp->inp_sp))
+	if (ipsec_copy_pcbpolicy(sotoinpcb(lso)->inp_sp, inp->inp_sp))
 		printf("syncache_expand: could not copy policy\n");
 #endif
 #ifdef INET6

diff --git a/kame/sys/netinet6/tcp6_input.c b/kame/sys/netinet6/tcp6_input.c
@@ -1,4 +1,4 @@
-/*	$KAME: tcp6_input.c,v 1.57 2002/06/11 17:54:30 itojun Exp $	*/
+/*	$KAME: tcp6_input.c,v 1.58 2002/06/11 21:52:24 itojun Exp $	*/
 
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
@@ -753,7 +753,7 @@ tcp6_input(mp, offp, proto)
 							M_NOWAIT);
 #ifdef IPSEC
 			/* copy old policy into new socket's */
-			if (ipsec_deepcopy_pcbpolicy(sotoin6pcb(oso)->in6p_sp,
+			if (ipsec_copy_pcbpolicy(sotoin6pcb(oso)->in6p_sp,
 			                      in6p->in6p_sp))
 				printf("tcp6_input: could not copy policy\n");
 #endif
@@ -2550,7 +2550,7 @@ syn_cache_get6(so, m, off, len, src, dst)
 	in6p->in6p_fport = sc->sc_sport;
 #ifdef IPSEC
 	/* copy old policy into new socket's */
-	if (ipsec_deepcopy_pcbpolicy(sotoin6pcb(oso)->in6p_sp, in6p->in6p_sp))
+	if (ipsec_copy_pcbpolicy(sotoin6pcb(oso)->in6p_sp, in6p->in6p_sp))
 		printf("syn_cache_get6: could not copy policy\n");
 #endif
 

diff --git a/netbsd/sys/netinet/tcp_input.c b/netbsd/sys/netinet/tcp_input.c
@@ -3196,13 +3196,13 @@ syn_cache_get(src, dst, th, hlen, tlen, so, m)
 	 */
 	if (inp) {
 		/* copy old policy into new socket's */
-		if (ipsec_deepcopy_pcbpolicy(sotoinpcb(oso)->inp_sp, inp->inp_sp))
+		if (ipsec_copy_pcbpolicy(sotoinpcb(oso)->inp_sp, inp->inp_sp))
 			printf("tcp_input: could not copy policy\n");
 	}
 #ifdef INET6
 	else if (in6p) {
 		/* copy old policy into new socket's */
-		if (ipsec_deepcopy_pcbpolicy(sotoin6pcb(oso)->in6p_sp, in6p->in6p_sp))
+		if (ipsec_copy_pcbpolicy(sotoin6pcb(oso)->in6p_sp, in6p->in6p_sp))
 			printf("tcp_input: could not copy policy\n");
 	}
 #endif