From fa5f2fd372e305def493df89d0c7002a7e92f50b Mon Sep 17 00:00:00 2001
From: M.Gergő
Date: Mon, 25 May 2020 19:25:15 +0200
Subject: Faster DNS resolving

---
 test.sh        |  4 ++--
 ubnt_unifi.php | 32 +++++++++-----------------------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/test.sh b/test.sh
index 8c7df9b..b8e828c 100755
--- a/test.sh
+++ b/test.sh
@@ -1,10 +1,10 @@
 #!/bin/bash
 
 controller="aaa.bbb.com"
-timeout="10"
+timeout="800"
 retry="1"
 maxproc="24"
-devnet="192.168.1.0/29"
+devnet="192.168.1.0/24"
 devices="ap1.local ap10.aaa.bb index.hu 192.168.1.1 192.168.1.111"
 resolvdup="1"
 
diff --git a/ubnt_unifi.php b/ubnt_unifi.php
index 44eadc6..61fa0b9 100644
--- a/ubnt_unifi.php
+++ b/ubnt_unifi.php
@@ -476,27 +476,18 @@ foreach($hosts2 as $key2 => $val2){     // Merge hosts into one
         $i++;
 }
 
-print_r($hosts);                                                                                                               /**************** */
-print_r($hosts2);                                                                                                             /**************** */                        
-print_r($hostsip);                                                                                                      /******************** */
-$hosts = array_merge($hosts, $hosts2);
+//$hosts = array_merge($hosts, $hosts2);
 unset($hosts2);
-
-echo "\nshm_open\n";                                                                                                  /***************** */
 $numhost = count($hostsip);
 $shm_key = ftok($argv[0], 'c');
 $shm = shmop_open($shm_key, "c", 0640, ceil($numhost/$maxproc)*32768);
 $sf = sem_get($shm_key,1,0640,1);
 $child = array();
 $raw = array();
-//$hostsr = $hosts;
 $hostsipr = $hostsip;
-//unset($hosts);
 unset($hostsip);
-//$hostst = array();
 $hostsipt = array();
 
-echo "\npermutation\n";                                                                                             /*************** */
 for($i=0,$j=0; $i<$numhost; $i++){	//Sorting addresses for child-processes
 	
 	if($j >= $maxproc){		//With permutation
@@ -513,7 +504,6 @@ for($i=0,$j=0; $i<$numhost; $i++){	//Sorting addresses for child-processes
 
 
 
-echo "\nfork\n";                                                                                          /************************ */
 for ($p=0; $p<$maxproc; $p++){		//Starts child processes to retrieve SNMP data.
 	
 	unset($hostsip);
@@ -577,7 +567,6 @@ function numchild($child, $n){	//How many child process is alive
         return $l;
 }
 
-echo "\nwait\n";                                                                                             /********************* */
 
 while(numchild($child, $maxproc)){	//Receive the raw data segments and wait for child processes
 
@@ -599,10 +588,9 @@ while(numchild($child, $maxproc)){	//Receive the raw data segments and wait for
 sem_remove($sf);
 shmop_delete($shm);
 shmop_close($shm);
-//$hosts = $hostsr;
 $hostsip = $hostsipr;
 //print_r($raw);
-//print_r($hosts);
+//print_r($hostsip);
 //$test = collect_netw_summary($raw, "ap12.wireless.lan");
 //print_r($test);
 //$test = collect_response_time($raw, "ap12.wireless.lan");
@@ -612,7 +600,6 @@ if(!is_array($raw) /*|| empty($raw)*/){
         die();
 }
 
-echo "\nprocess\n";                                                                             /************************** */
 
 if (isset($argv[1]) and $argv[1] == "config"){			// munin config
 
@@ -621,11 +608,11 @@ if (isset($argv[1]) and $argv[1] == "config"){			// munin config
 		print_header(collect_radio_summary($raw,$key['hs']));
 	}
         print_header(collect_netw_summary($raw,null));
-        foreach($hosts as $key => $val){
+        foreach($hostsip as $key => $val){
                 print_header(collect_netw_summary($raw,$key['hs']));
         } 
 	print_header(collect_response_time($raw,null));
-        foreach($hosts as $key => $val){
+        foreach($hostsip as $key => $val){
                 print_header(collect_response_time($raw,$key['hs']));
         }
 
@@ -662,29 +649,28 @@ if (isset($argv[1]) and $argv[1] == "config"){			// munin config
 	print_r(collect_netw_summary($raw,null));
         print_r(collect_response_time($raw,null));
         
-        echo "\n\nHeader-Print test on Controller: \n";
+        echo "\n\nHeader-Print test on Controller: \n\n";
         print_header(collect_radio_summary($raw,null));
-        echo "\n\nData-Print test on Controller: \n";
+        echo "\n\nData-Print test on Controller: \n\n";
         print_data(collect_radio_summary($raw,null));
 
 
 } else {							// munin data
 	print_data(collect_radio_summary($raw,null));
-        foreach($hosts as $key => $val){
+        foreach($hostsip as $key => $val){
                 print_data(collect_radio_summary($raw,$val['hs']));
         }
         print_data(collect_netw_summary($raw,null));
-        foreach($hosts as $key => $val){
+        foreach($hostsip as $key => $val){
                 print_data(collect_netw_summary($raw,$val['hs']));
         }
 	print_data(collect_response_time($raw,null));
-	foreach($hosts as $key => $val){
+	foreach($hostsip as $key => $val){
 		print_data(collect_response_time($raw,$val['hs']));
 	}
 }
 
 
 echo "\n";
-
 ?>
 
-- 
cgit v1.2.3