summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/bgpd.c
diff options
context:
space:
mode:
authorClaudio Jeker <claudio@cvs.openbsd.org>2019-08-05 08:46:56 +0000
committerClaudio Jeker <claudio@cvs.openbsd.org>2019-08-05 08:46:56 +0000
commit9e7a3389b7ffa16f27b2eb2f10c654156db0d0ce (patch)
tree557fb31e44a9afe31104ad9609a7149723b49270 /usr.sbin/bgpd/bgpd.c
parentd4bf2e261eb4d86f50acdc7a40fc250d7e756370 (diff)
Cleanup config reload in the RDE. Use the bgpd_conf struct to store sets
and l3vpns instead of temporary globals. Also rework rde_reload_done to free filters and sets earlier. The soft-reconfiguration process no longer needs the previous filters / sets to do its work since there is a full Adj-RIB-Out. OK benno@
Diffstat (limited to 'usr.sbin/bgpd/bgpd.c')
-rw-r--r--usr.sbin/bgpd/bgpd.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/usr.sbin/bgpd/bgpd.c b/usr.sbin/bgpd/bgpd.c
index c276c398d7c..4a666a3cff0 100644
--- a/usr.sbin/bgpd/bgpd.c
+++ b/usr.sbin/bgpd/bgpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bgpd.c,v 1.223 2019/08/05 08:36:19 claudio Exp $ */
+/* $OpenBSD: bgpd.c,v 1.224 2019/08/05 08:46:55 claudio Exp $ */
/*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@@ -610,12 +610,12 @@ reconfigure(char *conffile, struct bgpd_config *conf)
}
/* as-sets for filters in the RDE */
- while ((aset = SIMPLEQ_FIRST(conf->as_sets)) != NULL) {
+ while ((aset = SIMPLEQ_FIRST(&conf->as_sets)) != NULL) {
struct ibuf *wbuf;
u_int32_t *as;
size_t i, l, n;
- SIMPLEQ_REMOVE_HEAD(conf->as_sets, entry);
+ SIMPLEQ_REMOVE_HEAD(&conf->as_sets, entry);
as = set_get(aset->set, &n);
if ((wbuf = imsg_create(ibuf_rde, IMSG_RECONF_AS_SET, 0, 0,