From b77b3a5782945753e535e6d2d9eebf9f92ca788f Mon Sep 17 00:00:00 2001 From: Franco Fichtner Date: Tue, 22 May 2018 08:42:52 +0200 Subject: [PATCH] interfaces: flip arguments of interface_configure() --- src/etc/inc/interfaces.inc | 10 +++++----- src/etc/rc.configure_interface | 2 +- src/etc/rc.linkup | 2 +- src/etc/rc.newwanip | 2 +- src/opnsense/scripts/shell/setaddr.php | 2 +- src/www/interfaces.php | 2 +- src/www/interfaces_assign.php | 2 +- src/www/interfaces_bridge_edit.php | 2 +- src/www/interfaces_gif_edit.php | 2 +- src/www/interfaces_gre_edit.php | 2 +- src/www/interfaces_lagg_edit.php | 2 +- src/www/interfaces_vlan_edit.php | 2 +- src/www/status_interfaces.php | 2 +- 13 files changed, 17 insertions(+), 17 deletions(-) diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index aaecf9a8c..a555108a0 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -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; diff --git a/src/etc/rc.configure_interface b/src/etc/rc.configure_interface index bc7db62ec..1026d4c39 100755 --- a/src/etc/rc.configure_interface +++ b/src/etc/rc.configure_interface @@ -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); diff --git a/src/etc/rc.linkup b/src/etc/rc.linkup index 3c194ba40..fc81e9f05 100755 --- a/src/etc/rc.linkup +++ b/src/etc/rc.linkup @@ -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; } } diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 3fa903997..a5d8d9600 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -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); } diff --git a/src/opnsense/scripts/shell/setaddr.php b/src/opnsense/scripts/shell/setaddr.php index 05abad98c..fde9d7173 100755 --- a/src/opnsense/scripts/shell/setaddr.php +++ b/src/opnsense/scripts/shell/setaddr.php @@ -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); diff --git a/src/www/interfaces.php b/src/www/interfaces.php index 327ec0771..b2f31f9f4 100644 --- a/src/www/interfaces.php +++ b/src/www/interfaces.php @@ -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); } } } diff --git a/src/www/interfaces_assign.php b/src/www/interfaces_assign.php index 5f053fb37..312d18d9e 100644 --- a/src/www/interfaces_assign.php +++ b/src/www/interfaces_assign.php @@ -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++; } diff --git a/src/www/interfaces_bridge_edit.php b/src/www/interfaces_bridge_edit.php index 8f62396da..6f184e264 100644 --- a/src/www/interfaces_bridge_edit.php +++ b/src/www/interfaces_bridge_edit.php @@ -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; diff --git a/src/www/interfaces_gif_edit.php b/src/www/interfaces_gif_edit.php index 771fd6eeb..74da4eac2 100644 --- a/src/www/interfaces_gif_edit.php +++ b/src/www/interfaces_gif_edit.php @@ -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; diff --git a/src/www/interfaces_gre_edit.php b/src/www/interfaces_gre_edit.php index 74cdc9886..24caddf45 100644 --- a/src/www/interfaces_gre_edit.php +++ b/src/www/interfaces_gre_edit.php @@ -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; diff --git a/src/www/interfaces_lagg_edit.php b/src/www/interfaces_lagg_edit.php index f1b960d74..95d2ebcc3 100644 --- a/src/www/interfaces_lagg_edit.php +++ b/src/www/interfaces_lagg_edit.php @@ -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; diff --git a/src/www/interfaces_vlan_edit.php b/src/www/interfaces_vlan_edit.php index 709414ecb..b9783d77e 100644 --- a/src/www/interfaces_vlan_edit.php +++ b/src/www/interfaces_vlan_edit.php @@ -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; diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php index 86fe37688..64e14f35c 100644 --- a/src/www/status_interfaces.php +++ b/src/www/status_interfaces.php @@ -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;