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

interfaces: flip arguments of interface_configure()

Browse Source
This commit is contained in:
Franco Fichtner 2018-05-22 08:42:52 +02:00
parent eb1e3966e5
commit b77b3a5782
13 changed files with 17 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/etc/inc/interfaces.inc
View File

@ -907,7 +907,7 @@ function interfaces_configure($verbose = false)
} elseif (!empty($config['interfaces'][$if]['ipaddrv6']) && $config['interfaces'][$if]['ipaddrv6'] == 'track6') {
$track6_list[$if] = $ifname;
} else {
interface_configure($if, false, false, $verbose);
interface_configure($verbose, $if);
}
}
@ -922,7 +922,7 @@ function interfaces_configure($verbose = false)
interfaces_bridge_configure(1);
foreach ($track6_list as $if => $ifname) {
interface_configure($if, false, false, $verbose);
interface_configure($verbose, $if);
}
interfaces_vips_configure('', $verbose);
@ -930,13 +930,13 @@ function interfaces_configure($verbose = false)
interfaces_gif_configure(2, $verbose);
foreach ($delayed_list as $if => $ifname) {
interface_configure($if, false, false, $verbose);
interface_configure($verbose, $if);
}
interfaces_bridge_configure(2);
foreach ($bridge_list as $if => $ifname) {
interface_configure($if, false, false, $verbose);
interface_configure($verbose, $if);
}
interfaces_group_setup();
@ -2308,7 +2308,7 @@ function interface_virtual_create($interface)
}
}
function interface_configure($interface = 'wan', $reload = false, $linkupevent = false, $verbose = false)
function interface_configure($verbose = false, $interface = 'wan', $reload = false, $linkupevent = false)
{
global $config;

2
src/etc/rc.configure_interface
View File

@ -37,4 +37,4 @@ require_once("services.inc");
$argument = isset($argv[1]) ? trim($argv[1]) : 'wan';
interface_configure($argument, true, false, true);
interface_configure(true, $argument, true);

2
src/etc/rc.linkup
View File

@ -70,7 +70,7 @@ function handle_argument_group($iface, $argument2)
log_error("DEVD Ethernet attached event for {$iface}");
log_error("HOTPLUG: Configuring interface {$iface}");
// Do not try to readd to bridge otherwise em(4) has problems
interface_configure($iface, true, true);
interface_configure(false, $iface, true, true);
break;
}
}

2
src/etc/rc.newwanip
View File

@ -140,7 +140,7 @@ if (isset($config['gifs']['gif']) && is_array($config['gifs']['gif'])){
$gif['gifif'] = interface_gif_configure($gif);
$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
if (!empty($confif)) {
interface_configure($confif);
interface_configure(false, $confif);
}
system_routing_configure(false, $ifname);
}

2
src/opnsense/scripts/shell/setaddr.php
View File

@ -558,7 +558,7 @@ echo "done.\n";
system_hosts_generate(true);
system_resolvconf_generate(true);
interface_bring_down($interface);
interface_configure($interface, true, false, true);
interface_configure(true, $interface, true);
setup_gateways_monitor(true);
filter_configure_sync(true);

2
src/www/interfaces.php
View File

@ -517,7 +517,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
foreach ($toapplylist as $ifapply => $ifcfgo) {
interface_bring_down($ifapply, $ifcfgo);
if (isset($config['interfaces'][$ifapply]['enable'])) {
interface_configure($ifapply, true);
interface_configure(false, $ifapply, true);
}
}
}

2
src/www/interfaces_assign.php
View File

@ -307,7 +307,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
interface_sync_wireless_clones($config['interfaces'][$ifname], false);
}
/* Reload all for the interface. */
interface_configure($ifname, true);
interface_configure(false, $ifname, true);
// count changes
$changes++;
}

2
src/www/interfaces_bridge_edit.php
View File

@ -194,7 +194,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
$confif = convert_real_interface_to_friendly_interface_name($bridge['bridgeif']);
if ($confif <> "") {
interface_configure($confif);
interface_configure(false, $confif);
}
header(url_safe('Location: /interfaces_bridge.php'));
exit;

2
src/www/interfaces_gif_edit.php
View File

@ -127,7 +127,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
$confif = convert_real_interface_to_friendly_interface_name($gif['gifif']);
if ($confif <> "") {
interface_configure($confif);
interface_configure(false, $confif);
}
header(url_safe('Location: /interfaces_gif.php'));
exit;

2
src/www/interfaces_gre_edit.php
View File

@ -101,7 +101,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
$confif = convert_real_interface_to_friendly_interface_name($gre['greif']);
if ($confif <> "") {
interface_configure($confif);
interface_configure(false, $confif);
}
header(url_safe('Location: /interfaces_gre.php'));
exit;

2
src/www/interfaces_lagg_edit.php
View File

@ -145,7 +145,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
$confif = convert_real_interface_to_friendly_interface_name($lagg['laggif']);
if ($confif <> "") {
interface_configure($confif);
interface_configure(false, $confif);
}
header(url_safe('Location: /interfaces_lagg.php'));
exit;

2
src/www/interfaces_vlan_edit.php
View File

@ -123,7 +123,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'GET') {
write_config();
if ($confif <> "") {
interface_configure($confif);
interface_configure(false, $confif);
}
header(url_safe('Location: /interfaces_vlan.php'));
exit;

2
src/www/status_interfaces.php
View File

@ -39,7 +39,7 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!empty($_POST['status']) && $_POST['status'] == 'up') {
interface_bring_down($interface);
} else {
interface_configure($interface, true);
interface_configure(false, $interface, true);
}
header(url_safe('Location: /status_interfaces.php'));
exit;