Rename SIMPLEQ_* to STAILQ_* in /usr/src/usr.sbin
Index: bgpd/bgpd.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.c,v
retrieving revision 1.230
diff -u -p -r1.230 bgpd.c
--- bgpd/bgpd.c 5 Nov 2020 11:52:59 -0000 1.230
+++ bgpd/bgpd.c 25 Dec 2020 16:21:29 -0000
@@ -57,7 +57,7 @@ pid_t reconfpid;
int reconfpending;
struct imsgbuf *ibuf_se;
struct imsgbuf *ibuf_rde;
-struct rib_names ribnames = SIMPLEQ_HEAD_INITIALIZER(ribnames);
+struct rib_names ribnames = STAILQ_HEAD_INITIALIZER(ribnames);
char *cname;
char *rcname;
@@ -176,8 +176,8 @@ main(int argc, char *argv[])
else
fprintf(stderr, "configuration OK\n");
- while ((rr = SIMPLEQ_FIRST(&ribnames)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
+ while ((rr = STAILQ_FIRST(&ribnames)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ribnames, entry);
free(rr);
}
free_config(conf);
@@ -380,8 +380,8 @@ BROKEN if (pledge("stdio rpath wpath cpa
RB_FOREACH(p, peer_head, &conf->peers)
pfkey_remove(p);
- while ((rr = SIMPLEQ_FIRST(&ribnames)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
+ while ((rr = STAILQ_FIRST(&ribnames)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ribnames, entry);
free(rr);
}
free_config(conf);
@@ -528,8 +528,8 @@ send_config(struct bgpd_config *conf)
ktable_preload();
/* RIBs for the RDE */
- while ((rr = SIMPLEQ_FIRST(&ribnames))) {
- SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
+ while ((rr = STAILQ_FIRST(&ribnames))) {
+ STAILQ_REMOVE_HEAD(&ribnames, entry);
if (ktable_update(rr->rtableid, rr->name, rr->flags,
conf->fib_priority) == -1) {
log_warnx("failed to load rdomain %d",
@@ -557,8 +557,8 @@ send_config(struct bgpd_config *conf)
kr_net_reload(conf->default_tableid, 0, &conf->networks);
/* prefixsets for filters in the RDE */
- while ((ps = SIMPLEQ_FIRST(&conf->prefixsets)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->prefixsets, entry);
+ while ((ps = STAILQ_FIRST(&conf->prefixsets)) != NULL) {
+ STAILQ_REMOVE_HEAD(&conf->prefixsets, entry);
if (imsg_compose(ibuf_rde, IMSG_RECONF_PREFIX_SET, 0, 0, -1,
ps->name, sizeof(ps->name)) == -1)
return (-1);
@@ -574,8 +574,8 @@ send_config(struct bgpd_config *conf)
}
/* originsets for filters in the RDE */
- while ((ps = SIMPLEQ_FIRST(&conf->originsets)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->originsets, entry);
+ while ((ps = STAILQ_FIRST(&conf->originsets)) != NULL) {
+ STAILQ_REMOVE_HEAD(&conf->originsets, entry);
if (imsg_compose(ibuf_rde, IMSG_RECONF_ORIGIN_SET, 0, 0, -1,
ps->name, sizeof(ps->name)) == -1)
return (-1);
@@ -625,12 +625,12 @@ send_config(struct bgpd_config *conf)
}
/* as-sets for filters in the RDE */
- while ((aset = SIMPLEQ_FIRST(&conf->as_sets)) != NULL) {
+ while ((aset = STAILQ_FIRST(&conf->as_sets)) != NULL) {
struct ibuf *wbuf;
u_int32_t *as;
size_t i, l, n;
- SIMPLEQ_REMOVE_HEAD(&conf->as_sets, entry);
+ STAILQ_REMOVE_HEAD(&conf->as_sets, entry);
as = set_get(aset->set, &n);
if ((wbuf = imsg_create(ibuf_rde, IMSG_RECONF_AS_SET, 0, 0,
@@ -668,8 +668,8 @@ send_config(struct bgpd_config *conf)
free(r);
}
- while ((vpn = SIMPLEQ_FIRST(&conf->l3vpns)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->l3vpns, entry);
+ while ((vpn = STAILQ_FIRST(&conf->l3vpns)) != NULL) {
+ STAILQ_REMOVE_HEAD(&conf->l3vpns, entry);
if (ktable_update(vpn->rtableid, vpn->descr, vpn->flags,
conf->fib_priority) == -1) {
log_warnx("failed to load rdomain %d",
Index: bgpd/bgpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/bgpd.h,v
retrieving revision 1.406
diff -u -p -r1.406 bgpd.h
--- bgpd/bgpd.h 23 Dec 2020 13:20:47 -0000 1.406
+++ bgpd/bgpd.h 25 Dec 2020 16:21:30 -0000
@@ -237,13 +237,13 @@ struct peer;
RB_HEAD(peer_head, peer);
struct l3vpn;
-SIMPLEQ_HEAD(l3vpn_head, l3vpn);
+STAILQ_HEAD(l3vpn_head, l3vpn);
struct network;
TAILQ_HEAD(network_head, network);
struct prefixset;
-SIMPLEQ_HEAD(prefixset_head, prefixset);
+STAILQ_HEAD(prefixset_head, prefixset);
struct prefixset_item;
RB_HEAD(prefixset_tree, prefixset_item);
@@ -259,14 +259,14 @@ struct trie_head {
struct rde_prefixset {
char name[SET_NAME_LEN];
struct trie_head th;
- SIMPLEQ_ENTRY(rde_prefixset) entry;
+ STAILQ_ENTRY(rde_prefixset) entry;
int dirty;
};
-SIMPLEQ_HEAD(rde_prefixset_head, rde_prefixset);
+STAILQ_HEAD(rde_prefixset_head, rde_prefixset);
struct set_table;
struct as_set;
-SIMPLEQ_HEAD(as_set_head, as_set);
+STAILQ_HEAD(as_set_head, as_set);
struct filter_rule;
TAILQ_HEAD(filter_head, filter_rule);
@@ -1042,18 +1042,18 @@ struct prefixset {
int sflags;
char name[SET_NAME_LEN];
struct prefixset_tree psitems;
- SIMPLEQ_ENTRY(prefixset) entry;
+ STAILQ_ENTRY(prefixset) entry;
};
struct as_set {
char name[SET_NAME_LEN];
- SIMPLEQ_ENTRY(as_set) entry;
+ STAILQ_ENTRY(as_set) entry;
struct set_table *set;
int dirty;
};
struct l3vpn {
- SIMPLEQ_ENTRY(l3vpn) entry;
+ STAILQ_ENTRY(l3vpn) entry;
char descr[PEER_DESCR_LEN];
char ifmpe[IFNAMSIZ];
struct filter_set_head import;
@@ -1066,13 +1066,13 @@ struct l3vpn {
};
struct rde_rib {
- SIMPLEQ_ENTRY(rde_rib) entry;
+ STAILQ_ENTRY(rde_rib) entry;
char name[PEER_DESCR_LEN];
u_int rtableid;
u_int16_t id;
u_int16_t flags;
};
-SIMPLEQ_HEAD(rib_names, rde_rib);
+STAILQ_HEAD(rib_names, rde_rib);
extern struct rib_names ribnames;
/* rde_rib flags */
Index: bgpd/config.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/config.c,v
retrieving revision 1.95
diff -u -p -r1.95 config.c
--- bgpd/config.c 14 Feb 2020 13:54:31 -0000 1.95
+++ bgpd/config.c 25 Dec 2020 16:21:30 -0000
@@ -53,13 +53,13 @@ new_config(void)
/* init the various list for later */
RB_INIT(&conf->peers);
TAILQ_INIT(&conf->networks);
- SIMPLEQ_INIT(&conf->l3vpns);
- SIMPLEQ_INIT(&conf->prefixsets);
- SIMPLEQ_INIT(&conf->originsets);
- SIMPLEQ_INIT(&conf->rde_prefixsets);
- SIMPLEQ_INIT(&conf->rde_originsets);
+ STAILQ_INIT(&conf->l3vpns);
+ STAILQ_INIT(&conf->prefixsets);
+ STAILQ_INIT(&conf->originsets);
+ STAILQ_INIT(&conf->rde_prefixsets);
+ STAILQ_INIT(&conf->rde_originsets);
RB_INIT(&conf->roa);
- SIMPLEQ_INIT(&conf->as_sets);
+ STAILQ_INIT(&conf->as_sets);
TAILQ_INIT(conf->filters);
TAILQ_INIT(conf->listen_addrs);
@@ -101,8 +101,8 @@ free_l3vpns(struct l3vpn_head *l3vpns)
{
struct l3vpn *vpn;
- while ((vpn = SIMPLEQ_FIRST(l3vpns)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(l3vpns, entry);
+ while ((vpn = STAILQ_FIRST(l3vpns)) != NULL) {
+ STAILQ_REMOVE_HEAD(l3vpns, entry);
filterset_free(&vpn->export);
filterset_free(&vpn->import);
free_networks(&vpn->net_l);
@@ -115,10 +115,10 @@ free_prefixsets(struct prefixset_head *p
{
struct prefixset *ps;
- while (!SIMPLEQ_EMPTY(psh)) {
- ps = SIMPLEQ_FIRST(psh);
+ while (!STAILQ_EMPTY(psh)) {
+ ps = STAILQ_FIRST(psh);
free_prefixtree(&ps->psitems);
- SIMPLEQ_REMOVE_HEAD(psh, entry);
+ STAILQ_REMOVE_HEAD(psh, entry);
free(ps);
}
}
@@ -131,10 +131,10 @@ free_rde_prefixsets(struct rde_prefixset
if (psh == NULL)
return;
- while (!SIMPLEQ_EMPTY(psh)) {
- ps = SIMPLEQ_FIRST(psh);
+ while (!STAILQ_EMPTY(psh)) {
+ ps = STAILQ_FIRST(psh);
trie_free(&ps->th);
- SIMPLEQ_REMOVE_HEAD(psh, entry);
+ STAILQ_REMOVE_HEAD(psh, entry);
free(ps);
}
}
@@ -237,15 +237,15 @@ merge_config(struct bgpd_config *xconf,
/* switch the prefixsets, first remove the old ones */
free_prefixsets(&xconf->prefixsets);
- SIMPLEQ_CONCAT(&xconf->prefixsets, &conf->prefixsets);
+ STAILQ_CONCAT(&xconf->prefixsets, &conf->prefixsets);
/* switch the originsets, first remove the old ones */
free_prefixsets(&xconf->originsets);
- SIMPLEQ_CONCAT(&xconf->originsets, &conf->originsets);
+ STAILQ_CONCAT(&xconf->originsets, &conf->originsets);
/* switch the as_sets, first remove the old ones */
as_sets_free(&xconf->as_sets);
- SIMPLEQ_CONCAT(&xconf->as_sets, &conf->as_sets);
+ STAILQ_CONCAT(&xconf->as_sets, &conf->as_sets);
/* switch the network statements, but first remove the old ones */
free_networks(&xconf->networks);
@@ -253,7 +253,7 @@ merge_config(struct bgpd_config *xconf,
/* switch the l3vpn configs, first remove the old ones */
free_l3vpns(&xconf->l3vpns);
- SIMPLEQ_CONCAT(&xconf->l3vpns, &conf->l3vpns);
+ STAILQ_CONCAT(&xconf->l3vpns, &conf->l3vpns);
/*
* merge new listeners:
Index: bgpd/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/parse.y,v
retrieving revision 1.410
diff -u -p -r1.410 parse.y
--- bgpd/parse.y 27 Oct 2020 19:13:34 -0000 1.410
+++ bgpd/parse.y 25 Dec 2020 16:21:30 -0000
@@ -437,7 +437,7 @@ prefixset : PREFIXSET STRING '{' optnl
}
free($2);
} prefixset_l optnl '}' {
- SIMPLEQ_INSERT_TAIL(&conf->prefixsets, curpset, entry);
+ STAILQ_INSERT_TAIL(&conf->prefixsets, curpset, entry);
curpset = NULL;
}
| PREFIXSET STRING '{' optnl '}' {
@@ -446,7 +446,7 @@ prefixset : PREFIXSET STRING '{' optnl
YYERROR;
}
free($2);
- SIMPLEQ_INSERT_TAIL(&conf->prefixsets, curpset, entry);
+ STAILQ_INSERT_TAIL(&conf->prefixsets, curpset, entry);
curpset = NULL;
}
@@ -513,7 +513,7 @@ origin_set : ORIGINSET STRING '{' optnl
curpsitree = &curoset->psitems;
free($2);
} roa_set_l optnl '}' {
- SIMPLEQ_INSERT_TAIL(&conf->originsets, curoset, entry);
+ STAILQ_INSERT_TAIL(&conf->originsets, curoset, entry);
curoset = NULL;
curpsitree = NULL;
}
@@ -523,7 +523,7 @@ origin_set : ORIGINSET STRING '{' optnl
YYERROR;
}
free($2);
- SIMPLEQ_INSERT_TAIL(&conf->originsets, curoset, entry);
+ STAILQ_INSERT_TAIL(&conf->originsets, curoset, entry);
curoset = NULL;
curpsitree = NULL;
}
@@ -1078,7 +1078,7 @@ l3vpn : VPN STRING ON STRING
{
netconf = &curvpn->net_l;
} '{' l3vpnopts_l '}' {
/* insert into list */
- SIMPLEQ_INSERT_TAIL(&conf->l3vpns, curvpn, entry);
+ STAILQ_INSERT_TAIL(&conf->l3vpns, curvpn, entry);
curvpn = NULL;
netconf = &conf->networks;
}
@@ -3350,8 +3350,8 @@ parse_config(char *filename, struct peer
if (errors) {
errors:
- while ((rr = SIMPLEQ_FIRST(&ribnames)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ribnames, entry);
+ while ((rr = STAILQ_FIRST(&ribnames)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ribnames, entry);
free(rr);
}
@@ -3928,7 +3928,7 @@ add_rib(char *name)
return (NULL);
}
rr->flags = F_RIB_NOFIB;
- SIMPLEQ_INSERT_TAIL(&ribnames, rr, entry);
+ STAILQ_INSERT_TAIL(&ribnames, rr, entry);
}
return (rr);
}
@@ -3938,7 +3938,7 @@ find_rib(char *name)
{
struct rde_rib *rr;
- SIMPLEQ_FOREACH(rr, &ribnames, entry) {
+ STAILQ_FOREACH(rr, &ribnames, entry) {
if (!strcmp(rr->name, name))
return (rr);
}
@@ -3973,7 +3973,7 @@ find_prefixset(char *name, struct prefix
{
struct prefixset *ps;
- SIMPLEQ_FOREACH(ps, p, entry) {
+ STAILQ_FOREACH(ps, p, entry) {
if (!strcmp(ps->name, name))
return (ps);
}
Index: bgpd/printconf.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/printconf.c,v
retrieving revision 1.143
diff -u -p -r1.143 printconf.c
--- bgpd/printconf.c 5 Nov 2020 11:51:13 -0000 1.143
+++ bgpd/printconf.c 25 Dec 2020 16:21:30 -0000
@@ -497,7 +497,7 @@ print_as_sets(struct as_set_head *as_set
size_t i, n;
int len;
- SIMPLEQ_FOREACH(aset, as_sets, entry) {
+ STAILQ_FOREACH(aset, as_sets, entry) {
printf("as-set \"%s\" {\n\t", aset->name);
as = set_get(aset->set, &n);
for (i = 0, len = 8; i < n; i++) {
@@ -517,7 +517,7 @@ print_prefixsets(struct prefixset_head *
struct prefixset *ps;
struct prefixset_item *psi;
- SIMPLEQ_FOREACH(ps, psh, entry) {
+ STAILQ_FOREACH(ps, psh, entry) {
int count = 0;
printf("prefix-set \"%s\" {", ps->name);
RB_FOREACH(psi, prefixset_tree, &ps->psitems) {
@@ -539,7 +539,7 @@ print_originsets(struct prefixset_head *
struct roa_set *rs;
size_t i, n;
- SIMPLEQ_FOREACH(ps, psh, entry) {
+ STAILQ_FOREACH(ps, psh, entry) {
printf("origin-set \"%s\" {", ps->name);
RB_FOREACH(psi, prefixset_tree, &ps->psitems) {
rs = set_get(psi->set, &n);
@@ -1009,12 +1009,12 @@ print_config(struct bgpd_config *conf, s
print_originsets(&conf->originsets);
TAILQ_FOREACH(n, &conf->networks, entry)
print_network(&n->net, "");
- if (!SIMPLEQ_EMPTY(&conf->l3vpns))
+ if (!STAILQ_EMPTY(&conf->l3vpns))
printf("\n");
- SIMPLEQ_FOREACH(vpn, &conf->l3vpns, entry)
+ STAILQ_FOREACH(vpn, &conf->l3vpns, entry)
print_l3vpn(vpn);
printf("\n");
- SIMPLEQ_FOREACH(rr, rib_l, entry) {
+ STAILQ_FOREACH(rr, rib_l, entry) {
if (rr->flags & F_RIB_NOEVALUATE)
printf("rde rib %s no evaluate\n", rr->name);
else if (rr->flags & F_RIB_NOFIB)
Index: bgpd/rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.c,v
retrieving revision 1.507
diff -u -p -r1.507 rde.c
--- bgpd/rde.c 4 Dec 2020 11:57:13 -0000 1.507
+++ bgpd/rde.c 25 Dec 2020 16:21:30 -0000
@@ -806,10 +806,10 @@ rde_dispatch_imsg_parent(struct imsgbuf
fatal(NULL);
memcpy(ps->name, imsg.data, sizeof(ps->name));
if (imsg.hdr.type == IMSG_RECONF_ORIGIN_SET) {
- SIMPLEQ_INSERT_TAIL(&nconf->rde_originsets, ps,
+ STAILQ_INSERT_TAIL(&nconf->rde_originsets, ps,
entry);
} else {
- SIMPLEQ_INSERT_TAIL(&nconf->rde_prefixsets, ps,
+ STAILQ_INSERT_TAIL(&nconf->rde_prefixsets, ps,
entry);
}
last_prefixset = ps;
@@ -885,7 +885,7 @@ rde_dispatch_imsg_parent(struct imsgbuf
TAILQ_INIT(&vpn->import);
TAILQ_INIT(&vpn->export);
TAILQ_INIT(&vpn->net_l);
- SIMPLEQ_INSERT_TAIL(&nconf->l3vpns, vpn, entry);
+ STAILQ_INSERT_TAIL(&nconf->l3vpns, vpn, entry);
break;
case IMSG_RECONF_VPN_EXPORT:
if (vpn == NULL) {
@@ -2747,7 +2747,7 @@ rde_send_kroute(struct rib *rib, struct
/* not Loc-RIB, no update for VPNs */
break;
- SIMPLEQ_FOREACH(vpn, &conf->l3vpns, entry) {
+ STAILQ_FOREACH(vpn, &conf->l3vpns, entry) {
if (!rde_l3vpn_import(prefix_communities(p), vpn))
continue;
/* must send exit_nexthop so that correct MPLS tunnel
@@ -3098,28 +3098,28 @@ rde_reload_done(void)
softreconfig = 0;
- SIMPLEQ_INIT(&prefixsets_old);
- SIMPLEQ_INIT(&originsets_old);
- SIMPLEQ_INIT(&as_sets_old);
- SIMPLEQ_CONCAT(&prefixsets_old, &conf->rde_prefixsets);
- SIMPLEQ_CONCAT(&originsets_old, &conf->rde_originsets);
- SIMPLEQ_CONCAT(&as_sets_old, &conf->as_sets);
+ STAILQ_INIT(&prefixsets_old);
+ STAILQ_INIT(&originsets_old);
+ STAILQ_INIT(&as_sets_old);
+ STAILQ_CONCAT(&prefixsets_old, &conf->rde_prefixsets);
+ STAILQ_CONCAT(&originsets_old, &conf->rde_originsets);
+ STAILQ_CONCAT(&as_sets_old, &conf->as_sets);
roa_old = conf->rde_roa;
/* merge the main config */
copy_config(conf, nconf);
/* need to copy the sets and roa table and clear them in nconf */
- SIMPLEQ_CONCAT(&conf->rde_prefixsets, &nconf->rde_prefixsets);
- SIMPLEQ_CONCAT(&conf->rde_originsets, &nconf->rde_originsets);
- SIMPLEQ_CONCAT(&conf->as_sets, &nconf->as_sets);
+ STAILQ_CONCAT(&conf->rde_prefixsets, &nconf->rde_prefixsets);
+ STAILQ_CONCAT(&conf->rde_originsets, &nconf->rde_originsets);
+ STAILQ_CONCAT(&conf->as_sets, &nconf->as_sets);
conf->rde_roa = nconf->rde_roa;
memset(&nconf->rde_roa, 0, sizeof(nconf->rde_roa));
/* apply new set of l3vpn, sync will be done later */
free_l3vpns(&conf->l3vpns);
- SIMPLEQ_CONCAT(&conf->l3vpns, &nconf->l3vpns);
+ STAILQ_CONCAT(&conf->l3vpns, &nconf->l3vpns);
/* XXX WHERE IS THE SYNC ??? */
free_config(nconf);
@@ -3610,7 +3610,7 @@ network_add(struct network_config *nc, s
u_int16_t i;
if (nc->rd != 0) {
- SIMPLEQ_FOREACH(vpn, &conf->l3vpns, entry) {
+ STAILQ_FOREACH(vpn, &conf->l3vpns, entry) {
if (vpn->rd != nc->rd)
continue;
switch (nc->prefix.aid) {
@@ -3696,7 +3696,7 @@ network_delete(struct network_config *nc
u_int32_t i;
if (nc->rd) {
- SIMPLEQ_FOREACH(vpn, &conf->l3vpns, entry) {
+ STAILQ_FOREACH(vpn, &conf->l3vpns, entry) {
if (vpn->rd != nc->rd)
continue;
switch (nc->prefix.aid) {
@@ -3853,7 +3853,7 @@ rde_find_prefixset(char *name, struct rd
{
struct rde_prefixset *ps;
- SIMPLEQ_FOREACH(ps, p, entry) {
+ STAILQ_FOREACH(ps, p, entry) {
if (!strcmp(ps->name, name))
return (ps);
}
@@ -3866,7 +3866,7 @@ rde_mark_prefixsets_dirty(struct rde_pre
{
struct rde_prefixset *new, *old;
- SIMPLEQ_FOREACH(new, psnew, entry) {
+ STAILQ_FOREACH(new, psnew, entry) {
if ((psold == NULL) ||
(old = rde_find_prefixset(new->name, psold)) == NULL) {
new->dirty = 1;
Index: bgpd/rde.h
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde.h,v
retrieving revision 1.235
diff -u -p -r1.235 rde.h
--- bgpd/rde.h 4 Dec 2020 11:57:13 -0000 1.235
+++ bgpd/rde.h 25 Dec 2020 16:21:30 -0000
@@ -81,7 +81,7 @@ struct iq;
struct rde_peer {
LIST_ENTRY(rde_peer) hash_l; /* hash list over all peers */
LIST_ENTRY(rde_peer) peer_l; /* list of all peers */
- SIMPLEQ_HEAD(, iq) imsg_queue;
+ STAILQ_HEAD(, iq) imsg_queue;
struct peer_config conf;
struct bgpd_addr remote_addr;
struct bgpd_addr local_v4_addr;
Index: bgpd/rde_peer.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde_peer.c,v
retrieving revision 1.6
diff -u -p -r1.6 rde_peer.c
--- bgpd/rde_peer.c 4 Dec 2020 11:57:13 -0000 1.6
+++ bgpd/rde_peer.c 25 Dec 2020 16:21:30 -0000
@@ -38,7 +38,7 @@ struct rde_peer_head peerlist;
struct rde_peer *peerself;
struct iq {
- SIMPLEQ_ENTRY(iq) entry;
+ STAILQ_ENTRY(iq) entry;
struct imsg imsg;
};
@@ -170,7 +170,7 @@ peer_add(u_int32_t id, struct peer_confi
if (peer->loc_rib_id == RIB_NOTFOUND)
fatalx("King Bula's new peer met an unknown RIB");
peer->state = PEER_NONE;
- SIMPLEQ_INIT(&peer->imsg_queue);
+ STAILQ_INIT(&peer->imsg_queue);
head = PEER_HASH(id);
@@ -466,7 +466,7 @@ peer_imsg_push(struct rde_peer *peer, st
if ((iq = calloc(1, sizeof(*iq))) == NULL)
fatal(NULL);
imsg_move(&iq->imsg, imsg);
- SIMPLEQ_INSERT_TAIL(&peer->imsg_queue, iq, entry);
+ STAILQ_INSERT_TAIL(&peer->imsg_queue, iq, entry);
}
/*
@@ -478,13 +478,13 @@ peer_imsg_pop(struct rde_peer *peer, str
{
struct iq *iq;
- iq = SIMPLEQ_FIRST(&peer->imsg_queue);
+ iq = STAILQ_FIRST(&peer->imsg_queue);
if (iq == NULL)
return 0;
imsg_move(imsg, &iq->imsg);
- SIMPLEQ_REMOVE_HEAD(&peer->imsg_queue, entry);
+ STAILQ_REMOVE_HEAD(&peer->imsg_queue, entry);
free(iq);
return 1;
@@ -495,7 +495,7 @@ peer_imsg_queued(struct rde_peer *peer,
{
int *p = arg;
- *p = *p || !SIMPLEQ_EMPTY(&peer->imsg_queue);
+ *p = *p || !STAILQ_EMPTY(&peer->imsg_queue);
}
/*
@@ -519,8 +519,8 @@ peer_imsg_flush(struct rde_peer *peer)
{
struct iq *iq;
- while ((iq = SIMPLEQ_FIRST(&peer->imsg_queue)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&peer->imsg_queue, entry);
+ while ((iq = STAILQ_FIRST(&peer->imsg_queue)) != NULL) {
+ STAILQ_REMOVE_HEAD(&peer->imsg_queue, entry);
free(iq);
}
}
Index: bgpd/rde_sets.c
===================================================================
RCS file: /cvs/src/usr.sbin/bgpd/rde_sets.c,v
retrieving revision 1.9
diff -u -p -r1.9 rde_sets.c
--- bgpd/rde_sets.c 5 Aug 2019 08:46:55 -0000 1.9
+++ bgpd/rde_sets.c 25 Dec 2020 16:21:30 -0000
@@ -54,7 +54,7 @@ as_sets_new(struct as_set_head *as_sets,
return NULL;
}
- SIMPLEQ_INSERT_TAIL(as_sets, aset, entry);
+ STAILQ_INSERT_TAIL(as_sets, aset, entry);
return aset;
}
@@ -63,7 +63,7 @@ as_sets_lookup(struct as_set_head *as_se
{
struct as_set *aset;
- SIMPLEQ_FOREACH(aset, as_sets, entry) {
+ STAILQ_FOREACH(aset, as_sets, entry) {
if (strcmp(aset->name, name) == 0)
return aset;
}
@@ -78,9 +78,9 @@ as_sets_free(struct as_set_head *as_sets
if (as_sets == NULL)
return;
- while (!SIMPLEQ_EMPTY(as_sets)) {
- aset = SIMPLEQ_FIRST(as_sets);
- SIMPLEQ_REMOVE_HEAD(as_sets, entry);
+ while (!STAILQ_EMPTY(as_sets)) {
+ aset = STAILQ_FIRST(as_sets);
+ STAILQ_REMOVE_HEAD(as_sets, entry);
set_free(aset->set);
free(aset);
}
@@ -91,7 +91,7 @@ as_sets_mark_dirty(struct as_set_head *o
{
struct as_set *n, *o;
- SIMPLEQ_FOREACH(n, new, entry) {
+ STAILQ_FOREACH(n, new, entry) {
if (old == NULL || (o = as_sets_lookup(old, n->name)) == NULL ||
!set_equal(n->set, o->set))
n->dirty = 1;
Index: cron/job.c
===================================================================
RCS file: /cvs/src/usr.sbin/cron/job.c,v
retrieving revision 1.15
diff -u -p -r1.15 job.c
--- cron/job.c 17 Apr 2020 02:12:56 -0000 1.15
+++ cron/job.c 25 Dec 2020 16:21:30 -0000
@@ -30,14 +30,14 @@
#include "funcs.h"
typedef struct _job {
- SIMPLEQ_ENTRY(_job) entries;
+ STAILQ_ENTRY(_job) entries;
entry *e;
user *u;
pid_t pid;
} job;
-static SIMPLEQ_HEAD(job_queue, _job) jobs = SIMPLEQ_HEAD_INITIALIZER(jobs);
+static STAILQ_HEAD(job_queue, _job) jobs = STAILQ_HEAD_INITIALIZER(jobs);
void
job_add(entry *e, user *u)
@@ -45,7 +45,7 @@ job_add(entry *e, user *u)
job *j;
/* if already on queue, keep going */
- SIMPLEQ_FOREACH(j, &jobs, entries) {
+ STAILQ_FOREACH(j, &jobs, entries) {
if (j->e == e && j->u == u) {
if ((j->e->flags & DONT_LOG) == 0) {
syslog(LOG_INFO, "(%s) SKIPPING (%s)",
@@ -63,7 +63,7 @@ job_add(entry *e, user *u)
j->pid = -1;
/* add it to the tail */
- SIMPLEQ_INSERT_TAIL(&jobs, j, entries);
+ STAILQ_INSERT_TAIL(&jobs, j, entries);
}
void
@@ -71,12 +71,12 @@ job_remove(entry *e, user *u)
{
job *j, *prev = NULL;
- SIMPLEQ_FOREACH(j, &jobs, entries) {
+ STAILQ_FOREACH(j, &jobs, entries) {
if (j->e == e && j->u == u) {
if (prev == NULL)
- SIMPLEQ_REMOVE_HEAD(&jobs, entries);
+ STAILQ_REMOVE_HEAD(&jobs, entries);
else
- SIMPLEQ_REMOVE_AFTER(&jobs, prev, entries);
+ STAILQ_REMOVE_AFTER(&jobs, prev, entries);
free(j);
break;
}
@@ -90,12 +90,12 @@ job_exit(pid_t jobpid)
job *j, *prev = NULL;
/* If a singleton exited, remove and free it. */
- SIMPLEQ_FOREACH(j, &jobs, entries) {
+ STAILQ_FOREACH(j, &jobs, entries) {
if (jobpid == j->pid) {
if (prev == NULL)
- SIMPLEQ_REMOVE_HEAD(&jobs, entries);
+ STAILQ_REMOVE_HEAD(&jobs, entries);
else
- SIMPLEQ_REMOVE_AFTER(&jobs, prev, entries);
+ STAILQ_REMOVE_AFTER(&jobs, prev, entries);
free(j);
break;
}
@@ -106,12 +106,12 @@ job_exit(pid_t jobpid)
int
job_runqueue(void)
{
- struct job_queue singletons = SIMPLEQ_HEAD_INITIALIZER(singletons);
+ struct job_queue singletons = STAILQ_HEAD_INITIALIZER(singletons);
job *j;
int run = 0;
- while ((j = SIMPLEQ_FIRST(&jobs))) {
- SIMPLEQ_REMOVE_HEAD(&jobs, entries);
+ while ((j = STAILQ_FIRST(&jobs))) {
+ STAILQ_REMOVE_HEAD(&jobs, entries);
/* Only start the job if it is not a running singleton. */
if (j->pid == -1) {
@@ -121,10 +121,10 @@ job_runqueue(void)
/* Singleton jobs persist in the queue until they exit. */
if (j->pid != -1)
- SIMPLEQ_INSERT_TAIL(&singletons, j, entries);
+ STAILQ_INSERT_TAIL(&singletons, j, entries);
else
free(j);
}
- SIMPLEQ_CONCAT(&jobs, &singletons);
+ STAILQ_CONCAT(&jobs, &singletons);
return (run);
}
Index: eigrpd/eigrpd.h
===================================================================
RCS file: /cvs/src/usr.sbin/eigrpd/eigrpd.h,v
retrieving revision 1.25
diff -u -p -r1.25 eigrpd.h
--- eigrpd/eigrpd.h 5 Aug 2018 08:10:35 -0000 1.25
+++ eigrpd/eigrpd.h 25 Dec 2020 16:21:30 -0000
@@ -261,7 +261,7 @@ struct redist_metric {
};
struct redistribute {
- SIMPLEQ_ENTRY(redistribute) entry;
+ STAILQ_ENTRY(redistribute) entry;
uint8_t type;
int af;
union eigrpd_addr addr;
@@ -273,7 +273,7 @@ struct redistribute {
uint32_t tag;
} emetric;
};
-SIMPLEQ_HEAD(redist_list, redistribute);
+STAILQ_HEAD(redist_list, redistribute);
struct eigrp_stats {
uint32_t hellos_sent;
Index: eigrpd/eigrpe.c
===================================================================
RCS file: /cvs/src/usr.sbin/eigrpd/eigrpe.c,v
retrieving revision 1.36
diff -u -p -r1.36 eigrpe.c
--- eigrpd/eigrpe.c 5 Aug 2018 08:10:35 -0000 1.36
+++ eigrpd/eigrpe.c 25 Dec 2020 16:21:30 -0000
@@ -327,7 +327,7 @@ eigrpe_dispatch_main(int fd, short event
fatal(NULL);
memcpy(neigrp, imsg.data, sizeof(struct eigrp));
- SIMPLEQ_INIT(&neigrp->redist_list);
+ STAILQ_INIT(&neigrp->redist_list);
TAILQ_INIT(&neigrp->ei_list);
RB_INIT(&neigrp->nbrs);
RB_INIT(&neigrp->topology);
Index: eigrpd/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/eigrpd/parse.y,v
retrieving revision 1.30
diff -u -p -r1.30 parse.y
--- eigrpd/parse.y 13 Feb 2019 22:57:08 -0000 1.30
+++ eigrpd/parse.y 25 Dec 2020 16:21:30 -0000
@@ -329,7 +329,7 @@ asopts_l : asopts_l asoptsl nl
asoptsl : interface
| redistribute {
- SIMPLEQ_INSERT_TAIL(&eigrp->redist_list, $1, entry);
+ STAILQ_INSERT_TAIL(&eigrp->redist_list, $1, entry);
}
| defaults
;
@@ -1138,7 +1138,7 @@ conf_get_instance(uint16_t as)
e->af = af;
e->as = as;
- SIMPLEQ_INIT(&e->redist_list);
+ STAILQ_INIT(&e->redist_list);
TAILQ_INIT(&e->ei_list);
RB_INIT(&e->nbrs);
RB_INIT(&e->topology);
@@ -1204,9 +1204,9 @@ clear_config(struct eigrpd_conf *xconf)
struct summary_addr *s;
while ((e = TAILQ_FIRST(&xconf->instances)) != NULL) {
- while (!SIMPLEQ_EMPTY(&e->redist_list)) {
- r = SIMPLEQ_FIRST(&e->redist_list);
- SIMPLEQ_REMOVE_HEAD(&e->redist_list, entry);
+ while (!STAILQ_EMPTY(&e->redist_list)) {
+ r = STAILQ_FIRST(&e->redist_list);
+ STAILQ_REMOVE_HEAD(&e->redist_list, entry);
free(r);
}
Index: eigrpd/printconf.c
===================================================================
RCS file: /cvs/src/usr.sbin/eigrpd/printconf.c,v
retrieving revision 1.6
diff -u -p -r1.6 printconf.c
--- eigrpd/printconf.c 2 Sep 2016 16:44:33 -0000 1.6
+++ eigrpd/printconf.c 25 Dec 2020 16:21:30 -0000
@@ -75,7 +75,7 @@ print_redistribute(struct eigrp *eigrp)
printf("\n");
}
- SIMPLEQ_FOREACH(r, &eigrp->redist_list, entry) {
+ STAILQ_FOREACH(r, &eigrp->redist_list, entry) {
switch (r->type & ~REDIST_NO) {
case REDIST_STATIC:
printf("\t\t%sredistribute static", print_no(r->type));
Index: eigrpd/rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/eigrpd/rde.c,v
retrieving revision 1.23
diff -u -p -r1.23 rde.c
--- eigrpd/rde.c 2 Sep 2016 16:46:29 -0000 1.23
+++ eigrpd/rde.c 25 Dec 2020 16:21:30 -0000
@@ -388,7 +388,7 @@ rde_dispatch_parent(int fd, short event,
fatal(NULL);
memcpy(neigrp, imsg.data, sizeof(struct eigrp));
- SIMPLEQ_INIT(&neigrp->redist_list);
+ STAILQ_INIT(&neigrp->redist_list);
TAILQ_INIT(&neigrp->ei_list);
RB_INIT(&neigrp->nbrs);
RB_INIT(&neigrp->topology);
@@ -583,7 +583,7 @@ eigrp_redistribute(struct eigrp *eigrp,
if (!eigrp_addrisset(kr->af, &kr->prefix) && kr->prefixlen == 0)
is_default = 1;
- SIMPLEQ_FOREACH(r, &eigrp->redist_list, entry) {
+ STAILQ_FOREACH(r, &eigrp->redist_list, entry) {
switch (r->type & ~REDIST_NO) {
case REDIST_STATIC:
if (is_default)
Index: identd/identd.c
===================================================================
RCS file: /cvs/src/usr.sbin/identd/identd.c,v
retrieving revision 1.40
diff -u -p -r1.40 identd.c
--- identd/identd.c 3 Jul 2019 03:24:03 -0000 1.40
+++ identd/identd.c 25 Dec 2020 16:21:30 -0000
@@ -82,7 +82,7 @@ struct ident_client {
/* from the request */
u_int port;
} client, server;
- SIMPLEQ_ENTRY(ident_client) entry;
+ STAILQ_ENTRY(ident_client) entry;
enum ident_client_state state;
struct event ev;
struct event tmo;
@@ -95,7 +95,7 @@ struct ident_client {
};
struct ident_resolver {
- SIMPLEQ_ENTRY(ident_resolver) entry;
+ STAILQ_ENTRY(ident_resolver) entry;
char *buf;
size_t buflen;
u_int error;
@@ -211,10 +211,10 @@ int (*parent_uprintf)(struct ident_resol
struct event proc_rd, proc_wr;
union {
struct {
- SIMPLEQ_HEAD(, ident_resolver) replies;
+ STAILQ_HEAD(, ident_resolver) replies;
} parent;
struct {
- SIMPLEQ_HEAD(, ident_client) pushing, popping;
+ STAILQ_HEAD(, ident_client) pushing, popping;
} child;
} sc;
@@ -330,15 +330,15 @@ main(int argc, char *argv[])
if (pledge("stdio getpw rpath id", NULL) == -1)
err(1, "pledge");
- SIMPLEQ_INIT(&sc.parent.replies);
+ STAILQ_INIT(&sc.parent.replies);
event_set(&proc_rd, sibling, EV_READ | EV_PERSIST,
parent_rd, NULL);
event_set(&proc_wr, sibling, EV_WRITE,
parent_wr, NULL);
} else {
- SIMPLEQ_INIT(&sc.child.pushing);
- SIMPLEQ_INIT(&sc.child.popping);
+ STAILQ_INIT(&sc.child.pushing);
+ STAILQ_INIT(&sc.child.popping);
identd_listen(addr, "auth", family);
@@ -426,7 +426,7 @@ parent_rd(int fd, short events, void *ar
r->buflen = n + 1;
done:
- SIMPLEQ_INSERT_TAIL(&sc.parent.replies, r, entry);
+ STAILQ_INSERT_TAIL(&sc.parent.replies, r, entry);
event_add(&proc_wr, NULL);
}
@@ -483,7 +483,7 @@ parent_noident(struct ident_resolver *r,
void
parent_wr(int fd, short events, void *arg)
{
- struct ident_resolver *r = SIMPLEQ_FIRST(&sc.parent.replies);
+ struct ident_resolver *r = STAILQ_FIRST(&sc.parent.replies);
struct iovec iov[2];
int iovcnt = 0;
ssize_t n;
@@ -513,14 +513,14 @@ parent_wr(int fd, short events, void *ar
if (n != sizeof(r->error) + r->buflen)
lerrx(1, "unexpected parent write length %zd", n);
- SIMPLEQ_REMOVE_HEAD(&sc.parent.replies, entry);
+ STAILQ_REMOVE_HEAD(&sc.parent.replies, entry);
if (r->buflen > 0)
free(r->buf);
free(r);
- if (!SIMPLEQ_EMPTY(&sc.parent.replies))
+ if (!STAILQ_EMPTY(&sc.parent.replies))
event_add(&proc_wr, NULL);
}
@@ -551,11 +551,11 @@ child_rd(int fd, short events, void *arg
break;
}
- c = SIMPLEQ_FIRST(&sc.child.popping);
+ c = STAILQ_FIRST(&sc.child.popping);
if (c == NULL)
lerrx(1, "unsolicited data from parent");
- SIMPLEQ_REMOVE_HEAD(&sc.child.popping, entry);
+ STAILQ_REMOVE_HEAD(&sc.child.popping, entry);
if (n < sizeof(reply.error))
lerrx(1, "short data from parent");
@@ -607,7 +607,7 @@ fail:
void
child_wr(int fd, short events, void *arg)
{
- struct ident_client *c = SIMPLEQ_FIRST(&sc.child.pushing);
+ struct ident_client *c = STAILQ_FIRST(&sc.child.pushing);
const char *errstr = NULL;
ssize_t n;
@@ -632,13 +632,13 @@ child_wr(int fd, short events, void *arg
lerrx(1, "unexpected child write length %zd", n);
}
- SIMPLEQ_REMOVE_HEAD(&sc.child.pushing, entry);
+ STAILQ_REMOVE_HEAD(&sc.child.pushing, entry);
if (errstr == NULL)
- SIMPLEQ_INSERT_TAIL(&sc.child.popping, c, entry);
+ STAILQ_INSERT_TAIL(&sc.child.popping, c, entry);
else if (identd_error(c, errstr) == -1)
identd_close(c);
- if (!SIMPLEQ_EMPTY(&sc.child.pushing))
+ if (!STAILQ_EMPTY(&sc.child.pushing))
event_add(&proc_wr, NULL);
}
@@ -820,7 +820,7 @@ identd_request(int fd, short events, voi
goto error;
}
- SIMPLEQ_INSERT_TAIL(&sc.child.pushing, c, entry);
+ STAILQ_INSERT_TAIL(&sc.child.pushing, c, entry);
c->state = S_QUEUED;
event_del(&c->ev);
Index: iscsictl/iscsictl.c
===================================================================
RCS file: /cvs/src/usr.sbin/iscsictl/iscsictl.c,v
retrieving revision 1.11
diff -u -p -r1.11 iscsictl.c
--- iscsictl/iscsictl.c 16 Aug 2016 18:41:57 -0000 1.11
+++ iscsictl/iscsictl.c 25 Dec 2020 16:21:30 -0000
@@ -135,7 +135,7 @@ main (int argc, char* argv[])
&cf->initiator, sizeof(cf->initiator)) == -1)
err(1, "control_compose");
}
- SIMPLEQ_FOREACH(s, &cf->sessions, entry) {
+ STAILQ_FOREACH(s, &cf->sessions, entry) {
struct ctrldata cdv[3];
bzero(cdv, sizeof(cdv));
Index: iscsictl/iscsictl.h
===================================================================
RCS file: /cvs/src/usr.sbin/iscsictl/iscsictl.h,v
retrieving revision 1.4
diff -u -p -r1.4 iscsictl.h
--- iscsictl/iscsictl.h 21 Apr 2014 17:44:47 -0000 1.4
+++ iscsictl/iscsictl.h 25 Dec 2020 16:21:30 -0000
@@ -19,13 +19,13 @@
#define ISCSID_OPT_NOACTION 0x01
struct iscsi_config {
- SIMPLEQ_HEAD(, session_ctlcfg) sessions;
+ STAILQ_HEAD(, session_ctlcfg) sessions;
struct initiator_config initiator;
};
struct session_ctlcfg {
struct session_config session;
- SIMPLEQ_ENTRY(session_ctlcfg) entry;
+ STAILQ_ENTRY(session_ctlcfg) entry;
};
enum actions {
Index: iscsictl/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/iscsictl/parse.y,v
retrieving revision 1.18
diff -u -p -r1.18 parse.y
--- iscsictl/parse.y 13 Feb 2019 22:57:08 -0000 1.18
+++ iscsictl/parse.y 25 Dec 2020 16:21:30 -0000
@@ -225,7 +225,7 @@ target : TARGET STRING {
YYERROR;
}
free($2);
- SIMPLEQ_INSERT_TAIL(&conf->sessions, scelm, entry);
+ STAILQ_INSERT_TAIL(&conf->sessions, scelm, entry);
} '{' optnl targetopts_l '}'
;
@@ -711,7 +711,7 @@ parse_config(char *filename)
conf = calloc(1, sizeof(struct iscsi_config));
if (conf == NULL)
return (NULL);
- SIMPLEQ_INIT(&conf->sessions);
+ STAILQ_INIT(&conf->sessions);
yyparse();
errors = file->errors;
@@ -811,8 +811,8 @@ clear_config(struct iscsi_config *c)
{
struct session_ctlcfg *s;
- while ((s = SIMPLEQ_FIRST(&c->sessions))) {
- SIMPLEQ_REMOVE_HEAD(&c->sessions, entry);
+ while ((s = STAILQ_FIRST(&c->sessions))) {
+ STAILQ_REMOVE_HEAD(&c->sessions, entry);
free(s->session.TargetName);
free(s->session.InitiatorName);
free(s);
Index: ldapd/auth.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/auth.c,v
retrieving revision 1.14
diff -u -p -r1.14 auth.c
--- ldapd/auth.c 24 Oct 2019 12:39:26 -0000 1.14
+++ ldapd/auth.c 25 Dec 2020 16:21:30 -0000
@@ -139,7 +139,7 @@ authorized(struct conn *conn, struct nam
conn->binddn ? conn->binddn : "any",
ns ? ns->suffix : "global");
- SIMPLEQ_FOREACH(aci, &conf->acl, entry) {
+ STAILQ_FOREACH(aci, &conf->acl, entry) {
if (aci_matches(aci, conn, ns, dn, rights,
attr, scope)) {
type = aci->type;
@@ -155,7 +155,7 @@ authorized(struct conn *conn, struct nam
}
if (ns != NULL) {
- SIMPLEQ_FOREACH(aci, &ns->acl, entry) {
+ STAILQ_FOREACH(aci, &ns->acl, entry) {
if (aci_matches(aci, conn, ns, dn, rights,
attr, scope)) {
type = aci->type;
Index: ldapd/btree.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/btree.c,v
retrieving revision 1.38
diff -u -p -r1.38 btree.c
--- ldapd/btree.c 26 May 2017 21:23:14 -0000 1.38
+++ ldapd/btree.c 25 Dec 2020 16:21:30 -0000
@@ -124,7 +124,7 @@ struct btkey {
struct mpage { /* an in-memory cached page */
RB_ENTRY(mpage) entry; /* page cache entry */
- SIMPLEQ_ENTRY(mpage) next; /* queue of dirty pages */
+ STAILQ_ENTRY(mpage) next; /* queue of dirty pages */
TAILQ_ENTRY(mpage) lru_next; /* LRU queue */
struct mpage *parent; /* NULL if root */
unsigned int parent_index; /* keep track of node index */
@@ -135,7 +135,7 @@ struct mpage { /* an
in-memory cache
short dirty; /* 1 if on dirty queue */
};
RB_HEAD(page_cache, mpage);
-SIMPLEQ_HEAD(dirty_queue, mpage);
+STAILQ_HEAD(dirty_queue, mpage);
TAILQ_HEAD(lru_queue, mpage);
static int mpage_cmp(struct mpage *a, struct mpage *b);
@@ -567,7 +567,7 @@ mpage_dirty(struct btree *bt, struct mpa
if (!mp->dirty) {
mp->dirty = 1;
- SIMPLEQ_INSERT_TAIL(bt->txn->dirty_queue, mp, next);
+ STAILQ_INSERT_TAIL(bt->txn->dirty_queue, mp, next);
}
}
@@ -662,7 +662,7 @@ btree_txn_begin(struct btree *bt, int rd
free(txn);
return NULL;
}
- SIMPLEQ_INIT(txn->dirty_queue);
+ STAILQ_INIT(txn->dirty_queue);
DPRINTF("taking write lock on txn %p", txn);
if (flock(bt->fd, LOCK_EX | LOCK_NB) != 0) {
@@ -704,11 +704,11 @@ btree_txn_abort(struct btree_txn *txn)
if (!F_ISSET(txn->flags, BT_TXN_RDONLY)) {
/* Discard all dirty pages.
*/
- while (!SIMPLEQ_EMPTY(txn->dirty_queue)) {
- mp = SIMPLEQ_FIRST(txn->dirty_queue);
+ while (!STAILQ_EMPTY(txn->dirty_queue)) {
+ mp = STAILQ_FIRST(txn->dirty_queue);
assert(mp->ref == 0); /* cursors should be closed */
mpage_del(bt, mp);
- SIMPLEQ_REMOVE_HEAD(txn->dirty_queue, next);
+ STAILQ_REMOVE_HEAD(txn->dirty_queue, next);
mpage_free(mp);
}
@@ -761,7 +761,7 @@ btree_txn_commit(struct btree_txn *txn)
return BT_FAIL;
}
- if (SIMPLEQ_EMPTY(txn->dirty_queue))
+ if (STAILQ_EMPTY(txn->dirty_queue))
goto done;
if (F_ISSET(bt->flags, BT_FIXPADDING)) {
@@ -784,7 +784,7 @@ btree_txn_commit(struct btree_txn *txn)
do {
n = 0;
done = 1;
- SIMPLEQ_FOREACH(mp, txn->dirty_queue, next) {
+ STAILQ_FOREACH(mp, txn->dirty_queue, next) {
DPRINTF("committing page %u", mp->pgno);
iov[n].iov_len = bt->head.psize;
iov[n].iov_base = mp->page;
@@ -810,10 +810,10 @@ btree_txn_commit(struct btree_txn *txn)
/* Remove the dirty flag from the written pages.
*/
- while (!SIMPLEQ_EMPTY(txn->dirty_queue)) {
- mp = SIMPLEQ_FIRST(txn->dirty_queue);
+ while (!STAILQ_EMPTY(txn->dirty_queue)) {
+ mp = STAILQ_FIRST(txn->dirty_queue);
mp->dirty = 0;
- SIMPLEQ_REMOVE_HEAD(txn->dirty_queue, next);
+ STAILQ_REMOVE_HEAD(txn->dirty_queue, next);
if (--n == 0)
break;
}
@@ -951,7 +951,7 @@ btree_write_meta(struct btree *bt, pgno_
rc = write(bt->fd, mp->page, bt->head.psize);
mp->dirty = 0;
- SIMPLEQ_REMOVE_HEAD(bt->txn->dirty_queue, next);
+ STAILQ_REMOVE_HEAD(bt->txn->dirty_queue, next);
if (rc != (ssize_t)bt->head.psize) {
if (rc > 0)
DPRINTF("short write, filesystem full?");
Index: ldapd/ldapd.h
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/ldapd.h,v
retrieving revision 1.32
diff -u -p -r1.32 ldapd.h
--- ldapd/ldapd.h 24 Jun 2020 07:20:47 -0000 1.32
+++ ldapd/ldapd.h 25 Dec 2020 16:21:30 -0000
@@ -60,7 +60,7 @@
struct conn;
struct aci {
- SIMPLEQ_ENTRY(aci) entry;
+ STAILQ_ENTRY(aci) entry;
#define ACI_DENY 0
#define ACI_ALLOW 1
int type;
@@ -77,7 +77,7 @@ struct aci {
char *subject;
char *filter;
};
-SIMPLEQ_HEAD(acl, aci);
+STAILQ_HEAD(acl, aci);
/* An LDAP request.
*/
Index: ldapd/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/ldapd/parse.y,v
retrieving revision 1.37
diff -u -p -r1.37 parse.y
--- ldapd/parse.y 29 Nov 2020 19:48:35 -0000 1.37
+++ ldapd/parse.y 25 Dec 2020 16:21:30 -0000
@@ -138,7 +138,7 @@ grammar : /* empty */
| grammar error '\n' { file->errors++; }
| grammar namespace '\n'
| grammar aci '\n' {
- SIMPLEQ_INSERT_TAIL(&conf->acl, $2, entry);
+ STAILQ_INSERT_TAIL(&conf->acl, $2, entry);
}
| grammar schema '\n'
;
@@ -285,7 +285,7 @@ ns_opt : ROOTDN STRING {
| INDEX_CACHE_SIZE NUMBER { current_ns->index_cache_size
= $2; }
| FSYNC boolean { current_ns->sync = $2; }
| aci {
- SIMPLEQ_INSERT_TAIL(¤t_ns->acl, $1, entry);
+ STAILQ_INSERT_TAIL(¤t_ns->acl, $1, entry);
}
| RELAX SCHEMA { current_ns->relax = 1; }
| STRICT SCHEMA { current_ns->relax = 0; }
@@ -848,7 +848,7 @@ parse_config(char *filename)
if ((conf->sc_ssl = calloc(1, sizeof(*conf->sc_ssl))) == NULL)
fatal(NULL);
SPLAY_INIT(conf->sc_ssl);
- SIMPLEQ_INIT(&conf->acl);
+ STAILQ_INIT(&conf->acl);
SLIST_INIT(&conf->referrals);
if ((file = pushfile(filename, 1)) == NULL) {
@@ -1220,7 +1220,7 @@ namespace_new(const char *suffix)
}
TAILQ_INIT(&ns->indices);
TAILQ_INIT(&ns->request_queue);
- SIMPLEQ_INIT(&ns->acl);
+ STAILQ_INIT(&ns->acl);
SLIST_INIT(&ns->referrals);
return ns;
Index: ldomctl/config.c
===================================================================
RCS file: /cvs/src/usr.sbin/ldomctl/config.c,v
retrieving revision 1.41
diff -u -p -r1.41 config.c
--- ldomctl/config.c 29 Jun 2020 18:25:26 -0000 1.41
+++ ldomctl/config.c 25 Dec 2020 16:21:30 -0000
@@ -2791,7 +2791,7 @@ build_config(const char *filename, int n
uint64_t primary_stride = 1;
uint64_t memory = 0, primary_memory = 0;
- SIMPLEQ_INIT(&conf.domain_list);
+ STAILQ_INIT(&conf.domain_list);
if (parse_config(filename, &conf) < 0)
exit(1);
@@ -2805,7 +2805,7 @@ build_config(const char *filename, int n
pri_init(pri);
pri_alloc_memory(hv_membase, hv_memsize);
- SIMPLEQ_FOREACH(domain, &conf.domain_list, entry) {
+ STAILQ_FOREACH(domain, &conf.domain_list, entry) {
if (strcmp(domain->name, "primary") == 0) {
primary_num_cpus = domain->vcpu;
primary_stride = domain->vcpu_stride;
@@ -2847,14 +2847,14 @@ build_config(const char *filename, int n
guest_delete_memory(primary);
guest_add_memory(primary, -1, primary_memory);
- SIMPLEQ_FOREACH(domain, &conf.domain_list, entry) {
+ STAILQ_FOREACH(domain, &conf.domain_list, entry) {
if (strcmp(domain->name, "primary") != 0)
continue;
- SIMPLEQ_FOREACH(var, &domain->var_list, entry)
+ STAILQ_FOREACH(var, &domain->var_list, entry)
guest_add_variable(primary, var->name, var->str);
}
- SIMPLEQ_FOREACH(domain, &conf.domain_list, entry) {
+ STAILQ_FOREACH(domain, &conf.domain_list, entry) {
if (strcmp(domain->name, "primary") == 0)
continue;
guest = guest_create(domain->name);
@@ -2862,16 +2862,16 @@ build_config(const char *filename, int n
guest_add_cpu(guest, domain->vcpu_stride);
guest_add_memory(guest, -1, domain->memory);
i = 0;
- SIMPLEQ_FOREACH(vdisk, &domain->vdisk_list, entry)
+ STAILQ_FOREACH(vdisk, &domain->vdisk_list, entry)
guest_add_vdisk(guest, i++, vdisk->path,
vdisk->devalias);
i = 0;
- SIMPLEQ_FOREACH(vnet, &domain->vnet_list, entry)
+ STAILQ_FOREACH(vnet, &domain->vnet_list, entry)
guest_add_vnetwork(guest, i++, vnet->mac_addr,
vnet->mtu, vnet->devalias);
- SIMPLEQ_FOREACH(var, &domain->var_list, entry)
+ STAILQ_FOREACH(var, &domain->var_list, entry)
guest_add_variable(guest, var->name, var->str);
- SIMPLEQ_FOREACH(iodev, &domain->iodev_list, entry)
+ STAILQ_FOREACH(iodev, &domain->iodev_list, entry)
guest_add_iodev(guest, iodev->path);
guest_finalize(guest);
Index: ldomctl/ldomctl.h
===================================================================
RCS file: /cvs/src/usr.sbin/ldomctl/ldomctl.h,v
retrieving revision 1.14
diff -u -p -r1.14 ldomctl.h
--- ldomctl/ldomctl.h 21 Feb 2020 19:39:28 -0000 1.14
+++ ldomctl/ldomctl.h 25 Dec 2020 16:21:30 -0000
@@ -156,42 +156,42 @@ extern uint64_t hv_membase;
extern uint64_t hv_memsize;
struct vdisk {
- SIMPLEQ_ENTRY(vdisk) entry;
+ STAILQ_ENTRY(vdisk) entry;
const char *path;
const char *devalias;
};
struct vnet {
- SIMPLEQ_ENTRY(vnet) entry;
+ STAILQ_ENTRY(vnet) entry;
uint64_t mac_addr;
uint64_t mtu;
const char *devalias;
};
struct var {
- SIMPLEQ_ENTRY(var) entry;
+ STAILQ_ENTRY(var) entry;
const char *name;
const char *str;
};
struct iodev {
- SIMPLEQ_ENTRY(iodev) entry;
+ STAILQ_ENTRY(iodev) entry;
const char *path;
};
struct domain {
- SIMPLEQ_ENTRY(domain) entry;
+ STAILQ_ENTRY(domain) entry;
const char *name;
uint64_t vcpu, vcpu_stride;
uint64_t memory;
- SIMPLEQ_HEAD(, vdisk) vdisk_list;
- SIMPLEQ_HEAD(, vnet) vnet_list;
- SIMPLEQ_HEAD(, var) var_list;
- SIMPLEQ_HEAD(, iodev) iodev_list;
+ STAILQ_HEAD(, vdisk) vdisk_list;
+ STAILQ_HEAD(, vnet) vnet_list;
+ STAILQ_HEAD(, var) var_list;
+ STAILQ_HEAD(, iodev) iodev_list;
} *domain;
struct ldom_config {
- SIMPLEQ_HEAD(, domain) domain_list;
+ STAILQ_HEAD(, domain) domain_list;
};
int parse_config(const char *, struct ldom_config *);
Index: ldomctl/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/ldomctl/parse.y,v
retrieving revision 1.22
diff -u -p -r1.22 parse.y
--- ldomctl/parse.y 14 Sep 2020 18:09:57 -0000 1.22
+++ ldomctl/parse.y 25 Dec 2020 16:21:30 -0000
@@ -121,17 +121,17 @@ grammar : /* empty */
domain : DOMAIN STRING optnl '{' optnl {
struct domain *odomain;
- SIMPLEQ_FOREACH(odomain, &conf->domain_list, entry)
+ STAILQ_FOREACH(odomain, &conf->domain_list, entry)
if (strcmp(odomain->name, $2) == 0) {
yyerror("duplicate domain name: %s",
$2);
YYERROR;
}
domain = xzalloc(sizeof(struct domain));
domain->name = $2;
- SIMPLEQ_INIT(&domain->vdisk_list);
- SIMPLEQ_INIT(&domain->vnet_list);
- SIMPLEQ_INIT(&domain->var_list);
- SIMPLEQ_INIT(&domain->iodev_list);
+ STAILQ_INIT(&domain->vdisk_list);
+ STAILQ_INIT(&domain->vnet_list);
+ STAILQ_INIT(&domain->var_list);
+ STAILQ_INIT(&domain->iodev_list);
}
domainopts_l '}' {
if (strcmp(domain->name, "primary") != 0) {
@@ -145,15 +145,15 @@ domain : DOMAIN STRING optnl '{' optnl
domain->name);
YYERROR;
}
- if (SIMPLEQ_EMPTY(&domain->vdisk_list) &&
- SIMPLEQ_EMPTY(&domain->vnet_list) &&
- SIMPLEQ_EMPTY(&domain->iodev_list)) {
+ if (STAILQ_EMPTY(&domain->vdisk_list) &&
+ STAILQ_EMPTY(&domain->vnet_list) &&
+ STAILQ_EMPTY(&domain->iodev_list)) {
yyerror("at least one bootable device"
" is required: %s", domain->name);
YYERROR;
}
}
- SIMPLEQ_INSERT_TAIL(&conf->domain_list, domain, entry);
+ STAILQ_INSERT_TAIL(&conf->domain_list, domain, entry);
domain = NULL;
}
;
@@ -189,7 +189,7 @@ domainopts : VCPU vcpu {
struct vdisk *vdisk = xmalloc(sizeof(struct vdisk));
vdisk->path = $2;
vdisk->devalias = $3.devalias;
- SIMPLEQ_INSERT_TAIL(&domain->vdisk_list, vdisk, entry);
+ STAILQ_INSERT_TAIL(&domain->vdisk_list, vdisk, entry);
}
| VNET vnet_opts {
if (strcmp(domain->name, "primary") == 0) {
@@ -201,13 +201,13 @@ domainopts : VCPU vcpu {
vnet->mac_addr = $2.mac_addr;
vnet->mtu = $2.mtu;
vnet->devalias = $2.devalias;
- SIMPLEQ_INSERT_TAIL(&domain->vnet_list, vnet, entry);
+ STAILQ_INSERT_TAIL(&domain->vnet_list, vnet, entry);
}
| VARIABLE STRING '=' STRING {
struct var *var = xmalloc(sizeof(struct var));
var->name = $2;
var->str = $4;
- SIMPLEQ_INSERT_TAIL(&domain->var_list, var, entry);
+ STAILQ_INSERT_TAIL(&domain->var_list, var, entry);
}
| IODEVICE STRING {
if (strcmp(domain->name, "primary") == 0) {
@@ -217,8 +217,8 @@ domainopts : VCPU vcpu {
}
struct domain *odomain;
struct iodev *iodev;
- SIMPLEQ_FOREACH(odomain, &conf->domain_list, entry)
- SIMPLEQ_FOREACH(iodev, &odomain->iodev_list,
entry)
+ STAILQ_FOREACH(odomain, &conf->domain_list, entry)
+ STAILQ_FOREACH(iodev, &odomain->iodev_list,
entry)
if (strcmp(iodev->path, $2) == 0) {
yyerror("iodevice %s already"
" assigned", $2);
@@ -226,7 +226,7 @@ domainopts : VCPU vcpu {
}
iodev = xmalloc(sizeof(struct iodev));
iodev->path = $2;
- SIMPLEQ_INSERT_TAIL(&domain->iodev_list, iodev, entry);
+ STAILQ_INSERT_TAIL(&domain->iodev_list, iodev, entry);
}
;
Index: ospf6d/ospf6d.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospf6d/ospf6d.c,v
retrieving revision 1.48
diff -u -p -r1.48 ospf6d.c
--- ospf6d/ospf6d.c 16 Sep 2020 20:50:10 -0000 1.48
+++ ospf6d/ospf6d.c 25 Dec 2020 16:21:30 -0000
@@ -524,7 +524,7 @@ ospf_redistribute(struct kroute *kr, u_i
if (IN6_IS_ADDR_UNSPECIFIED(&kr->prefix) && kr->prefixlen == 0)
is_default = 1;
- SIMPLEQ_FOREACH(r, &ospfd_conf->redist_list, entry) {
+ STAILQ_FOREACH(r, &ospfd_conf->redist_list, entry) {
if (r->dependon[0] != '\0') {
if ((iface = if_findname(r->dependon)))
depend_ok = ifstate_is_up(iface);
@@ -662,18 +662,18 @@ merge_config(struct ospfd_conf *conf, st
conf->flags = xconf->flags;
conf->spf_delay = xconf->spf_delay;
conf->spf_hold_time = xconf->spf_hold_time;
- if (SIMPLEQ_EMPTY(&conf->redist_list) !=
- SIMPLEQ_EMPTY(&xconf->redist_list))
+ if (STAILQ_EMPTY(&conf->redist_list) !=
+ STAILQ_EMPTY(&xconf->redist_list))
rchange = 1;
conf->redist_label_or_prefix = xconf->redist_label_or_prefix;
if (ospfd_process == PROC_MAIN) {
/* main process does neither use areas nor interfaces */
- while ((r = SIMPLEQ_FIRST(&conf->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->redist_list, entry);
+ while ((r = STAILQ_FIRST(&conf->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&conf->redist_list, entry);
free(r);
}
- SIMPLEQ_CONCAT(&conf->redist_list, &xconf->redist_list);
+ STAILQ_CONCAT(&conf->redist_list, &xconf->redist_list);
/* adjust FIB priority if changed */
if (conf->fib_priority != xconf->fib_priority) {
Index: ospf6d/ospf6d.h
===================================================================
RCS file: /cvs/src/usr.sbin/ospf6d/ospf6d.h,v
retrieving revision 1.49
diff -u -p -r1.49 ospf6d.h
--- ospf6d/ospf6d.h 17 May 2020 18:29:25 -0000 1.49
+++ ospf6d/ospf6d.h 25 Dec 2020 16:21:30 -0000
@@ -354,7 +354,7 @@ enum {
#define REDIST_DEFAULT 0x20
struct redistribute {
- SIMPLEQ_ENTRY(redistribute) entry;
+ STAILQ_ENTRY(redistribute) entry;
struct in6_addr addr;
u_int32_t metric;
u_int16_t label;
@@ -362,7 +362,7 @@ struct redistribute {
u_int8_t prefixlen;
char dependon[IFNAMSIZ];
};
-SIMPLEQ_HEAD(redist_list, redistribute);
+STAILQ_HEAD(redist_list, redistribute);
struct ospfd_conf {
struct event ev;
Index: ospf6d/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/ospf6d/parse.y,v
retrieving revision 1.49
diff -u -p -r1.49 parse.y
--- ospf6d/parse.y 21 Jan 2020 20:38:52 -0000 1.49
+++ ospf6d/parse.y 25 Dec 2020 16:21:30 -0000
@@ -232,7 +232,7 @@ conf_main : ROUTERID STRING {
conf->flags &= ~OSPFD_FLAG_NO_FIB_UPDATE;
}
| redistribute {
- SIMPLEQ_INSERT_TAIL(&conf->redist_list, $1, entry);
+ STAILQ_INSERT_TAIL(&conf->redist_list, $1, entry);
conf->redistribute = 1;
}
| RTLABEL STRING EXTTAG NUMBER {
@@ -1052,7 +1052,7 @@ parse_config(char *filename, int opts)
LIST_INIT(&conf->area_list);
LIST_INIT(&conf->cand_list);
- SIMPLEQ_INIT(&conf->redist_list);
+ STAILQ_INIT(&conf->redist_list);
yyparse();
errors = file->errors;
@@ -1180,7 +1180,7 @@ conf_check_rdomain(u_int rdomain)
struct redistribute *r;
int errs = 0;
- SIMPLEQ_FOREACH(r, &conf->redist_list, entry)
+ STAILQ_FOREACH(r, &conf->redist_list, entry)
if (r->dependon[0] != '\0') {
idep = if_findname(r->dependon);
if (idep->rdomain != rdomain) {
@@ -1218,8 +1218,8 @@ void
conf_clear_redist_list(struct redist_list *rl)
{
struct redistribute *r;
- while ((r = SIMPLEQ_FIRST(rl)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(rl, entry);
+ while ((r = STAILQ_FIRST(rl)) != NULL) {
+ STAILQ_REMOVE_HEAD(rl, entry);
free(r);
}
}
Index: ospf6d/printconf.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospf6d/printconf.c,v
retrieving revision 1.10
diff -u -p -r1.10 printconf.c
--- ospf6d/printconf.c 21 Jan 2020 20:38:52 -0000 1.10
+++ ospf6d/printconf.c 25 Dec 2020 16:21:30 -0000
@@ -74,7 +74,7 @@ print_redistribute(struct ospfd_conf *co
{
struct redistribute *r;
- SIMPLEQ_FOREACH(r, &conf->redist_list, entry) {
+ STAILQ_FOREACH(r, &conf->redist_list, entry) {
switch (r->type & ~REDIST_NO) {
case REDIST_STATIC:
printf("%sredistribute static ", print_no(r->type));
Index: ospfd/area.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/area.c,v
retrieving revision 1.10
diff -u -p -r1.10 area.c
--- ospfd/area.c 22 Nov 2015 13:09:10 -0000 1.10
+++ ospfd/area.c 25 Dec 2020 16:21:30 -0000
@@ -38,7 +38,7 @@ area_new(void)
LIST_INIT(&area->iface_list);
LIST_INIT(&area->nbr_list);
RB_INIT(&area->lsa_tree);
- SIMPLEQ_INIT(&area->redist_list);
+ STAILQ_INIT(&area->redist_list);
return (area);
}
@@ -69,8 +69,8 @@ area_del(struct area *area)
vertex_free(v);
}
- while ((r = SIMPLEQ_FIRST(&area->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&area->redist_list, entry);
+ while ((r = STAILQ_FIRST(&area->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&area->redist_list, entry);
free(r);
}
Index: ospfd/ospfd.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/ospfd.c,v
retrieving revision 1.114
diff -u -p -r1.114 ospfd.c
--- ospfd/ospfd.c 16 Sep 2020 20:50:10 -0000 1.114
+++ ospfd/ospfd.c 25 Dec 2020 16:21:30 -0000
@@ -317,8 +317,8 @@ ospfd_shutdown(void)
close(iev_rde->ibuf.fd);
control_cleanup();
- while ((r = SIMPLEQ_FIRST(&ospfd_conf->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ospfd_conf->redist_list, entry);
+ while ((r = STAILQ_FIRST(&ospfd_conf->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ospfd_conf->redist_list, entry);
free(r);
}
kr_shutdown();
@@ -552,7 +552,7 @@ ospf_redistribute(struct kroute *kr, u_i
/* only allow 0.0.0.0/0 via REDIST_DEFAULT */
is_default = (kr->prefix.s_addr == INADDR_ANY && kr->prefixlen == 0);
- SIMPLEQ_FOREACH(r, &ospfd_conf->redist_list, entry) {
+ STAILQ_FOREACH(r, &ospfd_conf->redist_list, entry) {
if (r->dependon[0] != '\0') {
if ((kif = kif_findname(r->dependon, addr, NULL)))
depend_ok = ifstate_is_up(kif);
@@ -661,7 +661,7 @@ ospf_reload(void)
if (ospf_sendboth(IMSG_RECONF_AREA, area, sizeof(*area)) == -1)
return (-1);
- SIMPLEQ_FOREACH(r, &area->redist_list, entry) {
+ STAILQ_FOREACH(r, &area->redist_list, entry) {
main_imsg_compose_rde(IMSG_RECONF_REDIST, 0, r,
sizeof(*r));
}
@@ -706,19 +706,19 @@ merge_config(struct ospfd_conf *conf, st
conf->flags = xconf->flags;
conf->spf_delay = xconf->spf_delay;
conf->spf_hold_time = xconf->spf_hold_time;
- if (SIMPLEQ_EMPTY(&conf->redist_list) !=
- SIMPLEQ_EMPTY(&xconf->redist_list))
+ if (STAILQ_EMPTY(&conf->redist_list) !=
+ STAILQ_EMPTY(&xconf->redist_list))
rchange = 1;
conf->rfc1583compat = xconf->rfc1583compat;
conf->redist_label_or_prefix = xconf->redist_label_or_prefix;
if (ospfd_process == PROC_MAIN) {
/* main process does neither use areas nor interfaces */
- while ((r = SIMPLEQ_FIRST(&conf->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->redist_list, entry);
+ while ((r = STAILQ_FIRST(&conf->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&conf->redist_list, entry);
free(r);
}
- SIMPLEQ_CONCAT(&conf->redist_list, &xconf->redist_list);
+ STAILQ_CONCAT(&conf->redist_list, &xconf->redist_list);
/* adjust FIB priority if changed */
if (conf->fib_priority != xconf->fib_priority) {
@@ -772,12 +772,12 @@ merge_config(struct ospfd_conf *conf, st
if (a->stub != xa->stub && ospfd_process == PROC_OSPF_ENGINE)
a->dirty = 1; /* force rtr LSA update */
if (xa->stub && ospfd_process == PROC_RDE_ENGINE) {
- while ((r = SIMPLEQ_FIRST(&a->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&a->redist_list, entry);
+ while ((r = STAILQ_FIRST(&a->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&a->redist_list, entry);
free(r);
}
- SIMPLEQ_CONCAT(&a->redist_list, &xa->redist_list);
+ STAILQ_CONCAT(&a->redist_list, &xa->redist_list);
}
a->stub = xa->stub;
Index: ospfd/ospfd.h
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/ospfd.h,v
retrieving revision 1.107
diff -u -p -r1.107 ospfd.h
--- ospfd/ospfd.h 2 Nov 2020 00:30:56 -0000 1.107
+++ ospfd/ospfd.h 25 Dec 2020 16:21:30 -0000
@@ -146,7 +146,7 @@ enum imsg_type {
#define REDIST_DEFAULT 0x20
struct redistribute {
- SIMPLEQ_ENTRY(redistribute) entry;
+ STAILQ_ENTRY(redistribute) entry;
struct in_addr addr;
struct in_addr mask;
u_int32_t metric;
@@ -154,7 +154,7 @@ struct redistribute {
u_int16_t type;
char dependon[IFNAMSIZ];
};
-SIMPLEQ_HEAD(redist_list, redistribute);
+STAILQ_HEAD(redist_list, redistribute);
struct vertex;
struct rde_nbr;
Index: ospfd/ospfe.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/ospfe.c,v
retrieving revision 1.107
diff -u -p -r1.107 ospfe.c
--- ospfd/ospfe.c 2 Nov 2020 00:29:58 -0000 1.107
+++ ospfd/ospfe.c 25 Dec 2020 16:21:30 -0000
@@ -179,8 +179,8 @@ ospfe(struct ospfd_conf *xconf, int pipe
/* remove unneeded config stuff */
conf_clear_redist_list(&oeconf->redist_list);
LIST_FOREACH(area, &oeconf->area_list, entry) {
- while ((r = SIMPLEQ_FIRST(&area->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&area->redist_list, entry);
+ while ((r = STAILQ_FIRST(&area->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&area->redist_list, entry);
free(r);
}
}
@@ -419,7 +419,7 @@ ospfe_dispatch_main(int fd, short event,
LIST_INIT(&narea->iface_list);
LIST_INIT(&narea->nbr_list);
RB_INIT(&narea->lsa_tree);
- SIMPLEQ_INIT(&narea->redist_list);
+ STAILQ_INIT(&narea->redist_list);
LIST_INSERT_HEAD(&nconf->area_list, narea, entry);
break;
Index: ospfd/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/parse.y,v
retrieving revision 1.100
diff -u -p -r1.100 parse.y
--- ospfd/parse.y 21 Jan 2020 20:38:52 -0000 1.100
+++ ospfd/parse.y 25 Dec 2020 16:21:30 -0000
@@ -246,7 +246,7 @@ conf_main : ROUTERID STRING {
conf->flags &= ~OSPFD_FLAG_NO_FIB_UPDATE;
}
| redistribute {
- SIMPLEQ_INSERT_TAIL(&conf->redist_list, $1, entry);
+ STAILQ_INSERT_TAIL(&conf->redist_list, $1, entry);
conf->redistribute = 1;
}
| RTLABEL STRING EXTTAG NUMBER {
@@ -663,12 +663,12 @@ areaoptsl : interface
yyerror("bad redistribute option");
YYERROR;
}
- if (!SIMPLEQ_EMPTY(&area->redist_list)) {
+ if (!STAILQ_EMPTY(&area->redist_list)) {
yyerror("area redistribute option only "
"allowed once");
YYERROR;
}
- SIMPLEQ_INSERT_TAIL(&area->redist_list, $2, entry);
+ STAILQ_INSERT_TAIL(&area->redist_list, $2, entry);
}
;
@@ -1243,7 +1243,7 @@ parse_config(char *filename, int opts)
LIST_INIT(&conf->area_list);
LIST_INIT(&conf->cand_list);
- SIMPLEQ_INIT(&conf->redist_list);
+ STAILQ_INIT(&conf->redist_list);
yyparse();
errors = file->errors;
@@ -1394,7 +1394,7 @@ conf_check_rdomain(unsigned int rdomain)
struct redistribute *r;
int errs = 0;
- SIMPLEQ_FOREACH(r, &conf->redist_list, entry)
+ STAILQ_FOREACH(r, &conf->redist_list, entry)
if (r->dependon[0] != '\0') {
bzero(&addr, sizeof(addr));
kif = kif_findname(r->dependon, addr, NULL);
@@ -1434,8 +1434,8 @@ void
conf_clear_redist_list(struct redist_list *rl)
{
struct redistribute *r;
- while ((r = SIMPLEQ_FIRST(rl)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(rl, entry);
+ while ((r = STAILQ_FIRST(rl)) != NULL) {
+ STAILQ_REMOVE_HEAD(rl, entry);
free(r);
}
}
Index: ospfd/printconf.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/printconf.c,v
retrieving revision 1.22
diff -u -p -r1.22 printconf.c
--- ospfd/printconf.c 21 Jan 2020 20:38:52 -0000 1.22
+++ ospfd/printconf.c 25 Dec 2020 16:21:30 -0000
@@ -78,7 +78,7 @@ print_redistribute(struct redist_list *r
{
struct redistribute *r;
- SIMPLEQ_FOREACH(r, rlh, entry) {
+ STAILQ_FOREACH(r, rlh, entry) {
switch (r->type & ~REDIST_NO) {
case REDIST_STATIC:
printf("%sredistribute static ", print_no(r->type));
@@ -187,7 +187,7 @@ print_config(struct ospfd_conf *conf)
printf("area %s {\n", inet_ntoa(area->id));
if (area->stub) {
printf("\tstub");
- if (SIMPLEQ_EMPTY(&area->redist_list))
+ if (STAILQ_EMPTY(&area->redist_list))
printf("\n");
else {
printf(" ");
Index: ospfd/rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/rde.c,v
retrieving revision 1.110
diff -u -p -r1.110 rde.c
--- ospfd/rde.c 19 Nov 2019 09:55:55 -0000 1.110
+++ ospfd/rde.c 25 Dec 2020 16:21:30 -0000
@@ -706,7 +706,7 @@ rde_dispatch_parent(int fd, short event,
LIST_INIT(&narea->iface_list);
LIST_INIT(&narea->nbr_list);
RB_INIT(&narea->lsa_tree);
- SIMPLEQ_INIT(&narea->redist_list);
+ STAILQ_INIT(&narea->redist_list);
LIST_INSERT_HEAD(&nconf->area_list, narea, entry);
break;
@@ -715,7 +715,7 @@ rde_dispatch_parent(int fd, short event,
fatal(NULL);
memcpy(nred, imsg.data, sizeof(struct redistribute));
- SIMPLEQ_INSERT_TAIL(&narea->redist_list, nred, entry);
+ STAILQ_INSERT_TAIL(&narea->redist_list, nred, entry);
break;
case IMSG_RECONF_IFACE:
if ((niface = malloc(sizeof(struct iface))) == NULL)
Index: ospfd/rde_lsdb.c
===================================================================
RCS file: /cvs/src/usr.sbin/ospfd/rde_lsdb.c,v
retrieving revision 1.51
diff -u -p -r1.51 rde_lsdb.c
--- ospfd/rde_lsdb.c 5 Oct 2020 09:19:05 -0000 1.51
+++ ospfd/rde_lsdb.c 25 Dec 2020 16:21:30 -0000
@@ -819,7 +819,7 @@ lsa_generate_stub_sums(struct area *area
if (!back || !back->active)
return;
- SIMPLEQ_FOREACH(r, &area->redist_list, entry) {
+ STAILQ_FOREACH(r, &area->redist_list, entry) {
bzero(&rn, sizeof(rn));
if (r->type == REDIST_DEFAULT) {
/* setup fake rt_node */
Index: rad/engine.c
===================================================================
RCS file: /cvs/src/usr.sbin/rad/engine.c,v
retrieving revision 1.16
diff -u -p -r1.16 engine.c
--- rad/engine.c 20 May 2020 10:37:02 -0000 1.16
+++ rad/engine.c 25 Dec 2020 16:21:30 -0000
@@ -327,9 +327,9 @@ engine_dispatch_main(int fd, short event
if ((nconf = malloc(sizeof(struct rad_conf))) == NULL)
fatal(NULL);
memcpy(nconf, imsg.data, sizeof(struct rad_conf));
- SIMPLEQ_INIT(&nconf->ra_iface_list);
- SIMPLEQ_INIT(&nconf->ra_options.ra_rdnss_list);
- SIMPLEQ_INIT(&nconf->ra_options.ra_dnssl_list);
+ STAILQ_INIT(&nconf->ra_iface_list);
+ STAILQ_INIT(&nconf->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&nconf->ra_options.ra_dnssl_list);
ra_options = &nconf->ra_options;
break;
case IMSG_RECONF_RA_IFACE:
@@ -343,10 +343,10 @@ engine_dispatch_main(int fd, short event
memcpy(ra_iface_conf, imsg.data,
sizeof(struct ra_iface_conf));
ra_iface_conf->autoprefix = NULL;
- SIMPLEQ_INIT(&ra_iface_conf->ra_prefix_list);
- SIMPLEQ_INIT(&ra_iface_conf->ra_options.ra_rdnss_list);
- SIMPLEQ_INIT(&ra_iface_conf->ra_options.ra_dnssl_list);
- SIMPLEQ_INSERT_TAIL(&nconf->ra_iface_list,
+ STAILQ_INIT(&ra_iface_conf->ra_prefix_list);
+ STAILQ_INIT(&ra_iface_conf->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&ra_iface_conf->ra_options.ra_dnssl_list);
+ STAILQ_INSERT_TAIL(&nconf->ra_iface_list,
ra_iface_conf, entry);
ra_options = &ra_iface_conf->ra_options;
break;
@@ -373,7 +373,7 @@ engine_dispatch_main(int fd, short event
fatal(NULL);
memcpy(ra_prefix_conf, imsg.data, sizeof(struct
ra_prefix_conf));
- SIMPLEQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list,
+ STAILQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list,
ra_prefix_conf, entry);
break;
case IMSG_RECONF_RA_RDNSS:
@@ -386,7 +386,7 @@ engine_dispatch_main(int fd, short event
fatal(NULL);
memcpy(ra_rdnss_conf, imsg.data, sizeof(struct
ra_rdnss_conf));
- SIMPLEQ_INSERT_TAIL(&ra_options->ra_rdnss_list,
+ STAILQ_INSERT_TAIL(&ra_options->ra_rdnss_list,
ra_rdnss_conf, entry);
break;
case IMSG_RECONF_RA_DNSSL:
@@ -399,7 +399,7 @@ engine_dispatch_main(int fd, short event
fatal(NULL);
memcpy(ra_dnssl_conf, imsg.data, sizeof(struct
ra_dnssl_conf));
- SIMPLEQ_INSERT_TAIL(&ra_options->ra_dnssl_list,
+ STAILQ_INSERT_TAIL(&ra_options->ra_dnssl_list,
ra_dnssl_conf, entry);
break;
case IMSG_RECONF_END:
Index: rad/frontend.c
===================================================================
RCS file: /cvs/src/usr.sbin/rad/frontend.c,v
retrieving revision 1.34
diff -u -p -r1.34 frontend.c
--- rad/frontend.c 1 Dec 2020 18:10:27 -0000 1.34
+++ rad/frontend.c 25 Dec 2020 16:21:30 -0000
@@ -366,9 +366,9 @@ frontend_dispatch_main(int fd, short eve
NULL)
fatal(NULL);
memcpy(nconf, imsg.data, sizeof(struct rad_conf));
- SIMPLEQ_INIT(&nconf->ra_iface_list);
- SIMPLEQ_INIT(&nconf->ra_options.ra_rdnss_list);
- SIMPLEQ_INIT(&nconf->ra_options.ra_dnssl_list);
+ STAILQ_INIT(&nconf->ra_iface_list);
+ STAILQ_INIT(&nconf->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&nconf->ra_options.ra_dnssl_list);
ra_options = &nconf->ra_options;
break;
case IMSG_RECONF_RA_IFACE:
@@ -382,10 +382,10 @@ frontend_dispatch_main(int fd, short eve
memcpy(ra_iface_conf, imsg.data, sizeof(struct
ra_iface_conf));
ra_iface_conf->autoprefix = NULL;
- SIMPLEQ_INIT(&ra_iface_conf->ra_prefix_list);
- SIMPLEQ_INIT(&ra_iface_conf->ra_options.ra_rdnss_list);
- SIMPLEQ_INIT(&ra_iface_conf->ra_options.ra_dnssl_list);
- SIMPLEQ_INSERT_TAIL(&nconf->ra_iface_list,
+ STAILQ_INIT(&ra_iface_conf->ra_prefix_list);
+ STAILQ_INIT(&ra_iface_conf->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&ra_iface_conf->ra_options.ra_dnssl_list);
+ STAILQ_INSERT_TAIL(&nconf->ra_iface_list,
ra_iface_conf, entry);
ra_options = &ra_iface_conf->ra_options;
break;
@@ -412,7 +412,7 @@ frontend_dispatch_main(int fd, short eve
fatal(NULL);
memcpy(ra_prefix_conf, imsg.data,
sizeof(struct ra_prefix_conf));
- SIMPLEQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list,
+ STAILQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list,
ra_prefix_conf, entry);
break;
case IMSG_RECONF_RA_RDNSS:
@@ -425,7 +425,7 @@ frontend_dispatch_main(int fd, short eve
fatal(NULL);
memcpy(ra_rdnss_conf, imsg.data, sizeof(struct
ra_rdnss_conf));
- SIMPLEQ_INSERT_TAIL(&ra_options->ra_rdnss_list,
+ STAILQ_INSERT_TAIL(&ra_options->ra_rdnss_list,
ra_rdnss_conf, entry);
break;
case IMSG_RECONF_RA_DNSSL:
@@ -438,7 +438,7 @@ frontend_dispatch_main(int fd, short eve
fatal(NULL);
memcpy(ra_dnssl_conf, imsg.data, sizeof(struct
ra_dnssl_conf));
- SIMPLEQ_INSERT_TAIL(&ra_options->ra_dnssl_list,
+ STAILQ_INSERT_TAIL(&ra_options->ra_dnssl_list,
ra_dnssl_conf, entry);
break;
case IMSG_RECONF_END:
@@ -713,7 +713,7 @@ find_ra_iface_conf(struct ra_iface_conf_
{
struct ra_iface_conf *ra_iface_conf;
- SIMPLEQ_FOREACH(ra_iface_conf, head, entry) {
+ STAILQ_FOREACH(ra_iface_conf, head, entry) {
if (strcmp(ra_iface_conf->name, if_name) == 0)
return ra_iface_conf;
}
@@ -818,7 +818,7 @@ merge_ra_interface(char *name, char *con
ra_iface->if_index = if_index;
ra_iface->rdomain = ifrdomain;
- SIMPLEQ_INIT(&ra_iface->prefixes);
+ STAILQ_INIT(&ra_iface->prefixes);
ra_iface->icmp6ev = get_icmp6ev_by_rdomain(ifrdomain);
join_all_routers_mcast_group(ra_iface);
@@ -839,7 +839,7 @@ merge_ra_interfaces(void)
TAILQ_FOREACH(ra_iface, &ra_interfaces, entry)
ra_iface->removed = 1;
- SIMPLEQ_FOREACH(ra_iface_conf, &frontend_conf->ra_iface_list, entry) {
+ STAILQ_FOREACH(ra_iface_conf, &frontend_conf->ra_iface_list, entry) {
conf_name = ra_iface_conf->name;
/* check if network interface or group */
@@ -878,9 +878,9 @@ merge_ra_interfaces(void)
}
TAILQ_FOREACH(ra_iface, &ra_interfaces, entry) {
- while ((ra_prefix_conf = SIMPLEQ_FIRST(&ra_iface->prefixes))
+ while ((ra_prefix_conf = STAILQ_FIRST(&ra_iface->prefixes))
!= NULL) {
- SIMPLEQ_REMOVE_HEAD(&ra_iface->prefixes,
+ STAILQ_REMOVE_HEAD(&ra_iface->prefixes,
entry);
free(ra_prefix_conf);
}
@@ -899,7 +899,7 @@ merge_ra_interfaces(void)
log_debug("add static prefixes for %s", ra_iface->name);
- SIMPLEQ_FOREACH(ra_prefix_conf, &ra_iface_conf->ra_prefix_list,
+ STAILQ_FOREACH(ra_prefix_conf, &ra_iface_conf->ra_prefix_list,
entry) {
add_new_prefix_to_ra_iface(ra_iface,
&ra_prefix_conf->prefix,
@@ -921,8 +921,8 @@ free_ra_iface(struct ra_iface *ra_iface)
leave_all_routers_mcast_group(ra_iface);
- while ((prefix = SIMPLEQ_FIRST(&ra_iface->prefixes)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ra_iface->prefixes, entry);
+ while ((prefix = STAILQ_FIRST(&ra_iface->prefixes)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ra_iface->prefixes, entry);
free(prefix);
}
@@ -1048,7 +1048,7 @@ find_ra_prefix_conf(struct ra_prefix_con
{
struct ra_prefix_conf *ra_prefix_conf;
- SIMPLEQ_FOREACH(ra_prefix_conf, head, entry) {
+ STAILQ_FOREACH(ra_prefix_conf, head, entry) {
if (ra_prefix_conf->prefixlen == prefixlen &&
memcmp(&ra_prefix_conf->prefix, prefix, sizeof(*prefix)) ==
0)
@@ -1079,7 +1079,7 @@ add_new_prefix_to_ra_iface(struct ra_ifa
new_ra_prefix_conf->pltime = ra_prefix_conf->pltime;
new_ra_prefix_conf->aflag = ra_prefix_conf->aflag;
new_ra_prefix_conf->lflag = ra_prefix_conf->lflag;
- SIMPLEQ_INSERT_TAIL(&ra_iface->prefixes, new_ra_prefix_conf, entry);
+ STAILQ_INSERT_TAIL(&ra_iface->prefixes, new_ra_prefix_conf, entry);
ra_iface->prefix_count++;
}
@@ -1153,7 +1153,7 @@ build_packet(struct ra_iface *ra_iface)
p += sizeof(*ndopt_mtu);
}
- SIMPLEQ_FOREACH(ra_prefix_conf, &ra_iface->prefixes, entry) {
+ STAILQ_FOREACH(ra_prefix_conf, &ra_iface->prefixes, entry) {
ndopt_pi = (struct nd_opt_prefix_info *)p;
memset(ndopt_pi, 0, sizeof(*ndopt_pi));
ndopt_pi->nd_opt_pi_type = ND_OPT_PREFIX_INFORMATION;
@@ -1182,7 +1182,7 @@ build_packet(struct ra_iface *ra_iface)
ndopt_rdnss->nd_opt_rdnss_lifetime =
htonl(ra_iface_conf->ra_options.rdns_lifetime);
p += sizeof(struct nd_opt_rdnss);
- SIMPLEQ_FOREACH(ra_rdnss,
+ STAILQ_FOREACH(ra_rdnss,
&ra_iface_conf->ra_options.ra_rdnss_list, entry) {
memcpy(p, &ra_rdnss->rdnss, sizeof(ra_rdnss->rdnss));
p += sizeof(ra_rdnss->rdnss);
@@ -1200,7 +1200,7 @@ build_packet(struct ra_iface *ra_iface)
htonl(ra_iface_conf->ra_options.rdns_lifetime);
p += sizeof(struct nd_opt_dnssl);
- SIMPLEQ_FOREACH(ra_dnssl,
+ STAILQ_FOREACH(ra_dnssl,
&ra_iface_conf->ra_options.ra_dnssl_list, entry) {
label_start = ra_dnssl->search;
while ((label_end = strchr(label_start, '.')) != NULL) {
Index: rad/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/rad/parse.y,v
retrieving revision 1.16
diff -u -p -r1.16 parse.y
--- rad/parse.y 30 Mar 2020 17:47:48 -0000 1.16
+++ rad/parse.y 25 Dec 2020 16:21:30 -0000
@@ -342,7 +342,7 @@ nserveroptsl : STRING {
== NULL)
err(1, "%s", __func__);
memcpy(&ra_rdnss_conf->rdnss, &addr, sizeof(addr));
- SIMPLEQ_INSERT_TAIL(&ra_options->ra_rdnss_list,
+ STAILQ_INSERT_TAIL(&ra_options->ra_rdnss_list,
ra_rdnss_conf, entry);
ra_options->rdnss_count++;
}
@@ -381,7 +381,7 @@ searchoptsl : STRING {
YYERROR;
}
}
- SIMPLEQ_INSERT_TAIL(&ra_options->ra_dnssl_list,
+ STAILQ_INSERT_TAIL(&ra_options->ra_dnssl_list,
ra_dnssl_conf, entry);
ra_options->dnssl_len += len + 1;
}
@@ -835,9 +835,9 @@ parse_config(char *filename)
return (NULL);
}
- if (!SIMPLEQ_EMPTY(&conf->ra_options.ra_rdnss_list) ||
- !SIMPLEQ_EMPTY(&conf->ra_options.ra_dnssl_list)) {
- SIMPLEQ_FOREACH(iface, &conf->ra_iface_list, entry)
+ if (!STAILQ_EMPTY(&conf->ra_options.ra_rdnss_list) ||
+ !STAILQ_EMPTY(&conf->ra_options.ra_dnssl_list)) {
+ STAILQ_FOREACH(iface, &conf->ra_iface_list, entry)
copy_dns_options(&conf->ra_options,
&iface->ra_options);
}
@@ -851,22 +851,22 @@ copy_dns_options(const struct ra_options
struct ra_rdnss_conf *ra_rdnss, *nra_rdnss;
struct ra_dnssl_conf *ra_dnssl, *nra_dnssl;
- if (SIMPLEQ_EMPTY(&dst->ra_rdnss_list)) {
- SIMPLEQ_FOREACH(ra_rdnss, &src->ra_rdnss_list, entry) {
+ if (STAILQ_EMPTY(&dst->ra_rdnss_list)) {
+ STAILQ_FOREACH(ra_rdnss, &src->ra_rdnss_list, entry) {
if ((nra_rdnss = calloc(1, sizeof(*nra_rdnss))) == NULL)
errx(1, "%s", __func__);
memcpy(nra_rdnss, ra_rdnss, sizeof(*nra_rdnss));
- SIMPLEQ_INSERT_TAIL(&dst->ra_rdnss_list, nra_rdnss,
+ STAILQ_INSERT_TAIL(&dst->ra_rdnss_list, nra_rdnss,
entry);
}
dst->rdnss_count = src->rdnss_count;
}
- if (SIMPLEQ_EMPTY(&dst->ra_dnssl_list)) {
- SIMPLEQ_FOREACH(ra_dnssl, &src->ra_dnssl_list, entry) {
+ if (STAILQ_EMPTY(&dst->ra_dnssl_list)) {
+ STAILQ_FOREACH(ra_dnssl, &src->ra_dnssl_list, entry) {
if ((nra_dnssl = calloc(1, sizeof(*nra_dnssl))) == NULL)
errx(1, "%s", __func__);
memcpy(nra_dnssl, ra_dnssl, sizeof(*nra_dnssl));
- SIMPLEQ_INSERT_TAIL(&dst->ra_dnssl_list, nra_dnssl,
+ STAILQ_INSERT_TAIL(&dst->ra_dnssl_list, nra_dnssl,
entry);
}
dst->dnssl_len = src->dnssl_len;
@@ -953,7 +953,7 @@ conf_get_ra_prefix(struct in6_addr *addr
if (ra_iface_conf->autoprefix != NULL)
return (ra_iface_conf->autoprefix);
} else {
- SIMPLEQ_FOREACH(prefix, &ra_iface_conf->ra_prefix_list, entry) {
+ STAILQ_FOREACH(prefix, &ra_iface_conf->ra_prefix_list, entry) {
if (prefix->prefixlen == prefixlen && memcmp(addr,
&prefix->prefix, sizeof(*addr)) == 0)
return (prefix);
@@ -973,7 +973,7 @@ conf_get_ra_prefix(struct in6_addr *addr
ra_iface_conf->autoprefix = prefix;
else {
prefix->prefix = *addr;
- SIMPLEQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list, prefix,
+ STAILQ_INSERT_TAIL(&ra_iface_conf->ra_prefix_list, prefix,
entry);
}
@@ -986,7 +986,7 @@ conf_get_ra_iface(char *name)
struct ra_iface_conf *iface;
size_t n;
- SIMPLEQ_FOREACH(iface, &conf->ra_iface_list, entry) {
+ STAILQ_FOREACH(iface, &conf->ra_iface_list, entry) {
if (strcmp(name, iface->name) == 0)
return (iface);
}
@@ -1001,13 +1001,13 @@ conf_get_ra_iface(char *name)
/* Inherit attributes set in global section. */
iface->ra_options = conf->ra_options;
- SIMPLEQ_INIT(&iface->ra_prefix_list);
- SIMPLEQ_INIT(&iface->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&iface->ra_prefix_list);
+ STAILQ_INIT(&iface->ra_options.ra_rdnss_list);
iface->ra_options.rdnss_count = 0;
- SIMPLEQ_INIT(&iface->ra_options.ra_dnssl_list);
+ STAILQ_INIT(&iface->ra_options.ra_dnssl_list);
iface->ra_options.dnssl_len = 0;
- SIMPLEQ_INSERT_TAIL(&conf->ra_iface_list, iface, entry);
+ STAILQ_INSERT_TAIL(&conf->ra_iface_list, iface, entry);
return (iface);
}
@@ -1019,8 +1019,8 @@ clear_config(struct rad_conf *xconf)
free_dns_options(&xconf->ra_options);
- while((iface = SIMPLEQ_FIRST(&xconf->ra_iface_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&xconf->ra_iface_list, entry);
+ while((iface = STAILQ_FIRST(&xconf->ra_iface_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&xconf->ra_iface_list, entry);
free_ra_iface_conf(iface);
}
Index: rad/printconf.c
===================================================================
RCS file: /cvs/src/usr.sbin/rad/printconf.c,v
retrieving revision 1.5
diff -u -p -r1.5 printconf.c
--- rad/printconf.c 3 Aug 2018 13:14:46 -0000 1.5
+++ rad/printconf.c 25 Dec 2020 16:21:30 -0000
@@ -61,13 +61,13 @@ print_ra_options(const char *indent, con
if (ra_options->mtu > 0)
printf("%smtu %u\n", indent, ra_options->mtu);
- if (!SIMPLEQ_EMPTY(&ra_options->ra_rdnss_list) ||
- !SIMPLEQ_EMPTY(&ra_options->ra_dnssl_list)) {
+ if (!STAILQ_EMPTY(&ra_options->ra_rdnss_list) ||
+ !STAILQ_EMPTY(&ra_options->ra_dnssl_list)) {
printf("%sdns {\n", indent);
printf("%s\tlifetime %u\n", indent, ra_options->rdns_lifetime);
- if (!SIMPLEQ_EMPTY(&ra_options->ra_rdnss_list)) {
+ if (!STAILQ_EMPTY(&ra_options->ra_rdnss_list)) {
printf("%s\tnameserver {\n", indent);
- SIMPLEQ_FOREACH(ra_rdnss,
+ STAILQ_FOREACH(ra_rdnss,
&ra_options->ra_rdnss_list, entry) {
inet_ntop(AF_INET6, &ra_rdnss->rdnss,
buf, sizeof(buf));
@@ -75,9 +75,9 @@ print_ra_options(const char *indent, con
}
printf("%s\t}\n", indent);
}
- if (!SIMPLEQ_EMPTY(&ra_options->ra_dnssl_list)) {
+ if (!STAILQ_EMPTY(&ra_options->ra_dnssl_list)) {
printf("%s\tsearch {\n", indent);
- SIMPLEQ_FOREACH(ra_dnssl,
+ STAILQ_FOREACH(ra_dnssl,
&ra_options->ra_dnssl_list, entry)
printf("%s\t\t%s\n", indent, ra_dnssl->search);
printf("%s\t}\n", indent);
@@ -107,7 +107,7 @@ print_config(struct rad_conf *conf)
print_ra_options("", &conf->ra_options);
printf("\n");
- SIMPLEQ_FOREACH(iface, &conf->ra_iface_list, entry) {
+ STAILQ_FOREACH(iface, &conf->ra_iface_list, entry) {
printf("interface %s {\n", iface->name);
print_ra_options("\t", &iface->ra_options);
@@ -119,7 +119,7 @@ print_config(struct rad_conf *conf)
} else
printf("\tno auto prefix\n");
- SIMPLEQ_FOREACH(prefix, &iface->ra_prefix_list, entry) {
+ STAILQ_FOREACH(prefix, &iface->ra_prefix_list, entry) {
bufp = inet_net_ntop(AF_INET6, &prefix->prefix,
prefix->prefixlen, buf, sizeof(buf));
printf("\tprefix %s {\n", bufp);
Index: rad/rad.c
===================================================================
RCS file: /cvs/src/usr.sbin/rad/rad.c,v
retrieving revision 1.24
diff -u -p -r1.24 rad.c
--- rad/rad.c 1 Dec 2020 17:31:37 -0000 1.24
+++ rad/rad.c 25 Dec 2020 16:21:30 -0000
@@ -576,13 +576,13 @@ main_imsg_send_config(struct rad_conf *x
return (-1);
/* send global dns options to children */
- SIMPLEQ_FOREACH(ra_rdnss_conf, &xconf->ra_options.ra_rdnss_list,
+ STAILQ_FOREACH(ra_rdnss_conf, &xconf->ra_options.ra_rdnss_list,
entry) {
if (main_sendboth(IMSG_RECONF_RA_RDNSS, ra_rdnss_conf,
sizeof(*ra_rdnss_conf)) == -1)
return (-1);
}
- SIMPLEQ_FOREACH(ra_dnssl_conf, &xconf->ra_options.ra_dnssl_list,
+ STAILQ_FOREACH(ra_dnssl_conf, &xconf->ra_options.ra_dnssl_list,
entry) {
if (main_sendboth(IMSG_RECONF_RA_DNSSL, ra_dnssl_conf,
sizeof(*ra_dnssl_conf)) == -1)
@@ -590,7 +590,7 @@ main_imsg_send_config(struct rad_conf *x
}
/* Send the interface list to children. */
- SIMPLEQ_FOREACH(ra_iface_conf, &xconf->ra_iface_list, entry) {
+ STAILQ_FOREACH(ra_iface_conf, &xconf->ra_iface_list, entry) {
if (main_sendboth(IMSG_RECONF_RA_IFACE, ra_iface_conf,
sizeof(*ra_iface_conf)) == -1)
return (-1);
@@ -600,19 +600,19 @@ main_imsg_send_config(struct rad_conf *x
sizeof(*ra_iface_conf->autoprefix)) == -1)
return (-1);
}
- SIMPLEQ_FOREACH(ra_prefix_conf, &ra_iface_conf->ra_prefix_list,
+ STAILQ_FOREACH(ra_prefix_conf, &ra_iface_conf->ra_prefix_list,
entry) {
if (main_sendboth(IMSG_RECONF_RA_PREFIX,
ra_prefix_conf, sizeof(*ra_prefix_conf)) == -1)
return (-1);
}
- SIMPLEQ_FOREACH(ra_rdnss_conf,
+ STAILQ_FOREACH(ra_rdnss_conf,
&ra_iface_conf->ra_options.ra_rdnss_list, entry) {
if (main_sendboth(IMSG_RECONF_RA_RDNSS, ra_rdnss_conf,
sizeof(*ra_rdnss_conf)) == -1)
return (-1);
}
- SIMPLEQ_FOREACH(ra_dnssl_conf,
+ STAILQ_FOREACH(ra_dnssl_conf,
&ra_iface_conf->ra_options.ra_dnssl_list, entry) {
if (main_sendboth(IMSG_RECONF_RA_DNSSL, ra_dnssl_conf,
sizeof(*ra_dnssl_conf)) == -1)
@@ -647,9 +647,9 @@ free_ra_iface_conf(struct ra_iface_conf
free(ra_iface_conf->autoprefix);
- while ((prefix = SIMPLEQ_FIRST(&ra_iface_conf->ra_prefix_list)) !=
+ while ((prefix = STAILQ_FIRST(&ra_iface_conf->ra_prefix_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&ra_iface_conf->ra_prefix_list, entry);
+ STAILQ_REMOVE_HEAD(&ra_iface_conf->ra_prefix_list, entry);
free(prefix);
}
@@ -664,14 +664,14 @@ free_dns_options(struct ra_options_conf
struct ra_rdnss_conf *ra_rdnss;
struct ra_dnssl_conf *ra_dnssl;
- while ((ra_rdnss = SIMPLEQ_FIRST(&ra_options->ra_rdnss_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ra_options->ra_rdnss_list, entry);
+ while ((ra_rdnss = STAILQ_FIRST(&ra_options->ra_rdnss_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ra_options->ra_rdnss_list, entry);
free(ra_rdnss);
}
ra_options->rdnss_count = 0;
- while ((ra_dnssl = SIMPLEQ_FIRST(&ra_options->ra_dnssl_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&ra_options->ra_dnssl_list, entry);
+ while ((ra_dnssl = STAILQ_FIRST(&ra_options->ra_dnssl_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&ra_options->ra_dnssl_list, entry);
free(ra_dnssl);
}
ra_options->dnssl_len = 0;
@@ -683,23 +683,23 @@ merge_config(struct rad_conf *conf, stru
struct ra_iface_conf *ra_iface_conf;
/* Remove & discard existing interfaces. */
- while ((ra_iface_conf = SIMPLEQ_FIRST(&conf->ra_iface_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->ra_iface_list, entry);
+ while ((ra_iface_conf = STAILQ_FIRST(&conf->ra_iface_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&conf->ra_iface_list, entry);
free_ra_iface_conf(ra_iface_conf);
}
free_dns_options(&conf->ra_options);
conf->ra_options = xconf->ra_options;
- SIMPLEQ_INIT(&conf->ra_options.ra_rdnss_list);
- SIMPLEQ_INIT(&conf->ra_options.ra_dnssl_list);
+ STAILQ_INIT(&conf->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&conf->ra_options.ra_dnssl_list);
/* Add new interfaces. */
- SIMPLEQ_CONCAT(&conf->ra_iface_list, &xconf->ra_iface_list);
+ STAILQ_CONCAT(&conf->ra_iface_list, &xconf->ra_iface_list);
/* Add dns options */
- SIMPLEQ_CONCAT(&conf->ra_options.ra_rdnss_list,
+ STAILQ_CONCAT(&conf->ra_options.ra_rdnss_list,
&xconf->ra_options.ra_rdnss_list);
- SIMPLEQ_CONCAT(&conf->ra_options.ra_dnssl_list,
+ STAILQ_CONCAT(&conf->ra_options.ra_dnssl_list,
&xconf->ra_options.ra_dnssl_list);
free(xconf);
}
@@ -713,7 +713,7 @@ config_new_empty(void)
if (xconf == NULL)
fatal(NULL);
- SIMPLEQ_INIT(&xconf->ra_iface_list);
+ STAILQ_INIT(&xconf->ra_iface_list);
xconf->ra_options.dfr = 1;
xconf->ra_options.cur_hl = 0;
@@ -724,8 +724,8 @@ config_new_empty(void)
xconf->ra_options.retrans_timer = 0;
xconf->ra_options.mtu = 0;
xconf->ra_options.rdns_lifetime = DEFAULT_RDNS_LIFETIME;
- SIMPLEQ_INIT(&xconf->ra_options.ra_rdnss_list);
- SIMPLEQ_INIT(&xconf->ra_options.ra_dnssl_list);
+ STAILQ_INIT(&xconf->ra_options.ra_rdnss_list);
+ STAILQ_INIT(&xconf->ra_options.ra_dnssl_list);
return (xconf);
}
Index: rad/rad.h
===================================================================
RCS file: /cvs/src/usr.sbin/rad/rad.h,v
retrieving revision 1.19
diff -u -p -r1.19 rad.h
--- rad/rad.h 1 Dec 2020 17:31:37 -0000 1.19
+++ rad/rad.h 25 Dec 2020 16:21:30 -0000
@@ -80,11 +80,11 @@ enum imsg_type {
/* RFC 8106 */
struct ra_rdnss_conf {
- SIMPLEQ_ENTRY(ra_rdnss_conf) entry;
+ STAILQ_ENTRY(ra_rdnss_conf) entry;
struct in6_addr rdnss;
};
struct ra_dnssl_conf {
- SIMPLEQ_ENTRY(ra_dnssl_conf) entry;
+ STAILQ_ENTRY(ra_dnssl_conf) entry;
char search[MAX_SEARCH];
};
@@ -99,15 +99,15 @@ struct ra_options_conf {
uint32_t retrans_timer;
uint32_t mtu;
uint32_t rdns_lifetime;
- SIMPLEQ_HEAD(, ra_rdnss_conf) ra_rdnss_list;
+ STAILQ_HEAD(, ra_rdnss_conf) ra_rdnss_list;
int rdnss_count;
- SIMPLEQ_HEAD(, ra_dnssl_conf) ra_dnssl_list;
+ STAILQ_HEAD(, ra_dnssl_conf) ra_dnssl_list;
int dnssl_len;
};
/* RFC 4861 Section 4.6.2 */
struct ra_prefix_conf {
- SIMPLEQ_ENTRY(ra_prefix_conf) entry;
+ STAILQ_ENTRY(ra_prefix_conf) entry;
struct in6_addr prefix; /* prefix */
int prefixlen; /* prefix length */
uint32_t vltime; /* valid lifetime */
@@ -117,17 +117,17 @@ struct ra_prefix_conf {
};
struct ra_iface_conf {
- SIMPLEQ_ENTRY(ra_iface_conf) entry;
+ STAILQ_ENTRY(ra_iface_conf) entry;
struct ra_options_conf ra_options;
struct ra_prefix_conf *autoprefix;
- SIMPLEQ_HEAD(ra_prefix_conf_head,
+ STAILQ_HEAD(ra_prefix_conf_head,
ra_prefix_conf) ra_prefix_list;
char name[IF_NAMESIZE];
};
struct rad_conf {
struct ra_options_conf ra_options;
- SIMPLEQ_HEAD(ra_iface_conf_head, ra_iface_conf) ra_iface_list;
+ STAILQ_HEAD(ra_iface_conf_head, ra_iface_conf) ra_iface_list;
};
struct imsg_ra_rs {
Index: ripd/parse.y
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/parse.y,v
retrieving revision 1.47
diff -u -p -r1.47 parse.y
--- ripd/parse.y 10 May 2019 01:29:31 -0000 1.47
+++ ripd/parse.y 25 Dec 2020 16:21:30 -0000
@@ -233,7 +233,7 @@ conf_main : SPLIT_HORIZON STRING {
if ($1)
r->type |= REDIST_NO;
- SIMPLEQ_INSERT_TAIL(&conf->redist_list, r,
+ STAILQ_INSERT_TAIL(&conf->redist_list, r,
entry);
conf->redistribute |= REDISTRIBUTE_ON;
@@ -250,7 +250,7 @@ conf_main : SPLIT_HORIZON STRING {
r->type |= REDIST_NO;
free($4);
- SIMPLEQ_INSERT_TAIL(&conf->redist_list, r, entry);
+ STAILQ_INSERT_TAIL(&conf->redist_list, r, entry);
conf->redistribute |= REDISTRIBUTE_ON;
}
| defaults
@@ -781,7 +781,7 @@ parse_config(char *filename, int opts)
conf->opts = opts;
conf->options = OPT_SPLIT_POISONED;
conf->fib_priority = RTP_RIP;
- SIMPLEQ_INIT(&conf->redist_list);
+ STAILQ_INIT(&conf->redist_list);
if ((file = pushfile(filename, !(conf->opts & RIPD_OPT_NOACTION))) ==
NULL) {
free(conf);
Index: ripd/printconf.c
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/printconf.c,v
retrieving revision 1.8
diff -u -p -r1.8 printconf.c
--- ripd/printconf.c 12 May 2019 11:27:08 -0000 1.8
+++ ripd/printconf.c 25 Dec 2020 16:21:30 -0000
@@ -72,7 +72,7 @@ print_redistribute(struct ripd_conf *con
{
struct redistribute *r;
- SIMPLEQ_FOREACH(r, &conf->redist_list, entry) {
+ STAILQ_FOREACH(r, &conf->redist_list, entry) {
switch (r->type & ~REDIST_NO) {
case REDIST_STATIC:
printf("%sredistribute static\n", print_no(r->type));
Index: ripd/rde.c
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/rde.c,v
retrieving revision 1.22
diff -u -p -r1.22 rde.c
--- ripd/rde.c 4 Nov 2018 07:52:55 -0000 1.22
+++ ripd/rde.c 25 Dec 2020 16:21:30 -0000
@@ -149,8 +149,8 @@ rde(struct ripd_conf *xconf, int pipe_pa
rt_init();
/* remove unneeded config stuff */
- while ((r = SIMPLEQ_FIRST(&rdeconf->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&rdeconf->redist_list, entry);
+ while ((r = STAILQ_FIRST(&rdeconf->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&rdeconf->redist_list, entry);
free(r);
}
Index: ripd/ripd.c
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/ripd.c,v
retrieving revision 1.33
diff -u -p -r1.33 ripd.c
--- ripd/ripd.c 8 Aug 2019 16:50:15 -0000 1.33
+++ ripd/ripd.c 25 Dec 2020 16:21:30 -0000
@@ -467,7 +467,7 @@ rip_redistribute(struct kroute *kr)
if (kr->prefix.s_addr == INADDR_ANY && kr->netmask.s_addr == INADDR_ANY)
is_default = 1;
- SIMPLEQ_FOREACH(r, &conf->redist_list, entry) {
+ STAILQ_FOREACH(r, &conf->redist_list, entry) {
switch (r->type & ~REDIST_NO) {
case REDIST_LABEL:
if (kr->rtlabel == r->label)
Index: ripd/ripd.h
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/ripd.h,v
retrieving revision 1.26
diff -u -p -r1.26 ripd.h
--- ripd/ripd.h 31 Dec 2018 20:34:16 -0000 1.26
+++ ripd/ripd.h 25 Dec 2020 16:21:30 -0000
@@ -221,7 +221,7 @@ enum {
#define REDIST_NO 0x20
struct redistribute {
- SIMPLEQ_ENTRY(redistribute) entry;
+ STAILQ_ENTRY(redistribute) entry;
struct in_addr addr;
struct in_addr mask;
u_int32_t metric;
@@ -233,7 +233,7 @@ struct ripd_conf {
struct event ev;
struct event report_timer;
LIST_HEAD(, iface) iface_list;
- SIMPLEQ_HEAD(, redistribute) redist_list;
+ STAILQ_HEAD(, redistribute) redist_list;
u_int32_t opts;
#define RIPD_OPT_VERBOSE 0x00000001
Index: ripd/ripe.c
===================================================================
RCS file: /cvs/src/usr.sbin/ripd/ripe.c,v
retrieving revision 1.25
diff -u -p -r1.25 ripe.c
--- ripd/ripe.c 11 Dec 2019 21:04:59 -0000 1.25
+++ ripd/ripe.c 25 Dec 2020 16:21:30 -0000
@@ -176,8 +176,8 @@ ripe(struct ripd_conf *xconf, int pipe_p
event_add(&oeconf->ev, NULL);
/* remove unneeded config stuff */
- while ((r = SIMPLEQ_FIRST(&oeconf->redist_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&oeconf->redist_list, entry);
+ while ((r = STAILQ_FIRST(&oeconf->redist_list)) != NULL) {
+ STAILQ_REMOVE_HEAD(&oeconf->redist_list, entry);
free(r);
}
Index: sasyncd/net.c
===================================================================
RCS file: /cvs/src/usr.sbin/sasyncd/net.c,v
retrieving revision 1.23
diff -u -p -r1.23 net.c
--- sasyncd/net.c 12 Dec 2015 20:04:23 -0000 1.23
+++ sasyncd/net.c 25 Dec 2020 16:21:30 -0000
@@ -57,7 +57,7 @@ struct msg {
};
struct qmsg {
- SIMPLEQ_ENTRY(qmsg) next;
+ STAILQ_ENTRY(qmsg) next;
struct msg *msg;
};
@@ -287,7 +287,7 @@ net_init(void)
for (p = LIST_FIRST(&cfgstate.peerlist); p; p = LIST_NEXT(p, link)) {
p->socket = -1;
- SIMPLEQ_INIT(&p->msgs);
+ STAILQ_INIT(&p->msgs);
}
net_check_peers(0);
@@ -311,7 +311,7 @@ net_enqueue(struct syncpeer *p, struct m
qm->msg = m;
m->refcnt++;
- SIMPLEQ_INSERT_TAIL(&p->msgs, qm, next);
+ STAILQ_INSERT_TAIL(&p->msgs, qm, next);
return;
}
@@ -425,7 +425,7 @@ net_set_pending_wfds(fd_set *fds)
int max_fd = -1;
for (p = LIST_FIRST(&cfgstate.peerlist); p; p = LIST_NEXT(p, link))
- if (p->socket > -1 && SIMPLEQ_FIRST(&p->msgs)) {
+ if (p->socket > -1 && STAILQ_FIRST(&p->msgs)) {
FD_SET(p->socket, fds);
if (p->socket > max_fd)
max_fd = p->socket;
@@ -577,7 +577,7 @@ net_send_messages(fd_set *fds)
for (p = LIST_FIRST(&cfgstate.peerlist); p; p = LIST_NEXT(p, link)) {
if (p->socket < 0 || !FD_ISSET(p->socket, fds))
continue;
- qm = SIMPLEQ_FIRST(&p->msgs);
+ qm = STAILQ_FIRST(&p->msgs);
if (!qm) {
/* XXX Log */
continue;
@@ -599,7 +599,7 @@ net_send_messages(fd_set *fds)
}
/* cleanup */
- SIMPLEQ_REMOVE_HEAD(&p->msgs, next);
+ STAILQ_REMOVE_HEAD(&p->msgs, next);
free(qm);
if (--m->refcnt < 1) {
@@ -631,8 +631,8 @@ net_shutdown(void)
int i;
while ((p = LIST_FIRST(&cfgstate.peerlist))) {
- while ((qm = SIMPLEQ_FIRST(&p->msgs))) {
- SIMPLEQ_REMOVE_HEAD(&p->msgs, next);
+ while ((qm = STAILQ_FIRST(&p->msgs))) {
+ STAILQ_REMOVE_HEAD(&p->msgs, next);
m = qm->msg;
if (--m->refcnt < 1) {
free(m->buf);
Index: sasyncd/net.h
===================================================================
RCS file: /cvs/src/usr.sbin/sasyncd/net.h,v
retrieving revision 1.5
diff -u -p -r1.5 net.h
--- sasyncd/net.h 2 Jun 2006 20:09:43 -0000 1.5
+++ sasyncd/net.h 25 Dec 2020 16:21:30 -0000
@@ -39,7 +39,7 @@ struct syncpeer {
int socket;
enum RUNSTATE runstate;
- SIMPLEQ_HEAD(, qmsg) msgs;
+ STAILQ_HEAD(, qmsg) msgs;
};
/* Control message types. */
Index: sasyncd/pfkey.c
===================================================================
RCS file: /cvs/src/usr.sbin/sasyncd/pfkey.c,v
retrieving revision 1.29
diff -u -p -r1.29 pfkey.c
--- sasyncd/pfkey.c 28 Jun 2018 02:37:26 -0000 1.29
+++ sasyncd/pfkey.c 25 Dec 2020 16:21:30 -0000
@@ -51,13 +51,13 @@
struct pfkey_msg
{
- SIMPLEQ_ENTRY(pfkey_msg) next;
+ STAILQ_ENTRY(pfkey_msg) next;
u_int8_t *buf;
u_int32_t len;
};
-SIMPLEQ_HEAD(, pfkey_msg) pfkey_msglist;
+STAILQ_HEAD(, pfkey_msg) pfkey_msglist;
static const char *msgtypes[] = {
"RESERVED", "GETSPI", "UPDATE", "ADD", "DELETE", "GET", "ACQUIRE",
@@ -358,7 +358,7 @@ pfkey_init(int reinit)
if (reinit)
return (fd > -1 ? 0 : -1);
- SIMPLEQ_INIT(&pfkey_msglist);
+ STAILQ_INIT(&pfkey_msglist);
return 0;
}
@@ -372,7 +372,7 @@ pfkey_set_rfd(fd_set *fds)
void
pfkey_set_pending_wfd(fd_set *fds)
{
- if (cfgstate.pfkey_socket != -1 && SIMPLEQ_FIRST(&pfkey_msglist))
+ if (cfgstate.pfkey_socket != -1 && STAILQ_FIRST(&pfkey_msglist))
FD_SET(cfgstate.pfkey_socket, fds);
}
@@ -387,7 +387,7 @@ pfkey_read_message(fd_set *fds)
void
pfkey_send_message(fd_set *fds)
{
- struct pfkey_msg *pmsg = SIMPLEQ_FIRST(&pfkey_msglist);
+ struct pfkey_msg *pmsg = STAILQ_FIRST(&pfkey_msglist);
if (!pmsg || !FD_ISSET(cfgstate.pfkey_socket, fds))
return;
@@ -398,7 +398,7 @@ pfkey_send_message(fd_set *fds)
(void)pfkey_write(pmsg->buf, pmsg->len);
- SIMPLEQ_REMOVE_HEAD(&pfkey_msglist, next);
+ STAILQ_REMOVE_HEAD(&pfkey_msglist, next);
free(pmsg->buf);
free(pmsg);
@@ -428,17 +428,17 @@ pfkey_queue_message(u_int8_t *data, u_in
pfkey_print_type(sadb), sadb->sadb_msg_len * CHUNK,
sadb->sadb_msg_seq);
- SIMPLEQ_INSERT_TAIL(&pfkey_msglist, pmsg, next);
+ STAILQ_INSERT_TAIL(&pfkey_msglist, pmsg, next);
return 0;
}
void
pfkey_shutdown(void)
{
- struct pfkey_msg *p = SIMPLEQ_FIRST(&pfkey_msglist);
+ struct pfkey_msg *p = STAILQ_FIRST(&pfkey_msglist);
- while ((p = SIMPLEQ_FIRST(&pfkey_msglist))) {
- SIMPLEQ_REMOVE_HEAD(&pfkey_msglist, next);
+ while ((p = STAILQ_FIRST(&pfkey_msglist))) {
+ STAILQ_REMOVE_HEAD(&pfkey_msglist, next);
free(p->buf);
free(p);
}
Index: syslogd/syslogd.c
===================================================================
RCS file: /cvs/src/usr.sbin/syslogd/syslogd.c,v
retrieving revision 1.264
diff -u -p -r1.264 syslogd.c
--- syslogd/syslogd.c 14 Sep 2020 20:36:01 -0000 1.264
+++ syslogd/syslogd.c 25 Dec 2020 16:21:30 -0000
@@ -141,7 +141,7 @@ const char ctty[] = _PATH_CONSOLE;
*/
struct filed {
- SIMPLEQ_ENTRY(filed) f_next; /* next in linked list */
+ STAILQ_ENTRY(filed) f_next; /* next in linked list */
int f_type; /* entry type, see below */
int f_file; /* file descriptor */
time_t f_time; /* time this was last written */
@@ -212,7 +212,7 @@ char *TypeNames[] = {
"PIPE", "FORWTCP", "FORWTLS",
};
-SIMPLEQ_HEAD(filed_list, filed) Files;
+STAILQ_HEAD(filed_list, filed) Files;
struct filed consfile;
int Debug; /* debug flag */
@@ -1819,7 +1819,7 @@ logline(int pri, int flags, char *from,
init_dropped++;
return;
}
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
/* skip messages that are incorrect priority */
if (f->f_pmask[fac] < prilev ||
f->f_pmask[fac] == INTERNAL_NOPRI)
@@ -2293,7 +2293,7 @@ die(int signo)
{
struct filed *f;
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
/* flush any pending output */
if (f->f_prevcount)
fprintlog(f, 0, (char *)NULL);
@@ -2342,10 +2342,10 @@ init(void)
* Close all open log files.
*/
Initialized = 0;
- SIMPLEQ_INIT(&mb);
- while (!SIMPLEQ_EMPTY(&Files)) {
- f = SIMPLEQ_FIRST(&Files);
- SIMPLEQ_REMOVE_HEAD(&Files, f_next);
+ STAILQ_INIT(&mb);
+ while (!STAILQ_EMPTY(&Files)) {
+ f = STAILQ_FIRST(&Files);
+ STAILQ_REMOVE_HEAD(&Files, f_next);
/* flush any pending output */
if (f->f_prevcount)
fprintlog(f, 0, (char *)NULL);
@@ -2380,18 +2380,18 @@ init(void)
f->f_program = NULL;
f->f_hostname = NULL;
log_debug("add %p to mb", f);
- SIMPLEQ_INSERT_HEAD(&mb, f, f_next);
+ STAILQ_INSERT_HEAD(&mb, f, f_next);
} else
free(f);
}
- SIMPLEQ_INIT(&Files);
+ STAILQ_INIT(&Files);
/* open the configuration file */
if ((cf = priv_open_config()) == NULL) {
log_debug("cannot open %s", ConfFile);
- SIMPLEQ_INSERT_TAIL(&Files,
+ STAILQ_INSERT_TAIL(&Files,
cfline("*.ERR\t/dev/console", "*", "*"), f_next);
- SIMPLEQ_INSERT_TAIL(&Files,
+ STAILQ_INSERT_TAIL(&Files,
cfline("*.PANIC\t*", "*", "*"), f_next);
Initialized = 1;
dropped_warn(&init_dropped, "during initialization");
@@ -2445,20 +2445,20 @@ init(void)
*p = '\0';
f = cfline(cline, progblock, hostblock);
if (f != NULL)
- SIMPLEQ_INSERT_TAIL(&Files, f, f_next);
+ STAILQ_INSERT_TAIL(&Files, f, f_next);
}
free(cline);
if (!feof(cf))
fatal("read config file");
/* Match and initialize the memory buffers */
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
if (f->f_type != F_MEMBUF)
continue;
log_debug("Initialize membuf %s at %p",
f->f_un.f_mb.f_mname, f);
- SIMPLEQ_FOREACH(m, &mb, f_next) {
+ STAILQ_FOREACH(m, &mb, f_next) {
if (m->f_un.f_mb.f_rb == NULL)
continue;
if (strcmp(m->f_un.f_mb.f_mname,
@@ -2480,9 +2480,9 @@ init(void)
}
/* make sure remaining buffers are freed */
- while (!SIMPLEQ_EMPTY(&mb)) {
- m = SIMPLEQ_FIRST(&mb);
- SIMPLEQ_REMOVE_HEAD(&mb, f_next);
+ while (!STAILQ_EMPTY(&mb)) {
+ m = STAILQ_FIRST(&mb);
+ STAILQ_REMOVE_HEAD(&mb, f_next);
if (m->f_un.f_mb.f_rb != NULL) {
log_warnx("mismatched membuf");
ringbuf_free(m->f_un.f_mb.f_rb);
@@ -2515,7 +2515,7 @@ init(void)
}
if (Debug) {
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
for (i = 0; i <= LOG_NFACILITIES; i++)
if (f->f_pmask[i] == INTERNAL_NOPRI)
printf("X ");
@@ -2567,7 +2567,7 @@ find_dup(struct filed *f)
{
struct filed *list;
- SIMPLEQ_FOREACH(list, &Files, f_next) {
+ STAILQ_FOREACH(list, &Files, f_next) {
if (list->f_quick || f->f_quick)
continue;
switch (list->f_type) {
@@ -3000,7 +3000,7 @@ markit(void)
MarkSeq = 0;
}
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
if (f->f_prevcount && now.tv_sec >= REPEATTIME(f)) {
log_debug("flush %s: repeated %d times, %d sec",
TypeNames[f->f_type], f->f_prevcount,
@@ -3130,7 +3130,7 @@ ctlconn_cleanup(void)
event_add(ev_ctlaccept, NULL);
if (ctl_state == CTL_WRITING_CONT_REPLY)
- SIMPLEQ_FOREACH(f, &Files, f_next)
+ STAILQ_FOREACH(f, &Files, f_next)
if (f->f_type == F_MEMBUF)
f->f_un.f_mb.f_attached = 0;
@@ -3174,7 +3174,7 @@ static struct filed
{
struct filed *f;
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
if (f->f_type == F_MEMBUF &&
strcmp(f->f_un.f_mb.f_mname, name) == 0)
break;
@@ -3279,7 +3279,7 @@ ctlconn_readcb(int fd, short event, void
}
break;
case CMD_LIST:
- SIMPLEQ_FOREACH(f, &Files, f_next) {
+ STAILQ_FOREACH(f, &Files, f_next) {
if (f->f_type == F_MEMBUF) {
strlcat(reply_text, f->f_un.f_mb.f_mname,
MAX_MEMBUF);
