diff --git a/net/quagga/Makefile b/net/quagga/Makefile index 51e30d961..6fbf1453d 100644 --- a/net/quagga/Makefile +++ b/net/quagga/Makefile @@ -1,5 +1,5 @@ PLUGIN_NAME= quagga -PLUGIN_VERSION= 1.4.2 +PLUGIN_VERSION= 1.4.3 PLUGIN_COMMENT= Quagga Routing Suite PLUGIN_DEPENDS= quagga ruby PLUGIN_MAINTAINER= franz.fabian.94@gmail.com diff --git a/net/quagga/pkg-descr b/net/quagga/pkg-descr index 78840b370..6e73b36a2 100644 --- a/net/quagga/pkg-descr +++ b/net/quagga/pkg-descr @@ -1,8 +1,9 @@ Quagga is a routing software suite, providing implementations of -OSPFv2, OSPFv3, RIP v1 and v2, RIPv3, BGPv4 and experemental ISIS -for Unix platforms, particularly FreeBSD and Linux and also NetBSD, -to mention a few. Quagga is a fork of GNU Zebra which was developed -by Kunihiro Ishiguro. The Quagga tree aims to build a more involved -community around Quagga than the current centralised model of GNU Zebra. +OSPFv2, OSPFv3, RIP v1 and v2, RIPv3, BGPv4 for Unix platforms, +particularly FreeBSD and Linux and also NetBSD, to mention a few. + +Quagga is a fork of GNU Zebra which was developed by Kunihiro Ishiguro. +The Quagga tree aims to build a more involved community around Quagga +than the current centralised model of GNU Zebra. WWW: http://www.quagga.net/ diff --git a/net/quagga/src/etc/inc/plugins.inc.d/quagga.inc b/net/quagga/src/etc/inc/plugins.inc.d/quagga.inc index 442ecd285..5e1941e19 100644 --- a/net/quagga/src/etc/inc/plugins.inc.d/quagga.inc +++ b/net/quagga/src/etc/inc/plugins.inc.d/quagga.inc @@ -58,6 +58,22 @@ function quagga_firewall($fw) ), null ); + $fw->registerFilterRule( + 1, /* priority */ + array( + 'ipprotocol' => 'inet', + 'protocol' => 'ospf', + 'statetype' => 'keep', + 'label' => 'Pass OSPF UNICAST (autogenerated)', + 'from' => $network->ipaddr . '/' . $network->netmask, + 'to' => '(self)', + 'direction' => 'in', + 'type' => 'pass', + 'disablereplyto' => 1, + 'quick' => true + ), + null + ); } } } diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php index 116aba171..05f02ee88 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/BgpController.php @@ -28,7 +28,6 @@ class BgpController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = gettext("BGP Settings"); $this->view->bgpForm = $this->getForm("bgp"); $this->view->formDialogEditBGPNeighbor = $this->getForm("dialogEditBGPNeighbor"); $this->view->formDialogEditBGPASPaths = $this->getForm("dialogEditBGPASPath"); diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php index 53ed82e2a..6c3e824ac 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/DiagnosticsController.php @@ -28,28 +28,23 @@ class DiagnosticsController extends \OPNsense\Base\IndexController { public function bgpAction() { - $this->view->title = gettext("Diagnostics: BGP"); $this->view->diagnosticsForm = $this->getForm("diagnostics"); $this->view->pick('OPNsense/Quagga/diagnosticsbgp'); } public function ospfAction() { - $this->view->title = gettext("Diagnostics: OSPF"); $this->view->pick('OPNsense/Quagga/diagnosticsospf'); } public function ospfv3Action() { - $this->view->title = gettext("Diagnostics: OSPFv3"); $this->view->pick('OPNsense/Quagga/diagnosticsospfv3'); } public function generalAction() { - $this->view->title = gettext("Diagnostics: General"); $this->view->pick('OPNsense/Quagga/diagnosticsgeneral'); } public function logAction() { - $this->view->title = gettext("Diagnostics: Log"); $this->view->pick('OPNsense/Quagga/log'); } } diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php index b030ea9d4..db963b90f 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/GeneralController.php @@ -31,7 +31,6 @@ class GeneralController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = gettext("Routing-Settings"); $this->view->generalForm = $this->getForm("general"); $this->view->pick('OPNsense/Quagga/general'); } diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php deleted file mode 100644 index 5e1f17168..000000000 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/IsisController.php +++ /dev/null @@ -1,38 +0,0 @@ -view->title = gettext("IS-IS-Settings"); - $this->view->generalForm = $this->getForm("isis"); - $this->view->pick('OPNsense/Quagga/isis'); - } -} diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php index 3eaaa05b3..501e99baf 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/Ospf6Controller.php @@ -28,7 +28,6 @@ class Ospf6Controller extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = gettext("OSPFv3 Settings"); $this->view->ospf6Form = $this->getForm("ospf6"); $this->view->formDialogEditInterface = $this->getForm("dialogEditOSPF6Interface"); $this->view->pick('OPNsense/Quagga/ospf6'); diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php index 4d6fa815f..d445c3e6f 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/OspfController.php @@ -31,7 +31,6 @@ class OspfController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = gettext("OSPF Settings"); $this->view->generalForm = $this->getForm("ospf"); $this->view->formDialogEditNetwork = $this->getForm("dialogEditOSPFNetwork"); $this->view->formDialogEditInterface = $this->getForm("dialogEditOSPFInterface"); diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php index 31eae7ba1..357da5c11 100644 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php +++ b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/RipController.php @@ -31,7 +31,6 @@ class RipController extends \OPNsense\Base\IndexController { public function indexAction() { - $this->view->title = gettext("RIP Settings"); $this->view->ripForm = $this->getForm("rip"); $this->view->pick('OPNsense/Quagga/rip'); } diff --git a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml b/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml deleted file mode 100644 index bf188c45c..000000000 --- a/net/quagga/src/opnsense/mvc/app/controllers/OPNsense/Quagga/forms/isis.xml +++ /dev/null @@ -1,8 +0,0 @@ -
- - routing.isis.general.Enabled - - checkbox - This will activate the isis service. - -
diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml index 349e223c5..7cb852d74 100644 --- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml +++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/BGP.xml @@ -25,7 +25,6 @@ Babel routing protocol (Babel) Open Shortest Path First (OSPF) Connected routes (directly attached subnet or host) - Intermediate System to Intermediate System (IS-IS) Kernel routes (not installed via the zebra RIB) Routing Information Protocol (RIP) Statically configured routes diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml index d7da7259a..13cfdc231 100644 --- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml +++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/Menu/Menu.xml @@ -4,7 +4,6 @@ - diff --git a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml index 5a1b7bf10..4de2d4dc3 100644 --- a/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml +++ b/net/quagga/src/opnsense/mvc/app/models/OPNsense/Quagga/RIP.xml @@ -34,7 +34,6 @@ Babel routing protocol (Babel) Border Gateway Protocol (BGP) Connected routes (directly attached subnet or host) - Intermediate System to Intermediate System (IS-IS) Kernel routes (not installed via the zebra RIB) Protocol Independent Multicast (PIM) Open Shortest Path First (OSPF) diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt index fb3a3f866..9175b3966 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/bgp.volt @@ -39,10 +39,9 @@ POSSIBILITY OF SUCH DAMAGE.
{{ partial("layout_partials/base_form",['fields':bgpForm,'id':'frm_bgp_settings'])}} - -
- +
+
@@ -170,10 +169,12 @@ $(document).ready(function() { // link save button to API set action $("#saveAct").click(function(){ saveFormToEndpoint(url="/api/quagga/bgp/set",formid='frm_bgp_settings',callback_ok=function(){ + $("#saveAct_progress").addClass("fa fa-spinner fa-pulse"); ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) { ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { updateServiceStatusUI(data['status']); }); + $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse"); }); }); }); diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt index 2da315072..4abab85fb 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/general.volt @@ -28,9 +28,9 @@ POSSIBILITY OF SUCH DAMAGE. #}
{{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_general_settings'])}} -
- +
+
@@ -48,12 +48,14 @@ POSSIBILITY OF SUCH DAMAGE. // link save button to API set action $("#saveAct").click(function(){ saveFormToEndpoint(url="/api/quagga/general/set", formid='frm_general_settings',callback_ok=function(){ - ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) { - ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { - updateServiceStatusUI(data['status']); - }); + $("#saveAct_progress").addClass("fa fa-spinner fa-pulse"); + ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) { + ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { + updateServiceStatusUI(data['status']); }); - }); + $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse"); + }); + }, true); }); }); diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/isis.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/isis.volt deleted file mode 100644 index 4ca174841..000000000 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/isis.volt +++ /dev/null @@ -1 +0,0 @@ -{{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_ospf_settings'])}} diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt index 2b46723ae..77e774908 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf.volt @@ -38,10 +38,9 @@ POSSIBILITY OF SUCH DAMAGE.
{{ partial("layout_partials/base_form",['fields':generalForm,'id':'frm_ospf_settings'])}} -
- +
@@ -141,10 +140,12 @@ $( document ).ready(function() { // link save button to API set action $("#saveAct").click(function(){ saveFormToEndpoint(url="/api/quagga/ospfsettings/set",formid='frm_ospf_settings',callback_ok=function(){ + $("#saveAct_progress").addClass("fa fa-spinner fa-pulse"); ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) { ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { updateServiceStatusUI(data['status']); }); + $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse"); }); }); }); @@ -178,8 +179,7 @@ $( document ).ready(function() { 'options':{selection:false, multiSelect:false} } ); - - }); +}); {{ partial("layout_partials/base_dialog",['fields':formDialogEditNetwork,'id':'DialogEditNetwork','label':lang._('Edit Network')])}} diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt index 892627c5f..8cec1eb47 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/ospf6.volt @@ -37,10 +37,9 @@ POSSIBILITY OF SUCH DAMAGE.
{{ partial("layout_partials/base_form",['fields':ospf6Form,'id':'frm_ospf6_settings'])}} -
- +
@@ -81,6 +80,7 @@ $( document ).ready(function() { formatTokenizersUI(); $('.selectpicker').selectpicker('refresh'); }); + ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { updateServiceStatusUI(data['status']); }); @@ -88,13 +88,16 @@ $( document ).ready(function() { // link save button to API set action $("#saveAct").click(function(){ saveFormToEndpoint(url="/api/quagga/ospf6settings/set",formid='frm_ospf6_settings',callback_ok=function(){ + $("#saveAct_progress").addClass("fa fa-spinner fa-pulse"); ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) { ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { updateServiceStatusUI(data['status']); }); + $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse"); }); }); }); + $("#grid-interfaces").UIBootgrid( { 'search':'/api/quagga/ospf6settings/searchInterface', 'get':'/api/quagga/ospf6settings/getInterface/', @@ -105,9 +108,7 @@ $( document ).ready(function() { 'options':{selection:false, multiSelect:false} } ); - - - }); +}); {{ partial("layout_partials/base_dialog",['fields':formDialogEditInterface,'id':'DialogEditInterface','label':lang._('Edit Interface')])}} diff --git a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt index 101ec4f6e..206d3f182 100644 --- a/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt +++ b/net/quagga/src/opnsense/mvc/app/views/OPNsense/Quagga/rip.volt @@ -26,12 +26,12 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. #} +
{{ partial("layout_partials/base_form",['fields':ripForm,'id':'frm_rip_settings'])}} -
- +
@@ -42,6 +42,7 @@ $(document).ready(function() { formatTokenizersUI(); $('.selectpicker').selectpicker('refresh'); }); + ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { updateServiceStatusUI(data['status']); }); @@ -49,14 +50,14 @@ $(document).ready(function() { // link save button to API set action $("#saveAct").click(function(){ saveFormToEndpoint(url="/api/quagga/rip/set",formid='frm_rip_settings',callback_ok=function(){ + $("#saveAct_progress").addClass("fa fa-spinner fa-pulse"); ajaxCall(url="/api/quagga/service/reconfigure", sendData={}, callback=function(data,status) { ajaxCall(url="/api/quagga/service/status", sendData={}, callback=function(data,status) { updateServiceStatusUI(data['status']); }); + $("#saveAct_progress").removeClass("fa fa-spinner fa-pulse"); }); }); }); - - - }); +}); diff --git a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga index b8dca88f2..8601a0893 100644 --- a/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga +++ b/net/quagga/src/opnsense/service/templates/OPNsense/Quagga/quagga @@ -11,7 +11,6 @@ if helpers.exists('OPNsense.quagga.rip.enabled') and OPNsense.quagga.rip.enabled if helpers.exists('OPNsense.quagga.bgp.enabled') and OPNsense.quagga.bgp.enabled == '1' %} bgpd{% endif %}{% if helpers.exists('OPNsense.quagga.ospf6.enabled') and OPNsense.quagga.ospf6.enabled == '1' %} ospf6d{% endif %}{% if helpers.exists('OPNsense.quagga.ripng.enabled') and OPNsense.quagga.ripng.enabled == '1' %} ripngd{% endif %}{% -if helpers.exists('OPNsense.quagga.isis.enabled') and OPNsense.quagga.isis.enabled == '1' %} isisd{% endif %}" #quagga_flags="...." #quagga_extralibs_path="... ..." #router_enable="NO"