From 8ececc2d421af6c85493e483a36dfa9f068bc57b Mon Sep 17 00:00:00 2001 From: Henning Brauer Date: Fri, 19 Dec 2003 20:34:54 +0000 Subject: actually we need to init the configuration we receive in the reconfigure case much earlier, on RECONF_CONF, and not on RECONF_DONE, to prevent an unneeded session down/up cycle for already established sessions. --- usr.sbin/bgpd/session.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'usr.sbin') diff --git a/usr.sbin/bgpd/session.c b/usr.sbin/bgpd/session.c index 43e9a9e0d4b..4df08e76ffe 100644 --- a/usr.sbin/bgpd/session.c +++ b/usr.sbin/bgpd/session.c @@ -1,4 +1,4 @@ -/* $OpenBSD: session.c,v 1.9 2003/12/19 20:20:58 henning Exp $ */ +/* $OpenBSD: session.c,v 1.10 2003/12/19 20:34:53 henning Exp $ */ /* * Copyright (c) 2003 Henning Brauer @@ -1218,6 +1218,7 @@ session_dispatch_imsg(int fd, int idx) fatal(NULL, errno); memcpy(nconf, imsg.data, sizeof(struct bgpd_config)); nconf->peers = NULL; + init_conf(nconf); pending_reconf = 1; break; case IMSG_RECONF_PEER: @@ -1272,7 +1273,6 @@ session_dispatch_imsg(int fd, int idx) conf->holdtime = nconf->holdtime; conf->bgpid = nconf->bgpid; conf->min_holdtime = nconf->min_holdtime; - init_conf(conf); /* add new peers */ for (p = nconf->peers; p != NULL; p = next) { next = p->next; -- cgit v1.2.3