plugins: add firewall reload button, inline service_name_compare()

IPFW and PF are used for more than just firewall and shaper, e.g.
NAT, policy routing or shaping, and the plugin framework supports
registering multiple user-facing services per file.

(cherry picked from commit 3b34f51f)
(cherry picked from commit ff0dcc4d)
(cherry picked from commit 5e1e138f)
(cherry picked from commit c8cb224b)

plist

@@ -46,11 +46,12 @@
 /usr/local/etc/inc/plugins.inc.d/if_ipsec.inc
 /usr/local/etc/inc/plugins.inc.d/if_openvpn.inc
 /usr/local/etc/inc/plugins.inc.d/igmpproxy.inc
+/usr/local/etc/inc/plugins.inc.d/ipfw.inc
 /usr/local/etc/inc/plugins.inc.d/miniupnpd.inc
+/usr/local/etc/inc/plugins.inc.d/pf.inc
 /usr/local/etc/inc/plugins.inc.d/relayd.inc
 /usr/local/etc/inc/plugins.inc.d/relayd/dns.proto
 /usr/local/etc/inc/plugins.inc.d/relayd/tcp.proto
-/usr/local/etc/inc/plugins.inc.d/shaper.inc
 /usr/local/etc/inc/plugins.inc.d/squid.inc
 /usr/local/etc/inc/plugins.inc.d/suricata.inc
 /usr/local/etc/inc/rrd.inc

src/etc/inc/plugins.inc.d/shaper.inc → src/etc/inc/plugins.inc.d/ipfw.inc

@@ -27,9 +27,10 @@
 */
 
 
-function shaper_services()
+function ipfw_services()
 {
     global $config;
+
     $services = array();
 
     if (!empty($config['OPNsense']['TrafficShaper']['rules']['rule'])) {

src/etc/inc/plugins.inc.d/pf.inc

+<?php
+
+/*
+    Copyright (C) 2016 Franco Fichtner <franco@opnsense.org>
+    All rights reserved.
+
+    Redistribution and use in source and binary forms, with or without
+    modification, are permitted provided that the following conditions are met:
+
+    1. Redistributions of source code must retain the above copyright notice,
+       this list of conditions and the following disclaimer.
+
+    2. Redistributions in binary form must reproduce the above copyright
+       notice, this list of conditions and the following disclaimer in the
+       documentation and/or other materials provided with the distribution.
+
+    THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
+    INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
+    AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+    AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
+    OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
+    SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
+    INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
+    CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+    ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+    POSSIBILITY OF SUCH DAMAGE.
+*/
+
+function pf_services()
+{
+    global $config;
+
+    $services = array();
+
+    if (!isset($config['system']['disablefilter'])) {
+        $services[] = array(
+            'description' => gettext('Packet Filter'),
+            'configd' => array(
+                'restart' => array('filter reload'),
+                'start' => array('filter reload'),
+                'stop' => array('filter reload'),
+            ),
+            'nocheck' => true,
+            'name' => 'pf',
+        );
+    }
+
+    return $services;
+}

src/etc/inc/services.inc

@@ -2187,6 +2187,10 @@ function services_get()
         }
     }
 
+    uasort($services, function ($a, $b) {
+        return strcasecmp($a['name'], $b['name']);
+    });
+
     return $services;
 }
 
@@ -2223,20 +2227,14 @@ function find_service_by_name($names, $filter = array())
     return array();
 }
 
-function service_name_compare($a, $b) {
-    if (strtolower($a['name']) == strtolower($b['name'])) {
-        return 0;
-    }
-    return (strtolower($a['name']) < strtolower($b['name'])) ? -1 : 1;
-}
-
-
 function get_service_status($service)
 {
+    if (!empty($service['nocheck'])) {
+        return true;
+    }
+
     if (isset($service['pidfile'])) {
         return isvalidpid($service['pidfile']);
-    } elseif (!empty($service['nocheck'])) {
-        return true;
     }
 
     return is_process_running($service['name']);

src/etc/inc/xmlrpc/service.inc

@@ -53,12 +53,11 @@ function xmlrpc_publishable_service()
 function list_services_xmlrpc()
 {
     $services = services_get();
-    if (count($services) > 0) {
-        uasort($services, "service_name_compare");
-    }
+
     foreach ($services as &$service) {
         $service['status'] = get_service_status($service);
     }
+
     return $services;
 }
 

src/www/status_services.php

@@ -56,14 +56,9 @@ if (!empty($_POST['service'])) {
 
 $services = services_get();
 
-if (count($services) > 0) {
-    uasort($services, "service_name_compare");
-}
-
 include("head.inc");
 
 ?>
-
 <body>
 
 <?php include("fbegin.inc"); ?>

src/www/widgets/widgets/services_status.widget.php

@@ -79,7 +79,6 @@ if (isset($_POST['servicestatusfilter'])) {
 <?php
   $skipservices = explode(",", $config['widgets']['servicestatusfilter']);
   if (count($services) > 0):
-      uasort($services, "service_name_compare");
       foreach ($services as $service):
           if (!$service['name'] || in_array($service['name'], $skipservices)) {
               continue;