mirror of
https://github.com/billz/raspap-webgui.git
synced 2023-10-10 13:37:24 +02:00
Processed with phpcbf
This commit is contained in:
billz
parent
e16844294b
commit
43043d48e4
@ -2,7 +2,8 @@
|
||||
|
||||
require_once 'includes/functions.php';
|
||||
|
||||
function getClients($simple=true) {
|
||||
function getClients($simple=true)
|
||||
{
|
||||
exec('ifconfig -a | grep -oP "^(?!lo)(\w*)"', $rawdevs); // all devices except loopback
|
||||
$path=RASPI_CLIENT_SCRIPT_PATH;
|
||||
$cl=array();
|
||||
@ -19,14 +20,17 @@ function getClients($simple=true) {
|
||||
}
|
||||
foreach ($rawdevs as $i => $dev) {
|
||||
$cl["device"][$i]["name"]=$dev;
|
||||
if (preg_match("/^(\w+)[0-9]$/",$dev,$nam) === 1) $nam=$nam[1];
|
||||
else $nam="none";
|
||||
if (($n = array_search($nam,$_SESSION["net-device-name-prefix"])) === false) $n = count($_SESSION["net-device-types"])-1;
|
||||
if (preg_match("/^(\w+)[0-9]$/", $dev, $nam) === 1) { $nam=$nam[1];
|
||||
} else { $nam="none";
|
||||
}
|
||||
if (($n = array_search($nam, $_SESSION["net-device-name-prefix"])) === false) { $n = count($_SESSION["net-device-types"])-1;
|
||||
}
|
||||
$ty = $_SESSION["net-device-types"][$n];
|
||||
$cl["device"][$i]["type"]=$ty;
|
||||
unset($udevinfo);
|
||||
exec("udevadm info /sys/class/net/$dev 2> /dev/null", $udevinfo);
|
||||
if ( $nam == "ppp" && isset($devtty)) exec("udevadm info --name='$devtty' 2> /dev/null", $udevinfo);
|
||||
if ($nam == "ppp" && isset($devtty)) { exec("udevadm info --name='$devtty' 2> /dev/null", $udevinfo);
|
||||
}
|
||||
if(!empty($udevinfo) && is_array($udevinfo)) {
|
||||
$model = preg_only_match("/ID_MODEL_ENC=(.*)$/", $udevinfo);
|
||||
if(empty($model) || preg_match("/^[0-9a-f]{4}$/", $model) === 1) {
|
||||
@ -58,8 +62,9 @@ function getClients($simple=true) {
|
||||
case "eth":
|
||||
unset($res);
|
||||
exec("ip link show $dev 2> /dev/null | grep -oP ' UP '", $res);
|
||||
if(empty($res) && empty($ipadd)) $cl["device"][$i]["connected"] = "n";
|
||||
else $cl["device"][$i]["connected"] = "y";
|
||||
if(empty($res) && empty($ipadd)) { $cl["device"][$i]["connected"] = "n";
|
||||
} else { $cl["device"][$i]["connected"] = "y";
|
||||
}
|
||||
break;
|
||||
case "wlan":
|
||||
unset($retiw);
|
||||
@ -73,15 +78,18 @@ function getClients($simple=true) {
|
||||
$cl["device"][$i]["ap-mac"] = preg_only_match("/^Connected to ([0-9a-f\:]*).*$/", $retiw);
|
||||
$sig = preg_only_match("/.*signal: (.*)$/", $retiw);
|
||||
$val = preg_only_match("/^([0-9\.-]*).*$/", $sig);
|
||||
if (!is_numeric($val)) $val = -100;
|
||||
if( $val >= -50 ) $qual=100;
|
||||
else if( $val < -100) $qual=0;
|
||||
else $qual=round($val*2+200);
|
||||
if (!is_numeric($val)) { $val = -100;
|
||||
}
|
||||
if($val >= -50 ) { $qual=100;
|
||||
} else if($val < -100) { $qual=0;
|
||||
} else { $qual=round($val*2+200);
|
||||
}
|
||||
$cl["device"][$i]["signal"] = "$sig (".$qual."%)";
|
||||
$cl["device"][$i]["bitrate"] = preg_only_match("/.*bitrate: ([0-9\.]* \w*\/s).*$/", $retiw);
|
||||
$cl["device"][$i]["freq"] = preg_only_match("/.*freq: (.*)$/", $retiw);
|
||||
$cl["device"][$i]["ap-mac"] = preg_only_match("/^Connected to ([0-9a-f\:]*).*$/", $retiw);
|
||||
} else $cl["device"][$i]["connected"] = "n";
|
||||
} else { $cl["device"][$i]["connected"] = "n";
|
||||
}
|
||||
break;
|
||||
case "ppp":
|
||||
unset($res);
|
||||
@ -96,14 +104,16 @@ function getClients($simple=true) {
|
||||
}
|
||||
break;
|
||||
}
|
||||
if(empty($res) && empty($ipadd)) $cl["device"][$i]["connected"] = "n";
|
||||
else $cl["device"][$i]["connected"] = "y";
|
||||
if(empty($res) && empty($ipadd)) { $cl["device"][$i]["connected"] = "n";
|
||||
} else { $cl["device"][$i]["connected"] = "y";
|
||||
}
|
||||
unset($res);
|
||||
exec("$path/info_huawei.sh mode modem", $res);
|
||||
$cl["device"][$i]["mode"] = $res[0];
|
||||
unset($res);
|
||||
exec("$path/info_huawei.sh device modem", $res);
|
||||
if( $res[0] != "none" ) $cl["device"][$i]["model"] = $res[0];
|
||||
if($res[0] != "none" ) { $cl["device"][$i]["model"] = $res[0];
|
||||
}
|
||||
unset($res);
|
||||
exec("$path/info_huawei.sh signal modem", $res);
|
||||
$cl["device"][$i]["signal"] = $res[0];
|
||||
@ -121,7 +131,8 @@ function getClients($simple=true) {
|
||||
$cl["device"][$i]["mode"] = $res[0];
|
||||
unset($res);
|
||||
exec("$path/info_huawei.sh device hilink $apiadd", $res);
|
||||
if( $res[0] != "none" ) $cl["device"][$i]["model"] = $res[0];
|
||||
if($res[0] != "none" ) { $cl["device"][$i]["model"] = $res[0];
|
||||
}
|
||||
unset($res);
|
||||
exec("$path/info_huawei.sh signal hilink $apiadd", $res);
|
||||
$cl["device"][$i]["signal"] = $res[0];
|
||||
@ -148,13 +159,15 @@ function getClients($simple=true) {
|
||||
if (!isset($cl["device"][$i]["signal"])) {
|
||||
$cl["device"][$i]["signal"]= $cl["device"][$i]["connected"] == "n" ? "-100 dB (0%)": "0 dB (100%)";;
|
||||
}
|
||||
if (!isset($cl["device"][$i]["isAP"])) $cl["device"][$i]["isAP"]=false;
|
||||
if (!isset($cl["device"][$i]["isAP"])) { $cl["device"][$i]["isAP"]=false;
|
||||
}
|
||||
}
|
||||
}
|
||||
return $cl;
|
||||
}
|
||||
|
||||
function load_client_config() {
|
||||
function load_client_config()
|
||||
{
|
||||
// load network device config file for UDEV rules into $_SESSION
|
||||
if(true) {
|
||||
// if(!isset($_SESSION["udevrules"])) {
|
||||
@ -170,7 +183,7 @@ function load_client_config() {
|
||||
$_SESSION["net-device-types-info"][]=$dev["type_info"];
|
||||
}
|
||||
} catch (Exception $e) {
|
||||
$_SESSION["udevrules"]= NULL;
|
||||
$_SESSION["udevrules"]= null;
|
||||
}
|
||||
$_SESSION["net-device-types"][]="none";
|
||||
$_SESSION["net-device-types-info"][]="unknown";
|
||||
@ -178,7 +191,8 @@ function load_client_config() {
|
||||
}
|
||||
}
|
||||
|
||||
function findCurrentClientIndex($clients) {
|
||||
function findCurrentClientIndex($clients)
|
||||
{
|
||||
$devid = -1;
|
||||
if(!empty($clients)) {
|
||||
$ncl=$clients["clients"];
|
||||
@ -195,25 +209,31 @@ function findCurrentClientIndex($clients) {
|
||||
return $devid;
|
||||
}
|
||||
|
||||
function waitClientConnected($dev, $timeout=10) {
|
||||
function waitClientConnected($dev, $timeout=10)
|
||||
{
|
||||
do {
|
||||
exec('ifconfig -a | grep -i '.$dev.' -A 1 | grep -oP "(?<=inet )([0-9]{1,3}\.){3}[0-9]{1,3}"', $res);
|
||||
$connected= !empty($res);
|
||||
if(!$connected) sleep(1);
|
||||
if(!$connected) { sleep(1);
|
||||
}
|
||||
} while(!$connected && --$timeout > 0);
|
||||
return $connected;
|
||||
}
|
||||
|
||||
function setClientState($state) {
|
||||
function setClientState($state)
|
||||
{
|
||||
$clients=getClients();
|
||||
if (($idx = findCurrentClientIndex($clients)) >= 0) {
|
||||
$dev = $clients["device"][$idx];
|
||||
exec('ifconfig -a | grep -i '.$dev["name"].' -A 1 | grep -oP "(?<=inet )([0-9]{1,3}\.){3}[0-9]{1,3}"', $res);
|
||||
if ( !empty($res)) $connected=$res[0];
|
||||
if (!empty($res)) { $connected=$res[0];
|
||||
}
|
||||
switch($dev["type"]) {
|
||||
case "wlan":
|
||||
if($state =="up") exec('sudo ip link set '.$dev["name"].' up');
|
||||
if(!empty($connected) && $state =="down") exec('sudo ip link set '.$dev["name"].' down');
|
||||
if($state =="up") { exec('sudo ip link set '.$dev["name"].' up');
|
||||
}
|
||||
if(!empty($connected) && $state =="down") { exec('sudo ip link set '.$dev["name"].' down');
|
||||
}
|
||||
break;
|
||||
case "hilink":
|
||||
preg_match("/^([0-9]{1,3}\.){3}/", $connected, $ipadd);
|
||||
@ -227,12 +247,15 @@ function setClientState($state) {
|
||||
exec('sudo '.RASPI_CLIENT_SCRIPT_PATH.'/onoff_huawei_hilink.sh -c '.$mode.' -h '.$ipadd.' -p '.$pin);
|
||||
break;
|
||||
case "ppp":
|
||||
if($state == "up") exec('sudo ifup '.$dev["name"]);
|
||||
if(!empty($connected) && $state == "down") exec('sudo ifdown '.$dev["name"]);
|
||||
if($state == "up") { exec('sudo ifup '.$dev["name"]);
|
||||
}
|
||||
if(!empty($connected) && $state == "down") { exec('sudo ifdown '.$dev["name"]);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
break;
|
||||
}
|
||||
if($state=="up") waitClientConnected($dev["name"],15);
|
||||
if($state=="up") { waitClientConnected($dev["name"], 15);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Loading…
Reference in New Issue
Block a user