diff options
| author | smos <seth.mos@dds.nl> | 2012-05-22 07:49:49 +0200 |
|---|---|---|
| committer | smos <seth.mos@dds.nl> | 2012-05-22 07:49:49 +0200 |
| commit | e7de69fbd5cbe9900074e890b89b644065d7a4eb (patch) | |
| tree | 32614f03bf09d34b0fca7b4f61a0427614bdd06a /etc/inc/interfaces.inc | |
| parent | ee8c34f4874f2ec49832bf4d8c7894801a168e21 (diff) | |
| download | pfsense-e7de69fbd5cbe9900074e890b89b644065d7a4eb.zip pfsense-e7de69fbd5cbe9900074e890b89b644065d7a4eb.tar.gz | |
First round of CARP vip renaming changes
Ticket #2415
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 6405063..eb4499d 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1177,7 +1177,7 @@ function interface_bring_down($interface = "wan", $destroy = false) { } if ($destroy == true) { - if (preg_match("/^vip|^tun|^ovpn|^gif|^gre|^lagg|^bridge|vlan|^stf|^srd/i", $realif)) + if (preg_match("/^[a-z0-9]_vip|^tun|^ovpn|^gif|^gre|^lagg|^bridge|vlan|^stf|^srd/i", $realif)) pfSense_interface_destroy($realif); } @@ -4305,7 +4305,7 @@ function get_interface_ip($interface = "wan") if (!$realif) { if (preg_match("/^carp/i", $interface)) $realif = $interface; - else if (preg_match("/^vip/i", $interface)) + else if (preg_match("/^[a-z0-9]_vip/i", $interface)) $realif = $interface; else return null; @@ -4331,7 +4331,7 @@ function get_interface_ipv6($interface = "wan") if (!$realif) { if (preg_match("/^carp/i", $interface)) $realif = $interface; - else if (preg_match("/^vip/i", $interface)) + else if (preg_match("/^[a-z0-9]_vip/i", $interface)) $realif = $interface; else return null; @@ -4350,7 +4350,7 @@ function get_interface_linklocal($interface = "wan") if (!$realif) { if (preg_match("/^carp/i", $interface)) $realif = $interface; - else if (preg_match("/^vip/i", $interface)) + else if (preg_match("/^[a-z0-9]_vip/i", $interface)) $realif = $interface; else return null; @@ -4369,7 +4369,7 @@ function get_interface_subnet($interface = "wan") if (!$realif) { if (preg_match("/^carp/i", $interface)) $realif = $interface; - else if (preg_match("/^vip/i", $interface)) + else if (preg_match("/^[a-z0-9]_vip/i", $interface)) $realif = $interface; else return null; @@ -4388,7 +4388,7 @@ function get_interface_subnetv6($interface = "wan") if (!$realif) { if (preg_match("/^carp/i", $interface)) $realif = $interface; - else if (preg_match("/^vip/i", $interface)) + else if (preg_match("/^[a-z0-9]_vip/i", $interface)) $realif = $interface; else return null; |
