diff options
author | Henning Brauer <henning@cvs.openbsd.org> | 2004-06-20 18:35:13 +0000 |
---|---|---|
committer | Henning Brauer <henning@cvs.openbsd.org> | 2004-06-20 18:35:13 +0000 |
commit | 27aab8e947ae47e5ef251b626c74f07b90c6d431 (patch) | |
tree | 107f3a2241bf2915922968599d684540fb3a41a9 /usr.sbin | |
parent | 3e242c00ff1012f1cedac4f789cf6f5bbb86b327 (diff) |
at least somewhat consistently name the TAILQ_ENTRYs... this confused me
more than once
Diffstat (limited to 'usr.sbin')
-rw-r--r-- | usr.sbin/bgpd/bgpd.c | 10 | ||||
-rw-r--r-- | usr.sbin/bgpd/bgpd.h | 8 | ||||
-rw-r--r-- | usr.sbin/bgpd/buffer.c | 10 | ||||
-rw-r--r-- | usr.sbin/bgpd/control.c | 10 | ||||
-rw-r--r-- | usr.sbin/bgpd/mrt.c | 6 | ||||
-rw-r--r-- | usr.sbin/bgpd/parse.y | 20 | ||||
-rw-r--r-- | usr.sbin/bgpd/printconf.c | 6 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde.c | 10 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde.h | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde_attr.c | 22 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde_filter.c | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/rde_update.c | 4 | ||||
-rw-r--r-- | usr.sbin/bgpd/session.c | 8 | ||||
-rw-r--r-- | usr.sbin/bgpd/session.h | 4 |
14 files changed, 63 insertions, 63 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c index 3cfcafbd986..b66996e6ce7 100644 --- a/usr.sbin/bgpd/bgpd.c +++ b/usr.sbin/bgpd/bgpd.c @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.c,v 1.96 2004/06/20 17:49:46 henning Exp $ */ +/* $OpenBSD: bgpd.c,v 1.97 2004/06/20 18:35:11 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -222,12 +222,12 @@ main(int argc, char *argv[]) quit = 1; while ((net = TAILQ_FIRST(&net_l)) != NULL) { - TAILQ_REMOVE(&net_l, net, network_l); + TAILQ_REMOVE(&net_l, net, entry); free(net); } while ((r = TAILQ_FIRST(rules_l)) != NULL) { - TAILQ_REMOVE(rules_l, r, entries); + TAILQ_REMOVE(rules_l, r, entry); free(r); } @@ -400,14 +400,14 @@ reconfigure(char *conffile, struct bgpd_config *conf, struct mrt_head *mrt_l, if (imsg_compose(&ibuf_rde, IMSG_NETWORK_ADD, 0, &n->net, sizeof(struct network_config)) == -1) return (-1); - TAILQ_REMOVE(&net_l, n, network_l); + TAILQ_REMOVE(&net_l, n, entry); free(n); } while ((r = TAILQ_FIRST(rules_l)) != NULL) { if (imsg_compose(&ibuf_rde, IMSG_RECONF_FILTER, 0, r, sizeof(struct filter_rule)) == -1) return (-1); - TAILQ_REMOVE(rules_l, r, entries); + TAILQ_REMOVE(rules_l, r, entry); free(r); } while ((la = TAILQ_FIRST(conf->listen_addrs)) != NULL) { diff --git a/usr.sbin/bgpd/bgpd.h b/usr.sbin/bgpd/bgpd.h index d4d34ada083..f14f50af26a 100644 --- a/usr.sbin/bgpd/bgpd.h +++ b/usr.sbin/bgpd/bgpd.h @@ -1,4 +1,4 @@ -/* $OpenBSD: bgpd.h,v 1.127 2004/06/20 17:49:46 henning Exp $ */ +/* $OpenBSD: bgpd.h,v 1.128 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -78,7 +78,7 @@ enum reconf_action { }; struct buf { - TAILQ_ENTRY(buf) entries; + TAILQ_ENTRY(buf) entry; u_char *buf; ssize_t size; ssize_t wpos; @@ -232,7 +232,7 @@ TAILQ_HEAD(network_head, network); struct network { struct network_config net; - TAILQ_ENTRY(network) network_l; + TAILQ_ENTRY(network) entry; }; /* ipc messages */ @@ -504,7 +504,7 @@ struct filter_match { TAILQ_HEAD(filter_head, filter_rule); struct filter_rule { - TAILQ_ENTRY(filter_rule) entries; + TAILQ_ENTRY(filter_rule) entry; enum filter_actions action; enum directions dir; u_int8_t quick; diff --git a/usr.sbin/bgpd/buffer.c b/usr.sbin/bgpd/buffer.c index 46d498bd1d2..a47ced7b15d 100644 --- a/usr.sbin/bgpd/buffer.c +++ b/usr.sbin/bgpd/buffer.c @@ -1,4 +1,4 @@ -/* $OpenBSD: buffer.c,v 1.20 2004/06/20 18:03:26 henning Exp $ */ +/* $OpenBSD: buffer.c,v 1.21 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -149,7 +149,7 @@ msgbuf_write(struct msgbuf *msgbuf) bzero(&iov, sizeof(iov)); bzero(&msg, sizeof(msg)); - TAILQ_FOREACH(buf, &msgbuf->bufs, entries) { + TAILQ_FOREACH(buf, &msgbuf->bufs, entry) { if (i >= IOV_MAX) break; iov[i].iov_base = buf->buf + buf->rpos; @@ -189,7 +189,7 @@ msgbuf_write(struct msgbuf *msgbuf) for (buf = TAILQ_FIRST(&msgbuf->bufs); buf != NULL && n > 0; buf = next) { - next = TAILQ_NEXT(buf, entries); + next = TAILQ_NEXT(buf, entry); if (n >= buf->size - buf->rpos) { n -= buf->size - buf->rpos; buf_dequeue(msgbuf, buf); @@ -244,14 +244,14 @@ msgbuf_unbounded(struct msgbuf *msgbuf) void buf_enqueue(struct msgbuf *msgbuf, struct buf *buf) { - TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entries); + TAILQ_INSERT_TAIL(&msgbuf->bufs, buf, entry); msgbuf->queued++; } void buf_dequeue(struct msgbuf *msgbuf, struct buf *buf) { - TAILQ_REMOVE(&msgbuf->bufs, buf, entries); + TAILQ_REMOVE(&msgbuf->bufs, buf, entry); msgbuf->queued--; buf_free(buf); } diff --git a/usr.sbin/bgpd/control.c b/usr.sbin/bgpd/control.c index 2c9e9ebe234..db33c759868 100644 --- a/usr.sbin/bgpd/control.c +++ b/usr.sbin/bgpd/control.c @@ -1,4 +1,4 @@ -/* $OpenBSD: control.c,v 1.32 2004/06/09 13:01:44 henning Exp $ */ +/* $OpenBSD: control.c,v 1.33 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -130,7 +130,7 @@ control_accept(int listenfd) imsg_init(&ctl_conn->ibuf, connfd); - TAILQ_INSERT_TAIL(&ctl_conns, ctl_conn, entries); + TAILQ_INSERT_TAIL(&ctl_conns, ctl_conn, entry); return (1); } @@ -141,7 +141,7 @@ control_connbyfd(int fd) struct ctl_conn *c; for (c = TAILQ_FIRST(&ctl_conns); c != NULL && c->ibuf.fd != fd; - c = TAILQ_NEXT(c, entries)) + c = TAILQ_NEXT(c, entry)) ; /* nothing */ return (c); @@ -153,7 +153,7 @@ control_connbypid(pid_t pid) struct ctl_conn *c; for (c = TAILQ_FIRST(&ctl_conns); c != NULL && c->ibuf.pid != pid; - c = TAILQ_NEXT(c, entries)) + c = TAILQ_NEXT(c, entry)) ; /* nothing */ return (c); @@ -170,7 +170,7 @@ control_close(int fd) } msgbuf_clear(&c->ibuf.w); - TAILQ_REMOVE(&ctl_conns, c, entries); + TAILQ_REMOVE(&ctl_conns, c, entry); close(c->ibuf.fd); free(c); diff --git a/usr.sbin/bgpd/mrt.c b/usr.sbin/bgpd/mrt.c index 89752b7fdef..484b7910b32 100644 --- a/usr.sbin/bgpd/mrt.c +++ b/usr.sbin/bgpd/mrt.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mrt.c,v 1.30 2004/04/29 19:56:04 deraadt Exp $ */ +/* $OpenBSD: mrt.c,v 1.31 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> @@ -170,7 +170,7 @@ mrt_attr_length(struct attr_flags *a) if (a->med != 0) alen += 7; - TAILQ_FOREACH(oa, &a->others, attr_l) + TAILQ_FOREACH(oa, &a->others, entry) alen += 2 + oa->len + (oa->len > 255 ? 2 : 1); return alen; @@ -221,7 +221,7 @@ mrt_attr_dump(void *p, u_int16_t len, struct attr_flags *a) wlen += r; len -= r; /* dump all other path attributes without modification */ - TAILQ_FOREACH(oa, &a->others, attr_l) { + TAILQ_FOREACH(oa, &a->others, entry) { if ((r = attr_write(buf + wlen, len, oa->flags, oa->type, oa->data, oa->len)) == -1) return (-1); diff --git a/usr.sbin/bgpd/parse.y b/usr.sbin/bgpd/parse.y index 9ae7f6bfe55..c79414cc047 100644 --- a/usr.sbin/bgpd/parse.y +++ b/usr.sbin/bgpd/parse.y @@ -1,4 +1,4 @@ -/* $OpenBSD: parse.y,v 1.114 2004/06/08 14:34:48 henning Exp $ */ +/* $OpenBSD: parse.y,v 1.115 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2002, 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -74,7 +74,7 @@ int neighbor_consistent(struct peer *); TAILQ_HEAD(symhead, sym) symhead = TAILQ_HEAD_INITIALIZER(symhead); struct sym { - TAILQ_ENTRY(sym) entries; + TAILQ_ENTRY(sym) entry; int used; int persist; char *nam; @@ -295,7 +295,7 @@ conf_main : AS asnumber { memcpy(&n->net.attrset, &$3, sizeof(n->net.attrset)); - TAILQ_INSERT_TAIL(netconf, n, network_l); + TAILQ_INSERT_TAIL(netconf, n, entry); } | DUMP TABLE STRING optnumber { if (add_mrtconfig(MRT_TABLE_DUMP, $3, $4, NULL) == -1) { @@ -1341,14 +1341,14 @@ parse_config(char *filename, struct bgpd_config *xconf, /* Free macros and check which have not been used. */ for (sym = TAILQ_FIRST(&symhead); sym != NULL; sym = next) { - next = TAILQ_NEXT(sym, entries); + next = TAILQ_NEXT(sym, entry); if ((conf->opts & BGPD_OPT_VERBOSE2) && !sym->used) fprintf(stderr, "warning: macro \"%s\" not " "used\n", sym->nam); if (!sym->persist) { free(sym->nam); free(sym->val); - TAILQ_REMOVE(&symhead, sym, entries); + TAILQ_REMOVE(&symhead, sym, entry); free(sym); } } @@ -1374,7 +1374,7 @@ symset(const char *nam, const char *val, int persist) struct sym *sym; for (sym = TAILQ_FIRST(&symhead); sym && strcmp(nam, sym->nam); - sym = TAILQ_NEXT(sym, entries)) + sym = TAILQ_NEXT(sym, entry)) ; /* nothing */ if (sym != NULL) { @@ -1383,7 +1383,7 @@ symset(const char *nam, const char *val, int persist) else { free(sym->nam); free(sym->val); - TAILQ_REMOVE(&symhead, sym, entries); + TAILQ_REMOVE(&symhead, sym, entry); free(sym); } } @@ -1403,7 +1403,7 @@ symset(const char *nam, const char *val, int persist) } sym->used = 0; sym->persist = persist; - TAILQ_INSERT_TAIL(&symhead, sym, entries); + TAILQ_INSERT_TAIL(&symhead, sym, entry); return (0); } @@ -1434,7 +1434,7 @@ symget(const char *nam) { struct sym *sym; - TAILQ_FOREACH(sym, &symhead, entries) + TAILQ_FOREACH(sym, &symhead, entry) if (strcmp(nam, sym->nam) == 0) { sym->used = 1; return (sym->val); @@ -1654,7 +1654,7 @@ expand_rule(struct filter_rule *rule, struct filter_peers *peer, memcpy(&r->match, match, sizeof(struct filter_match)); memcpy(&r->set, set, sizeof(struct filter_set)); - TAILQ_INSERT_TAIL(filter_l, r, entries); + TAILQ_INSERT_TAIL(filter_l, r, entry); return (0); } diff --git a/usr.sbin/bgpd/printconf.c b/usr.sbin/bgpd/printconf.c index 6d7bcb86f38..95871b3b8c6 100644 --- a/usr.sbin/bgpd/printconf.c +++ b/usr.sbin/bgpd/printconf.c @@ -1,4 +1,4 @@ -/* $OpenBSD: printconf.c,v 1.21 2004/06/06 17:38:10 henning Exp $ */ +/* $OpenBSD: printconf.c,v 1.22 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -379,12 +379,12 @@ print_config(struct bgpd_config *conf, struct network_head *net_l, printf("\n"); print_mrt(0, 0, ""); printf("\n"); - TAILQ_FOREACH(n, net_l, network_l) + TAILQ_FOREACH(n, net_l, entry) print_network(&n->net); printf("\n"); for (p = peer_l; p != NULL; p = p->next) print_peer(&p->conf); printf("\n"); - TAILQ_FOREACH(r, rules_l, entries) + TAILQ_FOREACH(r, rules_l, entry) print_rule(peer_l, r); } diff --git a/usr.sbin/bgpd/rde.c b/usr.sbin/bgpd/rde.c index 6b183441ff1..d0f366df4ed 100644 --- a/usr.sbin/bgpd/rde.c +++ b/usr.sbin/bgpd/rde.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.c,v 1.116 2004/06/06 17:38:10 henning Exp $ */ +/* $OpenBSD: rde.c,v 1.117 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -370,7 +370,7 @@ rde_dispatch_imsg_parent(struct imsgbuf *ibuf) if ((r = malloc(sizeof(struct filter_rule))) == NULL) fatal(NULL); memcpy(r, imsg.data, sizeof(struct filter_rule)); - TAILQ_INSERT_TAIL(newrules, r, entries); + TAILQ_INSERT_TAIL(newrules, r, entry); break; case IMSG_RECONF_DONE: if (nconf == NULL) @@ -389,7 +389,7 @@ rde_dispatch_imsg_parent(struct imsgbuf *ibuf) nconf = NULL; prefix_network_clean(&peerself, reloadtime); while ((r = TAILQ_FIRST(rules_l)) != NULL) { - TAILQ_REMOVE(rules_l, r, entries); + TAILQ_REMOVE(rules_l, r, entry); free(r); } free(rules_l); @@ -1237,7 +1237,7 @@ network_init(struct network_head *net_l) "LOCAL AS %hu", conf->as); while ((n = TAILQ_FIRST(net_l)) != NULL) { - TAILQ_REMOVE(net_l, n, network_l); + TAILQ_REMOVE(net_l, n, entry); network_add(&n->net, 1); free(n); } @@ -1362,7 +1362,7 @@ rde_shutdown(void) /* free filters */ while ((r = TAILQ_FIRST(rules_l)) != NULL) { - TAILQ_REMOVE(rules_l, r, entries); + TAILQ_REMOVE(rules_l, r, entry); free(r); } free(rules_l); diff --git a/usr.sbin/bgpd/rde.h b/usr.sbin/bgpd/rde.h index 5b3a519c31d..319655debae 100644 --- a/usr.sbin/bgpd/rde.h +++ b/usr.sbin/bgpd/rde.h @@ -1,4 +1,4 @@ -/* $OpenBSD: rde.h,v 1.40 2004/05/21 15:36:40 claudio Exp $ */ +/* $OpenBSD: rde.h,v 1.41 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Claudio Jeker <claudio@openbsd.org> and @@ -116,7 +116,7 @@ struct attr { u_int8_t type; u_int16_t len; u_char *data; - TAILQ_ENTRY(attr) attr_l; + TAILQ_ENTRY(attr) entry; }; TAILQ_HEAD(attr_list, attr); diff --git a/usr.sbin/bgpd/rde_attr.c b/usr.sbin/bgpd/rde_attr.c index 511032b7a83..8ebd7befa8f 100644 --- a/usr.sbin/bgpd/rde_attr.c +++ b/usr.sbin/bgpd/rde_attr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_attr.c,v 1.31 2004/05/21 15:36:40 claudio Exp $ */ +/* $OpenBSD: rde_attr.c,v 1.32 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -322,7 +322,7 @@ optattr: *suberr = ERR_UPD_UNKNWN_WK_ATTR; return (p); } - TAILQ_FOREACH(a, &attr->others, attr_l) + TAILQ_FOREACH(a, &attr->others, entry) if (type == a->type) { *size = 0; *suberr = ERR_UPD_ATTRLIST; @@ -385,7 +385,7 @@ attr_compare(struct attr_flags *a, struct attr_flags *b) for (oa = TAILQ_FIRST(&a->others), ob = TAILQ_FIRST(&b->others); oa != NULL && ob != NULL; - oa = TAILQ_NEXT(oa, attr_l), ob = TAILQ_NEXT(ob, attr_l)) { + oa = TAILQ_NEXT(oa, entry), ob = TAILQ_NEXT(ob, entry)) { if (oa->type > ob->type) return (1); if (oa->type < ob->type) @@ -418,7 +418,7 @@ attr_copy(struct attr_flags *t, struct attr_flags *s) memcpy(t, s, sizeof(struct attr_flags)); t->aspath = aspath_create(s->aspath->data, s->aspath->hdr.len); TAILQ_INIT(&t->others); - TAILQ_FOREACH(os, &s->others, attr_l) + TAILQ_FOREACH(os, &s->others, entry) attr_optadd(t, os->flags, os->type, os->data, os->len); } @@ -432,8 +432,8 @@ attr_move(struct attr_flags *t, struct attr_flags *s) memcpy(t, s, sizeof(struct attr_flags)); TAILQ_INIT(&t->others); while ((os = TAILQ_FIRST(&s->others)) != NULL) { - TAILQ_REMOVE(&s->others, os, attr_l); - TAILQ_INSERT_TAIL(&t->others, os, attr_l); + TAILQ_REMOVE(&s->others, os, entry); + TAILQ_INSERT_TAIL(&t->others, os, entry); } } @@ -502,7 +502,7 @@ attr_optadd(struct attr_flags *attr, u_int8_t flags, u_int8_t type, a->data = NULL; /* keep a sorted list */ - TAILQ_FOREACH_REVERSE(p, &attr->others, attr_list, attr_l) { + TAILQ_FOREACH_REVERSE(p, &attr->others, attr_list, entry) { if (type == p->type) { /* attribute only once allowed */ free(a->data); @@ -510,11 +510,11 @@ attr_optadd(struct attr_flags *attr, u_int8_t flags, u_int8_t type, return (-1); } if (type > p->type) { - TAILQ_INSERT_AFTER(&attr->others, p, a, attr_l); + TAILQ_INSERT_AFTER(&attr->others, p, a, entry); return (0); } } - TAILQ_INSERT_HEAD(&attr->others, a, attr_l); + TAILQ_INSERT_HEAD(&attr->others, a, entry); return (0); } @@ -523,7 +523,7 @@ attr_optget(struct attr_flags *attr, u_int8_t type) { struct attr *a; - TAILQ_FOREACH(a, &attr->others, attr_l) { + TAILQ_FOREACH(a, &attr->others, entry) { if (type == a->type) return (a); if (type < a->type) @@ -539,7 +539,7 @@ attr_optfree(struct attr_flags *attr) struct attr *a; while ((a = TAILQ_FIRST(&attr->others)) != NULL) { - TAILQ_REMOVE(&attr->others, a, attr_l); + TAILQ_REMOVE(&attr->others, a, entry); free(a->data); free(a); } diff --git a/usr.sbin/bgpd/rde_filter.c b/usr.sbin/bgpd/rde_filter.c index 619dfc9dc74..38704d1ba0e 100644 --- a/usr.sbin/bgpd/rde_filter.c +++ b/usr.sbin/bgpd/rde_filter.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_filter.c,v 1.9 2004/05/17 12:39:32 djm Exp $ */ +/* $OpenBSD: rde_filter.c,v 1.10 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -35,7 +35,7 @@ rde_filter(struct rde_peer *peer, struct attr_flags *attrs, struct filter_rule *f; enum filter_actions action = ACTION_ALLOW; /* default allow */ - TAILQ_FOREACH(f, rules_l, entries) { + TAILQ_FOREACH(f, rules_l, entry) { if (dir != f->dir) continue; if (f->peer.groupid != 0 && diff --git a/usr.sbin/bgpd/rde_update.c b/usr.sbin/bgpd/rde_update.c index bd31894bba0..3d0db418b8d 100644 --- a/usr.sbin/bgpd/rde_update.c +++ b/usr.sbin/bgpd/rde_update.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rde_update.c,v 1.18 2004/05/21 15:36:40 claudio Exp $ */ +/* $OpenBSD: rde_update.c,v 1.19 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org> @@ -541,7 +541,7 @@ up_generate_attr(struct rde_peer *peer, struct update_attr *upa, * 3. transitive known attrs: announce unmodified * 4. transitive unknown attrs: set partial bit and re-announce */ - TAILQ_FOREACH(oa, &a->others, attr_l) { + TAILQ_FOREACH(oa, &a->others, entry) { switch (oa->type) { case ATTR_ATOMIC_AGGREGATE: if ((r = attr_write(up_attr_buf + wlen, len, diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 1434556ade9..e70f99ea77e 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.175 2004/06/20 17:49:46 henning Exp $ */ +/* $OpenBSD: session.c,v 1.176 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -234,14 +234,14 @@ session_main(struct bgpd_config *config, struct peer *cpeers, /* filter rules are not used in the SE */ while ((r = TAILQ_FIRST(rules)) != NULL) { - TAILQ_REMOVE(rules, r, entries); + TAILQ_REMOVE(rules, r, entry); free(r); } free(rules); /* network list is not used in the SE */ while ((net = TAILQ_FIRST(net_l)) != NULL) { - TAILQ_REMOVE(net_l, net, network_l); + TAILQ_REMOVE(net_l, net, entry); free(net); } @@ -391,7 +391,7 @@ session_main(struct bgpd_config *config, struct peer *cpeers, idx_peers = i; - TAILQ_FOREACH(ctl_conn, &ctl_conns, entries) { + TAILQ_FOREACH(ctl_conn, &ctl_conns, entry) { pfd[i].fd = ctl_conn->ibuf.fd; pfd[i].events = POLLIN; if (ctl_conn->ibuf.w.queued > 0) diff --git a/usr.sbin/bgpd/session.h b/usr.sbin/bgpd/session.h index 61a5a4d8951..c11240cb76c 100644 --- a/usr.sbin/bgpd/session.h +++ b/usr.sbin/bgpd/session.h @@ -1,4 +1,4 @@ -/* $OpenBSD: session.h,v 1.56 2004/06/20 17:49:46 henning Exp $ */ +/* $OpenBSD: session.h,v 1.57 2004/06/20 18:35:12 henning Exp $ */ /* * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> @@ -131,7 +131,7 @@ struct bgpd_sysdep { }; struct ctl_conn { - TAILQ_ENTRY(ctl_conn) entries; + TAILQ_ENTRY(ctl_conn) entry; struct imsgbuf ibuf; }; |