summaryrefslogtreecommitdiff
path: root/sys/netinet6/ip6_output.c
diff options
context:
space:
mode:
authorAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-05-28 06:45:33 +0000
committerAngelos D. Keromytis <angelos@cvs.openbsd.org>2001-05-28 06:45:33 +0000
commit81a7ec362a3632b09261a8422366e2aba1ca42ab (patch)
tree914ca238e82d6d721d69049c2ef94a282f085606 /sys/netinet6/ip6_output.c
parent6c41f06e46d789159beff47b9d2e618460f799c6 (diff)
Remove unused code.
Diffstat (limited to 'sys/netinet6/ip6_output.c')
-rw-r--r--sys/netinet6/ip6_output.c48
1 files changed, 3 insertions, 45 deletions
diff --git a/sys/netinet6/ip6_output.c b/sys/netinet6/ip6_output.c
index 4862af8b4dd..7820ec6598a 100644
--- a/sys/netinet6/ip6_output.c
+++ b/sys/netinet6/ip6_output.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: ip6_output.c,v 1.38 2001/05/28 05:28:22 angelos Exp $ */
+/* $OpenBSD: ip6_output.c,v 1.39 2001/05/28 06:45:32 angelos Exp $ */
/* $KAME: ip6_output.c,v 1.172 2001/03/25 09:55:56 itojun Exp $ */
/*
@@ -526,48 +526,6 @@ skip_ipsec2:;
dst->sin6_len = sizeof(struct sockaddr_in6);
dst->sin6_addr = ip6->ip6_dst;
}
-#if 0 /*KAME IPSEC*/
- if (needipsec && needipsectun) {
- struct ipsec_output_state state;
-
- bzero(&exthdrs, sizeof(exthdrs));
- exthdrs.ip6e_ip6 = m;
-
- bzero(&state, sizeof(state));
- state.m = m;
- state.ro = (struct route *)ro;
- state.dst = (struct sockaddr *)dst;
-
- error = ipsec6_output_tunnel(&state, sp, flags);
-
- m = state.m;
- ro = (struct route_in6 *)state.ro;
- dst = (struct sockaddr_in6 *)state.dst;
- if (error) {
- /* mbuf is already reclaimed in ipsec6_output_tunnel. */
- m0 = m = NULL;
- m = NULL;
- switch (error) {
- case EHOSTUNREACH:
- case ENETUNREACH:
- case EMSGSIZE:
- case ENOBUFS:
- case ENOMEM:
- break;
- default:
- printf("ip6_output (ipsec): error code %d\n", error);
- /*fall through*/
- case ENOENT:
- /* don't show these error codes to the user */
- error = 0;
- break;
- }
- goto bad;
- }
-
- exthdrs.ip6e_ip6 = m;
- }
-#endif /*IPSEC*/
#ifdef IPSEC
/*
* Check if the packet needs encapsulation.
@@ -589,8 +547,8 @@ skip_ipsec2:;
ip6->ip6_hlim = opt->ip6po_hlim & 0xff;
/*
- * XXX what should we do if ip6_hlim == 0 and the packet
- * gets tunnelled?
+ * XXX what should we do if ip6_hlim == 0 and the
+ * packet gets tunnelled?
*/
}