Mechanically change the forwarder SIMPLEQ to a TAILQ; needed for
future work.
OK?
diff --git parse.y parse.y
index e79260e2be2..fe5247c289c 100644
--- parse.y
+++ parse.y
@@ -342,11 +342,11 @@ forwarderoptsl : STRING port authname dot {
}
if ($4 == DOT)
- SIMPLEQ_INSERT_TAIL(
+ TAILQ_INSERT_TAIL(
&conf->uw_dot_forwarder_list,
uw_fwd, entry);
else {
- SIMPLEQ_INSERT_TAIL(
+ TAILQ_INSERT_TAIL(
&conf->uw_forwarder_list,
uw_fwd, entry);
}
@@ -893,14 +893,15 @@ clear_config(struct uw_conf *xconf)
{
struct uw_forwarder *uw_forwarder;
- while ((uw_forwarder = SIMPLEQ_FIRST(&xconf->uw_forwarder_list)) !=
+ while ((uw_forwarder = TAILQ_FIRST(&xconf->uw_forwarder_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&xconf->uw_forwarder_list, entry);
+ TAILQ_REMOVE(&xconf->uw_forwarder_list, uw_forwarder, entry);
free(uw_forwarder);
}
- while ((uw_forwarder = SIMPLEQ_FIRST(&xconf->uw_dot_forwarder_list)) !=
+ while ((uw_forwarder = TAILQ_FIRST(&xconf->uw_dot_forwarder_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&xconf->uw_dot_forwarder_list, entry);
+ TAILQ_REMOVE(&xconf->uw_dot_forwarder_list, uw_forwarder,
+ entry);
free(uw_forwarder);
}
diff --git printconf.c printconf.c
index 70c2681fa0a..8067ea1006e 100644
--- printconf.c
+++ printconf.c
@@ -76,15 +76,15 @@ print_config(struct uw_conf *conf)
printf(" }\n");
}
- if (!SIMPLEQ_EMPTY(&conf->uw_forwarder_list) ||
- !SIMPLEQ_EMPTY(&conf->uw_dot_forwarder_list)) {
+ if (!TAILQ_EMPTY(&conf->uw_forwarder_list) ||
+ !TAILQ_EMPTY(&conf->uw_dot_forwarder_list)) {
printf("forwarder {\n");
- SIMPLEQ_FOREACH(uw_forwarder, &conf->uw_forwarder_list, entry) {
+ TAILQ_FOREACH(uw_forwarder, &conf->uw_forwarder_list, entry) {
printf("\t");
print_forwarder(uw_forwarder->name);
printf("\n");
}
- SIMPLEQ_FOREACH(uw_forwarder, &conf->uw_dot_forwarder_list,
+ TAILQ_FOREACH(uw_forwarder, &conf->uw_dot_forwarder_list,
entry) {
printf("\t");
print_forwarder(uw_forwarder->name);
diff --git resolver.c resolver.c
index 05450a84b94..9e9852fe41b 100644
--- resolver.c
+++ resolver.c
@@ -339,7 +339,7 @@ resolver(int debug, int verbose)
new_recursor();
- SIMPLEQ_INIT(&dhcp_forwarder_list);
+ TAILQ_INIT(&dhcp_forwarder_list);
TAILQ_INIT(&trust_anchors);
TAILQ_INIT(&new_trust_anchors);
@@ -867,7 +867,7 @@ parse_dhcp_forwarders(char *forwarders)
struct uw_forwarder *uw_forwarder;
char *ns;
- SIMPLEQ_INIT(&new_forwarder_list);
+ TAILQ_INIT(&new_forwarder_list);
if (forwarders != NULL) {
while((ns = strsep(&forwarders, ",")) != NULL) {
@@ -879,7 +879,7 @@ parse_dhcp_forwarders(char *forwarders)
sizeof(uw_forwarder->name)) >=
sizeof(uw_forwarder->name))
fatalx("strlcpy");
- SIMPLEQ_INSERT_TAIL(&new_forwarder_list, uw_forwarder,
+ TAILQ_INSERT_TAIL(&new_forwarder_list, uw_forwarder,
entry);
}
}
@@ -893,8 +893,8 @@ parse_dhcp_forwarders(char *forwarders)
check_captive_portal(1);
} else {
while ((uw_forwarder =
- SIMPLEQ_FIRST(&new_forwarder_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(&new_forwarder_list, entry);
+ TAILQ_FIRST(&new_forwarder_list)) != NULL) {
+ TAILQ_REMOVE(&new_forwarder_list, uw_forwarder, entry);
free(uw_forwarder);
}
log_debug("%s: forwarders didn't change", __func__);
@@ -920,7 +920,7 @@ new_forwarders(int oppdot)
free_resolver(resolvers[UW_RES_DHCP]);
resolvers[UW_RES_DHCP] = NULL;
- if (SIMPLEQ_EMPTY(&dhcp_forwarder_list))
+ if (TAILQ_EMPTY(&dhcp_forwarder_list))
return;
if (TAILQ_EMPTY(&trust_anchors))
@@ -938,7 +938,7 @@ new_asr_forwarders(void)
free_resolver(resolvers[UW_RES_ASR]);
resolvers[UW_RES_ASR] = NULL;
- if (SIMPLEQ_EMPTY(&dhcp_forwarder_list))
+ if (TAILQ_EMPTY(&dhcp_forwarder_list))
return;
log_debug("%s: create_resolver", __func__);
@@ -953,7 +953,7 @@ new_static_forwarders(int oppdot)
free_resolver(resolvers[UW_RES_FORWARDER]);
resolvers[UW_RES_FORWARDER] = NULL;
- if (SIMPLEQ_EMPTY(&resolver_conf->uw_forwarder_list))
+ if (TAILQ_EMPTY(&resolver_conf->uw_forwarder_list))
return;
if (TAILQ_EMPTY(&trust_anchors))
@@ -971,7 +971,7 @@ new_static_dot_forwarders(void)
free_resolver(resolvers[UW_RES_DOT]);
resolvers[UW_RES_DOT] = NULL;
- if (SIMPLEQ_EMPTY(&resolver_conf->uw_dot_forwarder_list))
+ if (TAILQ_EMPTY(&resolver_conf->uw_dot_forwarder_list))
return;
if (TAILQ_EMPTY(&trust_anchors))
@@ -1007,11 +1007,11 @@ create_resolver(enum uw_resolver_type type, int oppdot)
switch (type) {
case UW_RES_ASR:
- if (SIMPLEQ_EMPTY(&dhcp_forwarder_list)) {
+ if (TAILQ_EMPTY(&dhcp_forwarder_list)) {
free(res);
return (NULL);
}
- SIMPLEQ_FOREACH(uw_forwarder, &dhcp_forwarder_list, entry) {
+ TAILQ_FOREACH(uw_forwarder, &dhcp_forwarder_list, entry) {
tmp = resolv_conf;
if (asprintf(&resolv_conf, "%snameserver %s\n", tmp ==
NULL ? "" : tmp, uw_forwarder->name) == -1) {
@@ -1170,7 +1170,7 @@ set_forwarders(struct uw_resolver *res, struct
uw_forwarder_head
{
struct uw_forwarder *uw_forwarder;
- SIMPLEQ_FOREACH(uw_forwarder, uw_forwarder_list, entry)
+ TAILQ_FOREACH(uw_forwarder, uw_forwarder_list, entry)
ub_ctx_set_fwd(res->ctx, uw_forwarder->name);
}
@@ -1180,7 +1180,7 @@ set_forwarders_oppdot(struct uw_resolver *res, struct
uw_forwarder_head
{
struct uw_forwarder *uw_forwarder;
- SIMPLEQ_FOREACH(uw_forwarder, uw_forwarder_list, entry) {
+ TAILQ_FOREACH(uw_forwarder, uw_forwarder_list, entry) {
char name[1024];
int port = uw_forwarder->port;
if (port == 0)
@@ -1409,14 +1409,14 @@ check_forwarders_changed(struct uw_forwarder_head
*list_a,
{
struct uw_forwarder *a, *b;
- a = SIMPLEQ_FIRST(list_a);
- b = SIMPLEQ_FIRST(list_b);
+ a = TAILQ_FIRST(list_a);
+ b = TAILQ_FIRST(list_b);
while(a != NULL && b != NULL) {
if (strcmp(a->name, b->name) != 0)
return 1;
- a = SIMPLEQ_NEXT(a, entry);
- b = SIMPLEQ_NEXT(b, entry);
+ a = TAILQ_NEXT(a, entry);
+ b = TAILQ_NEXT(b, entry);
}
if (a != NULL || b != NULL)
@@ -1461,14 +1461,14 @@ replace_forwarders(struct uw_forwarder_head *new_list,
struct
struct uw_forwarder *uw_forwarder;
while ((uw_forwarder =
- SIMPLEQ_FIRST(old_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(old_list, entry);
+ TAILQ_FIRST(old_list)) != NULL) {
+ TAILQ_REMOVE(old_list, uw_forwarder, entry);
free(uw_forwarder);
}
- while ((uw_forwarder = SIMPLEQ_FIRST(new_list)) != NULL) {
- SIMPLEQ_REMOVE_HEAD(new_list, entry);
- SIMPLEQ_INSERT_TAIL(old_list, uw_forwarder, entry);
+ while ((uw_forwarder = TAILQ_FIRST(new_list)) != NULL) {
+ TAILQ_REMOVE(new_list, uw_forwarder, entry);
+ TAILQ_INSERT_TAIL(old_list, uw_forwarder, entry);
}
}
diff --git unwind.c unwind.c
index 3e76308712e..02dd9c31a78 100644
--- unwind.c
+++ unwind.c
@@ -742,14 +742,14 @@ main_imsg_send_config(struct uw_conf *xconf)
}
/* send static forwarders to children */
- SIMPLEQ_FOREACH(uw_forwarder, &xconf->uw_forwarder_list, entry) {
+ TAILQ_FOREACH(uw_forwarder, &xconf->uw_forwarder_list, entry) {
if (main_sendall(IMSG_RECONF_FORWARDER, uw_forwarder,
sizeof(*uw_forwarder)) == -1)
return (-1);
}
/* send static DoT forwarders to children */
- SIMPLEQ_FOREACH(uw_forwarder, &xconf->uw_dot_forwarder_list,
+ TAILQ_FOREACH(uw_forwarder, &xconf->uw_dot_forwarder_list,
entry) {
if (main_sendall(IMSG_RECONF_DOT_FORWARDER, uw_forwarder,
sizeof(*uw_forwarder)) == -1)
@@ -782,14 +782,14 @@ merge_config(struct uw_conf *conf, struct uw_conf *xconf)
struct uw_forwarder *uw_forwarder;
/* Remove & discard existing forwarders. */
- while ((uw_forwarder = SIMPLEQ_FIRST(&conf->uw_forwarder_list)) !=
+ while ((uw_forwarder = TAILQ_FIRST(&conf->uw_forwarder_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->uw_forwarder_list, entry);
+ TAILQ_REMOVE(&conf->uw_forwarder_list, uw_forwarder, entry);
free(uw_forwarder);
}
- while ((uw_forwarder = SIMPLEQ_FIRST(&conf->uw_dot_forwarder_list)) !=
+ while ((uw_forwarder = TAILQ_FIRST(&conf->uw_dot_forwarder_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&conf->uw_dot_forwarder_list, entry);
+ TAILQ_REMOVE(&conf->uw_dot_forwarder_list, uw_forwarder, entry);
free(uw_forwarder);
}
@@ -817,16 +817,17 @@ merge_config(struct uw_conf *conf, struct uw_conf *xconf)
conf->blocklist_log = xconf->blocklist_log;
/* Add new forwarders. */
- while ((uw_forwarder = SIMPLEQ_FIRST(&xconf->uw_forwarder_list)) !=
+ while ((uw_forwarder = TAILQ_FIRST(&xconf->uw_forwarder_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&xconf->uw_forwarder_list, entry);
- SIMPLEQ_INSERT_TAIL(&conf->uw_forwarder_list,
+ TAILQ_REMOVE(&xconf->uw_forwarder_list, uw_forwarder, entry);
+ TAILQ_INSERT_TAIL(&conf->uw_forwarder_list,
uw_forwarder, entry);
}
- while ((uw_forwarder = SIMPLEQ_FIRST(&xconf->uw_dot_forwarder_list)) !=
+ while ((uw_forwarder = TAILQ_FIRST(&xconf->uw_dot_forwarder_list)) !=
NULL) {
- SIMPLEQ_REMOVE_HEAD(&xconf->uw_dot_forwarder_list, entry);
- SIMPLEQ_INSERT_TAIL(&conf->uw_dot_forwarder_list,
+ TAILQ_REMOVE(&xconf->uw_dot_forwarder_list, uw_forwarder,
+ entry);
+ TAILQ_INSERT_TAIL(&conf->uw_dot_forwarder_list,
uw_forwarder, entry);
}
@@ -852,8 +853,8 @@ config_new_empty(void)
sizeof(default_res_pref));
xconf->res_pref_len = 5;
- SIMPLEQ_INIT(&xconf->uw_forwarder_list);
- SIMPLEQ_INIT(&xconf->uw_dot_forwarder_list);
+ TAILQ_INIT(&xconf->uw_forwarder_list);
+ TAILQ_INIT(&xconf->uw_dot_forwarder_list);
if ((xconf->captive_portal_expected_response = strdup("")) == NULL)
fatal(NULL);
@@ -1046,8 +1047,8 @@ imsg_receive_config(struct imsg *imsg, struct uw_conf
**xconf)
nconf->captive_portal_host = NULL;
nconf->captive_portal_path = NULL;
nconf->captive_portal_expected_response = NULL;
- SIMPLEQ_INIT(&nconf->uw_forwarder_list);
- SIMPLEQ_INIT(&nconf->uw_dot_forwarder_list);
+ TAILQ_INIT(&nconf->uw_forwarder_list);
+ TAILQ_INIT(&nconf->uw_dot_forwarder_list);
break;
case IMSG_RECONF_CAPTIVE_PORTAL_HOST:
/* make sure this is a string */
@@ -1086,7 +1087,7 @@ imsg_receive_config(struct imsg *imsg, struct uw_conf
**xconf)
fatal(NULL);
memcpy(uw_forwarder, imsg->data, sizeof(struct
uw_forwarder));
- SIMPLEQ_INSERT_TAIL(&nconf->uw_forwarder_list,
+ TAILQ_INSERT_TAIL(&nconf->uw_forwarder_list,
uw_forwarder, entry);
break;
case IMSG_RECONF_DOT_FORWARDER:
@@ -1099,7 +1100,7 @@ imsg_receive_config(struct imsg *imsg, struct uw_conf
**xconf)
fatal(NULL);
memcpy(uw_forwarder, imsg->data, sizeof(struct
uw_forwarder));
- SIMPLEQ_INSERT_TAIL(&nconf->uw_dot_forwarder_list,
+ TAILQ_INSERT_TAIL(&nconf->uw_dot_forwarder_list,
uw_forwarder, entry);
break;
default:
diff --git unwind.h unwind.h
index f5623a6bff7..dac0abdf763 100644
--- unwind.h
+++ unwind.h
@@ -124,12 +124,12 @@ enum imsg_type {
};
struct uw_forwarder {
- SIMPLEQ_ENTRY(uw_forwarder) entry;
+ TAILQ_ENTRY(uw_forwarder) entry;
char name[1024]; /* XXX */
uint16_t port;
};
-SIMPLEQ_HEAD(uw_forwarder_head, uw_forwarder);
+TAILQ_HEAD(uw_forwarder_head, uw_forwarder);
struct uw_conf {
struct uw_forwarder_head uw_forwarder_list;
struct uw_forwarder_head uw_dot_forwarder_list;
--
I'm not entirely sure you are real.
