mirrors/pfsense
2
0
Fork 0
mirror of https://github.com/pfsense/pfsense.git synced 2025-10-26 11:38:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Break long lines

Browse Source
This commit is contained in:
Renato Botelho 2018-11-20 17:16:41 -02:00
parent 40db4055d5
commit 1f72df3b68
1 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2834,7 +2834,9 @@ function interface_carp_configure(&$vip) {
$realif = get_real_interface($vip['interface']);
if (!does_interface_exist($realif)) {
file_notice("CARP", sprintf(gettext("Interface specified for the virtual IP address %s does not exist. Skipping this VIP."), $vip['subnet']), "Firewall: Virtual IP", "");
file_notice("CARP", sprintf(gettext(
"Interface specified for the virtual IP address %s does not exist. Skipping this VIP."),
$vip['subnet']), "Firewall: Virtual IP", "");
return;
}
if ($realif != "lo0") {
@ -2845,7 +2847,8 @@ function interface_carp_configure(&$vip) {
}
$vip_password = $vip['password'];
$vip_password = escapeshellarg(addslashes(str_replace(" ", "", $vip_password)));
$vip_password = escapeshellarg(addslashes(str_replace(" ", "",
$vip_password)));
if ($vip['password'] != "") {
$password = " pass {$vip_password}";
}
@ -2855,19 +2858,27 @@ function interface_carp_configure(&$vip) {
$advbase = "advbase " . escapeshellarg($vip['advbase']);
}
$carp_maintenancemode = isset($config["virtualip_carp_maintenancemode"]);
$carp_maintenancemode = isset(
$config["virtualip_carp_maintenancemode"]);
if ($carp_maintenancemode) {
$advskew = "advskew 254";
} else {
$advskew = "advskew " . escapeshellarg($vip['advskew']);
}
mwexec("/sbin/ifconfig {$realif} vhid " . escapeshellarg($vip['vhid']) . " {$advskew} {$advbase} {$password}");
mwexec("/sbin/ifconfig {$realif} vhid " . escapeshellarg($vip['vhid']) .
" {$advskew} {$advbase} {$password}");
if (is_ipaddrv4($vip['subnet'])) {
mwexec("/sbin/ifconfig {$realif} " . escapeshellarg($vip['subnet']) . "/" . escapeshellarg($vip['subnet_bits']) . " alias vhid " . escapeshellarg($vip['vhid']));
mwexec("/sbin/ifconfig {$realif} " .
escapeshellarg($vip['subnet']) . "/" .
escapeshellarg($vip['subnet_bits']) .
" alias vhid " . escapeshellarg($vip['vhid']));
} else if (is_ipaddrv6($vip['subnet'])) {
mwexec("/sbin/ifconfig {$realif} inet6 " . escapeshellarg($vip['subnet']) . " prefixlen " . escapeshellarg($vip['subnet_bits']) . " alias vhid " . escapeshellarg($vip['vhid']));
mwexec("/sbin/ifconfig {$realif} inet6 " .
escapeshellarg($vip['subnet']) . " prefixlen " .
escapeshellarg($vip['subnet_bits']) . " alias vhid " .
escapeshellarg($vip['vhid']));
}
return $realif;