Project

General

Profile

« Previous | Next » 

Revision e4cf52ed

Added by Phil Davis almost 12 years ago

Do not include disabled OpenVPN in vpn_networks and negate_networks

View differences:

etc/inc/filter.inc
770 770
		if(is_array($config['openvpn']["openvpn-$type"])) {
771 771
			foreach ($config['openvpn']["openvpn-$type"] as $settings) {
772 772
				if(is_array($settings)) {
773
					if (is_subnet($settings['remote_network']) && $settings['remote_network'] <> "0.0.0.0/0")
774
						$vpns_arr[] = $settings['remote_network'];
775
					if (is_subnet($settings['tunnel_network']) && $settings['tunnel_network'] <> "0.0.0.0/0")
776
						$vpns_arr[] = $settings['tunnel_network'];
773
					if (!isset($settings['disable'])) {
774
						if (is_subnet($settings['remote_network']) && $settings['remote_network'] <> "0.0.0.0/0")
775
							$vpns_arr[] = $settings['remote_network'];
776
						if (is_subnet($settings['tunnel_network']) && $settings['tunnel_network'] <> "0.0.0.0/0")
777
							$vpns_arr[] = $settings['tunnel_network'];
778
					}
777 779
				}
778 780
			}
779 781
		}

Also available in: Unified diff