diff options
| author | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
|---|---|---|
| committer | jake <jake@FreeBSD.org> | 2000-05-23 20:41:01 +0000 |
| commit | d93fbc99166053b75c2eeb69b5cb603cfaf79ec0 (patch) | |
| tree | a4f130be4544ce7cfe4afa8c93f996b871433cb8 /sys/netkey | |
| parent | e814d2a0db522b0f163eef55a56d05aa226951f3 (diff) | |
| download | FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.zip FreeBSD-src-d93fbc99166053b75c2eeb69b5cb603cfaf79ec0.tar.gz | |
Change the way that the queue(3) structures are declared; don't assume that
the type argument to *_HEAD and *_ENTRY is a struct.
Suggested by: phk
Reviewed by: phk
Approved by: mdodd
Diffstat (limited to 'sys/netkey')
| -rw-r--r-- | sys/netkey/key.c | 8 | ||||
| -rw-r--r-- | sys/netkey/keydb.h | 10 |
2 files changed, 9 insertions, 9 deletions
diff --git a/sys/netkey/key.c b/sys/netkey/key.c index f00792d..2e348d1 100644 --- a/sys/netkey/key.c +++ b/sys/netkey/key.c @@ -110,12 +110,12 @@ static int key_blockacq_lifetime = 20; /* lifetime for blocking SADB_ACQUIRE.*/ static u_int32_t acq_seq = 0; static int key_tick_init_random = 0; -static LIST_HEAD(_sptree, secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ -static LIST_HEAD(_sahtree, secashead) sahtree; /* SAD */ -static LIST_HEAD(_regtree, secreg) regtree[SADB_SATYPE_MAX + 1]; +static LIST_HEAD(_sptree, struct secpolicy) sptree[IPSEC_DIR_MAX]; /* SPD */ +static LIST_HEAD(_sahtree, struct secashead) sahtree; /* SAD */ +static LIST_HEAD(_regtree, struct secreg) regtree[SADB_SATYPE_MAX + 1]; /* registed list */ #ifndef IPSEC_NONBLOCK_ACQUIRE -static LIST_HEAD(_acqtree, secacq) acqtree; /* acquiring list */ +static LIST_HEAD(_acqtree, struct secacq) acqtree; /* acquiring list */ #endif struct key_cb key_cb; diff --git a/sys/netkey/keydb.h b/sys/netkey/keydb.h index af4b3ba..608c10d 100644 --- a/sys/netkey/keydb.h +++ b/sys/netkey/keydb.h @@ -45,14 +45,14 @@ struct secasindex { /* Security Association Data Base */ struct secashead { - LIST_ENTRY(secashead) chain; + LIST_ENTRY(struct secashead) chain; struct secasindex saidx; struct secpolicyindex *owner; /* Indicate it who owned its SA. */ /* If NULL then it's shared SA */ u_int8_t state; /* MATURE or DEAD. */ - LIST_HEAD(_satree, secasvar) savtree[SADB_SASTATE_MAX+1]; + LIST_HEAD(_satree, struct secasvar) savtree[SADB_SASTATE_MAX+1]; /* SA chain */ /* The first of this list is newer SA */ @@ -61,7 +61,7 @@ struct secashead { /* Security Association */ struct secasvar { - LIST_ENTRY(secasvar) chain; + LIST_ENTRY(struct secasvar) chain; int refcnt; /* reference count */ u_int8_t state; /* Status of this Association */ @@ -102,7 +102,7 @@ struct secreplay { /* socket table due to send PF_KEY messages. */ struct secreg { - LIST_ENTRY(secreg) chain; + LIST_ENTRY(struct secreg) chain; struct socket *so; }; @@ -110,7 +110,7 @@ struct secreg { #ifndef IPSEC_NONBLOCK_ACQUIRE /* acquiring list table. */ struct secacq { - LIST_ENTRY(secacq) chain; + LIST_ENTRY(struct secacq) chain; struct secasindex saidx; |
