diff options
| author | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2006-06-01 04:12:35 +0000 |
|---|---|---|
| committer | Hans-Joerg Hoexer <hshoexer@cvs.openbsd.org> | 2006-06-01 04:12:35 +0000 |
| commit | 41b510063431c6988acaffe1b9be6589a4eb65a0 (patch) | |
| tree | 03cc2048fc361479211ecb4eada9e803700242cd | |
| parent | 98790c4d0304591c0e25e2343e134f4ce2b300b7 (diff) | |
rename list link for ipsec_rule structures from "entries" to "rule_entry".
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.c | 8 | ||||
| -rw-r--r-- | sbin/ipsecctl/ipsecctl.h | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/sbin/ipsecctl/ipsecctl.c b/sbin/ipsecctl/ipsecctl.c index d0939dfb9ec..8563cc0d511 100644 --- a/sbin/ipsecctl/ipsecctl.c +++ b/sbin/ipsecctl/ipsecctl.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecctl.c,v 1.48 2006/05/30 21:56:05 msf Exp $ */ +/* $OpenBSD: ipsecctl.c,v 1.49 2006/06/01 04:12:34 hshoexer Exp $ */ /* * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -151,7 +151,7 @@ ipsecctl_commit(int action, struct ipsecctl *ipsec) errx(1, "ipsecctl_commit: failed to open PF_KEY socket"); while ((rp = TAILQ_FIRST(&ipsec->rule_queue))) { - TAILQ_REMOVE(&ipsec->rule_queue, rp, entries); + TAILQ_REMOVE(&ipsec->rule_queue, rp, rule_entry); if (rp->type & RULE_IKE) { if (ike_ipsec_establish(action, rp) == -1) @@ -173,7 +173,7 @@ ipsecctl_commit(int action, struct ipsecctl *ipsec) int ipsecctl_add_rule(struct ipsecctl *ipsec, struct ipsec_rule *r) { - TAILQ_INSERT_TAIL(&ipsec->rule_queue, r, entries); + TAILQ_INSERT_TAIL(&ipsec->rule_queue, r, rule_entry); if ((ipsec->opts & IPSECCTL_OPT_VERBOSE) && !(ipsec->opts & IPSECCTL_OPT_SHOW)) @@ -444,7 +444,7 @@ ipsecctl_show_flows(int opts) } while ((rp = TAILQ_FIRST(&ipsec.rule_queue))) { - TAILQ_REMOVE(&ipsec.rule_queue, rp, entries); + TAILQ_REMOVE(&ipsec.rule_queue, rp, rule_entry); ipsecctl_print_rule(rp, ipsec.opts); diff --git a/sbin/ipsecctl/ipsecctl.h b/sbin/ipsecctl/ipsecctl.h index e4756f78ab2..c0353c69afb 100644 --- a/sbin/ipsecctl/ipsecctl.h +++ b/sbin/ipsecctl/ipsecctl.h @@ -1,4 +1,4 @@ -/* $OpenBSD: ipsecctl.h,v 1.38 2006/05/31 14:38:31 hshoexer Exp $ */ +/* $OpenBSD: ipsecctl.h,v 1.39 2006/06/01 04:12:34 hshoexer Exp $ */ /* * Copyright (c) 2004, 2005 Hans-Joerg Hoexer <hshoexer@openbsd.org> * @@ -161,7 +161,7 @@ struct ipsec_rule { u_int32_t spi; u_int32_t nr; - TAILQ_ENTRY(ipsec_rule) entries; + TAILQ_ENTRY(ipsec_rule) rule_entry; }; TAILQ_HEAD(ipsec_rule_queue, ipsec_rule); |