diff options
| author |   tobhe <tobhe@openbsd.org> | 2020-09-09 21:25:42 +0000 |
|---|---|---|
| committer | tobhe <tobhe@openbsd.org> | 2020-09-09 21:25:42 +0000 |
| commit | 34642e6951180f98f2d290a2bdd44e1b0e51880c (patch) | |
| tree | fa786589159d75cbf0dda9d70bf4d7a85c67c71b | |
| parent | Element next-line scopes can nest. Consequently, even when closing (diff) | |
| download | wireguard-openbsd-34642e6951180f98f2d290a2bdd44e1b0e51880c.tar.xz wireguard-openbsd-34642e6951180f98f2d290a2bdd44e1b0e51880c.zip | |
Delete dead code.
| -rw-r--r-- | sbin/iked/pfkey.c | 13 | ||||
| -rw-r--r-- | sbin/iked/policy.c | 14 |
2 files changed, 2 insertions, 25 deletions
diff --git a/sbin/iked/pfkey.c b/sbin/iked/pfkey.c index 38e6833208a..5b8d6a487bd 100644 --- a/sbin/iked/pfkey.c +++ b/sbin/iked/pfkey.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pfkey.c,v 1.70 2020/08/28 13:37:52 tobhe Exp $ */ +/* $OpenBSD: pfkey.c,v 1.71 2020/09/09 21:25:42 tobhe Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -352,17 +352,6 @@ pfkey_flow(int sd, uint8_t satype, uint8_t action, struct iked_flow *flow) iov_cnt++; if (action != SADB_X_DELFLOW && flow->flow_local != NULL) { -#if 0 - /* local ip */ - iov[iov_cnt].iov_base = &sa_local; - iov[iov_cnt].iov_len = sizeof(sa_local); - iov_cnt++; - iov[iov_cnt].iov_base = &slocal; - iov[iov_cnt].iov_len = ROUNDUP(slocal.ss_len); - smsg.sadb_msg_len += sa_local.sadb_address_len; - iov_cnt++; -#endif - /* remote peer */ iov[iov_cnt].iov_base = &sa_peer; iov[iov_cnt].iov_len = sizeof(sa_peer); diff --git a/sbin/iked/policy.c b/sbin/iked/policy.c index 655e4abaf59..015dcefdaff 100644 --- a/sbin/iked/policy.c +++ b/sbin/iked/policy.c @@ -1,4 +1,4 @@ -/* $OpenBSD: policy.c,v 1.69 2020/08/23 19:16:08 tobhe Exp $ */ +/* $OpenBSD: policy.c,v 1.70 2020/09/09 21:25:42 tobhe Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -648,18 +648,6 @@ sa_cmp(struct iked_sa *a, struct iked_sa *b) if (a->sa_hdr.sh_ispi < b->sa_hdr.sh_ispi) return (1); -#if 0 - /* Responder SPI is not yet set in the local IKE SADB */ - if ((b->sa_type == IKED_SATYPE_LOCAL && b->sa_hdr.sh_rspi == 0) || - (a->sa_type == IKED_SATYPE_LOCAL && a->sa_hdr.sh_rspi == 0)) - return (0); - - if (a->sa_hdr.sh_rspi > b->sa_hdr.sh_rspi) - return (-1); - if (a->sa_hdr.sh_rspi < b->sa_hdr.sh_rspi) - return (1); -#endif - return (0); } |