Dear Tech,
By applying this patch, you might save someone from confusing the renamed
variable with iev_ldpe in ldpd.c.
diff refs/remotes/origin/master 8c512ccc39fae85e26c6bf0b4b62aa7980809163
blob - 1bfd701a39082259d0913467704bee5191aa8714
blob + b284033f891ef1bdb1d4d5fe23129e252e1726ec
--- usr.sbin/ldpd/lde.c
+++ usr.sbin/ldpd/lde.c
@@ -62,7 +62,7 @@ RB_GENERATE(nbr_tree, lde_nbr, entry, lde_nbr_compare)
struct ldpd_conf *ldeconf;
struct nbr_tree lde_nbrs = RB_INITIALIZER(&lde_nbrs);
-static struct imsgev *iev_ldpe;
+static struct imsgev *iev_lde;
static struct imsgev *iev_main;
/* ARGSUSED */
@@ -152,8 +152,8 @@ static __dead void
lde_shutdown(void)
{
/* close pipes */
- msgbuf_clear(&iev_ldpe->ibuf.w);
- close(iev_ldpe->ibuf.fd);
+ msgbuf_clear(&iev_lde->ibuf.w);
+ close(iev_lde->ibuf.fd);
msgbuf_clear(&iev_main->ibuf.w);
close(iev_main->ibuf.fd);
@@ -163,7 +163,7 @@ lde_shutdown(void)
config_clear(ldeconf);
- free(iev_ldpe);
+ free(iev_lde);
free(iev_main);
log_info("label decision engine exiting");
@@ -181,7 +181,7 @@ int
lde_imsg_compose_ldpe(int type, uint32_t peerid, pid_t pid, void *data,
uint16_t datalen)
{
- return (imsg_compose_event(iev_ldpe, type, peerid, pid,
+ return (imsg_compose_event(iev_lde, type, peerid, pid,
-1, data, datalen));
}
@@ -450,7 +450,7 @@ lde_dispatch_parent(int fd, short event, void *bula)
}
break;
case IMSG_SOCKET_IPC:
- if (iev_ldpe) {
+ if (iev_lde) {
log_warnx("%s: received unexpected imsg fd "
"to ldpe", __func__);
break;
@@ -461,14 +461,14 @@ lde_dispatch_parent(int fd, short event, void *bula)
break;
}
- if ((iev_ldpe = malloc(sizeof(struct imsgev))) == NULL)
+ if ((iev_lde = malloc(sizeof(struct imsgev))) == NULL)
fatal(NULL);
- imsg_init(&iev_ldpe->ibuf, fd);
- iev_ldpe->handler = lde_dispatch_imsg;
- iev_ldpe->events = EV_READ;
- event_set(&iev_ldpe->ev, iev_ldpe->ibuf.fd,
- iev_ldpe->events, iev_ldpe->handler, iev_ldpe);
- event_add(&iev_ldpe->ev, NULL);
+ imsg_init(&iev_lde->ibuf, fd);
+ iev_lde->handler = lde_dispatch_imsg;
+ iev_lde->events = EV_READ;
+ event_set(&iev_lde->ev, iev_lde->ibuf.fd,
+ iev_lde->events, iev_lde->handler, iev_lde);
+ event_add(&iev_lde->ev, NULL);
break;
case IMSG_RECONF_CONF:
if ((nconf = malloc(sizeof(struct ldpd_conf))) ==