Skip to content

O
OpnSense
Commit fdeff9d2 authored by Franco Fichtner's avatar Franco Fichtner
Browse files
Options

inc: replace more legacy PHP module foo

parent 6b021991
Hide whitespace changes
Inline Side-by-side
Showing with 68 additions and 43 deletions
src/etc/inc/interfaces.inc
View file @ fdeff9d2
...@@ -72,16 +72,15 @@ function convert_128bit_to_ipv6($ip6bin) { ...@@ -72,16 +72,15 @@ function convert_128bit_to_ipv6($ip6bin) {
return($ip6addr); return($ip6addr);
} }
function interfaces_bring_up($interface)
{
if (!$interface) {
function interfaces_bring_up($interface) {
if(!$interface) {
log_error(gettext("interfaces_bring_up() was called but no variable defined.")); log_error(gettext("interfaces_bring_up() was called but no variable defined."));
log_error( "Backtrace: " . debug_backtrace() ); log_error( "Backtrace: " . debug_backtrace());
return; return;
} }
pfSense_interface_flags($interface, IFF_UP);
legacy_interface_flags($interface, 'up');
} }
/* /*
...@@ -923,20 +922,30 @@ function interface_gre_configure(&$gre, $grekey = "") { ...@@ -923,20 +922,30 @@ function interface_gre_configure(&$gre, $grekey = "") {
} else { } else {
mwexec("/sbin/ifconfig {$greif} " . escapeshellarg($gre['tunnel-local-addr']) . " " . escapeshellarg($gre['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gre['tunnel-remote-net'])); mwexec("/sbin/ifconfig {$greif} " . escapeshellarg($gre['tunnel-local-addr']) . " " . escapeshellarg($gre['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gre['tunnel-remote-net']));
} }
if (isset($gre['link0']))
pfSense_interface_flags($greif, IFF_LINK0);
if (isset($gre['link1']))
pfSense_interface_flags($greif, IFF_LINK1);
if (isset($gre['link2']))
pfSense_interface_flags($greif, IFF_LINK2);
if($greif) if (isset($gre['link0'])) {
interfaces_bring_up($greif); legacy_interface_flags($greif, 'link0');
else }
log_error(gettext("Could not bring greif up -- variable not defined.")); if (isset($gre['link1'])) {
legacy_interface_flags($greif, 'link1');
}
if (isset($gre['link2'])) {
legacy_interface_flags($greif, 'link2');
}
interfaces_bring_up($greif);
if (isset($gre['link1']) && $gre['link1']) {
mwexecf(
'/sbin/route add %s/%s %s',
array(
$gre['tunnel-remote-addr'],
$gre['tunnel-remote-net'],
$gre['tunnel-local-addr']
)
);
}
if (isset($gre['link1']) && $gre['link1'])
mwexec("/sbin/route add " . escapeshellarg($gre['tunnel-remote-addr']) . "/" . escapeshellarg($gre['tunnel-remote-net']) . " " . escapeshellarg($gre['tunnel-local-addr']));
if (is_ipaddrv4($gre['tunnel-remote-addr'])) { if (is_ipaddrv4($gre['tunnel-remote-addr'])) {
file_put_contents("/tmp/{$greif}_router", $gre['tunnel-remote-addr']); file_put_contents("/tmp/{$greif}_router", $gre['tunnel-remote-addr']);
} }
...@@ -1023,14 +1032,15 @@ function interface_gif_configure(&$gif, $gifkey = "") { ...@@ -1023,14 +1032,15 @@ function interface_gif_configure(&$gif, $gifkey = "") {
} else { } else {
mwexec("/sbin/ifconfig {$gifif} " . escapeshellarg($gif['tunnel-local-addr']) . " " . escapeshellarg($gif['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gif['tunnel-remote-net'])); mwexec("/sbin/ifconfig {$gifif} " . escapeshellarg($gif['tunnel-local-addr']) . " " . escapeshellarg($gif['tunnel-remote-addr']) . " netmask " . gen_subnet_mask($gif['tunnel-remote-net']));
} }
if (isset($gif['link0']))
pfSense_interface_flags($gifif, IFF_LINK0); if (isset($gif['link0'])) {
if (isset($gif['link1'])) legacy_interface_flags($gifif, 'link0');
pfSense_interface_flags($gifif, IFF_LINK1); }
if($gifif) if (isset($gif['link1'])) {
interfaces_bring_up($gifif); legacy_interface_flags($gifif, 'link1');
else }
log_error(gettext("could not bring gifif up -- variable not defined"));
interfaces_bring_up($gifif);
$iflist = get_configured_interface_list(); $iflist = get_configured_interface_list();
foreach($iflist as $ifname) { foreach($iflist as $ifname) {
...@@ -1046,7 +1056,6 @@ function interface_gif_configure(&$gif, $gifkey = "") { ...@@ -1046,7 +1056,6 @@ function interface_gif_configure(&$gif, $gifkey = "") {
} }
} }
if (is_ipaddrv4($gif['tunnel-remote-addr'])) { if (is_ipaddrv4($gif['tunnel-remote-addr'])) {
file_put_contents("/tmp/{$gifif}_router", $gif['tunnel-remote-addr']); file_put_contents("/tmp/{$gifif}_router", $gif['tunnel-remote-addr']);
} }
...@@ -1298,8 +1307,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg = ...@@ -1298,8 +1307,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
if(does_interface_exist("$realif")) { if(does_interface_exist("$realif")) {
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " delete", true); mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " delete", true);
interface_ipalias_cleanup($interface); interface_ipalias_cleanup($interface);
if ($destroy == true) if ($destroy) {
pfSense_interface_flags($realif, -IFF_UP); legacy_interface_flags($realif, 'down');
}
mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a"); mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a");
} }
break; break;
...@@ -1307,8 +1317,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg = ...@@ -1307,8 +1317,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
if(does_interface_exist("$realif")) { if(does_interface_exist("$realif")) {
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " delete", true); mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " delete", true);
interface_ipalias_cleanup($interface); interface_ipalias_cleanup($interface);
if ($destroy == true) if ($destroy) {
pfSense_interface_flags($realif, -IFF_UP); legacy_interface_flags($realif, 'down');
}
mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a"); mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a");
} }
break; break;
...@@ -1329,8 +1340,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg = ...@@ -1329,8 +1340,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
if (is_ipaddrv6($ip6) && $ip6 != "::") if (is_ipaddrv6($ip6) && $ip6 != "::")
mwexec("/sbin/ifconfig " . escapeshellarg($realifv6) . " inet6 {$ip6} delete", true); mwexec("/sbin/ifconfig " . escapeshellarg($realifv6) . " inet6 {$ip6} delete", true);
interface_ipalias_cleanup($interface, "inet6"); interface_ipalias_cleanup($interface, "inet6");
if ($destroy == true) if ($destroy) {
pfSense_interface_flags($realif, -IFF_UP); legacy_interface_flags($realif, 'down');
}
mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a"); mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a");
} }
$track6 = link_interface_to_track6($interface); $track6 = link_interface_to_track6($interface);
...@@ -1343,8 +1355,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg = ...@@ -1343,8 +1355,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
if (is_ipaddrv6($ip6)) if (is_ipaddrv6($ip6))
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 {$ip6} delete", true); mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 {$ip6} delete", true);
interface_ipalias_cleanup($interface, "inet6"); interface_ipalias_cleanup($interface, "inet6");
if ($destroy == true) if ($destroy) {
pfSense_interface_flags($realif, -IFF_UP); legacy_interface_flags($realif, 'down');
}
} }
$track6 = link_interface_to_track6($interface); $track6 = link_interface_to_track6($interface);
break; break;
...@@ -1356,8 +1369,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg = ...@@ -1356,8 +1369,9 @@ function interface_bring_down($interface = "wan", $destroy = false, $ifacecfg =
if (!empty($ifcfg['ipaddrv6']) && is_ipaddrv6($ifcfg['ipaddrv6'])) if (!empty($ifcfg['ipaddrv6']) && is_ipaddrv6($ifcfg['ipaddrv6']))
mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 {$ifcfg['ipaddrv6']} delete", true); mwexec("/sbin/ifconfig " . escapeshellarg($realif) . " inet6 {$ifcfg['ipaddrv6']} delete", true);
interface_ipalias_cleanup($interface, "inet6"); interface_ipalias_cleanup($interface, "inet6");
if ($destroy == true) if ($destroy) {
pfSense_interface_flags($realif, -IFF_UP); legacy_interface_flags($realif, 'down');
}
mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a"); mwexec("/usr/sbin/arp -d -i " . escapeshellarg($realif) . " -a");
} }
$track6 = link_interface_to_track6($interface); $track6 = link_interface_to_track6($interface);
...@@ -3451,11 +3465,12 @@ function interface_6rd_configure($interface = "wan", $wancfg) ...@@ -3451,11 +3465,12 @@ function interface_6rd_configure($interface = "wan", $wancfg)
} }
$tmpstfiface = legacy_interface_create('stf'); $tmpstfiface = legacy_interface_create('stf');
legacy_interface_rename($tmpstfiface, $stfiface); legacy_interface_rename($tmpstfiface, $stfiface);
pfSense_interface_flags($stfiface, IFF_LINK2); legacy_interface_flags($stfiface, 'link2');
if ($wancfg['prefix-6rd-v4plen'] > 0) if ($wancfg['prefix-6rd-v4plen'] > 0) {
$rd6prefixlen += intval($wancfg['prefix-6rd-v4plen']); $rd6prefixlen += intval($wancfg['prefix-6rd-v4plen']);
else } else {
$rd6prefixlen += 32; $rd6prefixlen += 32;
}
mwexec("/sbin/ifconfig {$stfiface} inet6 {$rd6prefix}/{$rd6prefixlen}"); mwexec("/sbin/ifconfig {$stfiface} inet6 {$rd6prefix}/{$rd6prefixlen}");
mwexec("/sbin/ifconfig {$stfiface} stfv4br " . escapeshellarg($wancfg['gateway-6rd'])); mwexec("/sbin/ifconfig {$stfiface} stfv4br " . escapeshellarg($wancfg['gateway-6rd']));
if ($wancfg['prefix-6rd-v4plen'] > 0 && $wancfg['prefix-6rd-v4plen'] < 32) if ($wancfg['prefix-6rd-v4plen'] > 0 && $wancfg['prefix-6rd-v4plen'] < 32)
...@@ -3556,7 +3571,7 @@ function interface_6to4_configure($interface = 'wan', $wancfg) ...@@ -3556,7 +3571,7 @@ function interface_6to4_configure($interface = 'wan', $wancfg)
} }
$tmpstfiface = legacy_interface_create('stf'); $tmpstfiface = legacy_interface_create('stf');
legacy_interface_rename($tmpstfiface, $stfiface); legacy_interface_rename($tmpstfiface, $stfiface);
pfSense_interface_flags($stfiface, IFF_LINK2); legacy_interface_flags($stfiface, 'link2');
mwexec("/sbin/ifconfig {$stfiface} inet6 {$stflanpr} prefixlen 16"); mwexec("/sbin/ifconfig {$stfiface} inet6 {$stflanpr} prefixlen 16");
/* write out a default router file */ /* write out a default router file */
......
src/etc/inc/interfaces.lib.inc
View file @ fdeff9d2
...@@ -50,6 +50,16 @@ function legacy_interface_listget($flag = '') ...@@ -50,6 +50,16 @@ function legacy_interface_listget($flag = '')
return ($ifs); return ($ifs);
} }
function legacy_interface_flags($ifs, $flag)
{
$cmd = '/sbin/ifconfig ' . escapeshellarg($ifs) . ' ' . escapeshellarg($flag);
exec($cmd . ' 2>&1', $out, $ret);
if ($ret) {
log_error('The command `' . $cmd . '\' failed to execute');
}
}
function legacy_interface_create($ifs) function legacy_interface_create($ifs)
{ {
$cmd = '/sbin/ifconfig ' . escapeshellarg($ifs) . ' create'; $cmd = '/sbin/ifconfig ' . escapeshellarg($ifs) . ' create';
......
src/etc/inc/pfsense-utils.inc
View file @ fdeff9d2
...@@ -127,7 +127,7 @@ function enable_hardware_offloading($interface) ...@@ -127,7 +127,7 @@ function enable_hardware_offloading($interface)
$supported_ints = array('fxp'); $supported_ints = array('fxp');
if (in_array($int_family, $supported_ints)) { if (in_array($int_family, $supported_ints)) {
if (does_interface_exist($int)) { if (does_interface_exist($int)) {
pfSense_interface_flags($int, IFF_LINK0); legacy_interface_flags($int, 'link0');
} }
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment

Technounit-GROUP 2023