diff options
| -rw-r--r-- | sbin/iked/iked.h | 3 | ||||
| -rw-r--r-- | sbin/iked/ikev2.c | 32 |
2 files changed, 2 insertions, 33 deletions
diff --git a/sbin/iked/iked.h b/sbin/iked/iked.h index d043e7097b5..ca625e89ad5 100644 --- a/sbin/iked/iked.h +++ b/sbin/iked/iked.h @@ -1,4 +1,4 @@ -/* $OpenBSD: iked.h,v 1.34 2011/01/26 16:59:23 mikeb Exp $ */ +/* $OpenBSD: iked.h,v 1.35 2011/04/15 13:10:49 reyk Exp $ */ /* $vantronix: iked.h,v 1.61 2010/06/03 07:57:33 reyk Exp $ */ /* @@ -639,7 +639,6 @@ int ikev2_policy2id(struct iked_static_id *, struct iked_id *, int); int ikev2_childsa_enable(struct iked *, struct iked_sa *); int ikev2_childsa_delete(struct iked *, struct iked_sa *, u_int8_t, u_int64_t, u_int64_t *, int); -int ikev2_flows_delete(struct iked *, struct iked_sa *, u_int8_t); struct ibuf * ikev2_prfplus(struct iked_hash *, struct ibuf *, struct ibuf *, diff --git a/sbin/iked/ikev2.c b/sbin/iked/ikev2.c index 450f463dd80..4cb967970dd 100644 --- a/sbin/iked/ikev2.c +++ b/sbin/iked/ikev2.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ikev2.c,v 1.47 2011/01/28 18:21:37 mikeb Exp $ */ +/* $OpenBSD: ikev2.c,v 1.48 2011/04/15 13:10:49 reyk Exp $ */ /* $vantronix: ikev2.c,v 1.101 2010/06/03 07:57:33 reyk Exp $ */ /* @@ -3615,36 +3615,6 @@ ikev2_childsa_delete(struct iked *env, struct iked_sa *sa, u_int8_t saproto, } int -ikev2_flows_delete(struct iked *env, struct iked_sa *sa, u_int8_t saproto) -{ - struct iked_flow *flow, *nextflow; - int found = 0; - - for (flow = TAILQ_FIRST(&sa->sa_flows); flow != NULL; flow = nextflow) { - nextflow = TAILQ_NEXT(flow, flow_entry); - - if (saproto && flow->flow_saproto != saproto) - continue; - - if (flow->flow_loaded) - RB_REMOVE(iked_activeflows, &env->sc_activeflows, flow); - - if (pfkey_flow_delete(env->sc_pfkey, flow) != 0) - log_debug("%s: failed to delete flow %p", __func__, - flow); - else - log_debug("%s: deleted flow %p", __func__, flow); - - TAILQ_REMOVE(&sa->sa_flows, flow, flow_entry); - flow_free(flow); - - found++; - } - - return (found ? 0 : -1); -} - -int ikev2_valid_proposal(struct iked_proposal *prop, struct iked_transform **exf, struct iked_transform **ixf) { |