FRR BGP startup fix. Issue #11031

pfsense · Nov 4, 2020 · df52ed6 · df52ed6
1 parent 5c22cac
commit df52ed6
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/net/pfSense-pkg-frr/Makefile b/net/pfSense-pkg-frr/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	pfSense-pkg-frr
 PORTVERSION=	0.6.8
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 MASTER_SITES=	# empty
 DISTFILES=	# empty

diff --git a/net/pfSense-pkg-frr/files/usr/local/pkg/frr/inc/frr_bgp.inc b/net/pfSense-pkg-frr/files/usr/local/pkg/frr/inc/frr_bgp.inc
@@ -19,6 +19,9 @@
  * limitations under the License.
  */
 
+/* Supported address famililes constant */
+define("FRR_BGP_ADDRESS_FAMILIES", array("ipv4 unicast", "ipv6 unicast"));
+
 /* Fetch the list of BGP AS Paths for use in selection lists */
 function frr_get_bgp_aspath_list() {
 	global $config;
@@ -914,9 +917,6 @@ function frr_bgp_generate_address_families() {
 function frr_generate_config_bgp() {
 	global $config, $frr_config_base, $frr_integrated_config, $frr_bgp_config_address_family;
 
-	/* Supported address famililes constant */
-	define("FRR_BGP_ADDRESS_FAMILIES", array("ipv4 unicast", "ipv6 unicast"));
-
 	/* Make bgpd config */
 	if (is_array($config['installedpackages']['frr']['config'])) {
 		$frr_conf = &$config['installedpackages']['frr']['config'][0];