lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-13 00:07:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

src: why not get rid of get_possible_listen_ips()

Browse Source 
Kill what we can already.  Only one plugin uses it (obsolete SNMP).
This commit is contained in:
Franco Fichtner 2018-09-16 15:12:49 +02:00
parent 18c3d97ef2
commit 7b0d16ec54
3 changed files with 15 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/etc/inc/system.inc
View File

@ -969,18 +969,24 @@ function system_arp_wrong_if()
));
}
function get_possible_listen_ips($include_ipv6_link_local = false, $include_loopback = true) {
function get_possible_listen_ips($include_ipv6_link_local = false)
{
global $config;
$interfaces = get_configured_interface_with_descr();
$carplist = get_configured_carp_interface_list();
$listenips = array();
foreach ($carplist as $cif => $carpip) {
$interfaces[$cif] = $carpip." (".get_vip_descr($carpip).")";
}
$aliaslist = get_configured_ip_aliases_list();
foreach ($aliaslist as $aliasip => $aliasif) {
$interfaces[$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
}
foreach ($interfaces as $iface => $ifacename) {
$tmp["name"] = $ifacename;
$tmp["value"] = $iface;
@ -994,11 +1000,11 @@ function get_possible_listen_ips($include_ipv6_link_local = false, $include_loop
}
}
}
if ($include_loopback) {
$tmp["name"] = "Localhost";
$tmp["value"] = "lo0";
$listenips[] = $tmp;
}
$tmp['name'] = 'Localhost';
$tmp['value'] = 'lo0';
$listenips[] = $tmp;
foreach (array('server', 'client') as $mode) {
if (isset($config['openvpn']["openvpn-{$mode}"]) && is_array($config['openvpn']["openvpn-{$mode}"])) {
foreach ($config['openvpn']["openvpn-{$mode}"] as $id => $setting) {
@ -1011,6 +1017,7 @@ function get_possible_listen_ips($include_ipv6_link_local = false, $include_loop
}
}
}
return $listenips;
}

2
src/www/diag_logs_settings.php
View File

@ -450,7 +450,7 @@ $(document).ready(function() {
<select name="sourceip" class="form-control">
<option value=""><?=gettext('Default (any)') ?></option>
<?php
foreach (get_possible_listen_ips(false) as $sip):?>
foreach (get_possible_listen_ips() as $sip): ?>
<option value="<?=$sip['value'];?>" <?=!link_interface_to_bridge($sip['value']) && ($sip['value'] == $pconfig['sourceip']) ? "selected=\"selected\"" : "";?>>
<?=htmlspecialchars($sip['name']);?>
</option>

2
src/www/services_unbound.php
View File

@ -195,7 +195,7 @@ include_once("head.inc");
<td>
<select name="active_interface[]" multiple="multiple" class="selectpicker" title="<?= html_safe(gettext('All (recommended)')) ?>">
<?php
foreach (get_possible_listen_ips(false) as $laddr):?>
foreach (get_possible_listen_ips() as $laddr):?>
<option value="<?=$laddr['value'];?>" <?=!empty($pconfig['active_interface'][0]) && in_array($laddr['value'], $pconfig['active_interface']) ? 'selected="selected"' : "";?>><?=htmlspecialchars($laddr['name']);?></option>
<?php
endforeach; ?>