From e1e70b41d9339762311514e2980c0fa61e0ca4e1 Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Sat, 2 Dec 2017 21:42:56 +0100 Subject: [PATCH] benchmarks/iperf: better place, minor adjustments --- Makefile | 3 ++- README.md | 2 +- benchmarks/iperf/Makefile | 8 ++++++++ {net => benchmarks}/iperf/pkg-descr | 0 .../iperf/src/etc/inc/plugins.inc.d/iperf.inc | 0 {net => benchmarks}/iperf/src/etc/rc.d/iperf | 0 .../controllers/OPNsense/iperf/Api/InstanceController.php | 4 ++-- .../controllers/OPNsense/iperf/Api/ServiceController.php | 0 .../app/controllers/OPNsense/iperf/IndexController.php | 0 .../OPNsense/iperf/forms/instance_settings.xml | 0 .../opnsense/mvc/app/models/OPNsense/iperf/ACL/ACL.xml | 0 .../mvc/app/models/OPNsense/iperf/FakeInstance.php | 0 .../mvc/app/models/OPNsense/iperf/FakeInstance.xml | 0 .../opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml | 0 .../src/opnsense/mvc/app/views/OPNsense/iperf/index.volt | 2 +- .../iperf/src/opnsense/scripts/iperf/ruby_iperf.rb | 1 - .../opnsense/service/conf/actions.d/actions_iperf.conf | 0 net/iperf/Makefile | 8 -------- 18 files changed, 14 insertions(+), 14 deletions(-) create mode 100644 benchmarks/iperf/Makefile rename {net => benchmarks}/iperf/pkg-descr (100%) rename {net => benchmarks}/iperf/src/etc/inc/plugins.inc.d/iperf.inc (100%) rename {net => benchmarks}/iperf/src/etc/rc.d/iperf (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php (99%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/ServiceController.php (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/IndexController.php (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/forms/instance_settings.xml (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/ACL/ACL.xml (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.php (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml (100%) rename {net => benchmarks}/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt (99%) rename {net => benchmarks}/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb (99%) rename {net => benchmarks}/iperf/src/opnsense/service/conf/actions.d/actions_iperf.conf (100%) delete mode 100644 net/iperf/Makefile diff --git a/Makefile b/Makefile index 8902b8d02..a2d489a06 100644 --- a/Makefile +++ b/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}/* diff --git a/README.md b/README.md index 88ac33e67..ce67f4ca5 100644 --- a/README.md +++ b/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 diff --git a/benchmarks/iperf/Makefile b/benchmarks/iperf/Makefile new file mode 100644 index 000000000..c5b00b1e3 --- /dev/null +++ b/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= franz.fabian.94@gmail.com +PLUGIN_DEVEL= yes + +.include "../../Mk/plugins.mk" diff --git a/net/iperf/pkg-descr b/benchmarks/iperf/pkg-descr similarity index 100% rename from net/iperf/pkg-descr rename to benchmarks/iperf/pkg-descr diff --git a/net/iperf/src/etc/inc/plugins.inc.d/iperf.inc b/benchmarks/iperf/src/etc/inc/plugins.inc.d/iperf.inc similarity index 100% rename from net/iperf/src/etc/inc/plugins.inc.d/iperf.inc rename to benchmarks/iperf/src/etc/inc/plugins.inc.d/iperf.inc diff --git a/net/iperf/src/etc/rc.d/iperf b/benchmarks/iperf/src/etc/rc.d/iperf similarity index 100% rename from net/iperf/src/etc/rc.d/iperf rename to benchmarks/iperf/src/etc/rc.d/iperf diff --git a/net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php similarity index 99% rename from net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php rename to benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php index d2fdcfab3..6716225fc 100644 --- a/net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php +++ b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/InstanceController.php @@ -62,7 +62,7 @@ class InstanceController extends ApiMutableModelControllerBase 'error' => 'interface is unknown'); } } - + public function queryAction() { $backend = new Backend(); return $this->send_command('query', $backend); @@ -89,7 +89,7 @@ class InstanceController extends ApiMutableModelControllerBase fgets($socket); fclose($socket); return json_decode($data,true); - + } private function get_real_interface_name($name) { $config = Config::getInstance()->toArray(); diff --git a/net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/ServiceController.php b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/ServiceController.php similarity index 100% rename from net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/ServiceController.php rename to benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/Api/ServiceController.php diff --git a/net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/IndexController.php b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/IndexController.php similarity index 100% rename from net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/IndexController.php rename to benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/IndexController.php diff --git a/net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/forms/instance_settings.xml b/benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/forms/instance_settings.xml similarity index 100% rename from net/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/forms/instance_settings.xml rename to benchmarks/iperf/src/opnsense/mvc/app/controllers/OPNsense/iperf/forms/instance_settings.xml diff --git a/net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/ACL/ACL.xml b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/ACL/ACL.xml similarity index 100% rename from net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/ACL/ACL.xml rename to benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/ACL/ACL.xml diff --git a/net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.php b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.php similarity index 100% rename from net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.php rename to benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.php diff --git a/net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml similarity index 100% rename from net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml rename to benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/FakeInstance.xml diff --git a/net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml b/benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml similarity index 100% rename from net/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml rename to benchmarks/iperf/src/opnsense/mvc/app/models/OPNsense/iperf/Menu/Menu.xml diff --git a/net/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt b/benchmarks/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt similarity index 99% rename from net/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt rename to benchmarks/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt index 333d97135..4869043e3 100644 --- a/net/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt +++ b/benchmarks/iperf/src/opnsense/mvc/app/views/OPNsense/iperf/index.volt @@ -48,7 +48,7 @@ function result_to_html(elements) { output += '' + '' + '
{{ lang._('Interface') }}' + element.interface + '
{{ lang._('Start Time') }}' + element.start_time + '
{{ lang._('Port') }}' + element.port + '
'; - + // only if test did already run if ('result' in element) { var result = element.result, diff --git a/net/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb b/benchmarks/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb similarity index 99% rename from net/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb rename to benchmarks/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb index 767a00200..23740fd90 100755 --- a/net/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb +++ b/benchmarks/iperf/src/opnsense/scripts/iperf/ruby_iperf.rb @@ -208,4 +208,3 @@ begin rescue server.close end - diff --git a/net/iperf/src/opnsense/service/conf/actions.d/actions_iperf.conf b/benchmarks/iperf/src/opnsense/service/conf/actions.d/actions_iperf.conf similarity index 100% rename from net/iperf/src/opnsense/service/conf/actions.d/actions_iperf.conf rename to benchmarks/iperf/src/opnsense/service/conf/actions.d/actions_iperf.conf diff --git a/net/iperf/Makefile b/net/iperf/Makefile deleted file mode 100644 index 2be7ff503..000000000 --- a/net/iperf/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -PLUGIN_NAME= iperf -PLUGIN_VERSION= 0.0.1 -PLUGIN_COMMENT= iperf connection speed tester -PLUGIN_DEPENDS= iperf3 ruby -PLUGIN_MAINTAINER= franz.fabian.94@gmail.com -PLUGIN_DEVEL= yes - -.include "../../Mk/plugins.mk"