summaryrefslogtreecommitdiffstats
path: root/sys/netinet/tcp_input.c
diff options
context:
space:
mode:
authormarkus <markus@openbsd.org>2015-04-16 19:24:13 +0000
committermarkus <markus@openbsd.org>2015-04-16 19:24:13 +0000
commitd5b2aefdce2b9b4a751d16e6dcd6ef5a4bb4524f (patch)
tree47ee220894b33456bf2f14699dbae07d816a9d2d /sys/netinet/tcp_input.c
parentchange {import,export}_identity so it can be used for policies; ok mikeb (diff)
downloadwireguard-openbsd-d5b2aefdce2b9b4a751d16e6dcd6ef5a4bb4524f.tar.xz
wireguard-openbsd-d5b2aefdce2b9b4a751d16e6dcd6ef5a4bb4524f.zip
remove unfinished/unused support for socket-attached ipsec-policies
ok mikeb
Diffstat (limited to 'sys/netinet/tcp_input.c')
-rw-r--r--sys/netinet/tcp_input.c30
1 files changed, 1 insertions, 29 deletions
diff --git a/sys/netinet/tcp_input.c b/sys/netinet/tcp_input.c
index 68749872653..04a32d0cbcf 100644
--- a/sys/netinet/tcp_input.c
+++ b/sys/netinet/tcp_input.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: tcp_input.c,v 1.288 2015/04/14 12:22:15 mikeb Exp $ */
+/* $OpenBSD: tcp_input.c,v 1.289 2015/04/16 19:24:13 markus Exp $ */
/* $NetBSD: tcp_input.c,v 1.23 1996/02/13 23:43:44 christos Exp $ */
/*
@@ -896,29 +896,6 @@ findpcb:
tcpstat.tcps_rcvnosec++;
goto drop;
}
-
- /* Latch SA */
- if (inp->inp_tdb_in != tdb) {
- if (tdb) {
- tdb_add_inp(tdb, inp, 1);
- if (inp->inp_ipo == NULL) {
- inp->inp_ipo = ipsec_add_policy(inp, af,
- IPSP_DIRECTION_OUT);
- if (inp->inp_ipo == NULL) {
- goto drop;
- }
- }
- if (inp->inp_ipo->ipo_dstid == NULL &&
- tdb->tdb_srcid != NULL) {
- inp->inp_ipo->ipo_dstid = tdb->tdb_srcid;
- tdb->tdb_srcid->ref_count++;
- }
- } else { /* Just reset */
- TAILQ_REMOVE(&inp->inp_tdb_in->tdb_inp_in, inp,
- inp_tdb_in_next);
- inp->inp_tdb_in = NULL;
- }
- }
#endif /* IPSEC */
/*
@@ -3694,11 +3671,6 @@ syn_cache_get(struct sockaddr *src, struct sockaddr *dst, struct tcphdr *th,
struct inpcb *newinp = sotoinpcb(so);
bcopy(inp->inp_seclevel, newinp->inp_seclevel,
sizeof(inp->inp_seclevel));
- newinp->inp_secrequire = inp->inp_secrequire;
- if (inp->inp_ipo != NULL) {
- newinp->inp_ipo = inp->inp_ipo;
- inp->inp_ipo->ipo_ref_count++;
- }
}
#endif /* IPSEC */
#ifdef INET6