From 143ca899219b4968aee53fb2903dc0169dbb85c3 Mon Sep 17 00:00:00 2001
From: Fabian Franz <fabian.franz@students.fh-hagenberg.at>
Date: Tue, 16 May 2017 20:55:26 +0200
Subject: [PATCH] add backend call for ipv6 route display

---
 .../OPNsense/Quagga/Api/DiagnosticsController.php   |  4 ++++
 net/quagga/src/opnsense/scripts/quagga/quagga.rb    | 13 ++++++++++---
 .../service/conf/actions.d/actions_quagga.conf      |  8 +++++++-
 3 files changed, 21 insertions(+), 4 deletions(-)

diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
index 588a3e4fc..07a4a4121 100644
--- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
+++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Api/DiagnosticsController.php
@@ -121,4 +121,8 @@ class DiagnosticsController extends ApiControllerBase
     {
         return $this->get_general_information('routes');
     }
+    public function generalroutes6Action()
+    {
+        return $this->get_general_information('routes6');
+    }
 }
diff --git a/net/quagga/src/opnsense/scripts/quagga/quagga.rb b/net/quagga/src/opnsense/scripts/quagga/quagga.rb
index 4abb1897b..d4a09a5c8 100755
--- a/net/quagga/src/opnsense/scripts/quagga/quagga.rb
+++ b/net/quagga/src/opnsense/scripts/quagga/quagga.rb
@@ -99,8 +99,8 @@ class General
   def initialize(vtysh)
     @vtysh = vtysh
   end
-  def routes
-    lines = @vtysh.execute("show ip route").lines
+  def routes(ipv6 = false)
+    lines = @vtysh.execute("show ip#{ipv6 ? 'v6' : ''} route").lines
 
     # headers
     meanings = {}
@@ -124,6 +124,10 @@ class General
     end
     entries
   end
+  
+  def routes6
+    routes(true)
+  end
 end
 
 class OSPF
@@ -679,9 +683,12 @@ OptionParser.new do |opts|
     options[:ospfv3_overview] = od
   end
   #### general things about routing
-  opts.on("-R", "--general-routes", "Print Routing Table") do |od|
+  opts.on("-R", "--general-routes", "Print Routing Table (IPv4)") do |od|
     options[:general_routes] = od
   end
+  opts.on("-6", "--general-routes6", "Print Routing Table (IPv6)") do |od|
+    options[:general_routes6] = od
+  end
   ### BGP
   opts.on("-B", "--bgp-overview", "Print an overview of BGP") do |od|
     options[:bgp_overview] = od
diff --git a/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf b/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf
index 3f1be1933..af1e2a60e 100644
--- a/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf
+++ b/net/quagga/src/opnsense/service/conf/actions.d/actions_quagga.conf
@@ -104,4 +104,10 @@ message: Print OSPF summary
 command:/usr/local/opnsense/scripts/quagga/quagga.rb --general-routes
 parameters:
 type:script_output
-message: Print Routing Table
+message: Print IPv4 Routing Table
+
+[general-routes6]
+command:/usr/local/opnsense/scripts/quagga/quagga.rb --general-routes6
+parameters:
+type:script_output
+message: Print IPv6 Routing Table