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@

13 files changed, 26 insertions, 0 deletions

diff --git a/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok b/regress/usr.sbin/bgpd/config/bgpd.conf.1.ok
index d642e31f347..859ca6aabaa 100644
--- 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 b0da8a576f0..813044f9570 100644
--- 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 d0997429874..1e3a3f4497b 100644
--- 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 7428292ae51..07156ee40f7 100644
--- 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 ad9bc57bc72..b3df41178e0 100644
--- 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 40218049a44..a6a9f18688a 100644
--- 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 00a8d6f7ad9..eba12e2f1f7 100644
--- 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 42190c7a9ec..674ba486b16 100644
--- 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 87abff86a01..bf3c2a2c9f3 100644
--- 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 d3f87cabed4..f0d9b7ea326 100644
--- 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 f9fa5306294..0a3e57b18b2 100644
--- 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 6c954b9f45b..21dd0579f02 100644
--- 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 ec5095bed19..d65278f47bb 100644
--- 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