lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-14 16:44:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

rc: if we replace, replace all #1606

Browse Source
This commit is contained in:
Franco Fichtner 2017-05-12 18:18:03 +02:00
parent 0a339af995
commit 27490d7ad2
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
src/etc/rc.initial.setlanip
View File

@ -219,10 +219,11 @@ function add_gateway_to_config($interface, $gatewayip, $inet_type, $is_in_subnet
$is_default = true;
$new_name = '';
foreach ($a_gateways as $item) {
foreach ($a_gateways as &$item) {
if ($item['ipprotocol'] === $inet_type) {
if ($item['interface'] === $interface && $item['gateway'] === $gatewayip) {
$new_name = $item['name'];
unset($item);
continue;
}
if (isset($item['defaultgw'])) {
@ -247,23 +248,25 @@ function add_gateway_to_config($interface, $gatewayip, $inet_type, $is_in_subnet
if ($new_name == '') {
$new_name = next_unused_gateway_name($interface);
$item = array(
'descr' => sprintf('Interface %s Gateway', strtoupper($interface)),
'defaultgw' => $is_default,
'ipprotocol' => $inet_type,
'interface' => $interface,
'gateway' => $gatewayip,
'monitor_disable' => 1,
'name' => $new_name,
'interval' => true,
'weight' => 1,
);
if (!$is_in_subnet) {
$item['fargw'] = 1;
}
$a_gateways[] = $item;
}
$item = array(
'descr' => sprintf('Interface %s Gateway', strtoupper($interface)),
'defaultgw' => $is_default,
'ipprotocol' => $inet_type,
'interface' => $interface,
'gateway' => $gatewayip,
'monitor_disable' => 1,
'name' => $new_name,
'interval' => true,
'weight' => 1,
);
if (!$is_in_subnet) {
$item['fargw'] = 1;
}
$a_gateways[] = $item;
return $new_name;
}