mirror/webgui
1
0
Fork 0
mirror of https://github.com/unraid/webgui.git synced 2026-05-02 07:49:20 -05:00
Code Issues Packages Projects Releases Wiki Activity

Change to use API

Browse Source 
Change to use libvirt_domain_interface_addresses which has been available for a long time but was not documented in the API manual. Using this function stops tainted warnings being written to the log.

Domain id=4 is tainted: custom-ga-command will no longer be seen in the log.
This commit is contained in:
SimonFair
2022-11-16 18:16:19 +00:00
parent 44a926fe34
commit f17bf4b791
2 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
plugins/dynamix.vm.manager/include/VMMachines.php
+5 -7
View File
@@ -192,20 +192,18 @@ foreach ($vms as $vm) {
echo "<thead><tr><th><i class='fa fa-sitemap'></i> <b>"._('Interfaces')."</b></th><th></th><th>"._('Type')."</th><th>"._('IP Address')."</th><th>"._('Prefix')."</th></tr></thead>";
$gastate = getgastate($res) ;
if ($gastate == "connected") {
$ip = $lv->domain_qemu_agent_command($res, '{"execute":"guest-network-get-interfaces"}', 10, 0) ;
$ip = $lv->domain_interface_addresses($res, 1) ;
if ($ip != false) {
$ip = json_decode($ip,true) ;
$ip = $ip["return"] ;
$duplicates = []; // hide duplicate interface names
foreach ($ip as $arrIP) {
$ipname = $arrIP["name"] ;
if (preg_match('/^(lo|Loopback)/',$ipname)) continue; // omit loopback interface
$iphdwadr = $arrIP["hardware-address"] == "" ? _("N/A") : $arrIP["hardware-address"] ;
$iplist = $arrIP["ip-addresses"] ;
$iphdwadr = $arrIP["hwaddr"] == "" ? _("N/A") : $arrIP["hwaddr"] ;
$iplist = $arrIP["addrs"] ;
foreach ($iplist as $arraddr) {
$ipaddrval = $arraddr["ip-address"] ;
$ipaddrval = $arraddr["addr"] ;
if (preg_match('/^f[c-f]/',$ipaddrval)) continue; // omit ipv6 private addresses
$iptype = $arraddr["ip-address-type"] ;
$iptype = $arraddr["type"] ? "ipv6" : "ipv4" ;
$ipprefix = $arraddr["prefix"] ;
$ipnamemac = "$ipname ($iphdwadr)";
if (!in_array($ipnamemac,$duplicates)) $duplicates[] = $ipnamemac; else $ipnamemac = "";
plugins/dynamix.vm.manager/include/libvirt.php
+5
View File
@@ -1571,6 +1571,11 @@
return ($tmp) ? $tmp : $this->_set_last_error();
}
function domain_interface_addresses($domain,$flag) {
$tmp = libvirt_domain_interface_addresses($domain,$flag);
return ($tmp) ? $tmp : $this->_set_last_error();
}
function domain_get_memory_stats($domain) {
$dom = $this->get_domain_object($domain);
if (!$dom)