summaryrefslogtreecommitdiff
path: root/usr.sbin/bgpd/config.c
diff options
context:
space:
mode:
authorHenning Brauer <henning@cvs.openbsd.org>2003-12-23 01:06:22 +0000
committerHenning Brauer <henning@cvs.openbsd.org>2003-12-23 01:06:22 +0000
commitd7fd4a13c62ac2d16ea4e2646be3b76940fef497 (patch)
tree33ac21b74746caafd79dbc0db730bff597079b47 /usr.sbin/bgpd/config.c
parentef5c8e75746e73e2fb914ff36b40cd079cb9f3a5 (diff)
allow the listening address to be specified, default to INADDR_ANY
should make jose@ happy
Diffstat (limited to 'usr.sbin/bgpd/config.c')
-rw-r--r--usr.sbin/bgpd/config.c6
1 files changed, 5 insertions, 1 deletions
diff --git a/usr.sbin/bgpd/config.c b/usr.sbin/bgpd/config.c
index 2e008b19fc3..dc2d26d0c2d 100644
--- a/usr.sbin/bgpd/config.c
+++ b/usr.sbin/bgpd/config.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: config.c,v 1.2 2003/12/19 14:23:28 henning Exp $ */
+/* $OpenBSD: config.c,v 1.3 2003/12/23 01:06:21 henning Exp $ */
/*
* Copyright (c) 2003 Henning Brauer <henning@openbsd.org>
@@ -23,6 +23,7 @@
#include <errno.h>
#include <ifaddrs.h>
#include <stdlib.h>
+#include <string.h>
#include <unistd.h>
#include "bgpd.h"
@@ -66,6 +67,9 @@ merge_config(struct bgpd_config *xconf, struct bgpd_config *conf)
if (!xconf->min_holdtime)
xconf->min_holdtime = conf->min_holdtime = MIN_HOLDTIME;
+ memcpy(&xconf->listen_addr, &conf->listen_addr,
+ sizeof(xconf->listen_addr));
+
/*
* as we cannot get the negotiated holdtime in the main process,
* the session engine needs to check it against the possibly new values