 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec.c,v 1.53 2011/06/05 01:45:37 christos Exp $	*/
+/*	$NetBSD: ipsec.c,v 1.54 2011/06/08 16:24:50 dyoung Exp $	*/
 /*	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.c,v 1.2.2.2 2003/07/01 01:38:13 sam Exp $	*/
 /*	$KAME: ipsec.c,v 1.103 2001/05/24 07:14:18 sakane Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *	notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -22,27 +22,27 @@
  * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
  * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE
  * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
  * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
  * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.53 2011/06/05 01:45:37 christos Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec.c,v 1.54 2011/06/08 16:24:50 dyoung Exp $");
 /*
  * IPsec controller part.
  */
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
 #include "opt_ipsec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 @@ -1214,27 +1214,27 @@ ipsec_copy_policy(const struct inpcbpoli
 	} else
 		return ENOBUFS;
 	new->priv = old->priv;
 	return 0;
+}
 /* deep-copy a policy in PCB */
 static struct secpolicy *
 ipsec_deepcopy_policy(const struct secpolicy *src)
+{
 	struct ipsecrequest *newchain = NULL;
-	const struct ipsecrequest *p;
+	struct ipsecrequest *p;
 	struct ipsecrequest **q;
 	struct ipsecrequest *r;
 	struct secpolicy *dst;
 	if (src == NULL)
 		return NULL;
 	dst = KEY_NEWSP();
 	if (dst == NULL)
 		return NULL;
 	/*
 	 * deep-copy IPsec request chain.  This is required since struct
 	 * ipsecrequest is not reference counted.

 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec.h,v 1.27 2011/06/05 01:40:40 christos Exp $	*/
+/*	$NetBSD: ipsec.h,v 1.28 2011/06/08 16:24:50 dyoung Exp $	*/
 /*	$FreeBSD: /usr/local/www/cvsroot/FreeBSD/src/sys/netipsec/ipsec.h,v 1.2.4.2 2004/02/14 22:23:23 bms Exp $	*/
 /*	$KAME: ipsec.h,v 1.53 2001/11/20 08:32:38 itojun Exp $	*/
 /*
  * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project.
  * All rights reserved.
+ *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
  * 1. Redistributions of source code must retain the above copyright
  *    notice, this list of conditions and the following disclaimer.
  * 2. Redistributions in binary form must reproduce the above copyright
 @@ -272,27 +272,27 @@ static __inline int
 ipsec_copy_pcbpolicy(
     struct inpcbpolicy *old,
     struct inpcbpolicy *new
+)
+{
   /*XXX do nothing */
   return (0);
+}
 struct inpcb;
 #define	ipsec_init_pcbpolicy ipsec_init_policy
 int ipsec_init_policy (struct socket *so, struct inpcbpolicy **);
 int ipsec_copy_policy
-	(struct inpcbpolicy *, struct inpcbpolicy *);
+	(const struct inpcbpolicy *, struct inpcbpolicy *);
 u_int ipsec_get_reqlevel (const struct ipsecrequest *);
 int ipsec_in_reject (const struct secpolicy *, const struct mbuf *);
 int ipsec4_set_policy (struct inpcb *, int, void *, size_t, kauth_cred_t);
 int ipsec4_get_policy (struct inpcb *, void *, size_t, struct mbuf **);
 int ipsec4_delete_pcbpolicy (struct inpcb *);
 int ipsec4_in_reject (struct mbuf *, struct inpcb *);
 /*
  * KAME ipsec4_in_reject_so(struct mbuf*, struct so)  compatibility shim
  */
 #define ipsec4_in_reject_so(m, _so) \
   ipsec4_in_reject(m, ((_so) == NULL? NULL : sotoinpcb(_so)))