 @@ -1,14 +1,14 @@
-/*	$NetBSD: ipsec_output.c,v 1.28 2008/04/28 17:40:11 degroote Exp $	*/
+/*	$NetBSD: ipsec_output.c,v 1.29 2009/12/01 01:01:34 dyoung Exp $	*/
 /*-
  * Copyright (c) 2002, 2003 Sam Leffler, Errno Consulting
  * 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
  *    notice, this list of conditions and the following disclaimer in the
  *    documentation and/or other materials provided with the distribution.
 @@ -19,27 +19,27 @@
  * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR 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.
+ *
  * $FreeBSD: /repoman/r/ncvs/src/sys/netipsec/ipsec_output.c,v 1.3.2.2 2003/03/28 20:32:53 sam Exp $
  */
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.28 2008/04/28 17:40:11 degroote Exp $");
+__KERNEL_RCSID(0, "$NetBSD: ipsec_output.c,v 1.29 2009/12/01 01:01:34 dyoung Exp $");
 /*
  * IPsec output processing.
  */
 #include "opt_inet.h"
 #ifdef __FreeBSD__
 #include "opt_inet6.h"
 #endif
 #include "opt_ipsec.h"
 #include <sys/param.h>
 #include <sys/systm.h>
 #include <sys/mbuf.h>
 @@ -201,27 +201,27 @@ ipsec_process_done(struct mbuf *m, struc
 		udp = (struct udphdr*) (mtod(mo, char*) + roff);
 		data = (uint64_t*) (udp + 1);
 		if (sav->natt_type == UDP_ENCAP_ESPINUDP_NON_IKE)
 			*data = 0; /* NON-IKE Marker */
 		if (sav->natt_type == UDP_ENCAP_ESPINUDP_NON_IKE)
 			udp->uh_sport = htons(UDP_ENCAP_ESPINUDP_PORT);
 		else
 			udp->uh_sport = key_portfromsaddr(&saidx->src);
 		udp->uh_dport = key_portfromsaddr(&saidx->dst);
 		udp->uh_sum = 0;
-       	udp->uh_ulen = htons(m->m_pkthdr.len - (ip->ip_hl << 2));
+		udp->uh_ulen = htons(m->m_pkthdr.len - (ip->ip_hl << 2));
+	}
 #endif /* IPSEC_NAT_T */
 	switch (saidx->dst.sa.sa_family) {
 #ifdef INET
 	case AF_INET:
 		/* Fix the header length, for AH processing. */
 		ip = mtod(m, struct ip *);
 		ip->ip_len = htons(m->m_pkthdr.len);
 #ifdef IPSEC_NAT_T
 		if (sav->natt_type != 0)
 			ip->ip_p = IPPROTO_UDP;
 #endif /* IPSEC_NAT_T */
 @@ -253,41 +253,41 @@ ipsec_process_done(struct mbuf *m, struc
 		error = ENXIO;
 		goto bad;
+	}
 	/*
 	 * If there's another (bundled) SA to apply, do so.
 	 * Note that this puts a burden on the kernel stack size.
 	 * If this is a problem we'll need to introduce a queue
 	 * to set the packet on so we can unwind the stack before
 	 * doing further processing.
 	 */
 	if (isr->next) {
 		IPSEC_STATINC(IPSEC_STAT_OUT_BUNDLESA);
-        switch ( saidx->dst.sa.sa_family ) {
+		switch ( saidx->dst.sa.sa_family ) {
 #ifdef INET
-        case AF_INET:
+		case AF_INET:
 			return ipsec4_process_packet(m, isr->next, 0,0);
 #endif /* INET */
 #ifdef INET6
 		case AF_INET6:
-        	return ipsec6_process_packet(m,isr->next);
+			return ipsec6_process_packet(m,isr->next);
 #endif /* INET6 */
 		default :
 			DPRINTF(("ipsec_process_done: unknown protocol family %u\n",
-                               saidx->dst.sa.sa_family));
+			       saidx->dst.sa.sa_family));
 			error = ENXIO;
 			goto bad;
+		}
+	}
 	/*
 	 * We're done with IPsec processing,
 	 * mark that we have already processed the packet
 	 * transmit it packet using the appropriate network protocol (IP or IPv6).
 	 */
 	if (ipsec_register_done(m, &error) < 0)
 		goto bad;
 	return ipsec_reinject_ipstack(m, saidx->dst.sa.sa_family);
 bad: