From 931788ad45b4f1114e97e6ac2869ab84efa767e2 Mon Sep 17 00:00:00 2001
From: Guillaume Mazoyer <gmazoyer@gravitons.in>
Date: Mon, 13 Jun 2016 11:23:09 +0200
Subject: Per router options to disable/enable IP versions.

Remove the global options to disable/enable IPv6 or IPv4. These options can
now be used on the router configuration level, which seems more appropriate.
---
 routers/bird.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

(limited to 'routers/bird.php')

diff --git a/routers/bird.php b/routers/bird.php
index 5219cc2..9a6c869 100644
--- a/routers/bird.php
+++ b/routers/bird.php
@@ -120,11 +120,11 @@ final class Bird extends Router {
 
       case 'as-path-regex':
         if (match_aspath_regex($parameter)) {
-          if (!$this->global_config['misc']['disable_ipv6']) {
+          if (!$this->config['disable_ipv6']) {
             $commands[] = $birdc6.' \'show route where bgp_path ~ [= '.
               $parameter.' =]\'';
           }
-          if (!$this->global_config['misc']['disable_ipv4']) {
+          if (!$this->config['disable_ipv4']) {
             $commands[] = $birdc.' \'show route where bgp_path ~ [= '.
               $parameter.' =]\'';
           }
@@ -135,11 +135,11 @@ final class Bird extends Router {
 
       case 'as':
         if (match_as($parameter)) {
-          if (!$this->global_config['misc']['disable_ipv6']) {
+          if (!$this->config['disable_ipv6']) {
             $commands[] = $birdc6.' \'show route where bgp_path ~ [= '.
               $parameter.' =]\'';
           }
-          if (!$this->global_config['misc']['disable_ipv4']) {
+          if (!$this->config['disable_ipv4']) {
             $commands[] = $birdc.' \'show route where bgp_path ~ [= '.
               $parameter.' =]\'';
           }
-- 
cgit v1.2.3