Regen most of the config output. With support for alternating ports the

moment when the default listeners are added to the config got moved into
parse_config() and so is now visible in the printed config. Showing the
listen on statements is probably a good thing.
Failure noticed by anton@

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok
index d642e31..859ca6a 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
index b0da8a5..813044f 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.10.ok
@@ -1,6 +1,8 @@
 AS 64512
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.11.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.11.ok
index d099742..1e3a3f4 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.11.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.11.ok
@@ -1,6 +1,8 @@
 AS 64512
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.12.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.12.ok
index 7428292..07156ee 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.12.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.12.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.13.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.13.ok
index ad9bc57..b3df411 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.13.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.13.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok
index 4021804..a6a9f18 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.2.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok
index 00a8d6f..eba12e2 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.3.ok
@@ -4,6 +4,8 @@ somemore_v6 = "{                2001:DB8:400::/64               2001:DB8:500::/64               }"
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok
index 42190c7..674ba48 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.4.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 rde rib Adj-RIB-In no evaluate

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok
index 87abff8..bf3c2a2 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.5.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 
 vpn "a rdomain" on mpe0 {

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
index d3f87ca..f0d9b7e 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.6.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 as-set "empty1" {
        

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
index f9fa530..0a3e57b 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.7.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 prefix-set "empty1" {
 }

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.8.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.8.ok
index 6c954b9..21dd057 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.8.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.8.ok
@@ -1,6 +1,8 @@
 AS 64512
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 prefix-set "mynetworks" {
        192.0.2.0/24, 2001:db8:abcd::/56

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.9.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.9.ok
index ec5095b..d65278f 100644 (file)
--- a/regress/usr.sbin/bgpd/config/bgpd.conf.9.ok
+++ b/regress/usr.sbin/bgpd/config/bgpd.conf.9.ok
@@ -1,6 +1,8 @@
 AS 1
 router-id 127.0.0.1
 socket "/var/run/bgpd.sock.0"
+listen on 0.0.0.0
+listen on ::
 
 roa-set {
        1.2.3.0/24 source-as 0