benchmarks/iperf: better place, minor adjustments

Makefile

@@ -3,7 +3,8 @@ PAGER?=		less
 all:
 	@cat ${.CURDIR}/README.md | ${PAGER}
 
-CATEGORIES=	databases devel dns mail net-mgmt net security sysutils www
+CATEGORIES=	benchmarks databases devel dns mail net-mgmt \
+		net security sysutils www
 
 .for CATEGORY in ${CATEGORIES}
 _${CATEGORY}!=	ls -1d ${CATEGORY}/*

README.md

@@ -29,6 +29,7 @@ A list of currently available plugins
 =====================================
 
 ```
+benchmarks/iperf -- Connection speed tester
 databases/redis -- Redis DB
 devel/debug -- Debugging Tools
 devel/helloworld -- A sample framework application
@@ -46,7 +47,6 @@ net/freeradius -- RADIUS Authentication, Authorization and Accounting Server
 net/ftp-proxy -- Control ftp-proxy processes
 net/haproxy -- Reliable, high performance TCP/HTTP load balancer
 net/igmp-proxy -- IGMP-Proxy Service
-net/iperf -- iperf connection speed tester
 net/l2tp -- L2TP server based on MPD5
 net/mdns-repeater -- Proxy multicast DNS between networks
 net/pppoe -- PPPoE server based on MPD5

benchmarks/iperf/Makefile

@@ -0,0 +1,8 @@
+PLUGIN_NAME=		iperf
+PLUGIN_VERSION=		0.0.1
+PLUGIN_COMMENT=		Connection speed tester
+PLUGIN_DEPENDS=		iperf3 ruby
+PLUGIN_MAINTAINER=	[email protected]
+PLUGIN_DEVEL=		yes
+
+.include "../../Mk/plugins.mk"

net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php → benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php

@@ -62,7 +62,7 @@ public function setAction() {
                       'error' => 'interface is unknown');
     }
   }
-  
+
   public function queryAction() {
       $backend = new Backend();
       return $this->send_command('query', $backend);
@@ -89,7 +89,7 @@ private function send_command($command, $backend) {
       fgets($socket);
       fclose($socket);
       return json_decode($data,true);
-      
+
   }
   private function get_real_interface_name($name) {
       $config = Config::getInstance()->toArray();

net/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt → benchmarks/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt

@@ -48,7 +48,7 @@ function result_to_html(elements) {
         output += '<table class="table table-striped"><tr><td>{{ lang._('Interface') }}</td><td>' + element.interface + '</td></tr>' +
         '<tr><td>{{ lang._('Start Time') }}</td><td>' + element.start_time + '</td></tr>' +
         '<tr><td>{{ lang._('Port') }}</td><td>' + element.port + '</td></tr></table>';
-        
+
         // only if test did already run
         if ('result' in element) {
             var result = element.result,

net/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb → benchmarks/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb

@@ -208,4 +208,3 @@ def run_test_thread(interface = 'any')
 rescue
   server.close
 end
-