diff options
author | Ermal <eri@pfsense.org> | 2012-04-05 20:13:44 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2012-04-05 20:22:01 +0000 |
commit | 7b47bd4c3ce792e94eca430f22891eb1dd36bb3c (patch) | |
tree | 8c983217d31e50eda49d5622d30616d2bab91704 /etc/inc | |
parent | c1a104c7c8cc61d103fe6eba8dd98a071074b4ec (diff) | |
download | pfsense-7b47bd4c3ce792e94eca430f22891eb1dd36bb3c.zip pfsense-7b47bd4c3ce792e94eca430f22891eb1dd36bb3c.tar.gz |
Make vips vhid be unique per parent interface!
Diffstat (limited to 'etc/inc')
-rw-r--r-- | etc/inc/interfaces.inc | 79 | ||||
-rw-r--r-- | etc/inc/openvpn.inc | 2 | ||||
-rw-r--r-- | etc/inc/upgrade_config.inc | 20 | ||||
-rw-r--r-- | etc/inc/util.inc | 10 |
4 files changed, 60 insertions, 51 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index e6d7d45..ddd66de 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -100,7 +100,7 @@ function does_vip_exist($vip) { switch ($vip['mode']) { case "carp": case "carpdev": - $realif = "vip{$vip['vhid']}"; + $realif = "{$vip['interface']}_vip{$vip['vhid']}"; if (!does_interface_exist($realif)) { return false; } @@ -750,9 +750,9 @@ function interfaces_gre_configure($checkparent = 0) { foreach ($config['gres']['gre'] as $i => $gre) { if(empty($gre['greif'])) $gre['greif'] = "gre{$i}"; - if ($checkparent == 1 && strstr($gre['if'], "vip")) + if ($checkparent == 1 && strstr($gre['if'], "_vip")) continue; - if ($checkparent == 2 && !strstr($gre['if'], "vip")) + if ($checkparent == 2 && !strstr($gre['if'], "_vip")) continue; /* XXX: Maybe we should report any errors?! */ interface_gre_configure($gre); @@ -816,9 +816,9 @@ function interfaces_gif_configure($checkparent = 0) { foreach ($config['gifs']['gif'] as $i => $gif) { if(empty($gif['gifif'])) $gre['gifif'] = "gif{$i}"; - if ($checkparent == 1 && strstr($gif['if'], "vip")) + if ($checkparent == 1 && strstr($gif['if'], "_vip")) continue; - if ($checkparent == 2 && !strstr($gif['if'], "vip")) + if ($checkparent == 2 && !strstr($gif['if'], "_vip")) continue; /* XXX: Maybe we should report any errors?! */ interface_gif_configure($gif); @@ -1034,13 +1034,9 @@ function interface_vip_bring_down($vip) { pfSense_interface_deladdress($vipif, $vip['subnet']); break; case "carp": - $vipif = "vip" . $vip['vhid']; - if(does_interface_exist($vipif)) - pfSense_interface_destroy($vipif); - break; case "carpdev-dhcp": - $vipif = "vip" . $vip['vhid']; - if(does_interface_exist($vipif)) + $vipif = "{$vip['interface']}_vip{$vip['vhid']}"; + if (does_interface_exist($vipif)) pfSense_interface_destroy($vipif); break; } @@ -1970,14 +1966,6 @@ function interface_carp_configure(&$vip) { if ($vip['mode'] != "carp") return; - $vip_password = $vip['password']; - $vip_password = escapeshellarg(addslashes(str_replace(" ", "", $vip_password))); - if ($vip['password'] != "") - $password = " pass {$vip_password}"; - - // set the vip interface to the vhid - $vipif = "vip{$vip['vhid']}"; - /* * ensure the interface containing the VIP really exists * prevents a panic if the interface is missing or invalid @@ -2005,7 +1993,8 @@ function interface_carp_configure(&$vip) { file_notice("CARP", sprintf(gettext("Sorry but we could not find a matching real interface subnet for the virtual IPv6 address %s."), $vip['subnet']), "Firewall: Virtual IP", ""); return; } - } + // set the vip interface to the vhid + $vipif = "{$vip['interface']}_vip{$vip['vhid']}"; /* create the carp interface and setup */ if (does_interface_exist($vipif)) { @@ -2019,7 +2008,12 @@ function interface_carp_configure(&$vip) { /* invalidate interface cache */ get_interface_arr(true); + $vip_password = $vip['password']; + $vip_password = escapeshellarg(addslashes(str_replace(" ", "", $vip_password))); + if ($vip['password'] != "") + $password = " pass {$vip_password}"; + $broadcast_address = gen_subnet_max($vip['subnet'], $vip['subnet_bits']); $advbase = ""; if (!empty($vip['advbase'])) $advbase = "advbase {$vip['advbase']}"; @@ -2036,7 +2030,7 @@ function interface_carp_configure(&$vip) { } interfaces_bring_up($vipif); - + return $vipif; } @@ -2046,17 +2040,12 @@ function interface_carpdev_configure(&$vip) { if ($vip['mode'] != "carpdev-dhcp") return; - $vip_password = $vip['password']; - $vip_password = str_replace(" ", "", $vip_password); - if($vip['password'] != "") - $password = " pass \"" . $vip_password . "\""; - if (empty($vip['interface'])) return; - $vipif = "vip" . $vip['vhid']; $realif = get_real_interface($vip['interface']); interfaces_bring_up($realif); + /* * ensure the interface containing the VIP really exists * prevents a panic if the interface is missing or invalid @@ -2066,6 +2055,7 @@ function interface_carpdev_configure(&$vip) { return; } + $vipif = "{$vip['interface']}_vip{$vip['vhid']}"; if (does_interface_exist($vipif)) { interface_bring_down($vipif); } else { @@ -2074,6 +2064,12 @@ function interface_carpdev_configure(&$vip) { pfSense_ngctl_name("{$carpdevif}:", $vipif); } + $vip_password = $vip['password']; + $vip_password = str_replace(" ", "", $vip_password); + if ($vip['password'] != "") + $password = " pass \"" . $vip_password . "\""; + + mwexec("/sbin/ifconfig {$vipif} carpdev {$realif} vhid {$vip['vhid']} advskew {$vip['advskew']} advbase {$vip['advbase']} {$password}"); interfaces_bring_up($vipif); @@ -3548,11 +3544,10 @@ function get_current_wan_address($interface = "wan") { function convert_real_interface_to_friendly_interface_name($interface = "wan") { global $config; - if (stristr($interface, "vip")) { - $index = intval(substr($interface, 3)); + if (stristr($interface, "_vip")) { foreach ($config['virtualip']['vip'] as $counter => $vip) { if ($vip['mode'] == "carpdev-dhcp" || $vip['mode'] == "carp") { - if ($index == $vip['vhid']) + if ($interface == "{$vip['interface']}_vip{$vip['vhid']}") return $vip['interface']; } } @@ -3608,11 +3603,11 @@ function convert_friendly_interface_to_friendly_descr($interface) { else $ifdesc = strtoupper($config['interfaces'][$interface]['descr']); break; - } else if (substr($interface, 0, 3) == "vip") { + } else if (stristr($interface, "_vip")) { if (is_array($config['virtualip']['vip'])) { foreach ($config['virtualip']['vip'] as $counter => $vip) { if ($vip['mode'] == "carpdev-dhcp" || $vip['mode'] == "carp") { - if ($interface == "vip{$vip['vhid']}") + if ($interface == "{$vip['interface']}_vip{$vip['vhid']}") return "{$vip['subnet']} - {$vip['descr']}"; } } @@ -3621,8 +3616,8 @@ function convert_friendly_interface_to_friendly_descr($interface) { /* if list */ $ifdescrs = get_configured_interface_with_descr(false, true); foreach ($ifdescrs as $if => $ifname) { - if ($if == $interface || $ifname == $interface) - return $ifname; + if ($if == $interface || $ifname == $interface) + return $ifname; } } break; @@ -3955,8 +3950,9 @@ function link_ip_to_carp_interface($ip) { $carp_ip = $vip['subnet']; $carp_sn = $vip['subnet_bits']; $carp_nw = gen_subnet($carp_ip, $carp_sn); - if (ip_in_subnet($ip, "{$carp_nw}/{$carp_sn}")) - $carp_int[] = "vip{$vip['vhid']}"; + if (ip_in_subnet($ip, "{$carp_nw}/{$carp_sn}")) { + $carp_int[] = "{$vip['interface']}_vip{$vip['vhid']}"; + } } } if (!empty($carp_int)) @@ -3990,14 +3986,9 @@ function link_interface_to_vips($int, $action = "") { if (is_array($config['virtualip']['vip'])) { foreach ($config['virtualip']['vip'] as $vip) { if ($int == $vip['interface']) { - if ($action == "update") { - if ($vip['mode'] == "carp" && !does_interface_exist("vip{$vip['vhid']}")) - interfaces_vips_configure($int); - else { - interface_vip_bring_down($vip); - interfaces_vips_configure($int); - } - } else + if ($action == "update") + interfaces_vips_configure($int); + else return $vip; } } diff --git a/etc/inc/openvpn.inc b/etc/inc/openvpn.inc index 01a6f6a..6575842 100644 --- a/etc/inc/openvpn.inc +++ b/etc/inc/openvpn.inc @@ -673,7 +673,7 @@ function openvpn_restart($mode, $settings) { return; /* Do not start if we are a CARP backup on this vip! */ - if ((substr($settings['interface'], 0, 3) == "vip") && (get_carp_interface_status($settings['interface']) == "BACKUP")) + if ((strstr($settings['interface'], "_vip") && (get_carp_interface_status($settings['interface']) == "BACKUP")) return; /* start the new process */ diff --git a/etc/inc/upgrade_config.inc b/etc/inc/upgrade_config.inc index d8461ee..8929a88 100644 --- a/etc/inc/upgrade_config.inc +++ b/etc/inc/upgrade_config.inc @@ -2631,6 +2631,7 @@ function upgrade_079_to_080() { } function upgrade_080_to_081() { +<<<<<<< HEAD global $config; global $g; @@ -2713,13 +2714,30 @@ function upgrade_080_to_081() { } function upgrade_081_to_082() { - global $config; + global $config, $g; /* enable the allow IPv6 toggle */ $config['system']['ipv6allow'] = true; + + /* XXX: Gross hacks in sight */ + write_config(); + if (is_array($config['virtualips']['vip'])) { + $vipchg = array(); + foreach ($config['virtualips']['vip'] as $vip) { + $realif = get_real_interface($vip['interface']); + file_put_contents("{$g['tmp_path']}/vipreplace", "s/vip{$vip['vhid']}/{$realif}_vip{$vip['vhid']}/g\n"); + } + mwexec("/bin/sh -I \"\" -f {$g['tmp_path']}/vipreplace /conf/config.xml"); + require_once("config.lib.inc"); + $config = parse_config(true); + } } function upgrade_082_to_083() { global $config; + + /* enable the allow IPv6 toggle if coming from 2.0.x where x > 1 */ + $config['system']['ipv6allow'] = true; + /* Upgrade captiveportal config */ if (!empty($config['captiveportal'])) { $tmpcp = $config['captiveportal']; diff --git a/etc/inc/util.inc b/etc/inc/util.inc index 3761a40..a2f52ef 100644 --- a/etc/inc/util.inc +++ b/etc/inc/util.inc @@ -631,11 +631,11 @@ function get_configured_carp_interface_list() { $viparr = &$config['virtualip']['vip']; foreach ($viparr as $vip) { switch ($vip['mode']) { - case "carp": - case "carpdev-dhcp": - $vipif = "vip" . $vip['vhid']; - $iflist[$vipif] = $vip['subnet']; - break; + case "carp": + case "carpdev-dhcp": + $vipif = "{$vip['interface']}_vip{$vip['vhid']}"; + $iflist[$vipif] = $vip['subnet']; + break; } } } |